diff --git a/.github/labeler.yml b/.github/labeler.yml
index 07a6c451cff8..95eaa49252dd 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -40,3 +40,7 @@ translation:
   - docs/ru-ru/**/*
 CI:
   - .github/**/*
+dd:
+  - data/constants/**/*
+  - data/mappings/**/*
+  - data/schemas/**/*
diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml
index 38c1cfe50691..db78f1611224 100644
--- a/.github/workflows/api.yml
+++ b/.github/workflows/api.yml
@@ -25,7 +25,7 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 1
         persist-credentials: false
diff --git a/.github/workflows/auto_tag.yml b/.github/workflows/auto_tag.yml
index 0fc5e8850551..b4465277b0d7 100644
--- a/.github/workflows/auto_tag.yml
+++ b/.github/workflows/auto_tag.yml
@@ -27,7 +27,7 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
diff --git a/.github/workflows/ci_builds.yml b/.github/workflows/ci_builds.yml
index b3bb83fa8500..81151d689877 100644
--- a/.github/workflows/ci_builds.yml
+++ b/.github/workflows/ci_builds.yml
@@ -33,7 +33,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
         ref: ${{ github.event.inputs.branch || github.ref }}
diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index 27bdcc562b78..77b5bfe0734d 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -24,7 +24,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml
index 9c041c42ec8e..afcda1fe98bb 100644
--- a/.github/workflows/develop_update.yml
+++ b/.github/workflows/develop_update.yml
@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}
         fetch-depth: 0
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 39a8e396becd..a6944e1816ff 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -23,7 +23,7 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 1
 
diff --git a/.github/workflows/feature_branch_update.yml b/.github/workflows/feature_branch_update.yml
index 097605516093..283a255342d8 100644
--- a/.github/workflows/feature_branch_update.yml
+++ b/.github/workflows/feature_branch_update.yml
@@ -21,7 +21,7 @@ jobs:
         - riot
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}
         fetch-depth: 0
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 3652071ed6e9..9e8b80c883e3 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
@@ -35,7 +35,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v37
+      uses: tj-actions/changed-files@v39
 
     - name: Run qmk formatters
       shell: 'bash {0}'
diff --git a/.github/workflows/format_push.yml b/.github/workflows/format_push.yml
index 45c8b3daf617..61b4caf422d2 100644
--- a/.github/workflows/format_push.yml
+++ b/.github/workflows/format_push.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 1c0667abbacd..19dd7c70a990 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
@@ -27,7 +27,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v37
+      uses: tj-actions/changed-files@v39
 
     - name: Print info
       run: |
@@ -74,31 +74,10 @@ jobs:
         fi
         exit $exit_code
 
-    - name: Verify at most one added keyboard
+    - name: Verify keyboard aliases
       if: always()
       shell: 'bash {0}'
       run: |
         git reset --hard
         git clean -xfd
-
-        # Get the keyboard list and count for the target branch
-        git checkout -f ${{ github.base_ref }}
-        git pull --ff-only
-        QMK_KEYBOARDS_BASE=$(qmk list-keyboards)
-        QMK_KEYBOARDS_BASE_COUNT=$(qmk list-keyboards | wc -l)
-
-        # Get the keyboard list and count for the PR
-        git checkout -f ${{ github.head_ref }}
-        git merge --no-commit --squash ${{ github.base_ref }}
-        QMK_KEYBOARDS_PR=$(qmk list-keyboards)
-        QMK_KEYBOARDS_PR_COUNT=$(qmk list-keyboards | wc -l)
-
-        echo "::group::Keyboards changes in this PR"
-        diff -d -U 0 <(echo "$QMK_KEYBOARDS_BASE") <(echo "$QMK_KEYBOARDS_PR") | grep -vE '^(---|\+\+\+|@@)' | sed -e 's@^-@Removed: @g' -e 's@^+@  Added: @g'
-        echo "::endgroup::"
-
-        if [[ $QMK_KEYBOARDS_PR_COUNT -gt $(($QMK_KEYBOARDS_BASE_COUNT + 1)) ]]; then
-            echo "More than one keyboard added in this PR -- see the PR Checklist."
-            echo "::error::More than one keyboard added in this PR -- see the PR Checklist."
-            exit 1
-        fi
+        qmk ci-validate-aliases
diff --git a/.github/workflows/regen.yml b/.github/workflows/regen.yml
index a2b4ef2b934b..a31526084f9e 100644
--- a/.github/workflows/regen.yml
+++ b/.github/workflows/regen.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Run qmk generators
       run: |
diff --git a/.github/workflows/regen_push.yml b/.github/workflows/regen_push.yml
index 7394925a0de9..f1b781293767 100644
--- a/.github/workflows/regen_push.yml
+++ b/.github/workflows/regen_push.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Run qmk generators
       run: |
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index f011fb5460d2..ce9bd0f3161e 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -3,6 +3,7 @@ name: 'Close stale issues and PRs'
 permissions:
   issues: write
   pull-requests: write
+  actions: write
 
 on:
   schedule:
@@ -13,7 +14,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@main
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
index fb538d4f841c..eec8c8b5fc23 100644
--- a/.github/workflows/unit_test.yml
+++ b/.github/workflows/unit_test.yml
@@ -26,7 +26,7 @@ jobs:
     container: ghcr.io/qmk/qmk_cli
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
     - name: Install dependencies
diff --git a/.gitignore b/.gitignore
index 13ed2960352a..f6401d9f832e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,6 +95,7 @@ secrets.tar
 # Python things
 __pycache__
 .python-version
+.venv
 
 # Prerequisites for updating ChibiOS
 /util/fmpp*
@@ -107,5 +108,6 @@ compile_commands.json
 .clangd/
 .cache/
 
-# VIA(L) json files that don't belong in QMK repo
+# VIA(L) files that don't belong in QMK repo
 via*.json
+/keyboards/**/keymaps/vial/*
diff --git a/Makefile b/Makefile
index c77eadf97d5d..9f2e4636a4b4 100644
--- a/Makefile
+++ b/Makefile
@@ -328,7 +328,7 @@ define PARSE_TEST
     ifeq ($$(TEST_NAME),all)
         MATCHED_TESTS := $$(TEST_LIST)
     else
-        MATCHED_TESTS := $$(foreach TEST, $$(TEST_LIST),$$(if $$(findstring $$(TEST_NAME), $$(notdir $$(TEST))), $$(TEST),))
+        MATCHED_TESTS := $$(foreach TEST, $$(TEST_LIST),$$(if $$(findstring x$$(TEST_NAME)x, x$$(notdir $$(TEST))x), $$(TEST),))
     endif
     $$(foreach TEST,$$(MATCHED_TESTS),$$(eval $$(call BUILD_TEST,$$(TEST),$$(TEST_TARGET))))
 endef
diff --git a/builddefs/build_full_test.mk b/builddefs/build_full_test.mk
index 964ba773d48c..85ee0898ec2d 100644
--- a/builddefs/build_full_test.mk
+++ b/builddefs/build_full_test.mk
@@ -17,7 +17,6 @@ $(TEST)_INC := \
 	tests/test_common/common_config.h
 
 $(TEST)_SRC := \
-	$(TMK_COMMON_SRC) \
 	$(QUANTUM_SRC) \
 	$(SRC) \
 	$(QUANTUM_PATH)/keymap_introspection.c \
@@ -31,7 +30,7 @@ $(TEST)_SRC := \
 	tests/test_common/test_logger.cpp \
 	$(patsubst $(ROOTDIR)/%,%,$(wildcard $(TEST_PATH)/*.cpp))
 
-$(TEST)_DEFS := $(TMK_COMMON_DEFS) $(OPT_DEFS) "-DKEYMAP_C=\"keymap.c\""
+$(TEST)_DEFS := $(OPT_DEFS) "-DKEYMAP_C=\"keymap.c\""
 
 $(TEST)_CONFIG := $(TEST_PATH)/config.h
 
diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index 0425d3fc9d76..6ae6bc686b37 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -27,7 +27,6 @@ QMK_BIN ?= qmk
 # Set the filename for the final firmware binary
 KEYBOARD_FILESAFE := $(subst /,_,$(KEYBOARD))
 TARGET ?= $(KEYBOARD_FILESAFE)_$(KEYMAP)
-KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD_FILESAFE)
 
 ifeq ($(strip $(DUMP_CI_METADATA)),yes)
     $(info CI Metadata: KEYBOARD=$(KEYBOARD))
@@ -44,7 +43,7 @@ endif
 # Object files and generated keymap directory
 #     To put object files in current directory, use a dot (.), do NOT make
 #     this an empty or blank macro!
-KEYMAP_OUTPUT := $(BUILD_DIR)/obj_$(TARGET)
+INTERMEDIATE_OUTPUT := $(BUILD_DIR)/obj_$(TARGET)
 
 ifdef SKIP_VERSION
     OPT_DEFS += -DSKIP_VERSION
@@ -60,7 +59,7 @@ VERSION_H_FLAGS += --skip-git
 endif
 
 # Generate the board's version.h file.
-$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(KEYMAP_OUTPUT)/src/version.h)
+$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(INTERMEDIATE_OUTPUT)/src/version.h)
 
 # Determine which subfolders exist.
 KEYBOARD_FOLDER_PATH_1 := $(KEYBOARD)
@@ -121,7 +120,7 @@ MAIN_KEYMAP_PATH_4 := $(KEYBOARD_PATH_4)/keymaps/$(KEYMAP)
 MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP)
 
 # Pull in rules from info.json
-INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_rules.mk)
+INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/info_rules.mk)
 include $(INFO_RULES_MK)
 
 # Check for keymap.json first, so we can regenerate keymap.c
@@ -161,28 +160,28 @@ endif
 
 # Have we found a keymap.json?
 ifneq ("$(wildcard $(KEYMAP_JSON))", "")
-    KEYMAP_C := $(KEYMAP_OUTPUT)/src/keymap.c
-    KEYMAP_H := $(KEYMAP_OUTPUT)/src/config.h
+    KEYMAP_C := $(INTERMEDIATE_OUTPUT)/src/keymap.c
+    KEYMAP_H := $(INTERMEDIATE_OUTPUT)/src/config.h
 
     # Load the keymap-level rules.mk if exists
     -include $(KEYMAP_PATH)/rules.mk
 
     # Load any rules.mk content from keymap.json
-    INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(KEYMAP_OUTPUT)/src/rules.mk $(KEYMAP_JSON))
+    INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(INTERMEDIATE_OUTPUT)/src/rules.mk $(KEYMAP_JSON))
     include $(INFO_RULES_MK)
 
 # Add rules to generate the keymap files - indentation here is important
-$(KEYMAP_OUTPUT)/src/keymap.c: $(KEYMAP_JSON)
+$(INTERMEDIATE_OUTPUT)/src/keymap.c: $(KEYMAP_JSON)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
 	$(eval CMD=$(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON))
 	@$(BUILD_CMD)
 
-$(KEYMAP_OUTPUT)/src/config.h: $(KEYMAP_JSON)
+$(INTERMEDIATE_OUTPUT)/src/config.h: $(KEYMAP_JSON)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
 	$(eval CMD=$(QMK_BIN) generate-config-h --quiet --output $(KEYMAP_H) $(KEYMAP_JSON))
 	@$(BUILD_CMD)
 
-generated-files: $(KEYMAP_OUTPUT)/src/config.h $(KEYMAP_OUTPUT)/src/keymap.c
+generated-files: $(INTERMEDIATE_OUTPUT)/src/config.h $(INTERMEDIATE_OUTPUT)/src/keymap.c
 
 endif
 
@@ -323,34 +322,34 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/info.json)","")
     INFO_JSON_FILES += $(KEYBOARD_PATH_5)/info.json
 endif
 
-CONFIG_H += $(KEYBOARD_OUTPUT)/src/info_config.h
-KEYBOARD_SRC += $(KEYBOARD_OUTPUT)/src/default_keyboard.c
+CONFIG_H += $(INTERMEDIATE_OUTPUT)/src/info_config.h
+KEYBOARD_SRC += $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c
 
-$(KEYBOARD_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES)
+$(INTERMEDIATE_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_config.h)
+	$(eval CMD=$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/info_config.h)
 	@$(BUILD_CMD)
 
-$(KEYBOARD_OUTPUT)/src/default_keyboard.c: $(INFO_JSON_FILES)
+$(INTERMEDIATE_OUTPUT)/src/default_keyboard.c: $(INFO_JSON_FILES)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-keyboard-c --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.c)
+	$(eval CMD=$(QMK_BIN) generate-keyboard-c --quiet --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c)
 	@$(BUILD_CMD)
 
-$(KEYBOARD_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES)
+$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --include $(FOUND_KEYBOARD_H) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h)
+	$(eval CMD=$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --include $(FOUND_KEYBOARD_H) --output $(INTERMEDIATE_OUTPUT)/src/default_keyboard.h)
 	@$(BUILD_CMD)
 
-generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/default_keyboard.c $(KEYBOARD_OUTPUT)/src/default_keyboard.h
+generated-files: $(INTERMEDIATE_OUTPUT)/src/info_config.h $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c $(INTERMEDIATE_OUTPUT)/src/default_keyboard.h
 
-generated-files: $(KEYMAP_OUTPUT)/src/info_deps.d
+generated-files: $(INTERMEDIATE_OUTPUT)/src/info_deps.d
 
-$(KEYMAP_OUTPUT)/src/info_deps.d:
+$(INTERMEDIATE_OUTPUT)/src/info_deps.d:
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-make-dependencies -kb $(KEYBOARD) -km $(KEYMAP) -o $(KEYMAP_OUTPUT)/src/info_deps.d)
+	$(eval CMD=$(QMK_BIN) generate-make-dependencies -kb $(KEYBOARD) -km $(KEYMAP) -o $(INTERMEDIATE_OUTPUT)/src/info_deps.d)
 	@$(BUILD_CMD)
 
--include $(KEYMAP_OUTPUT)/src/info_deps.d
+-include $(INTERMEDIATE_OUTPUT)/src/info_deps.d
 
 .INTERMEDIATE : generated-files
 
@@ -423,8 +422,7 @@ VPATH += $(KEYMAP_PATH)
 VPATH += $(USER_PATH)
 VPATH += $(KEYBOARD_PATHS)
 VPATH += $(COMMON_VPATH)
-VPATH += $(KEYBOARD_OUTPUT)/src
-VPATH += $(KEYMAP_OUTPUT)/src
+VPATH += $(INTERMEDIATE_OUTPUT)/src
 
 include $(BUILDDEFS_PATH)/common_features.mk
 include $(BUILDDEFS_PATH)/generic_features.mk
@@ -433,19 +431,17 @@ include $(PLATFORM_PATH)/common.mk
 
 SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
 SRC += $(patsubst %.c,%.clib,$(QUANTUM_LIB_SRC))
-SRC += $(TMK_COMMON_SRC)
-OPT_DEFS += $(TMK_COMMON_DEFS)
-EXTRALDFLAGS += $(TMK_COMMON_LDFLAGS)
 
 -include $(PLATFORM_PATH)/$(PLATFORM_KEY)/bootloader.mk
 include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
 -include $(PLATFORM_PATH)/$(PLATFORM_KEY)/flash.mk
 
 ifneq ($(strip $(PROTOCOL)),)
-    include $(TMK_PATH)/protocol/$(strip $(shell echo $(PROTOCOL) | tr '[:upper:]' '[:lower:]')).mk
+PROTOCOL_KEY = $(strip $(shell echo $(PROTOCOL) | tr '[:upper:]' '[:lower:]'))
 else
-    include $(TMK_PATH)/protocol/$(PLATFORM_KEY).mk
+PROTOCOL_KEY = $(PLATFORM_KEY)
 endif
+include $(TMK_PATH)/protocol/$(PROTOCOL_KEY)/$(PROTOCOL_KEY).mk
 
 # Setup definitions based on the selected MCU
 $(eval $(call add_qmk_prefix_defs,MCU_ORIG,MCU))
@@ -471,17 +467,14 @@ PROJECT_CONFIG := $(CONFIG_H)
 CONFIG_H += $(POST_CONFIG_H)
 ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H)
 
-OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
-$(KEYMAP_OUTPUT)_SRC := $(SRC)
-$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) \
--DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(KEYBOARD_OUTPUT)/src/default_keyboard.h\" \
--DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\"
-$(KEYMAP_OUTPUT)_INC :=  $(VPATH) $(EXTRAINCDIRS)
-$(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H)
-$(KEYBOARD_OUTPUT)_SRC := $(PLATFORM_SRC)
-$(KEYBOARD_OUTPUT)_DEFS := $(PROJECT_DEFS)
-$(KEYBOARD_OUTPUT)_INC := $(PROJECT_INC)
-$(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG)
+OUTPUTS := $(INTERMEDIATE_OUTPUT)
+$(INTERMEDIATE_OUTPUT)_SRC := $(SRC) $(PLATFORM_SRC)
+$(INTERMEDIATE_OUTPUT)_DEFS := $(OPT_DEFS) \
+	-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h\" \
+	-DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \
+	$(PROJECT_DEFS)
+$(INTERMEDIATE_OUTPUT)_INC :=  $(VPATH) $(EXTRAINCDIRS) $(PROJECT_INC)
+$(INTERMEDIATE_OUTPUT)_CONFIG := $(CONFIG_H) $(PROJECT_CONFIG)
 
 # Default target.
 all: build check-size
@@ -502,10 +495,10 @@ check-size: top-symbols
 top-symbols: build
 	echo "###########################################"
 	echo "# Highest flash usage:"
-	$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep -i ' [t] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000#       #g' -e 's#^000000#      #g' -e 's#^00000#     #g' -e 's#^0000#    #g' -e 's#^000#   #g' -e 's#^00#  #g' -e 's#^0# #g'
+	$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep ' [RrTt] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000#       #g' -e 's#^000000#      #g' -e 's#^00000#     #g' -e 's#^0000#    #g' -e 's#^000#   #g' -e 's#^00#  #g' -e 's#^0# #g'
 	echo "###########################################"
 	echo "# Highest RAM usage:"
-	$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep -i ' [dbv] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000#       #g' -e 's#^000000#      #g' -e 's#^00000#     #g' -e 's#^0000#    #g' -e 's#^000#   #g' -e 's#^00#  #g' -e 's#^0# #g'
+	$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep ' [BbCDdGgSs] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000#       #g' -e 's#^000000#      #g' -e 's#^00000#     #g' -e 's#^0000#    #g' -e 's#^000#   #g' -e 's#^00#  #g' -e 's#^0# #g'
 	echo "###########################################"
 endif
 
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index e904d6beb975..094eda6fef64 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -317,14 +317,10 @@ ifneq ($(strip $(FLASH_DRIVER)), none)
 endif
 
 RGBLIGHT_ENABLE ?= no
-VALID_RGBLIGHT_TYPES := WS2812 APA102 custom
-
-ifeq ($(strip $(RGBLIGHT_CUSTOM_DRIVER)), yes)
-    RGBLIGHT_DRIVER ?= custom
-endif
+VALID_RGBLIGHT_TYPES := ws2812 apa102 custom
 
 ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
-    RGBLIGHT_DRIVER ?= WS2812
+    RGBLIGHT_DRIVER ?= ws2812
 
     ifeq ($(filter $(RGBLIGHT_DRIVER),$(VALID_RGBLIGHT_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid RGBLIGHT_DRIVER,RGBLIGHT_DRIVER="$(RGBLIGHT_DRIVER)" is not a valid RGB type)
@@ -338,11 +334,11 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
         RGB_KEYCODES_ENABLE := yes
     endif
 
-    ifeq ($(strip $(RGBLIGHT_DRIVER)), WS2812)
+    ifeq ($(strip $(RGBLIGHT_DRIVER)), ws2812)
         WS2812_DRIVER_REQUIRED := yes
     endif
 
-    ifeq ($(strip $(RGBLIGHT_DRIVER)), APA102)
+    ifeq ($(strip $(RGBLIGHT_DRIVER)), apa102)
         APA102_DRIVER_REQUIRED := yes
     endif
 
@@ -352,8 +348,8 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
 endif
 
 LED_MATRIX_ENABLE ?= no
-VALID_LED_MATRIX_TYPES := IS31FL3731 IS31FL3742A IS31FL3743A IS31FL3745 IS31FL3746A CKLED2001 custom
-# TODO: IS31FL3733 IS31FL3737 IS31FL3741
+VALID_LED_MATRIX_TYPES := is31fl3731 is31fl3742a is31fl3743a is31fl3745 is31fl3746a ckled2001 custom
+# TODO: is31fl3733 is31fl3737 is31fl3741
 
 ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
     ifeq ($(filter $(LED_MATRIX_DRIVER),$(VALID_LED_MATRIX_TYPES)),)
@@ -367,48 +363,49 @@ endif
     COMMON_VPATH += $(QUANTUM_DIR)/led_matrix
     COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations
     COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations/runners
+    POST_CONFIG_H += $(QUANTUM_DIR)/led_matrix/post_config.h
     SRC += $(QUANTUM_DIR)/process_keycode/process_backlight.c
     SRC += $(QUANTUM_DIR)/led_matrix/led_matrix.c
     SRC += $(QUANTUM_DIR)/led_matrix/led_matrix_drivers.c
     SRC += $(LIB_PATH)/lib8tion/lib8tion.c
     CIE1931_CURVE := yes
 
-    ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3731)
+    ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3731)
         OPT_DEFS += -DIS31FL3731 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31fl3731-simple.c
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-	ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3742A)
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3742a)
         OPT_DEFS += -DIS31FLCOMMON -DIS31FL3742A -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31flcommon.c
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-	ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3743A)
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3743a)
         OPT_DEFS += -DIS31FLCOMMON -DIS31FL3743A -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31flcommon.c
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-	ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3745)
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3745)
         OPT_DEFS += -DIS31FLCOMMON -DIS31FL3745 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31flcommon.c
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-	ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3746A)
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3746a)
         OPT_DEFS += -DIS31FLCOMMON -DIS31FL3746A -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31flcommon.c
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-	ifeq ($(strip $(LED_MATRIX_DRIVER)), CKLED2001)
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), ckled2001)
         OPT_DEFS += -DCKLED2001 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led
         SRC += ckled2001-simple.c
@@ -419,7 +416,7 @@ endif
 
 RGB_MATRIX_ENABLE ?= no
 
-VALID_RGB_MATRIX_TYPES := AW20216 IS31FL3731 IS31FL3733 IS31FL3736 IS31FL3737 IS31FL3741 IS31FL3742A IS31FL3743A IS31FL3745 IS31FL3746A CKLED2001 WS2812 custom
+VALID_RGB_MATRIX_TYPES := aw20216 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a ckled2001 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)
@@ -432,6 +429,7 @@ endif
     COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix
     COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations
     COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations/runners
+    POST_CONFIG_H += $(QUANTUM_DIR)/rgb_matrix/post_config.h
     SRC += $(QUANTUM_DIR)/color.c
     SRC += $(QUANTUM_DIR)/rgb_matrix/rgb_matrix.c
     SRC += $(QUANTUM_DIR)/rgb_matrix/rgb_matrix_drivers.c
@@ -439,89 +437,89 @@ endif
     CIE1931_CURVE := yes
     RGB_KEYCODES_ENABLE := yes
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), AW20216)
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), aw20216)
         OPT_DEFS += -DAW20216 -DSTM32_SPI -DHAL_USE_SPI=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led
         SRC += aw20216.c
         QUANTUM_LIB_SRC += spi_master.c
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3731)
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3731)
         OPT_DEFS += -DIS31FL3731 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31fl3731.c
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3733)
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3733)
         OPT_DEFS += -DIS31FL3733 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31fl3733.c
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3736)
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3736)
         OPT_DEFS += -DIS31FL3736 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31fl3736.c
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3737)
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3737)
         OPT_DEFS += -DIS31FL3737 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31fl3737.c
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3741)
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3741)
         OPT_DEFS += -DIS31FL3741 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31fl3741.c
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-	ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3742A)
+	ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3742a)
         OPT_DEFS += -DIS31FLCOMMON -DIS31FL3742A -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31flcommon.c
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-	ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3743A)
+	ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3743a)
         OPT_DEFS += -DIS31FLCOMMON -DIS31FL3743A -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31flcommon.c
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-	ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3745)
+	ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3745)
         OPT_DEFS += -DIS31FLCOMMON -DIS31FL3745 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31flcommon.c
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-	ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3746A)
+	ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3746a)
         OPT_DEFS += -DIS31FLCOMMON -DIS31FL3746A -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31flcommon.c
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), CKLED2001)
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), ckled2001)
         OPT_DEFS += -DCKLED2001 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led
         SRC += ckled2001.c
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), WS2812)
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), ws2812)
         OPT_DEFS += -DWS2812
         WS2812_DRIVER_REQUIRED := yes
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), APA102)
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), apa102)
         OPT_DEFS += -DAPA102
         APA102_DRIVER_REQUIRED := yes
     endif
@@ -565,18 +563,18 @@ ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
     endif
 
     COMMON_VPATH += $(QUANTUM_DIR)/backlight
+    COMMON_VPATH += $(DRIVER_PATH)/backlight
     SRC += $(QUANTUM_DIR)/backlight/backlight.c
     SRC += $(QUANTUM_DIR)/process_keycode/process_backlight.c
     OPT_DEFS += -DBACKLIGHT_ENABLE
 
-    ifeq ($(strip $(BACKLIGHT_DRIVER)), custom)
-        OPT_DEFS += -DBACKLIGHT_CUSTOM_DRIVER
-    else
+    ifneq ($(strip $(BACKLIGHT_DRIVER)), custom)
         SRC += $(QUANTUM_DIR)/backlight/backlight_driver_common.c
-        ifeq ($(strip $(BACKLIGHT_DRIVER)), pwm)
-            SRC += $(QUANTUM_DIR)/backlight/backlight_$(PLATFORM_KEY).c
+
+        ifeq ($(strip $(BACKLIGHT_DRIVER)), software)
+            SRC += $(DRIVER_PATH)/backlight/backlight_software.c
         else
-            SRC += $(QUANTUM_DIR)/backlight/backlight_$(strip $(BACKLIGHT_DRIVER)).c
+            SRC += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/backlight_$(strip $(BACKLIGHT_DRIVER)).c
         endif
     endif
 endif
@@ -721,18 +719,23 @@ ifeq ($(strip $(FNV_ENABLE)), yes)
     SRC += qmk_fnv_type_validation.c hash_32a.c hash_64a.c
 endif
 
+VALID_HAPTIC_DRIVER_TYPES := drv2605l solenoid
 ifeq ($(strip $(HAPTIC_ENABLE)),yes)
-    COMMON_VPATH += $(DRIVER_PATH)/haptic
+    ifeq ($(filter $(HAPTIC_DRIVER),$(VALID_HAPTIC_DRIVER_TYPES)),)
+        $(call CATASTROPHIC_ERROR,Invalid HAPTIC_DRIVER,HAPTIC_DRIVER="$(HAPTIC_DRIVER)" is not a valid Haptic driver)
+    else
+        COMMON_VPATH += $(DRIVER_PATH)/haptic
 
-    ifneq ($(filter DRV2605L, $(HAPTIC_DRIVER)), )
-        SRC += DRV2605L.c
-        QUANTUM_LIB_SRC += i2c_master.c
-        OPT_DEFS += -DDRV2605L
-    endif
+        ifeq ($(strip $(HAPTIC_DRIVER)), drv2605l)
+            SRC += drv2605l.c
+            QUANTUM_LIB_SRC += i2c_master.c
+            OPT_DEFS += -DHAPTIC_DRV2605L
+        endif
 
-    ifneq ($(filter SOLENOID, $(HAPTIC_DRIVER)), )
-        SRC += solenoid.c
-        OPT_DEFS += -DSOLENOID_ENABLE
+        ifeq ($(strip $(HAPTIC_DRIVER)), solenoid)
+            SRC += solenoid.c
+            OPT_DEFS += -DHAPTIC_SOLENOID
+        endif
     endif
 endif
 
@@ -742,8 +745,8 @@ ifeq ($(strip $(HD44780_ENABLE)), yes)
     SRC += hd44780.c
 endif
 
-VALID_OLED_DRIVER_TYPES := SSD1306 custom
-OLED_DRIVER ?= SSD1306
+VALID_OLED_DRIVER_TYPES := custom ssd1306
+OLED_DRIVER ?= ssd1306
 VALID_OLED_TRANSPORT_TYPES := i2c spi custom
 OLED_TRANSPORT ?= i2c
 ifeq ($(strip $(OLED_ENABLE)), yes)
@@ -781,13 +784,15 @@ endif
 ifeq ($(strip $(UCIS_ENABLE)), yes)
     OPT_DEFS += -DUCIS_ENABLE
     UNICODE_COMMON := yes
-    SRC += $(QUANTUM_DIR)/process_keycode/process_ucis.c
+    SRC += $(QUANTUM_DIR)/process_keycode/process_ucis.c \
+           $(QUANTUM_DIR)/unicode/ucis.c
 endif
 
 ifeq ($(strip $(UNICODEMAP_ENABLE)), yes)
     OPT_DEFS += -DUNICODEMAP_ENABLE
     UNICODE_COMMON := yes
-    SRC += $(QUANTUM_DIR)/process_keycode/process_unicodemap.c
+    SRC += $(QUANTUM_DIR)/process_keycode/process_unicodemap.c \
+           $(QUANTUM_DIR)/unicode/unicodemap.c
 endif
 
 ifeq ($(strip $(UNICODE_ENABLE)), yes)
@@ -898,7 +903,7 @@ ifeq ($(strip $(USBPD_ENABLE)), yes)
 endif
 
 BLUETOOTH_ENABLE ?= no
-VALID_BLUETOOTH_DRIVER_TYPES := BluefruitLE RN42 custom
+VALID_BLUETOOTH_DRIVER_TYPES := bluefruit_le custom rn42
 ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
     ifeq ($(filter $(strip $(BLUETOOTH_DRIVER)),$(VALID_BLUETOOTH_DRIVER_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid BLUETOOTH_DRIVER,BLUETOOTH_DRIVER="$(BLUETOOTH_DRIVER)" is not a valid Bluetooth driver type)
@@ -908,7 +913,7 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
     COMMON_VPATH += $(DRIVER_PATH)/bluetooth
     SRC += outputselect.c
 
-    ifeq ($(strip $(BLUETOOTH_DRIVER)), BluefruitLE)
+    ifeq ($(strip $(BLUETOOTH_DRIVER)), bluefruit_le)
         OPT_DEFS += -DBLUETOOTH_BLUEFRUIT_LE -DHAL_USE_SPI=TRUE
         SRC += $(DRIVER_PATH)/bluetooth/bluetooth.c
         SRC += $(DRIVER_PATH)/bluetooth/bluefruit_le.cpp
@@ -916,7 +921,7 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
         QUANTUM_LIB_SRC += spi_master.c
     endif
 
-    ifeq ($(strip $(BLUETOOTH_DRIVER)), RN42)
+    ifeq ($(strip $(BLUETOOTH_DRIVER)), rn42)
         OPT_DEFS += -DBLUETOOTH_RN42 -DHAL_USE_SERIAL=TRUE
         SRC += $(DRIVER_PATH)/bluetooth/bluetooth.c
         SRC += $(DRIVER_PATH)/bluetooth/rn42.c
diff --git a/builddefs/common_rules.mk b/builddefs/common_rules.mk
index 816eac49ae8f..d20e9ad74d2c 100644
--- a/builddefs/common_rules.mk
+++ b/builddefs/common_rules.mk
@@ -176,7 +176,7 @@ MOVE_DEP = mv -f $(patsubst %.o,%.td,$@) $(patsubst %.o,%.d,$@)
 
 # For a ChibiOS build, ensure that the board files have the hook overrides injected
 define BOARDSRC_INJECT_HOOKS
-$(KEYBOARD_OUTPUT)/$(patsubst %.c,%.o,$(patsubst ./%,%,$1)): INIT_HOOK_CFLAGS += -include $(TOP_DIR)/tmk_core/protocol/chibios/init_hooks.h
+$(INTERMEDIATE_OUTPUT)/$(patsubst %.c,%.o,$(patsubst ./%,%,$1)): INIT_HOOK_CFLAGS += -include $(TOP_DIR)/tmk_core/protocol/chibios/init_hooks.h
 endef
 $(foreach LOBJ, $(BOARDSRC), $(eval $(call BOARDSRC_INJECT_HOOKS,$(LOBJ))))
 
@@ -392,6 +392,8 @@ check-size:
 	if [ $(MAX_SIZE) -gt 0 ] && [ $(CURRENT_SIZE) -gt 0 ]; then \
 		$(SILENT) || printf "$(MSG_CHECK_FILESIZE)" | $(AWK_CMD); \
 		if [ $(CURRENT_SIZE) -gt $(MAX_SIZE) ]; then \
+			$(REMOVE) $(TARGET).$(FIRMWARE_FORMAT); \
+			$(REMOVE) $(BUILD_DIR)/$(TARGET).{hex,bin,uf2}; \
 		    printf "\n * $(MSG_FILE_TOO_BIG)"; $(PRINT_ERROR_PLAIN); \
 		else \
 		    if [ $(FREE_SIZE) -lt $(SIZE_MARGIN) ]; then \
diff --git a/builddefs/show_options.mk b/builddefs/show_options.mk
index 8bcc02083bc5..563d08988036 100644
--- a/builddefs/show_options.mk
+++ b/builddefs/show_options.mk
@@ -17,7 +17,7 @@ HARDWARE_OPTION_NAMES = \
   BACKLIGHT_ENABLE \
   BACKLIGHT_DRIVER \
   RGBLIGHT_ENABLE \
-  RGBLIGHT_CUSTOM_DRIVER \
+  RGBLIGHT_DRIVER \
   RGB_MATRIX_ENABLE \
   RGB_MATRIX_DRIVER \
   CIE1931_CURVE \
@@ -60,7 +60,6 @@ OTHER_OPTION_NAMES = \
   ENCODER_ENABLE_CUSTOM \
   GERMAN_ENABLE \
   HAPTIC_ENABLE \
-  HHKB_RN42_ENABLE \
   ISSI_ENABLE \
   KEYLOGGER_ENABLE \
   LCD_BACKLIGHT_ENABLE \
diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson
index e53d90da39b3..76ad55f7da1d 100644
--- a/data/mappings/info_config.hjson
+++ b/data/mappings/info_config.hjson
@@ -64,13 +64,12 @@
 
     // LED Matrix
     "LED_MATRIX_CENTER": {"info_key": "led_matrix.center_point", "value_type": "array.int"},
-    "LED_MATRIX_HUE_STEP": {"info_key": "led_matrix.hue_steps", "value_type": "int"},
     "LED_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "led_matrix.max_brightness", "value_type": "int"},
-    "LED_MATRIX_SAT_STEP": {"info_key": "led_matrix.sat_steps", "value_type": "int"},
     "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"},
     "LED_MATRIX_VAL_STEP": {"info_key": "led_matrix.val_steps", "value_type": "int"},
+    "LED_MATRIX_LED_COUNT": {"info_key": "led_matrix.led_count", "value_type": "int", "to_json": false},
 
     // LUFA Bootloader
     "QMK_ESC_INPUT": {"info_key": "qmk_lufa_bootloader.esc_input"},
@@ -109,6 +108,7 @@
     "RGB_MATRIX_SPLIT": {"info_key": "rgb_matrix.split_count", "value_type": "array.int"},
     "RGB_MATRIX_TIMEOUT": {"info_key": "rgb_matrix.timeout", "value_type": "int"},
     "RGB_MATRIX_VAL_STEP": {"info_key": "rgb_matrix.val_steps", "value_type": "int"},
+    "RGB_MATRIX_LED_COUNT": {"info_key": "rgb_matrix.led_count", "value_type": "int", "to_json": false},
 
     // RGBLight
     "RGBLED_NUM": {"info_key": "rgblight.led_count", "value_type": "int"},
@@ -117,6 +117,7 @@
     "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_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"},
@@ -189,4 +190,9 @@
     "PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false, "value_type": "str", "deprecated": true, "replace_with": "`keyboard_name` in info.json"},
     "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex", "deprecated": true, "replace_with": "`usb.pid` in info.json"},
     "VENDOR_ID": {"info_key": "usb.vid", "value_type": "hex", "deprecated": true, "replace_with": "`usb.vid` in info.json"},
+
+    // Items we want flagged in lint
+    "VIAL_KEYBOARD_UID": {"info_key": "_invalid.vial_uid", "invalid": true},
+    "VIAL_UNLOCK_COMBO_COLS": {"info_key": "_invalid.vial_unlock_cols", "invalid": true},
+    "VIAL_UNLOCK_COMBO_ROWS": {"info_key": "_invalid.vial_unlock_rows", "invalid": true}
 }
diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson
index bf8ec05cb2ce..07191551da8f 100644
--- a/data/mappings/info_rules.hjson
+++ b/data/mappings/info_rules.hjson
@@ -35,6 +35,7 @@
     "PS2_ENABLE": {"info_key": "ps2.enabled", "value_type": "bool"},
     "PS2_MOUSE_ENABLE": {"info_key": "ps2.mouse_enabled", "value_type": "bool"},
     "RGB_MATRIX_DRIVER": {"info_key": "rgb_matrix.driver"},
+    "RGBLIGHT_DRIVER": {"info_key": "rgblight.driver"},
     "SECURE_ENABLE": {"info_key": "secure.enabled", "value_type": "bool"},
     "SPLIT_KEYBOARD": {"info_key": "split.enabled", "value_type": "bool"},
     "SPLIT_TRANSPORT": {"info_key": "split.transport.protocol", "to_c": false},
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index f1c1f81e9ad6..8e4265dc0115 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -1,13 +1,16 @@
 {
     // Format for each entry:
     // "<alias>": {
-    //     "target": "<keyboard_folder>",
-    //     "layouts": {
-    //         "<layout_alias>": "<layout_target>"
-    //     }
+    //     "target": "<keyboard_folder>"
     // }
     //
-    // Both target and layouts are optional.
+
+    /* This list of aliases is for testing purposes -- ensures "linked list" recursive traversal works correctly. */
+    "_test_a": { "target": "_test_b" },
+    "_test_b": { "target": "_test_c" },
+    "_test_c": { "target": "planck/rev6" },
+
+    /* The main list of aliases for moved keyboards within QMK. */
     "2_milk": {
         "target": "spaceman/2_milk"
     },
@@ -39,7 +42,7 @@
         "target": "amjkeyboard/amjpad"
     },
     "angel64": {
-        "target": "angel64/alpha"
+        "target": "kakunpc/angel64/alpha"
     },
     "ashpil/modelm_usbc": {
         "target": "ibm/model_m/ashpil_usbc"
@@ -51,10 +54,10 @@
         "target": "viktus/at101_bh"
     },
     "atom47/rev2": {
-        "target": "maartenwut/atom47/rev2"
+        "target": "evyd13/atom47/rev2"
     },
     "atom47/rev3": {
-        "target": "maartenwut/atom47/rev3"
+        "target": "evyd13/atom47/rev3"
     },
     "bakeneko60": {
         "target": "kkatano/bakeneko60"
@@ -69,7 +72,7 @@
         "target": "bear_face/v1"
     },
     "bm16a": {
-        "target": "kprepublic/bm16a"
+        "target": "kprepublic/bm16a/v1"
     },
     "bm16s": {
         "target": "kprepublic/bm16s"
@@ -81,16 +84,16 @@
         "target": "kprepublic/bm43a"
     },
     "bm60poker": {
-        "target": "kprepublic/bm60poker"
+        "target": "kprepublic/bm60hsrgb_poker/rev1"
     },
     "bm60rgb": {
-        "target": "kprepublic/bm60rgb"
+        "target": "kprepublic/bm60hsrgb/rev1"
     },
     "bm60rgb_iso": {
-        "target": "kprepublic/bm60rgb_iso"
+        "target": "kprepublic/bm60hsrgb_iso/rev1"
     },
     "bm68rgb": {
-        "target": "kprepublic/bm68rgb"
+        "target": "kprepublic/bm68hsrgb/rev1"
     },
     "bpiphany/pegasushoof": {
         "target": "bpiphany/pegasushoof/2013"
@@ -140,26 +143,14 @@
     "daisy": {
         "target": "ktec/daisy"
     },
-    "doro67/multi": {
-        "layouts": {
-            "LAYOUT_ansi": "LAYOUT_65_ansi_blocker"
-        }
-    },
-    "doro67/regular": {
-        "layouts": {
-            "LAYOUT": "LAYOUT_65_ansi_blocker"
-        }
-    },
-    "doro67/rgb": {
-        "layouts": {
-            "LAYOUT": "LAYOUT_65_ansi_blocker"
-        }
-    },
     "drakon": {
         "target": "jagdpietr/drakon"
     },
     "durgod/k320": {
-        "target": "durgod/k3x0/k320"
+        "target": "durgod/k320/base"
+    },
+    "durgod/k3x0/k320": {
+        "target": "durgod/k320/base"
     },
     "durgod/hades": {
         "target": "durgod/dgk6x/hades_ansi"
@@ -212,6 +203,12 @@
     "gmmk/pro/iso": {
         "target": "gmmk/pro/rev1/iso"
     },
+    "handwired/dactyl_manuform/3x5_3": {
+        "target": "handwired/dactyl_minidox"
+    },
+    "handwired/dactyl_manuform/6x6_kinesis": {
+        "target": "handwired/dactyl_kinesis"
+    },
     "handwired/ferris": {
         "target": "ferris/0_1"
     },
@@ -221,6 +218,21 @@
     "handwired/p1800fl": {
         "target": "team0110/p1800fl"
     },
+    "handwired/jscotto/scotto9": {
+        "target": "handwired/scottokeebs/scotto9"
+    },
+    "handwired/jscotto/scotto36": {
+        "target": "handwired/scottokeebs/scotto36"
+    },
+    "handwired/jscotto/scotto40": {
+        "target": "handwired/scottokeebs/scotto40"
+    },
+    "handwired/jscotto/scottocmd": {
+        "target": "handwired/scottokeebs/scottocmd"
+    },
+    "handwired/jscotto/scottostarter": {
+        "target": "handwired/scottokeebs/scottostarter"
+    },
     "helix/pico/sc/back": {
         "target": "helix/pico/sc"
     },
@@ -264,13 +276,10 @@
         "target": "keyhive/honeycomb"
     },
     "idb_60": {
-        "target": "idb/idb_60",
-        "layouts": {
-            "LAYOUT": "LAYOUT_all"
-        }
+        "target": "idb/idb_60"
     },
     "idobo": {
-        "target": "idobao/id75"
+        "target": "idobao/id75/v1"
     },
     "jacky_studio/piggy60": {
         "target": "jacky_studio/piggy60/rev1"
@@ -288,19 +297,13 @@
         "target": "jones/v03_1"
     },
     "kamigakushi": {
-        "target": "jaykeeb/kamigakushi",
-        "layouts": {
-            "LAYOUT": "LAYOUT_65_ansi_blocker_tsangan"
-        }
+        "target": "jaykeeb/kamigakushi"
     },
     "katana60": {
         "target": "rominronin/katana60/rev1"
     },
     "kbdfans/kbd67mkiirgb": {
-        "target": "kbdfans/kbd67/mkiirgb",
-        "layouts": {
-            "LAYOUT": "LAYOUT_65_ansi_blocker"
-        }
+        "target": "kbdfans/kbd67/mkiirgb"
     },
     "kbdfans/kbd67/mkiirgb": {
         "target": "kbdfans/kbd67/mkiirgb/v1"
@@ -408,7 +411,7 @@
         "target": "mechlovin/adelais/rgb_led/rev1"
     },
     "mechlovin/adelais/standard_led": {
-        "target": "mechlovin/adelais/standard_led/rev2"
+        "target": "mechlovin/adelais/standard_led/arm/rev2"
     },
     "mechlovin/delphine": {
         "target": "mechlovin/delphine/mono_led"
@@ -446,11 +449,6 @@
     "mschwingen/modelm": {
         "target": "ibm/model_m/mschwingen"
     },
-    "noxary/268_2": {
-        "layouts": {
-            "LAYOUT": "LAYOUT_65_ansi_blocker"
-        }
-    },
     "oddball": {
         "target": "oddball/v1"
     },
@@ -467,24 +465,19 @@
         "target": "pabile/p20/ver1"
     },
     "pancake/feather": {
-        "target": "spaceman/pancake/feather"
+        "target": "spaceman/pancake/rev1/feather"
     },
     "pancake/promicro": {
-        "target": "spaceman/pancake/promicro"
+        "target": "spaceman/pancake/rev1/promicro"
     },
     "peiorisboards/ixora": {
         "target": "coarse/ixora"
     },
-    "percent/canoe": {
-        "layouts": {
-            "LAYOUT_iso": "LAYOUT_65_iso_blocker"
-        }
-    },
     "plaid": {
         "target": "dm9records/plaid"
     },
     "plain60": {
-        "target": "maartenwut/plain60"
+        "target": "evyd13/plain60"
     },
     "ploopyco/trackball": {
         "target": "ploopyco/trackball/rev1_005"
@@ -492,21 +485,6 @@
     "polilla": {
         "target": "polilla/rev1"
     },
-    "preonic/rev1": {
-        "layouts": {
-            "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
-        }
-    },
-    "preonic/rev2": {
-        "layouts": {
-            "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
-        }
-    },
-    "preonic/rev3": {
-        "layouts": {
-            "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
-        }
-    },
     "primekb/prime_l": {
         "target": "primekb/prime_l/v1"
     },
@@ -535,10 +513,10 @@
         "target": "wilba_tech/rama_works_u80_a"
     },
     "ramonimbao/herringbone": {
-        "target": "ramonimbao/herringbone/v1"
+        "target": "rmi_kb/herringbone/v1"
     },
     "ramonimbao/mona": {
-        "target": "ramonimbao/mona/v1"
+        "target": "rmi_kb/mona/v1"
     },
     "rgbkb/pan": {
         "target": "rgbkb/pan/rev1/32a"
@@ -574,10 +552,10 @@
         "target": "tkw/stoutgat/v1"
     },
     "suihankey": {
-        "target": "suihankey/split/alpha"
+        "target": "kakunpc/suihankey/split/alpha"
     },
     "ta65": {
-        "target": "maartenwut/ta65"
+        "target": "evyd13/ta65"
     },
     "tartan": {
         "target": "dm9records/tartan"
@@ -595,16 +573,13 @@
         "target": "matthewdias/txuu"
     },
     "underscore33": {
-        "target": "underscore33/rev1"
+        "target": "tominabox1/underscore33/rev1"
     },
     "vinta": {
-        "target": "coarse/vinta",
-        "layouts": {
-            "LAYOUT_67_ansi": "LAYOUT_65_ansi_blocker"
-        }
+        "target": "coarse/vinta"
     },
     "wasdat": {
-        "target": "maartenwut/wasdat"
+        "target": "evyd13/wasdat"
     },
     "westfoxtrot/cypher": {
         "target": "westfoxtrot/cypher/rev1"
@@ -616,10 +591,10 @@
         "target": "xiudi/xd002"
     },
     "xd004": {
-        "target": "xiudi/xd004"
+        "target": "xiudi/xd004/v1"
     },
     "xd60": {
-        "target": "xiudi/xd60"
+        "target": "xiudi/xd60/rev2"
     },
     "xd68": {
         "target": "xiudi/xd68"
@@ -866,19 +841,22 @@
         "target": "kagizaraya/halberd"
     },
     "handwired/hillside/0_1": {
-        "target": "handwired/hillside/48"
+        "target": "hillside/48/0_1"
     },
     "hecomi/alpha": {
         "target": "takashiski/hecomi/alpha"
     },
+    "hfdkb/keyboard_sw/k83":{
+        "target": "inland/kb83"
+    },
     "hid_liber": {
         "target": "bpiphany/hid_liber"
     },
     "id67/default_rgb": {
-        "target": "idobao/id67/default_rgb"
+        "target": "idobao/id67"
     },
     "id67/rgb": {
-        "target": "idobao/id67/rgb"
+        "target": "idobao/id67"
     },
     "id80": {
         "target": "idobao/id80/v2/ansi"
@@ -1268,7 +1246,7 @@
         "target": "marksard/treadstone48/rev2"
     },
     "tronguylabs/m122_3270": {
-        "target": "ibm/model_m_122/m122_3270"
+        "target": "ibm/model_m_122/m122_3270/teensy"
     },
     "ua62": {
         "target": "nacly/ua62"
@@ -1322,7 +1300,7 @@
         "target": "ydkb/yd68"
     },
     "ymd75": {
-        "target": "ymdk/ymd75"
+        "target": "ymdk/ymd75/rev1"
     },
     "ymd96": {
         "target": "ymdk/ymd96"
diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema
index b9c64a55ec44..441e6395cf6e 100644
--- a/data/schemas/definitions.jsonschema
+++ b/data/schemas/definitions.jsonschema
@@ -29,6 +29,10 @@
         "minLength": 1,
         "maxLength": 250
     },
+    "snake_case": {
+        "type": "string",
+        "pattern": "^[a-z][a-z0-9_]*$"
+    },
     "layout_macro": {
         "oneOf": [
             {
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index ba4a7eec5570..4053387f3b42 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -71,6 +71,8 @@
                 "STM32F446",
                 "STM32G431",
                 "STM32G474",
+                "STM32H723",
+                "STM32H733",
                 "STM32L412",
                 "STM32L422",
                 "STM32L432",
@@ -146,7 +148,7 @@
             "properties": {
                 "driver": {
                     "type": "string",
-                    "enum": ["BluefruitLE", "RN42", "custom"]
+                    "enum": ["bluefruit_le", "custom", "rn42"]
                 }
             }
         },
@@ -174,6 +176,7 @@
         "bootloader": {
             "type": "string",
             "enum": [
+                "apm32-dfu",
                 "atmel-dfu",
                 "bootloadhid",
                 "caterina",
@@ -253,7 +256,11 @@
                 "enabled": {"type": "boolean"}
             }
         },
-        "features": {"$ref": "qmk.definitions.v1#/boolean_array"},
+        "features": {
+            "$ref": "qmk.definitions.v1#/boolean_array",
+            "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
+
+        },
         "indicators": {
             "type": "object",
             "properties": {
@@ -367,6 +374,7 @@
             "properties": {
                 "animations": {
                     "type": "object",
+                    "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
                     "additionalProperties": {
                         "type": "boolean"
                     }
@@ -380,8 +388,6 @@
                 },
                 "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
                 "timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"},
-                "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
-                "sat_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "val_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "speed_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "split_count": {
@@ -418,6 +424,7 @@
             "properties": {
                 "animations": {
                     "type": "object",
+                    "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
                     "additionalProperties": {
                         "type": "boolean"
                     }
@@ -470,11 +477,16 @@
             "properties": {
                 "animations": {
                     "type": "object",
+                    "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
                     "additionalProperties": {
                         "type": "boolean"
                     }
                 },
                 "brightness_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
+                "driver": {
+                    "type": "string",
+                    "enum": ["apa102", "custom", "ws2812"]
+                },
                 "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "layers": {
                     "type": "object",
@@ -491,6 +503,11 @@
                     }
                 },
                 "led_count": {"$ref": "qmk.definitions.v1#/unsigned_int"},
+                "led_map": {
+                    "type": "array",
+                    "minItems": 2,
+                    "items": {"$ref": "qmk.definitions.v1#/unsigned_int"}
+                },
                 "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
                 "pin": {
                     "$ref": "qmk.definitions.v1#/mcu_pin",
diff --git a/docs/ChangeLog/20230827.md b/docs/ChangeLog/20230827.md
new file mode 100644
index 000000000000..12093d889f3f
--- /dev/null
+++ b/docs/ChangeLog/20230827.md
@@ -0,0 +1,305 @@
+# QMK Breaking Changes - 2023 Aug 27 Changelog
+
+## Notable Changes :id=notable-changes
+
+As per last few breaking changes cycles, there have been _a lot_ of behind-the-scenes changes, mainly around migration of configurables into `info.json` files, cleanup of `info.json` files, additional layout definitions for keyboards, adding support for general community layouts to keyboards, as well as addressing technical debt.
+
+One thing to note for this release -- `qmk/qmk_firmware` is no longer accepting PRs for keymaps other than for manufacturer-supported keymaps. User keymap workflow has been documented [here](https://docs.qmk.fm/#/newbs) for several years. This change is to progressively reduce the maintenance burden on the project, and to allow us to focus on the core features of QMK.
+
+Existing user keymaps and userspace areas will likely be relocated/removed in the future -- non-building keymaps and userspace will be first targets, likely during the new breaking changes cycle. We will provide more information on Discord regarding this initiative as it becomes available.
+
+### RGB Matrix optimizations ([#21134](https://github.com/qmk/qmk_firmware/pull/21134), [#21135](https://github.com/qmk/qmk_firmware/pull/21135)) :id=rgb-matrix-optimizations
+
+Most RGB Matrix implementations now check whether or not RGB LED data has changed and skip transmission if it hasn't. This was measured to improve scan frequency in cases of static or infrequently-changing colors.
+
+### Audio optimizations ([#21496](https://github.com/qmk/qmk_firmware/pull/21496), [#21498](https://github.com/qmk/qmk_firmware/pull/21498))
+
+Some audio code relating to "notes" used `double` datatypes, which are implemented in software floating-point for most ARM microcontrollers. This has been changed to use `float` datatypes instead, which are implemented in hardware floating-point on most ARM microcontrollers. This change increases performance as well as reduces the firmware size by significant number of bytes.
+
+AVR sees minimal (if any) benefit -- `double` was interpreted as `float` on AVR anyway.
+
+## Changes Requiring User Action :id=changes-requiring-user-action
+
+### Updated Keyboard Codebases :id=updated-keyboard-codebases
+
+| Old Keyboard Name                     | New Keyboard Name                   |
+|---------------------------------------|-------------------------------------|
+| capsunlocked/cu80/v2_ansi/base        | capsunlocked/cu80/v2/ansi           |
+| capsunlocked/cu80/v2_iso/base         | capsunlocked/cu80/v2/iso            |
+| handwired/dactyl_manuform/3x5_3       | handwired/dactyl_minidox            |
+| handwired/dactyl_manuform/6x6_kinesis | handwired/dactyl_kinesis            |
+| handwired/jscotto/scotto36            | handwired/scottokeebs/scotto36      |
+| handwired/jscotto/scotto40            | handwired/scottokeebs/scotto40      |
+| handwired/jscotto/scotto9             | handwired/scottokeebs/scotto9       |
+| handwired/jscotto/scottocmd           | handwired/scottokeebs/scottocmd     |
+| handwired/jscotto/scottostarter       | handwired/scottokeebs/scottostarter |
+| hfdkb/keyboard_sw/k83                 | inland/kb83                         |
+| idb_60                                | idb/idb_60                          |
+| kamigakushi                           | jaykeeb/kamigakushi                 |
+| kbdfans/kbd67mkiirgb                  | kbdfans/kbd67/mkiirgb               |
+| modelh                                | ibm/model_m/modelh                  |
+| vinta                                 | coarse/vinta                        |
+
+### Remove encoder in-matrix workaround code ([#20389](https://github.com/qmk/qmk_firmware/pull/20389)) :id=remove-encoder-in-matrix-workaround-code
+
+Some keyboards "hacked" encoder support into spare slots in the key matrix in order to interoperate with VIA. This workaround is no longer necessary, and the code has been removed. If you have a keyboard that uses this workaround, you will need to update your keymap to use the new [Encoder Map](feature_encoders.md#encoder-map) API instead.
+
+### Unicodemap keycodes rename ([#21092](https://github.com/qmk/qmk_firmware/pull/21092)) :id=unicodemap-keycodes-rename
+
+The Unicodemap keycodes have been renamed:
+
+| Old       | New       |
+|-----------|-----------|
+| `X(i)`    | `UM(i)`   |
+| `XP(i,j)` | `UP(i,j)` |
+
+### Remove old OLED API code ([#21651](https://github.com/qmk/qmk_firmware/pull/21651)) :id=remove-old-oled-api-code
+
+Old OLED code using `ssd1306.c` `ssd1306.h`, and `SSD1306OLED` and other similar files have been consolidated to use the standard OLED driver. External user keymaps will need to be updated to use the standard OLED driver accordingly.
+
+### Driver naming consolidation ([#21551](https://github.com/qmk/qmk_firmware/pull/21551), [#21558](https://github.com/qmk/qmk_firmware/pull/21558), [#21580](https://github.com/qmk/qmk_firmware/pull/21580), [#21594](https://github.com/qmk/qmk_firmware/pull/21594), [#21624](https://github.com/qmk/qmk_firmware/pull/21624), [#21710](https://github.com/qmk/qmk_firmware/pull/21710)) :id=driver-naming-consolidation
+
+In most circumstances this won't affect users -- only keyboard designers with currently-unmerged boards. The only users affected are people who have modified existing keyboards in order to add/modify haptics, lighting, or bluetooth -- and only if the base keyboard did not configure them already. Driver naming has been modified to be lowercase.
+
+RGBLight (`RGBLIGHT_DRIVER` / `rgblight.driver`):
+
+| Old    | New    |
+|--------|--------|
+| `WS2812` | `ws2812` |
+| `APA102` | `apa102` |
+
+LED Matrix (`LED_MATRIX_DRIVER` / `led_matrix.driver`):
+
+| Old         | New         |
+|-------------|-------------|
+| `IS31FL3731`  | `is31fl3731`  |
+| `IS31FL3742A` | `is31fl3742a` |
+| `IS31FL3743A` | `is31fl3743a` |
+| `IS31FL3745`  | `is31fl3745`  |
+| `IS31FL3746A` | `is31fl3746a` |
+| `CKLED2001`   | `ckled2001`   |
+
+RGB Matrix (`RGB_MATRIX_DRIVER` / `rgb_matrix.driver`):
+
+| Old         | New         |
+|-------------|-------------|
+| `AW20216`     | `aw20216`     |
+| `IS31FL3731`  | `is31fl3731`  |
+| `IS31FL3733`  | `is31fl3733`  |
+| `IS31FL3736`  | `is31fl3736`  |
+| `IS31FL3737`  | `is31fl3737`  |
+| `IS31FL3741`  | `is31fl3741`  |
+| `IS31FL3742A` | `is31fl3742a` |
+| `IS31FL3743A` | `is31fl3743a` |
+| `IS31FL3745`  | `is31fl3745`  |
+| `IS31FL3746A` | `is31fl3746a` |
+| `CKLED2001`   | `ckled2001`   |
+| `WS2812`      | `ws2812`      |
+
+OLED (`OLED_DRIVER`):
+
+| Old     | New     |
+|---------|---------|
+| `SSD1306` | `ssd1306` |
+
+Haptic (`HAPTIC_DRIVER`):
+
+| Old      | New      |
+|----------|----------|
+| `DRV2605L` | `drv2605l` |
+| `SOLENOID` | `solenoid` |
+
+Bluetooth (`BLUETOOTH_DRIVER` / `bluetooth.driver`):
+
+| Old         | New          |
+|-------------|--------------|
+| `BluefruitLE` | `bluefruit_le` |
+| `RN42`        | `rn42`         |
+
+## Full changelist :id=full-changelist
+
+Core:
+* On-each-release tap dance function ([#20255](https://github.com/qmk/qmk_firmware/pull/20255))
+* Send a dummy keycode to neutralize flashing modifiers in retro tap and key overrides ([#20992](https://github.com/qmk/qmk_firmware/pull/20992))
+* Adds a way to separate tab from AUTO_SHIFT_SPECIAL. ([#20996](https://github.com/qmk/qmk_firmware/pull/20996))
+* [Enhancement] More info on `apply_autocorrect` ([#21056](https://github.com/qmk/qmk_firmware/pull/21056))
+* Remove quantum/keymap.h ([#21086](https://github.com/qmk/qmk_firmware/pull/21086))
+* Unicodemap keycodes rename ([#21092](https://github.com/qmk/qmk_firmware/pull/21092))
+* Merge upstream uf2conv.py changes ([#21107](https://github.com/qmk/qmk_firmware/pull/21107))
+* Add a dynamic_macro_stop_recording(void) function. ([#21108](https://github.com/qmk/qmk_firmware/pull/21108))
+* platforms: chibios: wait: only define the frequency ([#21115](https://github.com/qmk/qmk_firmware/pull/21115))
+* [Enhancement] Decouple autocorrect logic ([#21116](https://github.com/qmk/qmk_firmware/pull/21116))
+* Optimisation - Add RGB LED colour set check in drivers ([#21134](https://github.com/qmk/qmk_firmware/pull/21134))
+* RGB matrix ws2812 update ([#21135](https://github.com/qmk/qmk_firmware/pull/21135))
+* Pixel rain: Refactor the rain light decision operator ([#21139](https://github.com/qmk/qmk_firmware/pull/21139))
+* Use unsigned integer for kinetic speed ([#21151](https://github.com/qmk/qmk_firmware/pull/21151))
+* Reset `matrix_need_update` properly in eager debouncing algorithms ([#21154](https://github.com/qmk/qmk_firmware/pull/21154))
+* Refactor kinetic mouse key feature ([#21164](https://github.com/qmk/qmk_firmware/pull/21164))
+* RGB Matrix limit basic indicators to the last render ([#21169](https://github.com/qmk/qmk_firmware/pull/21169))
+* dynamic keymap: Rely on introspection to handle OOB access. ([#21247](https://github.com/qmk/qmk_firmware/pull/21247))
+* add VIA support for LED Matrix ([#21281](https://github.com/qmk/qmk_firmware/pull/21281))
+* Refactor times inverse of sqrt 2 calculation ([#21293](https://github.com/qmk/qmk_firmware/pull/21293))
+* Move protocol makefiles into their respective folders ([#21332](https://github.com/qmk/qmk_firmware/pull/21332))
+* Remove use of __flash within LED drivers ([#21343](https://github.com/qmk/qmk_firmware/pull/21343))
+* STM32H723 support ([#21352](https://github.com/qmk/qmk_firmware/pull/21352))
+* Remove CORTEX_ENABLE_WFI_IDLE from keyboards. ([#21353](https://github.com/qmk/qmk_firmware/pull/21353))
+* Get rid of `USB_LED_KANA` and `USB_LED_COMPOSE` ([#21366](https://github.com/qmk/qmk_firmware/pull/21366))
+* Minor board clean-up after #19780 ([#21391](https://github.com/qmk/qmk_firmware/pull/21391))
+* Get rid of `USB_LED_SCROLL_LOCK` ([#21405](https://github.com/qmk/qmk_firmware/pull/21405))
+* Get rid of `USB_LED_NUM_LOCK` ([#21424](https://github.com/qmk/qmk_firmware/pull/21424))
+* Simplify audio_duration_to_ms() and audio_ms_to_duration(), reduce firmware size by a few bytes. ([#21427](https://github.com/qmk/qmk_firmware/pull/21427))
+* Allow key override to respect weak mods caused by caps word ([#21434](https://github.com/qmk/qmk_firmware/pull/21434))
+* Get rid of `USB_LED_CAPS_LOCK` ([#21436](https://github.com/qmk/qmk_firmware/pull/21436))
+* tmk_core: remove direct `quantum.h` includes ([#21465](https://github.com/qmk/qmk_firmware/pull/21465))
+* bootmagic mods covering the case when swapped mods are pressed at the same time (#21320) ([#21472](https://github.com/qmk/qmk_firmware/pull/21472))
+* drivers: remove direct `quantum.h` includes ([#21473](https://github.com/qmk/qmk_firmware/pull/21473))
+* debounce: remove direct `quantum.h` includes ([#21480](https://github.com/qmk/qmk_firmware/pull/21480))
+* keymap_extras: remove direct `quantum.h` includes ([#21485](https://github.com/qmk/qmk_firmware/pull/21485))
+* process_keycode: remove direct `quantum.h` includes ([#21486](https://github.com/qmk/qmk_firmware/pull/21486))
+* Add MOUSEKEY_WHEEL_DELTA documentation ([#21493](https://github.com/qmk/qmk_firmware/pull/21493))
+* Reduce needless precision in audio note frequency calculation ([#21496](https://github.com/qmk/qmk_firmware/pull/21496))
+* Remove needless precision in additive DAC sample generation ([#21498](https://github.com/qmk/qmk_firmware/pull/21498))
+* quantum: remove direct `quantum.h` includes ([#21507](https://github.com/qmk/qmk_firmware/pull/21507))
+* process_combo: restore wait.h header ([#21514](https://github.com/qmk/qmk_firmware/pull/21514))
+* Eliminate `TMK_COMMON_*` in makefiles ([#21517](https://github.com/qmk/qmk_firmware/pull/21517))
+* backlight: split AVR PWM and timer drivers ([#21540](https://github.com/qmk/qmk_firmware/pull/21540))
+* haptic: naming cleanups ([#21551](https://github.com/qmk/qmk_firmware/pull/21551))
+* rgblight: driver selection cleanups ([#21558](https://github.com/qmk/qmk_firmware/pull/21558))
+* LED Matrix: driver naming cleanups ([#21580](https://github.com/qmk/qmk_firmware/pull/21580))
+* Unify MIDI note calculation with the audio feature (from #21496) ([#21588](https://github.com/qmk/qmk_firmware/pull/21588))
+* Allow the user to select a single tone for the additive DAC ([#21591](https://github.com/qmk/qmk_firmware/pull/21591))
+* RGB Matrix: driver naming cleanups ([#21594](https://github.com/qmk/qmk_firmware/pull/21594))
+* Raw HID: documentation improvements ([#21596](https://github.com/qmk/qmk_firmware/pull/21596))
+* Unicode: move keycode aliases to a separate header ([#21613](https://github.com/qmk/qmk_firmware/pull/21613))
+* Bluetooth: driver naming cleanups ([#21624](https://github.com/qmk/qmk_firmware/pull/21624))
+* Remove old OLED API code ([#21651](https://github.com/qmk/qmk_firmware/pull/21651))
+* haptic: further naming cleanups ([#21682](https://github.com/qmk/qmk_firmware/pull/21682))
+* Simplfy RGB/LED matrix effect logic ([#21703](https://github.com/qmk/qmk_firmware/pull/21703))
+* OLED: driver naming cleanups ([#21710](https://github.com/qmk/qmk_firmware/pull/21710))
+
+CLI:
+* Add *_MATRIX_LED_COUNT generation/validation ([#19515](https://github.com/qmk/qmk_firmware/pull/19515))
+* Revert "Add *_MATRIX_LED_COUNT generation/validation" ([#21109](https://github.com/qmk/qmk_firmware/pull/21109))
+* Add *_MATRIX_LED_COUNT generation ([#21110](https://github.com/qmk/qmk_firmware/pull/21110))
+* feat, docs: WB32 flashing ([#21217](https://github.com/qmk/qmk_firmware/pull/21217))
+* Improve error messages when layout key matrix row/col is OOB ([#21640](https://github.com/qmk/qmk_firmware/pull/21640))
+
+Submodule updates:
+* Update ChibiOS-Contrib ([#21553](https://github.com/qmk/qmk_firmware/pull/21553))
+
+Keyboards:
+* Add support for Rastersoft MiniTKL ([#20230](https://github.com/qmk/qmk_firmware/pull/20230))
+* Remove encoder in-matrix workaround code ([#20389](https://github.com/qmk/qmk_firmware/pull/20389))
+* Revamp `dactyl_manuform` readme.md ([#20395](https://github.com/qmk/qmk_firmware/pull/20395))
+* added hackpad keyboard ([#20402](https://github.com/qmk/qmk_firmware/pull/20402))
+* Add `handwired/dactyl_cc` keyboard ([#20517](https://github.com/qmk/qmk_firmware/pull/20517))
+* Add Mino Plus  Hotswap ([#20534](https://github.com/qmk/qmk_firmware/pull/20534))
+* Move kb83 keyboard. ([#20761](https://github.com/qmk/qmk_firmware/pull/20761))
+* Rename `dactyl_manuform` variant `3x5_3` ([#21015](https://github.com/qmk/qmk_firmware/pull/21015))
+* Update `k34` layout to `split_3x5_2` ([#21046](https://github.com/qmk/qmk_firmware/pull/21046))
+* giabalanai keymaps: transpose added ([#21054](https://github.com/qmk/qmk_firmware/pull/21054))
+* Move `RGBLIGHT_SLEEP` to data driven ([#21072](https://github.com/qmk/qmk_firmware/pull/21072))
+* update layouts of `dactyl_manuform/4x5_5` ([#21094](https://github.com/qmk/qmk_firmware/pull/21094))
+* Move `RGBLIGHT_LED_MAP` to data driven ([#21095](https://github.com/qmk/qmk_firmware/pull/21095))
+* Move `RGBLED_SPLIT` to data driven ([#21113](https://github.com/qmk/qmk_firmware/pull/21113))
+* Update `dactyl_promicro` readme ([#21144](https://github.com/qmk/qmk_firmware/pull/21144))
+* Delete jscotto directory ([#21157](https://github.com/qmk/qmk_firmware/pull/21157))
+* correct and modernise `dactyl_manuform/6x7` variant ([#21176](https://github.com/qmk/qmk_firmware/pull/21176))
+* Move `RGBLIGHT_SPLIT` to data driven ([#21190](https://github.com/qmk/qmk_firmware/pull/21190))
+* Minor amendment to `bcat` userspace to prevent build failure ([#21205](https://github.com/qmk/qmk_firmware/pull/21205))
+* FJLabs Swordfish Layout Macro Refactor ([#21234](https://github.com/qmk/qmk_firmware/pull/21234))
+* Add skyloong/Dt40 keyboard ([#21237](https://github.com/qmk/qmk_firmware/pull/21237))
+* `dactyl_manuform/6x7` correction ([#21240](https://github.com/qmk/qmk_firmware/pull/21240))
+* Amend `ryanbaekr` boards by pin definitions ([#21248](https://github.com/qmk/qmk_firmware/pull/21248))
+* EC Pro X JIS Layout Touch-Up ([#21260](https://github.com/qmk/qmk_firmware/pull/21260))
+* Eason Aeroboard Refactor ([#21271](https://github.com/qmk/qmk_firmware/pull/21271))
+* Move `RGBLED_NUM` to data driven ([#21278](https://github.com/qmk/qmk_firmware/pull/21278))
+* Remove default `TAPPING_TERM` from keyboard config.h ([#21284](https://github.com/qmk/qmk_firmware/pull/21284))
+* Move `RGBLIGHT_HUE/SAT/VAL_STEP` to data driven ([#21292](https://github.com/qmk/qmk_firmware/pull/21292))
+* Move `TAPPING_TERM` to data driven ([#21296](https://github.com/qmk/qmk_firmware/pull/21296))
+* Modernize, correct, and uniform `dactyl_manuform` variant `5x6_68` ([#21299](https://github.com/qmk/qmk_firmware/pull/21299))
+* rename and modernise `dactyl_manuform/6x6_kinesis` ([#21302](https://github.com/qmk/qmk_firmware/pull/21302))
+* ProtoTypist PT-60 Refactor ([#21322](https://github.com/qmk/qmk_firmware/pull/21322))
+* ProtoTypist PT-80 Refactor ([#21325](https://github.com/qmk/qmk_firmware/pull/21325))
+* add jels60v2 support ([#21337](https://github.com/qmk/qmk_firmware/pull/21337))
+* Move `RGB_MATRIX_HUE/SAT/VAL/SPD_STEP` to data driven ([#21354](https://github.com/qmk/qmk_firmware/pull/21354))
+* Move `TAPPING_TOGGLE` to data driven ([#21360](https://github.com/qmk/qmk_firmware/pull/21360))
+* Move `TAP_CODE_DELAY` to data driven ([#21363](https://github.com/qmk/qmk_firmware/pull/21363))
+* gmmk/pro: Turn off RGB when suspended ([#21370](https://github.com/qmk/qmk_firmware/pull/21370))
+* Move miscellaneous defines to data driven ([#21382](https://github.com/qmk/qmk_firmware/pull/21382))
+* kyria: remove `LAYOUT_stack` ([#21384](https://github.com/qmk/qmk_firmware/pull/21384))
+* Reduce `keebio/bamfk1:via` firmware size ([#21432](https://github.com/qmk/qmk_firmware/pull/21432))
+* Refactor `capsunlocked/cu80/v2` ([#21454](https://github.com/qmk/qmk_firmware/pull/21454))
+* Mechlovin Zed65 rev1 Develop Touch-Up ([#21476](https://github.com/qmk/qmk_firmware/pull/21476))
+* Add PW88 keyboard ([#21482](https://github.com/qmk/qmk_firmware/pull/21482))
+* Prepare ymdk/ymd75 for rev4 ([#21484](https://github.com/qmk/qmk_firmware/pull/21484))
+* Move `DEBOUNCE_TYPE` to data driven ([#21489](https://github.com/qmk/qmk_firmware/pull/21489))
+* aleblazer/zodiark:via: Disable two RGB effects ([#21495](https://github.com/qmk/qmk_firmware/pull/21495))
+* Spruce up `dactyl_lightcycle` and `dactyl_maximus` layouts ([#21519](https://github.com/qmk/qmk_firmware/pull/21519))
+* Amend layout and matrix positions for `dactyl_cc` ([#21523](https://github.com/qmk/qmk_firmware/pull/21523))
+* moved model h controller under ibm/model_m ([#21526](https://github.com/qmk/qmk_firmware/pull/21526))
+* tominabox1/le_chiffre refactor pt 1 ([#21567](https://github.com/qmk/qmk_firmware/pull/21567))
+* Update ERA65 PCB ([#21592](https://github.com/qmk/qmk_firmware/pull/21592))
+* Update `usb.`* for dactyl_cc ([#21612](https://github.com/qmk/qmk_firmware/pull/21612))
+* Kintwin controller for kinesis keyboard, split layout ([#21614](https://github.com/qmk/qmk_firmware/pull/21614))
+* Add STM32f3 Discovery onekey ([#21625](https://github.com/qmk/qmk_firmware/pull/21625))
+* Automata02 Alisaie Develop Touch-Up ([#21630](https://github.com/qmk/qmk_firmware/pull/21630))
+* Move RGBLight animations to data driven ([#21635](https://github.com/qmk/qmk_firmware/pull/21635))
+* Refactoring entirely Caticorn PCB ([#21644](https://github.com/qmk/qmk_firmware/pull/21644))
+* AMJKeyboard AMJ84 Develop Touch-Up ([#21645](https://github.com/qmk/qmk_firmware/pull/21645))
+* Remove layout aliases from keyboard_aliases.hjson ([#21658](https://github.com/qmk/qmk_firmware/pull/21658))
+* kikoslab/kl90: Remove invalid config option ([#21708](https://github.com/qmk/qmk_firmware/pull/21708))
+* Remove more legacy config.h options ([#21709](https://github.com/qmk/qmk_firmware/pull/21709))
+* add willoucom/keypad ([#21714](https://github.com/qmk/qmk_firmware/pull/21714))
+* Tidy up encoder in matrix references ([#21718](https://github.com/qmk/qmk_firmware/pull/21718))
+* Add city42 ([#21727](https://github.com/qmk/qmk_firmware/pull/21727))
+* feat: add squigglybob splitkb kyria rev2 keymap ([#21751](https://github.com/qmk/qmk_firmware/pull/21751))
+* Align SENSE75 with recent Drop additions ([#21757](https://github.com/qmk/qmk_firmware/pull/21757))
+
+Keyboard fixes:
+* fix `scheikled` keymap for `dactyl_manuform/4x6` ([#21206](https://github.com/qmk/qmk_firmware/pull/21206))
+* Fixup `dekunukem/duckypad` ([#21298](https://github.com/qmk/qmk_firmware/pull/21298))
+* Fixup `nightly_boards/n40_o` ([#21307](https://github.com/qmk/qmk_firmware/pull/21307))
+* Fix `rate/pistachio_pro:via` ([#21339](https://github.com/qmk/qmk_firmware/pull/21339))
+* Fix encoder map declarations ([#21435](https://github.com/qmk/qmk_firmware/pull/21435))
+* jones/v1: fix layout offset and disable audio on via keymap ([#21468](https://github.com/qmk/qmk_firmware/pull/21468))
+* Fix backlight support for some boards ([#21554](https://github.com/qmk/qmk_firmware/pull/21554))
+* kinesis: remove stacked split layouts ([#21569](https://github.com/qmk/qmk_firmware/pull/21569))
+* Fix layout offsets for a handful of boards ([#21636](https://github.com/qmk/qmk_firmware/pull/21636))
+* doio/kb38: fix layout ([#21704](https://github.com/qmk/qmk_firmware/pull/21704))
+* Fix drop/shift/v2 compilation ([#21800](https://github.com/qmk/qmk_firmware/pull/21800))
+* Fix keyboards with old RGB driver names ([#21815](https://github.com/qmk/qmk_firmware/pull/21815))
+* Fix keyboards with old RGB driver names ([#21817](https://github.com/qmk/qmk_firmware/pull/21817))
+
+Others:
+* Rework info.json reference ([#21324](https://github.com/qmk/qmk_firmware/pull/21324))
+* Enable auto-merge of develop to riot ([#21389](https://github.com/qmk/qmk_firmware/pull/21389))
+
+Bugs:
+* Fix non-functional S3 wakeup / resume from suspense ([#19780](https://github.com/qmk/qmk_firmware/pull/19780))
+* [Bugfix] Check `NULL` pointers on QP ([#20481](https://github.com/qmk/qmk_firmware/pull/20481))
+* Fix PS2_MOUSE_INVERT_BUTTONS ([#20646](https://github.com/qmk/qmk_firmware/pull/20646))
+* Fix backlight sync on suspend_power_down for split keyboards ([#21079](https://github.com/qmk/qmk_firmware/pull/21079))
+* Consolidate `KEYBOARD_OUTPUT`+`KEYMAP_OUTPUT`=>`INTERMEDIATE_OUTPUT` ([#21272](https://github.com/qmk/qmk_firmware/pull/21272))
+* Chibios USB: Take into account if host wants remote wakeup or not ([#21287](https://github.com/qmk/qmk_firmware/pull/21287))
+* Fix anchor IDs for some API references ([#21345](https://github.com/qmk/qmk_firmware/pull/21345))
+* Pixel fractal: Set minimum middle column value ([#21365](https://github.com/qmk/qmk_firmware/pull/21365))
+* Fix ili9xxx inversion opcode entry ([#21422](https://github.com/qmk/qmk_firmware/pull/21422))
+* Relocate backlight drivers ([#21444](https://github.com/qmk/qmk_firmware/pull/21444))
+* Fixup STM32-DFU ([#21447](https://github.com/qmk/qmk_firmware/pull/21447))
+* keycode aliases: work around ChibiOS ch.h include guard ([#21497](https://github.com/qmk/qmk_firmware/pull/21497))
+* Fix compilation error when Split Watchdog enabled ([#21543](https://github.com/qmk/qmk_firmware/pull/21543))
+* Revert " Fix compilation error when Split Watchdog enabled" ([#21572](https://github.com/qmk/qmk_firmware/pull/21572))
+* quantum.h: clean up process_keycode includes ([#21579](https://github.com/qmk/qmk_firmware/pull/21579))
+* Fix stuck note with square wave in additive DAC ([#21589](https://github.com/qmk/qmk_firmware/pull/21589))
+* [Fix] USB HID tests compliance ([#21626](https://github.com/qmk/qmk_firmware/pull/21626))
+* Fix Dynamic Macro Compilation for avr-gcc 5.4.0 + Linux ([#21653](https://github.com/qmk/qmk_firmware/pull/21653))
+* Unicode, Unicodemap and UCIS refactor ([#21659](https://github.com/qmk/qmk_firmware/pull/21659))
+* Audio: Don't play the first note of zero-note melodies ([#21661](https://github.com/qmk/qmk_firmware/pull/21661))
+* Fix mouse-key spamming empty reports ([#21663](https://github.com/qmk/qmk_firmware/pull/21663))
+* Restore usb suspend wakeup delay ([#21676](https://github.com/qmk/qmk_firmware/pull/21676))
+* Fix compilation error for APA on ChibiOS ([#21773](https://github.com/qmk/qmk_firmware/pull/21773))
+* fix: restore rgb matrix indicators to jellybean_raindrops animation ([#21792](https://github.com/qmk/qmk_firmware/pull/21792))
+* Remove `led_matrix.hue_steps` and `led_matrix.sat_steps` from schema ([#21827](https://github.com/qmk/qmk_firmware/pull/21827))
+* Revert  changes to ChibiOS Suspend Code ([#21830](https://github.com/qmk/qmk_firmware/pull/21830))
+* Add "apm32-dfu" in keyboard.jsonschema ([#21842](https://github.com/qmk/qmk_firmware/pull/21842))
diff --git a/docs/_summary.md b/docs/_summary.md
index 8b7959c2b34f..26a543aee42c 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -80,6 +80,7 @@
     * [Caps Word](feature_caps_word.md)
     * [Combos](feature_combo.md)
     * [Debounce API](feature_debounce_type.md)
+    * [Digitizer](feature_digitizer.md)
     * [EEPROM](feature_eeprom.md)
     * [Key Lock](feature_key_lock.md)
     * [Key Overrides](feature_key_overrides.md)
@@ -115,7 +116,6 @@
     * [Bootmagic Lite](feature_bootmagic.md)
     * [Converters](feature_converters.md)
     * [Custom Matrix](custom_matrix.md)
-    * [Digitizer](feature_digitizer.md)
     * [DIP Switch](feature_dip_switch.md)
     * [Encoders](feature_encoders.md)
     * [Haptic Feedback](feature_haptic_feedback.md)
@@ -139,7 +139,7 @@
   * Breaking Changes
     * [Overview](breaking_changes.md)
     * [My Pull Request Was Flagged](breaking_changes_instructions.md)
-    * [Most Recent ChangeLog](ChangeLog/20230528.md "QMK v0.21.0 - 2023 May 28")
+    * [Most Recent ChangeLog](ChangeLog/20230827.md "QMK v0.22.0 - 2023 Aug 27")
     * [Past Breaking Changes](breaking_changes_history.md)
 
   * C Development
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
index e660182c3286..fdf6ccef9c79 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?
 
+* [2023 Aug 27](ChangeLog/20230827.md)
 * [2023 May 28](ChangeLog/20230528.md)
 * [2023 Feb 26](ChangeLog/20230226.md)
-* [2022 Nov 26](ChangeLog/20221126.md)
 * [Older Breaking Changes](breaking_changes_history.md)
 
 ## When is the next Breaking Change?
 
-The next Breaking Change is scheduled for August 27, 2023.
+The next Breaking Change is scheduled for November 26, 2023.
 
 ### Important Dates
 
-* 2023 May 28 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
-* 2023 Jul 30 - `develop` closed to new PRs.
-* 2023 Jul 30 - Call for testers.
-* 2023 Aug 13 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
-* 2023 Aug 20 - `develop` is locked, only critical bugfix PRs merged.
-* 2023 Aug 25 - `master` is locked, no PRs merged.
-* 2023 Aug 27 - Merge `develop` to `master`.
-* 2023 Aug 27 - `master` is unlocked. PRs can be merged again.
+* 2023 Aug 27 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
+* 2023 Oct 29 - `develop` closed to new PRs.
+* 2023 Oct 29 - Call for testers.
+* 2023 Nov 5 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
+* 2023 Nov 19 - `develop` is locked, only critical bugfix PRs merged.
+* 2023 Nov 23 - `master` is locked, no PRs merged.
+* 2023 Nov 26 - Merge `develop` to `master`.
+* 2023 Nov 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/20230827`.
+* The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20231126`.
     * 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.
 
@@ -119,6 +119,7 @@ This happens immediately after the previous `develop` branch is merged to `maste
     * `git commit -m 'Branch point for <DATE> Breaking Change'`
     * `git tag breakpoint_<YYYY>_<MM>_<DD>`
     * `git push upstream breakpoint_<YYYY>_<MM>_<DD>`
+    * `git push upstream develop`
 
 * All submodules under `lib` now need to be checked against their QMK-based forks:
     * `git submodule foreach git log -n1`
diff --git a/docs/breaking_changes_history.md b/docs/breaking_changes_history.md
index 79f2899d2cf6..deb3dfb99008 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.
 
+* [2023 Aug 27](ChangeLog/20230827.md) - version 0.22.0
 * [2023 May 28](ChangeLog/20230528.md) - version 0.21.0
 * [2023 Feb 26](ChangeLog/20230226.md) - version 0.20.0
 * [2022 Nov 26](ChangeLog/20221126.md) - version 0.19.0
diff --git a/docs/cli.md b/docs/cli.md
index 8684479d0c1d..feb5458d3954 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -6,7 +6,7 @@ The QMK CLI makes building and working with QMK keyboards easier. We have provid
 
 ### Requirements :id=requirements
 
-QMK requires Python 3.6 or greater. We try to keep the number of requirements small but you will also need to install the packages listed in [`requirements.txt`](https://github.com/qmk/qmk_firmware/blob/master/requirements.txt). These are installed automatically when you install the QMK CLI.
+QMK requires Python 3.7 or greater. We try to keep the number of requirements small but you will also need to install the packages listed in [`requirements.txt`](https://github.com/qmk/qmk_firmware/blob/master/requirements.txt). These are installed automatically when you install the QMK CLI.
 
 ### Install Using Homebrew (macOS, some Linux) :id=install-using-homebrew
 
@@ -20,7 +20,7 @@ qmk setup  # This will clone `qmk/qmk_firmware` and optionally set up your build
 
 ### Install Using pip :id=install-using-easy_install-or-pip
 
-If your system is not listed above you can install QMK manually. First ensure that you have Python 3.6 (or later) installed and have installed pip. Then install QMK with this command:
+If your system is not listed above you can install QMK manually. First ensure that you have Python 3.7 (or later) installed and have installed pip. Then install QMK with this command:
 
 ```
 python3 -m pip install qmk
diff --git a/docs/cli_development.md b/docs/cli_development.md
index d878deff17c4..8d4ee625352f 100644
--- a/docs/cli_development.md
+++ b/docs/cli_development.md
@@ -44,7 +44,7 @@ def hello(cli):
 
 First we import the `cli` object from `milc`. This is how we interact with the user and control the script's behavior. We use `@cli.argument()` to define a command line flag, `--name`. This also creates a configuration variable named `hello.name` (and the corresponding `user.name`) which the user can set so they don't have to specify the argument. The `cli.subcommand()` decorator designates this function as a subcommand. The name of the subcommand will be taken from the name of the function.
 
-Once inside our function we find a typical "Hello, World!" program. We use `cli.log` to access the underlying [Logger Object](https://docs.python.org/3.6/library/logging.html#logger-objects), whose behavior is user controllable. We also access the value for name supplied by the user as `cli.config.hello.name`. The value for `cli.config.hello.name` will be determined by looking at the `--name` argument supplied by the user, if not provided it will use the value in the `qmk.ini` config file, and if neither of those is provided it will fall back to the default supplied in the `cli.argument()` decorator.
+Once inside our function we find a typical "Hello, World!" program. We use `cli.log` to access the underlying [Logger Object](https://docs.python.org/3.7/library/logging.html#logger-objects), whose behavior is user controllable. We also access the value for name supplied by the user as `cli.config.hello.name`. The value for `cli.config.hello.name` will be determined by looking at the `--name` argument supplied by the user, if not provided it will use the value in the `qmk.ini` config file, and if neither of those is provided it will fall back to the default supplied in the `cli.argument()` decorator.
 
 # User Interaction
 
@@ -56,13 +56,13 @@ There are two main methods for outputting text in a subcommand- `cli.log` and `c
 
 You can use special tokens to colorize your text, to make it easier to understand the output of your program. See [Colorizing Text](#colorizing-text) below.
 
-Both of these methods support built-in string formatting using python's [printf style string format operations](https://docs.python.org/3.6/library/stdtypes.html#old-string-formatting). You can use tokens such as `%s` and `%d` within your text strings then pass the values as arguments. See our Hello, World program above for an example.
+Both of these methods support built-in string formatting using python's [printf style string format operations](https://docs.python.org/3.7/library/stdtypes.html#old-string-formatting). You can use tokens such as `%s` and `%d` within your text strings then pass the values as arguments. See our Hello, World program above for an example.
 
 You should never use the format operator (`%`) directly, always pass values as arguments.
 
 ### Logging (`cli.log`)
 
-The `cli.log` object gives you access to a [Logger Object](https://docs.python.org/3.6/library/logging.html#logger-objects). We have configured our log output to show the user a nice emoji for each log level (or the log level name if their terminal does not support unicode.) This way the user can tell at a glance which messages are most important when something goes wrong.
+The `cli.log` object gives you access to a [Logger Object](https://docs.python.org/3.7/library/logging.html#logger-objects). We have configured our log output to show the user a nice emoji for each log level (or the log level name if their terminal does not support unicode.) This way the user can tell at a glance which messages are most important when something goes wrong.
 
 The default log level is `INFO`. If the user runs `qmk -v <subcommand>` the default log level will be set to `DEBUG`.
 
diff --git a/docs/coding_conventions_python.md b/docs/coding_conventions_python.md
index 2b6870344873..1ed27ee46abb 100644
--- a/docs/coding_conventions_python.md
+++ b/docs/coding_conventions_python.md
@@ -317,7 +317,7 @@ At the time of this writing our tests are not very comprehensive. Looking at the
 
 ## Integration Tests
 
-Integration tests can be found in `lib/python/qmk/tests/test_cli_commands.py`. This is where CLI commands are actually run and their overall behavior is verified. We use [`subprocess`](https://docs.python.org/3.6/library/subprocess.html#module-subprocess) to launch each CLI command and a combination of checking output and returncode to determine if the right thing happened.
+Integration tests can be found in `lib/python/qmk/tests/test_cli_commands.py`. This is where CLI commands are actually run and their overall behavior is verified. We use [`subprocess`](https://docs.python.org/3.7/library/subprocess.html#module-subprocess) to launch each CLI command and a combination of checking output and returncode to determine if the right thing happened.
 
 ## Unit Tests
 
diff --git a/docs/compatible_microcontrollers.md b/docs/compatible_microcontrollers.md
index cc9c0b7f92a2..197033f78b57 100644
--- a/docs/compatible_microcontrollers.md
+++ b/docs/compatible_microcontrollers.md
@@ -43,6 +43,8 @@ You can also use any ARM chip with USB that [ChibiOS](https://www.chibios.org) s
  * [STM32F446](https://www.st.com/en/microcontrollers-microprocessors/stm32f446.html)
  * [STM32G431](https://www.st.com/en/microcontrollers-microprocessors/stm32g4x1.html)
  * [STM32G474](https://www.st.com/en/microcontrollers-microprocessors/stm32g4x4.html)
+ * [STM32H723](https://www.st.com/en/microcontrollers-microprocessors/stm32h723-733.html)
+ * [STM32H733](https://www.st.com/en/microcontrollers-microprocessors/stm32h723-733.html)
  * [STM32L412](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x2.html)
  * [STM32L422](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x2.html)
  * [STM32L432](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x2.html)
diff --git a/docs/config_options.md b/docs/config_options.md
index 4698260118f3..8119b9e356fa 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -439,7 +439,7 @@ Use these to enable or disable building certain features. The more you have enab
 * `UNICODE_ENABLE`
   * Unicode
 * `BLUETOOTH_ENABLE`
-  * Current options are BluefruitLE, RN42
+  * Current options are bluefruit_le, rn42
 * `SPLIT_KEYBOARD`
   * Enables split keyboard support (dual MCU like the let's split and bakingpy's boards) and includes all necessary files located at quantum/split_common
 * `CUSTOM_MATRIX`
diff --git a/docs/contributing.md b/docs/contributing.md
index 4801bb8224a4..e94a63760982 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -36,7 +36,7 @@ If you need help you can [open an issue](https://github.com/qmk/qmk_firmware/iss
 Never made an open source contribution before? Wondering how contributions work in QMK? Here's a quick rundown!
 
 0. Sign up for a [GitHub](https://github.com) account.
-1. Put together a keymap to contribute, [find an issue](https://github.com/qmk/qmk_firmware/issues) you are interested in addressing, or [a feature](https://github.com/qmk/qmk_firmware/issues?q=is%3Aopen+is%3Aissue+label%3Afeature) you would like to add.
+1. [Find an issue](https://github.com/qmk/qmk_firmware/issues) you are interested in addressing, or [a feature](https://github.com/qmk/qmk_firmware/issues?q=is%3Aopen+is%3Aissue+label%3Afeature) you would like to add.
 2. Fork the repository associated with the issue to your GitHub account. This means that you will have a copy of the repository under `your-GitHub-username/qmk_firmware`.
 3. Clone the repository to your local machine using `git clone https://github.com/github-username/repository-name.git`.
 4. If you're working on a new feature consider opening an issue to talk with us about the work you're about to undertake.
@@ -67,7 +67,7 @@ We have a few different types of changes in QMK, each requiring a different leve
 * Separate PRs into logical units. For example, do not submit one PR covering two separate features, instead submit a separate PR for each feature.
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * Make sure your code change actually compiles.
-  * Keymaps: Make sure that `make keyboard:your_new_keymap` does not return any errors.
+  * Keymaps: Make sure that `make keyboard:keymap` does not return any errors.
   * Keyboards: Make sure that `make keyboard:all` does not return any errors.
   * Core: Make sure that `make all` does not return any errors.
 * Make sure commit messages are understandable on their own. You should put a short description (no more than 70 characters) on the first line, the second line should be empty, and on the 3rd and later lines you should describe your commit in detail, if required. Example:
@@ -114,16 +114,6 @@ or if you only have Python 3 installed:
 
 and navigating to `http://localhost:8936/`.
 
-## Keymaps
-
-Most first-time QMK contributors start with their personal keymaps. We try to keep keymap standards pretty casual (keymaps, after all, reflect the personality of their creators) but we do ask that you follow these guidelines to make it easier for others to discover and learn from your keymap.
-
-* Write a `readme.md` using [the template](documentation_templates.md).
-* All Keymap PRs are squashed, so if you care about how your commits are squashed you should do it yourself
-* Do not lump features in with keymap PRs. Submit the feature first and then a second PR for the keymap.
-* Do not include `Makefile`s in your keymap folder (they're no longer used)
-* Update copyrights in file headers (look for `%YOUR_NAME%`)
-
 ## Keyboards
 
 Keyboards are the raison d'être for QMK. Some keyboards are community maintained, while others are maintained by the people responsible for making a particular keyboard. The `readme.md` should tell you who maintains a particular keyboard. If you have questions relating to a particular keyboard you can [Open An Issue](https://github.com/qmk/qmk_firmware/issues) and tag the maintainer in your question.
@@ -131,7 +121,7 @@ Keyboards are the raison d'être for QMK. Some keyboards are community maintaine
 We also ask that you follow these guidelines:
 
 * Write a `readme.md` using [the template](documentation_templates.md).
-* Keep the number of commits reasonable or we will squash your PR
+* Include a `default` keymap that provides a clean slate for users to start with when creating their own keymaps.
 * Do not lump core features in with new keyboards. Submit the feature first and then submit a separate PR for the keyboard.
 * Name `.c`/`.h` file after the immediate parent folder, eg `/keyboards/<kb1>/<kb2>/<kb2>.[ch]`
 * Do not include `Makefile`s in your keyboard folder (they're no longer used)
diff --git a/docs/data_driven_config.md b/docs/data_driven_config.md
index ba287f5688e9..b288f9901a81 100644
--- a/docs/data_driven_config.md
+++ b/docs/data_driven_config.md
@@ -79,8 +79,8 @@ If you are not sure how to edit this file or are not comfortable with Python [op
 
 The final piece of the puzzle is providing your new option to the build system. This is done by generating two files:
 
-* `.build/obj_<keyboard>/src/info_config.h`
-* `.build/obj_<keyboard>/src/rules.mk`
+* `.build/obj_<keyboard>_<keymap>/src/info_config.h`
+* `.build/obj_<keyboard>_<keymap>/src/rules.mk`
 
 These two files are generated by the code here:
 
diff --git a/docs/feature_auto_shift.md b/docs/feature_auto_shift.md
index 1719807e2688..6241cbaeb158 100644
--- a/docs/feature_auto_shift.md
+++ b/docs/feature_auto_shift.md
@@ -133,7 +133,17 @@ groups in the below fallback switch.
 ### NO_AUTO_SHIFT_SPECIAL (simple define)
 
 Do not Auto Shift special keys, which include -\_, =+, [{, ]}, ;:, '", ,<, .>,
-and /?
+/?, and the KC_TAB.
+
+### NO_AUTO_SHIFT_TAB (simple define)
+
+Do not Auto Shift KC_TAB but leave Auto Shift enabled for the other special
+characters.
+
+### NO_AUTO_SHIFT_SYMBOLS (simple define)
+
+Do not Auto Shift symbol keys, which include -\_, =+, [{, ]}, ;:, '", ,<, .>,
+and /?.
 
 ### NO_AUTO_SHIFT_NUMERIC (simple define)
 
@@ -143,9 +153,13 @@ Do not Auto Shift numeric keys, zero through nine.
 
 Do not Auto Shift alpha characters, which include A through Z.
 
+### AUTO_SHIFT_ENTER (simple define)
+
+Auto Shift the enter key.
+
 ### Auto Shift Per Key
 
-There are functions that allows you to determine which keys shold be autoshifted, much like the tap-hold keys.
+There are functions that allows you to determine which keys should be autoshifted, much like the tap-hold keys.
 
 The first of these, used to simply add a key to Auto Shift, is `get_custom_auto_shifted_key`:
 
@@ -172,9 +186,15 @@ bool get_auto_shifted_key(uint16_t keycode, keyrecord_t *record) {
         case KC_1 ... KC_0:
 #    endif
 #    ifndef NO_AUTO_SHIFT_SPECIAL
+#    ifndef NO_AUTO_SHIFT_TAB
         case KC_TAB:
-        case KC_MINUS ... KC_SLASH:
-        case KC_NONUS_BACKSLASH:
+#    endif
+#    ifndef NO_AUTO_SHIFT_SYMBOLS
+        case AUTO_SHIFT_SYMBOLS:
+#    endif
+#    endif
+#    ifdef AUTO_SHIFT_ENTER
+        case KC_ENT:
 #    endif
             return true;
     }
@@ -192,6 +212,25 @@ Enables keyrepeat.
 
 Disables automatically keyrepeating when `AUTO_SHIFT_TIMEOUT` is exceeded.
 
+
+### AUTO_SHIFT_ALPHA (predefined key group)
+
+A predefined group of keys representing A through Z.
+
+### AUTO_SHIFT_NUMERIC (predefined key group)
+
+A predefined group of keys representing 0 through 9. Note, these are defined as
+1 through 0 since that is the order they normally appear in.
+
+### AUTO_SHIFT_SYMBOLS (predefined key group)
+
+A predefined group of keys representing symbolic characters which include -\_, =+, [{, ]}, ;:, '", ,<, .>,
+and /?.
+
+### AUTO_SHIFT_SPECIAL (predefined key group)
+
+A predefined group of keys that combines AUTO_SHIFT_SYMBOLS and KC_TAB.
+
 ## Custom Shifted Values
 
 Especially on small keyboards, the default shifted value for many keys is not
diff --git a/docs/feature_autocorrect.md b/docs/feature_autocorrect.md
index 9f80c93f8274..3a0a49095c6b 100644
--- a/docs/feature_autocorrect.md
+++ b/docs/feature_autocorrect.md
@@ -198,7 +198,9 @@ bool process_autocorrect_user(uint16_t *keycode, keyrecord_t *record, uint8_t *t
 
 ### Apply Autocorrect
 
-Additionally, `apply_autocorrect(uint8_t backspaces, const char *str)` allows for users to add additional handling to the autocorrection, or replace the functionality entirely. This passes on the number of backspaces needed to replace the words, as well as the replacement string (partial word, not the full word).
+Additionally, `apply_autocorrect(uint8_t backspaces, const char *str, char *typo, char *correct)` allows for users to add additional handling to the autocorrection, or replace the functionality entirely. This passes on the number of backspaces needed to replace the words, as well as the replacement string (partial word, not the full word), and the typo and corrected strings (complete words).
+
+?> Due to the way code works (no notion of words, just a stream of letters), the `typo` and `correct` strings are a best bet and could be "wrong". For example you may get `wordtpyo` & `wordtypo` instead of the expected `tpyo` & `typo`. 
 
 #### Apply Autocorrect Example
 
@@ -209,7 +211,7 @@ This following example will play a sound when a typo is autocorrected and execut
 float autocorrect_song[][2] = SONG(TERMINAL_SOUND);
 #endif
 
-bool apply_autocorrect(uint8_t backspaces, const char *str) {
+bool apply_autocorrect(uint8_t backspaces, const char *str, char *typo, char *correct) {
 #ifdef AUDIO_ENABLE
     PLAY_SONG(autocorrect_song);
 #endif
@@ -223,14 +225,17 @@ bool apply_autocorrect(uint8_t backspaces, const char *str) {
 
 ?> In this callback function, `return false` will stop the normal processing of autocorrect, which requires manually handling of removing the "bad" characters and typing the new characters.
 
-!> ***IMPORTANT***: `str` is a pointer to `PROGMEM` data for the autocorrection.  If you return false, and want to send the string, this needs to use `send_string_P` and not `send_string` or `SEND_STRING`.
+!> ***IMPORTANT***: `str` is a pointer to `PROGMEM` data for the autocorrection.  If you return false, and want to send the string, this needs to use `send_string_P` and not `send_string` nor `SEND_STRING`.
 
 You can also use `apply_autocorrect` to detect and display the event but allow internal code to execute the autocorrection with `return true`:
 
 ```c
-bool apply_autocorrect(uint8_t backspaces, const char *str) {
+bool apply_autocorrect(uint8_t backspaces, const char *str, char *typo, char *correct) {
 #ifdef OLED_ENABLE
     oled_write_P(PSTR("Auto-corrected"), false);
+#endif
+#ifdef CONSOLE_ENABLE
+    printf("'%s' was corrected to '%s'\n", typo, correct);
 #endif
     return true;
 }
diff --git a/docs/feature_backlight.md b/docs/feature_backlight.md
index 24057c608f8c..d032c33f18a1 100644
--- a/docs/feature_backlight.md
+++ b/docs/feature_backlight.md
@@ -1,12 +1,12 @@
 # Backlighting :id=backlighting
 
-Many keyboards support backlit keys by way of individual LEDs placed through or underneath the keyswitches. This feature is distinct from both the [RGB underglow](feature_rgblight.md) and [RGB matrix](feature_rgb_matrix.md) features as it usually allows for only a single colour per switch, though you can obviously install multiple different single coloured LEDs on a keyboard.
+Many keyboards support backlit keys by way of individual LEDs placed through or underneath the keyswitches. This feature is distinct from both the [RGB Underglow](feature_rgblight.md) and [RGB Matrix](feature_rgb_matrix.md) features as it usually allows for only a single colour per switch, though you can obviously install multiple different single coloured LEDs on a keyboard.
 
 QMK is able to control the brightness of these LEDs by switching them on and off rapidly in a certain ratio, a technique known as *Pulse Width Modulation*, or PWM. By altering the duty cycle of the PWM signal, it creates the illusion of dimming.
 
-The MCU can only supply so much current to its GPIO pins. Instead of powering the backlight directly from the MCU, the backlight pin is connected to a transistor or MOSFET that switches the power to the LEDs.
+## Usage :id=usage
 
-Most keyboards have backlighting enabled by default if they support it, but if it is not working for you, check that your `rules.mk` includes the following:
+Most keyboards have backlighting enabled by default if they support it, but if it is not working for you (or you have added support), check that your `rules.mk` includes the following:
 
 ```make
 BACKLIGHT_ENABLE = yes
@@ -14,57 +14,23 @@ BACKLIGHT_ENABLE = yes
 
 ## Keycodes :id=keycodes
 
-Once enabled, the following keycodes below can be used to change the backlight level.
+|Key                            |Aliases  |Description                        |
+|-------------------------------|---------|-----------------------------------|
+|`QK_BACKLIGHT_TOGGLE`          |`BL_TOGG`|Turn the backlight on or off       |
+|`QK_BACKLIGHT_STEP`            |`BL_STEP`|Cycle through backlight levels     |
+|`QK_BACKLIGHT_ON`              |`BL_ON`  |Set the backlight to max brightness|
+|`QK_BACKLIGHT_OFF`             |`BL_OFF` |Turn the backlight off             |
+|`QK_BACKLIGHT_UP`              |`BL_UP`  |Increase the backlight level       |
+|`QK_BACKLIGHT_DOWN`            |`BL_DOWN`|Decrease the backlight level       |
+|`QK_BACKLIGHT_TOGGLE_BREATHING`|`BL_BRTG`|Toggle backlight breathing         |
 
-| Key                             | Aliases   | Description                         |
-|---------------------------------|-----------|-------------------------------------|
-| `QK_BACKLIGHT_TOGGLE`           | `BL_TOGG` | Turn the backlight on or off        |
-| `QK_BACKLIGHT_STEP`             | `BL_STEP` | Cycle through backlight levels      |
-| `QK_BACKLIGHT_ON`               | `BL_ON`   | Set the backlight to max brightness |
-| `QK_BACKLIGHT_OFF`              | `BL_OFF`  | Turn the backlight off              |
-| `QK_BACKLIGHT_UP`               | `BL_UP`   | Increase the backlight level        |
-| `QK_BACKLIGHT_DOWN`             | `BL_DOWN` | Decrease the backlight level        |
-| `QK_BACKLIGHT_TOGGLE_BREATHING` | `BL_BRTG` | Toggle backlight breathing          |
+## Basic Configuration :id=basic-configuration
 
-## Functions :id=functions
-
-These functions can be used to change the backlighting in custom code:
-
-|Function                |Description                                 |
-|------------------------|--------------------------------------------|
-|`backlight_toggle()`    |Turn the backlight on or off                |
-|`backlight_enable()`    |Turn the backlight on                       |
-|`backlight_disable()`   |Turn the backlight off                      |
-|`backlight_step()`      |Cycle through backlight levels              |
-|`backlight_increase()`  |Increase the backlight level                |
-|`backlight_decrease()`  |Decrease the backlight level                |
-|`backlight_level(x)`    |Sets the backlight level to specified level |
-|`get_backlight_level()` |Return the current backlight level          |
-|`is_backlight_enabled()`|Return whether the backlight is currently on|
-
-If backlight breathing is enabled (see below), the following functions are also available:
-
-|Function             |Description                           |
-|---------------------|--------------------------------------|
-|`breathing_toggle()` |Turn the backlight breathing on or off|
-|`breathing_enable()` |Turns on backlight breathing          |
-|`breathing_disable()`|Turns off backlight breathing         |
-
-## Configuration :id=configuration
-
-To select which driver to use, configure your `rules.mk` with the following:
-
-```make
-BACKLIGHT_DRIVER = software
-```
-
-Valid driver values are `pwm`, `software`, `custom` or `no`. See below for help on individual drivers.
-
-To configure the backlighting, `#define` these in your `config.h`:
+Add the following to your `config.h`:
 
 |Define                       |Default           |Description                                                                                                      |
 |-----------------------------|------------------|-----------------------------------------------------------------------------------------------------------------|
-|`BACKLIGHT_PIN`              |*Not defined*     |The pin that controls the LED(s)                                                                                 |
+|`BACKLIGHT_PIN`              |*Not defined*     |The pin that controls the LEDs                                                                                   |
 |`BACKLIGHT_LEVELS`           |`3`               |The number of brightness levels (maximum 31 excluding off)                                                       |
 |`BACKLIGHT_CAPS_LOCK`        |*Not defined*     |Enable Caps Lock indicator using backlight (for keyboards without dedicated LED)                                 |
 |`BACKLIGHT_BREATHING`        |*Not defined*     |Enable backlight breathing, if supported                                                                         |
@@ -76,24 +42,88 @@ To configure the backlighting, `#define` these in your `config.h`:
 
 Unless you are designing your own keyboard, you generally should not need to change the `BACKLIGHT_PIN` or `BACKLIGHT_ON_STATE`.
 
-### Backlight On State :id=backlight-on-state
+### "On" State :id=on-state
 
 Most backlight circuits are driven by an N-channel MOSFET or NPN transistor. This means that to turn the transistor *on* and light the LEDs, you must drive the backlight pin, connected to the gate or base, *high*.
 Sometimes, however, a P-channel MOSFET, or a PNP transistor is used. In this case, when the transistor is on, the pin is driven *low* instead.
 
-This functionality is configured at the keyboard level with the `BACKLIGHT_ON_STATE` define.
+To configure the "on" state of the backlight circuit, add the following to your `config.h`:
+
+```c
+#define BACKLIGHT_ON_STATE 0
+```
+
+### Multiple Backlight Pins :id=multiple-backlight-pins
+
+Most keyboards have only one backlight pin which controls all backlight LEDs (especially if the backlight is connected to a hardware PWM pin).
+The `timer` and `software` drivers allow you to define multiple backlight pins, which will be turned on and off at the same time during the PWM duty cycle.
+
+This feature allows to set, for instance, the Caps Lock LED's (or any other controllable LED) brightness at the same level as the other LEDs of the backlight. This is useful if you have mapped Control in place of Caps Lock and you need the Caps Lock LED to be part of the backlight instead of being activated when Caps Lock is on, as it is usually wired to a separate pin from the backlight.
+
+To configure multiple backlight pins, add something like this to your `config.h`, instead of `BACKLIGHT_PIN`:
+
+```c
+#define BACKLIGHT_PINS { F5, B2 }
+```
+
+## Driver Configuration :id=driver-configuration
+
+Backlight driver selection is configured in `rules.mk`. Valid drivers are `pwm` (default), `timer`, `software`, or `custom`. See below for information on individual drivers.
 
-### AVR Driver :id=avr-driver
+### PWM Driver :id=pwm-driver
 
-The `pwm` driver is configured by default, however the equivalent setting within `rules.mk` would be:
+This is the default backlight driver, which leverages the hardware PWM output capability of the microcontroller.
 
 ```make
 BACKLIGHT_DRIVER = pwm
 ```
 
-#### Caveats :id=avr-caveats
+### Timer Driver :id=timer-driver
+
+This driver is similar to the PWM driver, but instead of directly configuring the pin to output a PWM signal, an interrupt handler is attached to the timer to turn the pin on and off as appropriate.
+
+```make
+BACKLIGHT_DRIVER = timer
+```
+
+### Software Driver :id=software-driver
+
+In this mode, PWM is "emulated" while running other keyboard tasks. It offers maximum hardware compatibility without extra platform configuration. However, breathing is not supported, and the backlight can flicker when the keyboard is busy.
+
+```make
+BACKLIGHT_DRIVER = software
+```
+
+### Custom Driver :id=custom-driver
+
+If none of the above drivers apply to your board (for example, you are using a separate IC to control the backlight), you can implement a custom backlight driver using a simple API.
+
+```make
+BACKLIGHT_DRIVER = custom
+```
+
+```c
+void backlight_init_ports(void) {
+    // Optional - runs on startup
+    //   Usually you want to configure pins here
+}
+void backlight_set(uint8_t level) {
+    // Optional - runs on level change
+    //   Usually you want to respond to the new value
+}
+
+void backlight_task(void) {
+    // Optional - runs periodically
+    //   Note that this is called in the main keyboard loop,
+    //   so long running actions here can cause performance issues
+}
+```
+
+## AVR Configuration :id=avr-configuration
+
+### PWM Driver :id=avr-pwm-driver
 
-On AVR boards, QMK automatically decides which driver to use according to the following table:
+The following table describes the supported pins for the PWM driver. Only cells marked with a timer number are capable of hardware PWM output; any others must use the `timer` driver.
 
 |Backlight Pin|AT90USB64/128|AT90USB162|ATmega16/32U4|ATmega16/32U2|ATmega32A|ATmega328/P|
 |-------------|-------------|----------|-------------|-------------|---------|-----------|
@@ -108,113 +138,169 @@ On AVR boards, QMK automatically decides which driver to use according to the fo
 |`D4`         |             |          |             |             |Timer 1  |           |
 |`D5`         |             |          |             |             |Timer 1  |           |
 
-All other pins will use timer-assisted software PWM:
+### Timer Driver :id=avr-timer-driver
 
-|Audio Pin|Audio Timer|Software PWM Timer|
-|---------|-----------|------------------|
-|`C4`     |Timer 3    |Timer 1           |
-|`C5`     |Timer 3    |Timer 1           |
-|`C6`     |Timer 3    |Timer 1           |
-|`B5`     |Timer 1    |Timer 3           |
-|`B6`     |Timer 1    |Timer 3           |
-|`B7`     |Timer 1    |Timer 3           |
+Any GPIO pin can be used with this driver. The following table describes the supported timers:
 
-When both timers are in use for Audio, the backlight PWM cannot use a hardware timer, and will instead be triggered during the matrix scan. In this case, breathing is not supported, and the backlight might flicker, because the PWM computation may not be called with enough timing precision.
+|AT90USB64/128|AT90USB162|ATmega16/32U4|ATmega16/32U2|ATmega32A|ATmega328/P|
+|-------------|----------|-------------|-------------|---------|-----------|
+|Timers 1 & 3 |Timer 1   |Timers 1 & 3 |Timer 1      |Timer 1  |Timer 1    |
 
-#### Hardware PWM Implementation :id=hardware-pwm-implementation
+The following `#define`s apply only to the `timer` driver:
 
-When using the supported pins for backlighting, QMK will use a hardware timer configured to output a PWM signal. This timer will count up to `ICRx` (by default `0xFFFF`) before resetting to 0.
-The desired brightness is calculated and stored in the `OCRxx` register. When the counter reaches this value, the backlight pin will go low, and is pulled high again when the counter resets.
-In this way `OCRxx` essentially controls the duty cycle of the LEDs, and thus the brightness, where `0x0000` is completely off and `0xFFFF` is completely on.
+|Define                 |Default|Description     |
+|-----------------------|-------|----------------|
+|`BACKLIGHT_PWM_TIMER`  |`1`    |The timer to use|
 
-The breathing effect is achieved by registering an interrupt handler for `TIMER1_OVF_vect` that is called whenever the counter resets, roughly 244 times per second.
-In this handler, the value of an incrementing counter is mapped onto a precomputed brightness curve. To turn off breathing, the interrupt handler is simply disabled, and the brightness reset to the level stored in EEPROM.
+Note that the choice of timer may conflict with the [Audio](feature_audio.md) feature.
 
-#### Timer Assisted PWM Implementation :id=timer-assisted-implementation
+## ChibiOS/ARM Configuration :id=arm-configuration
 
-When `BACKLIGHT_PIN` is not set to a hardware backlight pin, QMK will use a hardware timer configured to trigger software interrupts. This time will count up to `ICRx` (by default `0xFFFF`) before resetting to 0.
-When resetting to 0, the CPU will fire an OVF (overflow) interrupt that will turn the LEDs on, starting the duty cycle.
-The desired brightness is calculated and stored in the `OCRxx` register. When the counter reaches this value, the CPU will fire a Compare Output match interrupt, which will turn the LEDs off.
-In this way `OCRxx` essentially controls the duty cycle of the LEDs, and thus the brightness, where `0x0000` is completely off and `0xFFFF` is completely on.
+### PWM Driver :id=arm-pwm-driver
 
-The breathing effect is the same as in the hardware PWM implementation.
+Depending on the ChibiOS board configuration, you may need to enable PWM at the keyboard level. For STM32, this would look like:
 
-### ARM Driver :id=arm-configuration
+`halconf.h`:
+```c
+#define HAL_USE_PWM TRUE
+```
+`mcuconf.h`:
+```c
+#undef STM32_PWM_USE_TIM4
+#define STM32_PWM_USE_TIM4 TRUE
+```
 
-While still in its early stages, ARM backlight support aims to eventually have feature parity with AVR. The `pwm` driver is configured by default, however the equivalent setting within `rules.mk` would be:
+The following `#define`s apply only to the `pwm` driver:
 
-```make
-BACKLIGHT_DRIVER = pwm
+|Define                 |Default |Description                        |
+|-----------------------|--------|-----------------------------------|
+|`BACKLIGHT_PWM_DRIVER` |`PWMD4` |The PWM driver to use              |
+|`BACKLIGHT_PWM_CHANNEL`|`3`     |The PWM channel to use             |
+|`BACKLIGHT_PAL_MODE`   |`2`     |The pin alternative function to use|
+
+Refer to the ST datasheet for your particular MCU to determine these values. For example, these defaults are set up for pin `B8` on a Proton-C (STM32F303) using `TIM4_CH3` on AF2. Unless you are designing your own keyboard, you generally should not need to change them.
+
+### Timer Driver :id=arm-timer-driver
+
+Depending on the ChibiOS board configuration, you may need to enable general-purpose timers at the keyboard level. For STM32, this would look like:
+
+`halconf.h`:
+```c
+#define HAL_USE_GPT TRUE
+```
+`mcuconf.h`:
+```c
+#undef STM32_GPT_USE_TIM15
+#define STM32_GPT_USE_TIM15 TRUE
 ```
 
-#### ChibiOS Configuration :id=arm-configuration
+The following `#define`s apply only to the `timer` driver:
 
-The following `#define`s apply only to ARM-based keyboards:
+|Define                |Default |Description     |
+|----------------------|--------|----------------|
+|`BACKLIGHT_GPT_DRIVER`|`GPTD15`|The timer to use|
 
-|Define                 |Default|Description                        |
-|-----------------------|-------|-----------------------------------|
-|`BACKLIGHT_PWM_DRIVER` |`PWMD4`|The PWM driver to use              |
-|`BACKLIGHT_PWM_CHANNEL`|`3`    |The PWM channel to use             |
-|`BACKLIGHT_PAL_MODE`   |`2`    |The pin alternative function to use|
+## Example Schematic
 
-See the ST datasheet for your particular MCU to determine these values. Unless you are designing your own keyboard, you generally should not need to change them.
+Since the MCU can only supply so much current to its GPIO pins, instead of powering the backlight directly from the MCU, the backlight pin is connected to a transistor or MOSFET that switches the power to the LEDs.
 
-#### Caveats :id=arm-caveats
+In this typical example, the backlight LEDs are all connected in parallel towards an N-channel MOSFET. Its gate pin is wired to one of the microcontroller's GPIO pins through a 470Ω resistor to avoid ringing.
+A pulldown resistor is also placed between the gate pin and ground to keep it at a defined state when it is not otherwise being driven by the MCU.
+The values of these resistors are not critical - see [this Electronics StackExchange question](https://electronics.stackexchange.com/q/68748) for more information.
 
-Currently only hardware PWM is supported, not timer assisted, and does not provide automatic configuration.
+![Backlight example circuit](https://i.imgur.com/BmAvoUC.png)
 
-### Software PWM Driver :id=software-pwm-driver
+## API :id=api
 
-In this mode, PWM is "emulated" while running other keyboard tasks. It offers maximum hardware compatibility without extra platform configuration. The tradeoff is the backlight might jitter when the keyboard is busy. To enable, add this to your `rules.mk`:
+### `void backlight_toggle(void)` :id=api-backlight-toggle
 
-```make
-BACKLIGHT_DRIVER = software
-```
+Toggle the backlight on or off.
 
-#### Multiple Backlight Pins :id=multiple-backlight-pins
+---
 
-Most keyboards have only one backlight pin which controls all backlight LEDs (especially if the backlight is connected to a hardware PWM pin).
-In software PWM, it is possible to define multiple backlight pins, which will be turned on and off at the same time during the PWM duty cycle.
+### `void backlight_enable(void)` :id=api-backlight-enable
 
-This feature allows to set, for instance, the Caps Lock LED's (or any other controllable LED) brightness at the same level as the other LEDs of the backlight. This is useful if you have mapped Control in place of Caps Lock and you need the Caps Lock LED to be part of the backlight instead of being activated when Caps Lock is on, as it is usually wired to a separate pin from the backlight.
+Turn the backlight on.
 
-To activate multiple backlight pins, add something like this to your `config.h`, instead of `BACKLIGHT_PIN`:
+---
 
-```c
-#define BACKLIGHT_PINS { F5, B2 }
-```
+### `void backlight_disable(void)` :id=api-backlight-disable
 
-### Custom Driver :id=custom-driver
+Turn the backlight off.
 
-If none of the above drivers apply to your board (for example, you are using a separate IC to control the backlight), you can implement a custom backlight driver using this simple API provided by QMK. To enable, add this to your `rules.mk`:
+---
 
-```make
-BACKLIGHT_DRIVER = custom
-```
+### `void backlight_step(void)` :id=api-backlight-step
 
-Then implement any of these hooks:
+Cycle through backlight levels.
 
-```c
-void backlight_init_ports(void) {
-    // Optional - runs on startup
-    //   Usually you want to configure pins here
-}
-void backlight_set(uint8_t level) {
-    // Optional - runs on level change
-    //   Usually you want to respond to the new value
-}
+---
 
-void backlight_task(void) {
-    // Optional - runs periodically
-    //   Note that this is called in the main keyboard loop,
-    //   so long running actions here can cause performance issues
-}
-```
+### `void backlight_increase(void)` :id=api-backlight-increase
 
-## Example Schematic
+Increase the backlight level.
 
-In this typical example, the backlight LEDs are all connected in parallel towards an N-channel MOSFET. Its gate pin is wired to one of the microcontroller's GPIO pins through a 470Ω resistor to avoid ringing.
-A pulldown resistor is also placed between the gate pin and ground to keep it at a defined state when it is not otherwise being driven by the MCU.
-The values of these resistors are not critical - see [this Electronics StackExchange question](https://electronics.stackexchange.com/q/68748) for more information.
+---
 
-![Backlight example circuit](https://i.imgur.com/BmAvoUC.png)
+### `void backlight_decrease(void)` :id=api-backlight-decrease
+
+Decrease the backlight level.
+
+---
+
+### `void backlight_level(uint8_t level)` :id=api-backlight-level
+
+Set the backlight level.
+
+#### Arguments :id=api-backlight-level-arguments
+
+ - `uint8_t level`  
+   The level to set, from 0 to `BACKLIGHT_LEVELS`.
+
+---
+
+### `uint8_t get_backlight_level(void)` :id=api-get-backlight-level
+
+Get the current backlight level.
+
+#### Return Value :id=api-get-backlight-level-return
+
+The current backlight level, from 0 to `BACKLIGHT_LEVELS`.
+
+---
+
+### `bool is_backlight_enabled(void)` :id=api-is-backlight-enabled
+
+Get the current backlight state.
+
+#### Return Value :id=api-is-backlight-enabled-return
+
+`true` if the backlight is enabled.
+
+---
+
+### `void backlight_toggle_breathing(void)` :id=api-backlight-toggle-breathing
+
+Toggle backlight breathing on or off.
+
+---
+
+### `void backlight_enable_breathing(void)` :id=api-backlight-enable-breathing
+
+Turn backlight breathing on.
+
+---
+
+### `void backlight_disable_breathing(void)` :id=api-backlight-disable-breathing
+
+Turn backlight breathing off.
+
+---
+
+### `bool is_backlight_breathing(void)` :id=api-is-backlight-breathing
+
+Get the current backlight breathing state.
+
+#### Return Value :id=api-is-backlight-breathing-return
+
+`true` if backlight breathing is enabled.
diff --git a/docs/feature_bluetooth.md b/docs/feature_bluetooth.md
index f7ded84d8679..5fac06fba756 100644
--- a/docs/feature_bluetooth.md
+++ b/docs/feature_bluetooth.md
@@ -4,10 +4,10 @@
 
 Currently Bluetooth support is limited to AVR based chips. For Bluetooth 2.1, QMK has support for RN-42 modules. For more recent BLE protocols, currently only the Adafruit Bluefruit SPI Friend is directly supported. BLE is needed to connect to iOS devices. Note iOS does not support mouse input.
 
-|Board                                                           |Bluetooth Protocol  |Connection Type|rules.mk                        |Bluetooth Chip|
-|----------------------------------------------------------------|--------------------|---------------|--------------------------------|--------------|
-|Roving Networks RN-42 (Sparkfun Bluesmirf)                      |Bluetooth Classic   |UART           |`BLUETOOTH_DRIVER = RN42`       |RN-42         |
-|[Bluefruit LE SPI Friend](https://www.adafruit.com/product/2633)|Bluetooth Low Energy|SPI            |`BLUETOOTH_DRIVER = BluefruitLE`|nRF51822      |
+|Board                                                           |Bluetooth Protocol  |Connection Type|rules.mk                         |Bluetooth Chip|
+|----------------------------------------------------------------|--------------------|---------------|---------------------------------|--------------|
+|Roving Networks RN-42 (Sparkfun Bluesmirf)                      |Bluetooth Classic   |UART           |`BLUETOOTH_DRIVER = rn42`        |RN-42         |
+|[Bluefruit LE SPI Friend](https://www.adafruit.com/product/2633)|Bluetooth Low Energy|SPI            |`BLUETOOTH_DRIVER = bluefruit_le`|nRF51822      |
 
 Not Supported Yet but possible:
 * [Bluefruit LE UART Friend](https://www.adafruit.com/product/2479). [Possible tmk implementation found in](https://github.com/tmk/tmk_keyboard/issues/514)
@@ -32,7 +32,7 @@ Add the following to your `rules.mk`:
 
 ```make
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE # or RN42
+BLUETOOTH_DRIVER = bluefruit_le # or rn42
 ```
 
 ## Bluetooth Keycodes
diff --git a/docs/feature_converters.md b/docs/feature_converters.md
index b1abfa373ad8..11bdbed576b5 100644
--- a/docs/feature_converters.md
+++ b/docs/feature_converters.md
@@ -1,12 +1,10 @@
 # Converters
 
-Since many drop-in replacement controllers now exist, we've done our best to make them easy to use in existing designs.
+This page documents the automated process for converting keyboards to use drop-in replacement controllers. This process is designed to be easy to use and can be completed in a few simple steps.
 
-This page documents the handy automated process for converting keyboards.
+## Supported Converters
 
-### Supported Converters
-
-Currently the following converters are available:
+The following converters are available at this time:
 
 | From       | To                |
 |------------|-------------------|
@@ -28,14 +26,10 @@ Currently the following converters are available:
 | `elite_c`  | `helios`          |
 | `elite_c`  | `liatris`         |
 
-See below for more in depth information on each converter.
 
 ## Overview
 
-Each converter category is broken down by its declared `pin compatibility`.
-This ensures that only valid combinations are attempted.
-
-You can generate the firmware by appending `-e CONVERT_TO=<target>` to your compile/flash command. For example:
+Each converter category is broken down by its declared `pin compatibility`. This ensures that only valid combinations are attempted. You can generate the firmware by appending `-e CONVERT_TO=<target>` to your compile/flash command. For example:
 
 ```sh
 qmk flash -c -kb keebio/bdn9/rev1 -km default -e CONVERT_TO=proton_c
@@ -59,14 +53,12 @@ Once a converter is enabled, it exposes the `CONVERT_TO_<target_uppercase>` flag
 
 ### Pin Compatibility
 
-To ensure compatibility, provide validation, and power future workflows, a keyboard should declare its `pin compatibility`. For legacy reasons, this is currently assumed to be `promicro`.
-
-Currently the following pin compatibility interfaces are defined:
+To ensure compatibility, provide validation, and enable future workflows, a keyboard should declare its `pin compatibility`. For legacy reasons, this is currently assumed to be `promicro`. The following pin compatibility interfaces are currently defined:
 
-| Pinout     | Notes                             |
-|------------|-----------------------------------|
-| `promicro` | Includes RX/TX LEDs               |
-| `elite_c`  | Includes bottom row pins, no LEDs |
+| Pin Compatibility | Notes                             |
+|-------------------|-----------------------------------|
+| `promicro`        | Includes RX/TX LEDs               |
+| `elite_c`         | Includes bottom row pins, no LEDs |
 
 To declare the base for conversions, add this line to your keyboard's `rules.mk`:
 
@@ -140,7 +132,7 @@ The following defaults are based on what has been implemented for [RP2040](platf
 
 ### SparkFun Pro Micro - RP2040, Blok, Bit-C PRO and Michi :id=promicro_rp2040 
 
-Currently identical to [Adafruit KB2040](#kb2040).
+Feature set is identical to [Adafruit KB2040](#kb2040).
 
 ### STeMCell :id=stemcell
 
@@ -150,9 +142,7 @@ There are two versions of STeMCell available, with different pinouts:
   - v2.0.0 (pre-release v1.0.1, v1.0.2)
 Default official firmware only supports v2.0.0 STeMCell.
 
-STeMCell has support to swap UART and I2C pins, to enable single-wire uart communication in STM chips.
-
-The following additional flags has to be used while compiling, based on the pin used for split communication.
+STeMCell has support to swap UART and I2C pins to enable single-wire uart communication in STM chips. The following additional flags has to be used while compiling, based on the pin used for split communication:
 
 | Split Pin | Compile flags |
 |-----------|---------------|
@@ -173,11 +163,8 @@ The Bonsai C4 only has one on-board LED (B2), and by default, both the Pro Micro
 
 ### RP2040 Community Edition - Elite-Pi, Helios, and Liatris :id=rp2040_ce
 
-Feature set currently identical to [Adafruit KB2040](#kb2040).
-
-Enables VBUS detection by default for superior split keyboard support.
+Feature set is identical to [Adafruit KB2040](#kb2040). VBUS detection is enabled by default for superior split keyboard support. For more information, refer to the [Community Edition pinout](platformdev_rp2040.md#rp2040_ce) docs.
 
-For more information, refer to the [RP2040 Community Edition](platformdev_rp2040.md#rp2040_ce) docs.
 
 ## Elite-C
 
@@ -202,8 +189,8 @@ Converter summary:
 
 ### STeMCell :id=stemcell_elite
 
-Currently identical to [STeMCell](#stemcell) with support for the additional bottom row of pins.
+Identical to [Pro Micro - STeMCell](#stemcell) with support for the additional bottom row of pins.
 
 ### RP2040 Community Edition :id=rp2040_ce_elite
 
-Currently identical to [RP2040 Community Edition](#rp2040_ce), with support for the additional bottom row of pins.
+Identical to [Pro Micro - RP2040 Community Edition](#rp2040_ce) with support for the additional bottom row of pins.
diff --git a/docs/feature_haptic_feedback.md b/docs/feature_haptic_feedback.md
index b456bad736f8..68145edd6cca 100644
--- a/docs/feature_haptic_feedback.md
+++ b/docs/feature_haptic_feedback.md
@@ -4,11 +4,12 @@
 
 The following options are currently available for haptic feedback in `rules.mk`:
 
-```
+```make
 HAPTIC_ENABLE = yes
 
-HAPTIC_DRIVER += DRV2605L
-HAPTIC_DRIVER += SOLENOID
+HAPTIC_DRIVER = drv2605l
+# or
+HAPTIC_DRIVER = solenoid
 ```
 
 The following `config.h` settings are available for all types of haptic feedback:
@@ -92,30 +93,30 @@ This driver supports 2 different feedback motors. Set the following in your `con
 
 Eccentric Rotating Mass vibration motors (ERM) is motor with a off-set weight attached so when drive signal is attached, the off-set weight spins and causes a sinusoidal wave that translate into vibrations.
 
-```
-#define FB_ERM_LRA 0
-#define FB_BRAKEFACTOR 3 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
-#define FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
+```c
+#define DRV2605L_FB_ERM_LRA 0
+#define DRV2605L_FB_BRAKEFACTOR 3 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
+#define DRV2605L_FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
 
 /* Please refer to your datasheet for the optimal setting for your specific motor. */
-#define RATED_VOLTAGE 3
-#define V_PEAK 5
+#define DRV2605L_RATED_VOLTAGE 3
+#define DRV2605L_V_PEAK 5
 ```
 ##### LRA
 
 Linear resonant actuators (LRA, also know as a linear vibrator) works different from a ERM. A LRA has a weight and magnet suspended by springs and a voice coil. When the drive signal is applied, the weight would be vibrate on a single axis (side to side or up and down). Since the weight is attached to a spring, there is a resonance effect at a specific frequency. This frequency is where the LRA will operate the most efficiently. Refer to the motor's datasheet for the recommanded range for this frequency.
 
-``` 
-#define FB_ERM_LRA 1
-#define FB_BRAKEFACTOR 3 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
-#define FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
+```c
+#define DRV2605L_FB_ERM_LRA 1
+#define DRV2605L_FB_BRAKEFACTOR 3 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
+#define DRV2605L_FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
 
 /* Please refer to your datasheet for the optimal setting for your specific motor. */
-#define RATED_VOLTAGE 2
-#define V_PEAK 2.8
-#define V_RMS 2.0 
-#define V_PEAK 2.1
-#define F_LRA 205 /* resonance freq */
+#define DRV2605L_RATED_VOLTAGE 2
+#define DRV2605L_V_PEAK 2.8
+#define DRV2605L_V_RMS 2.0 
+#define DRV2605L_V_PEAK 2.1
+#define DRV2605L_F_LRA 205 /* resonance freq */
 ```
 
 #### DRV2605L waveform library
@@ -170,13 +171,13 @@ List of waveform sequences from the datasheet:
 | 42  | lg_dblclick_med_80  | 84  | transition_rampup_med_smooth1     |     |                                      |
 ### Optional DRV2605L defines
 
-```
-#define DRV_GREETING *sequence name or number*
+```c
+#define DRV2605L_GREETING *sequence name or number*
 ```
 If haptic feedback is enabled, the keyboard will vibrate to a specific sequence during startup. That can be selected using the following define:
 
-```
-#define DRV_MODE_DEFAULT *sequence name or number*
+```c
+#define DRV2605L_DEFAULT_MODE *sequence name or number*
 ```
 This will set what sequence `HF_RST` will set as the active mode. If not defined, mode will be set to 1 when `HF_RST` is pressed.
 
diff --git a/docs/feature_hd44780.md b/docs/feature_hd44780.md
index 4ade640baae7..dcbd656bbee4 100644
--- a/docs/feature_hd44780.md
+++ b/docs/feature_hd44780.md
@@ -1,6 +1,6 @@
-# HD44780 LCD Driver
+# HD44780 LCD Driver :id=hd44780-lcd-driver
 
-## Supported Hardware
+## Supported Hardware :id=supported-hardware
 
 LCD modules using [HD44780U](https://www.sparkfun.com/datasheets/LCD/HD44780.pdf) IC or equivalent, communicating in 4-bit mode.
 
@@ -11,7 +11,7 @@ LCD modules using [HD44780U](https://www.sparkfun.com/datasheets/LCD/HD44780.pdf
 
 To run these modules at 3.3V, an additional MAX660 voltage converter IC must be soldered on, along with two 10µF capacitors. See [this page](https://www.codrey.com/electronic-circuits/hack-your-16x2-lcd/) for more details.
 
-## Usage
+## Usage :id=usage
 
 Add the following to your `rules.mk`:
 
@@ -19,7 +19,7 @@ Add the following to your `rules.mk`:
 HD44780_ENABLE = yes
 ```
 
-## Basic Configuration
+## Basic Configuration :id=basic-configuration
 
 Add the following to your `config.h`:
 
@@ -33,9 +33,9 @@ Add the following to your `config.h`:
 |`HD44780_DISPLAY_LINES`|`2`           |The number of visible lines on the display                                                           |
 |`HD44780_WRAP_LINES`   |*Not defined* |If defined, input characters will wrap to the next line                                              |
 
-## Examples
+## Examples :id=examples
 
-### Hello World
+### Hello World :id=example-hello-world
 
 Add the following to your `keymap.c`:
 
@@ -46,7 +46,7 @@ void keyboard_post_init_user(void) {
 }
 ```
 
-### Custom Character Definition
+### Custom Character Definition :id=example-custom-character
 
 Up to eight custom characters can be defined. This data is stored in the Character Generator RAM (CGRAM), and is not persistent across power cycles.
 
@@ -77,15 +77,15 @@ void keyboard_post_init_user(void) {
 }
 ```
 
-## API
+## API :id=api
 
-### `void hd44780_init(bool cursor, bool blink)`
+### `void hd44780_init(bool cursor, bool blink)` :id=api-hd44780-init
 
 Initialize the display.
 
 This function should be called only once, before any of the other functions can be called.
 
-#### Arguments
+#### Arguments :id=api-hd44780-init-arguments
 
  - `bool cursor`  
    Whether to show the cursor.
@@ -94,7 +94,7 @@ This function should be called only once, before any of the other functions can
 
 ---
 
-### `void hd44780_clear(void)`
+### `void hd44780_clear(void)` :id=api-hd44780-clear
 
 Clear the display.
 
@@ -102,7 +102,7 @@ This function is called on init.
 
 ---
 
-### `void hd44780_home(void)`
+### `void hd44780_home(void)` :id=api-hd44780-home
 
 Move the cursor to the home position.
 
@@ -110,13 +110,13 @@ This function is called on init.
 
 ---
 
-### `void hd44780_on(bool cursor, bool blink)`
+### `void hd44780_on(bool cursor, bool blink)` :id=api-hd44780-on
 
 Turn the display on, and/or set the cursor properties.
 
 This function is called on init.
 
-#### Arguments
+#### Arguments :id=api-hd44780-on-arguments
 
  - `bool cursor`  
    Whether to show the cursor.
@@ -125,17 +125,17 @@ This function is called on init.
 
 ---
 
-### `void hd44780_off(void)`
+### `void hd44780_off(void)` :id=api-hd44780-off
 
 Turn the display off.
 
 ---
 
-### `void hd44780_set_cursor(uint8_t col, uint8_t line)`
+### `void hd44780_set_cursor(uint8_t col, uint8_t line)` :id=api-hd44780-set-cursor
 
 Move the cursor to the specified position on the display.
 
-#### Arguments
+#### Arguments :id=api-hd44780-set-cursor-arguments
 
  - `uint8_t col`  
    The column number to move to, from 0 to 15 on 16x2 displays.
@@ -144,48 +144,48 @@ Move the cursor to the specified position on the display.
 
 ---
 
-### `void hd44780_putc(char c)`
+### `void hd44780_putc(char c)` :id=api-hd44780-putc
 
 Print a character to the display. The newline character `\n` will move the cursor to the start of the next line.
 
 The exact character shown may depend on the ROM code of your particular display - refer to the datasheet for the full character set.
 
-#### Arguments
+#### Arguments :id=api-hd44780-putc-arguments
 
  - `char c`  
    The character to print.
 
 ---
 
-### `void hd44780_puts(const char *s)`
+### `void hd44780_puts(const char *s)` :id=api-hd44780-puts
 
 Print a string of characters to the display.
 
-#### Arguments
+#### Arguments :id=api-hd44780-puts-arguments
 
  - `const char *s`  
    The string to print.
 
 ---
 
-### `void hd44780_puts_P(const char *s)`
+### `void hd44780_puts_P(const char *s)` :id=api-hd44780-puts-p
 
 Print a string of characters from PROGMEM to the display.
 
 On ARM devices, this function is simply an alias of `hd44780_puts()`.
 
-#### Arguments
+#### Arguments :id=api-hd44780-puts-p-arguments
 
  - `const char *s`  
    The PROGMEM string to print (ie. `PSTR("Hello")`).
 
 ---
 
-### `void hd44780_define_char(uint8_t index, uint8_t *data)`
+### `void hd44780_define_char(uint8_t index, uint8_t *data)` :id=api-hd44780-define-char
 
 Define a custom character.
 
-#### Arguments
+#### Arguments :id=api-hd44780-define-char-arguments
 
  - `uint8_t index`  
    The index of the custom character to define, from 0 to 7.
@@ -194,13 +194,13 @@ Define a custom character.
 
 ---
 
-### `void hd44780_define_char_P(uint8_t index, const uint8_t *data)`
+### `void hd44780_define_char_P(uint8_t index, const uint8_t *data)` :id=api-hd44780-define-char-p
 
 Define a custom character from PROGMEM.
 
 On ARM devices, this function is simply an alias of `hd44780_define_char()`.
 
-#### Arguments
+#### Arguments :id=api-hd44780-define-char-p-arguments
 
  - `uint8_t index`  
    The index of the custom character to define, from 0 to 7.
@@ -209,21 +209,21 @@ On ARM devices, this function is simply an alias of `hd44780_define_char()`.
 
 ---
 
-### `bool hd44780_busy(void)`
+### `bool hd44780_busy(void)` :id=api-hd44780-busy
 
 Indicates whether the display is currently processing, and cannot accept instructions.
 
-#### Return Value
+#### Return Value :id=api-hd44780-busy-arguments
 
 `true` if the display is busy.
 
 ---
 
-### `void hd44780_write(uint8_t data, bool isData)`
+### `void hd44780_write(uint8_t data, bool isData)` :id=api-hd44780-write
 
 Write a byte to the display.
 
-#### Arguments
+#### Arguments :id=api-hd44780-write-arguments
 
  - `uint8_t data`  
    The byte to send to the display.
@@ -232,67 +232,67 @@ Write a byte to the display.
 
 ---
 
-### `uint8_t hd44780_read(bool isData)`
+### `uint8_t hd44780_read(bool isData)` :id=api-hd44780-read
 
 Read a byte from the display.
 
-#### Arguments
+#### Arguments :id=api-hd44780-read-arguments
 
  - `bool isData`  
    Whether to read the current cursor position, or the character at the cursor.
 
-#### Return Value
+#### Return Value :id=api-hd44780-read-return
 
 If `isData` is `true`, the returned byte will be the character at the current DDRAM address. Otherwise, it will be the current DDRAM address and the busy flag.
 
 ---
 
-### `void hd44780_command(uint8_t command)`
+### `void hd44780_command(uint8_t command)` :id=api-hd44780-command
 
 Send a command to the display. Refer to the datasheet and `hd44780.h` for the valid commands and defines.
 
 This function waits for the display to clear the busy flag before sending the command.
 
-#### Arguments
+#### Arguments :id=api-hd44780-command-arguments
 
  - `uint8_t command`  
    The command to send.
 
 ---
 
-### `void hd44780_data(uint8_t data)`
+### `void hd44780_data(uint8_t data)` :id=api-hd44780-data
 
 Send a byte of data to the display.
 
 This function waits for the display to clear the busy flag before sending the data.
 
-#### Arguments
+#### Arguments :id=api-hd44780-data-arguments
 
  - `uint8_t data`  
    The byte of data to send.
 
 ---
 
-### `void hd44780_set_cgram_address(uint8_t address)`
+### `void hd44780_set_cgram_address(uint8_t address)` :id=api-hd44780-set-cgram-address
 
 Set the CGRAM address.
 
 This function is used when defining custom characters.
 
-#### Arguments
+#### Arguments :id=api-hd44780-set-cgram-address-arguments
 
  - `uint8_t address`  
    The CGRAM address to move to, from `0x00` to `0x3F`.
 
 ---
 
-### `void hd44780_set_ddram_address(uint8_t address)`
+### `void hd44780_set_ddram_address(uint8_t address)` :id=api-hd44780-set-ddram-address
 
 Set the DDRAM address.
 
 This function is used when printing characters to the display, and setting the cursor.
 
-#### Arguments
+#### Arguments :id=api-hd44780-set-ddram-address-arguments
 
  - `uint8_t address`  
    The DDRAM address to move to, from `0x00` to `0x7F`.
diff --git a/docs/feature_key_overrides.md b/docs/feature_key_overrides.md
index 608eb001e4b8..59eced95c364 100644
--- a/docs/feature_key_overrides.md
+++ b/docs/feature_key_overrides.md
@@ -21,7 +21,7 @@ Then, in your `keymap.c` file, you'll need to define the array `key_overrides`,
 The `key_override_t` struct has many options that allow you to precisely tune your overrides. The full reference is shown below. Instead of manually creating a `key_override_t` value, it is recommended to use these dedicated initializers:
 
 #### `ko_make_basic(modifiers, key, replacement)`
-Returns a `key_override_t`, which sends `replacement` (can be a key-modifer combination), when `key` and `modifiers` are all pressed down. This override still activates if any additional modifiers not specified in `modifiers` are also pressed down. See `ko_make_with_layers_and_negmods` to customize this behavior.
+Returns a `key_override_t`, which sends `replacement` (can be a key-modifier combination), when `key` and `modifiers` are all pressed down. This override still activates if any additional modifiers not specified in `modifiers` are also pressed down. See `ko_make_with_layers_and_negmods` to customize this behavior.
 
 #### `ko_make_with_layers(modifiers, key, replacement, layers)`
 Additionally takes a bitmask `layers` that defines on which layers the override is used.
@@ -224,4 +224,31 @@ The duration of the key repeat delay is controlled with the `KEY_OVERRIDE_REPEAT
 
 ## Difference to Combos :id=difference-to-combos
 
-Note that key overrides are very different from [combos](https://docs.qmk.fm/#/feature_combo). Combos require that you press down several keys almost _at the same time_ and can work with any combination of non-modifier keys. Key overrides work like keyboard shortcuts (e.g. `ctrl` + `z`): They take combinations of _multiple_ modifiers and _one_ non-modifier key to then perform some custom action. Key overrides are implemented with much care to behave just like normal keyboard shortcuts would in regards to the order of pressed keys, timing, and interacton with other pressed keys. There are a number of optional settings that can be used to really fine-tune the behavior of each key override as well. Using key overrides also does not delay key input for regular key presses, which inherently happens in combos and may be undesirable.
+Note that key overrides are very different from [combos](https://docs.qmk.fm/#/feature_combo). Combos require that you press down several keys almost _at the same time_ and can work with any combination of non-modifier keys. Key overrides work like keyboard shortcuts (e.g. `ctrl` + `z`): They take combinations of _multiple_ modifiers and _one_ non-modifier key to then perform some custom action. Key overrides are implemented with much care to behave just like normal keyboard shortcuts would in regards to the order of pressed keys, timing, and interaction with other pressed keys. There are a number of optional settings that can be used to really fine-tune the behavior of each key override as well. Using key overrides also does not delay key input for regular key presses, which inherently happens in combos and may be undesirable.
+
+## Solution to the problem of flashing modifiers :id=neutralize-flashing-modifiers
+
+If the programs you use bind an action to taps of modifier keys (e.g. tapping left GUI to bring up the applications menu or tapping left Alt to focus the menu bar), you may find that using key overrides with suppressed mods falsely triggers those actions. To counteract this, you can define a `DUMMY_MOD_NEUTRALIZER_KEYCODE` in `config.h` that will get sent in between the register and unregister events of a suppressed modifier. That way, the programs on your computer will no longer interpret the mod suppression induced by key overrides as a lone tap of a modifier key and will thus not falsely trigger the undesired action.
+
+Naturally, for this technique to be effective, you must choose a `DUMMY_MOD_NEUTRALIZER_KEYCODE` for which no keyboard shortcuts are bound to. Recommended values are: `KC_RIGHT_CTRL` or `KC_F18`. 
+Please note that `DUMMY_MOD_NEUTRALIZER_KEYCODE` must be a basic, unmodified, HID keycode so values like `KC_NO`, `KC_TRANSPARENT` or `KC_PIPE` aka `S(KC_BACKSLASH)` are not permitted.
+
+By default, only left Alt and left GUI are neutralized. If you want to change the list of applicable modifier masks, use the following in your `config.h`:
+
+```c
+#define MODS_TO_NEUTRALIZE { <mod_mask_1>, <mod_mask_2>, ... }
+```
+
+Examples:
+
+```c
+#define DUMMY_MOD_NEUTRALIZER_KEYCODE KC_RIGHT_CTRL
+
+// Neutralize left alt and left GUI (Default value)
+#define MODS_TO_NEUTRALIZE { MOD_BIT(KC_LEFT_ALT), MOD_BIT(KC_LEFT_GUI) }
+
+// Neutralize left alt, left GUI, right GUI and left Control+Shift
+#define MODS_TO_NEUTRALIZE { MOD_BIT(KC_LEFT_ALT), MOD_BIT(KC_LEFT_GUI), MOD_BIT(KC_RIGHT_GUI), MOD_BIT(KC_LEFT_CTRL)|MOD_BIT(KC_LEFT_SHIFT) }
+```
+
+!> Do not use `MOD_xxx` constants like `MOD_LSFT` or `MOD_RALT`, since they're 5-bit packed bit-arrays while `MODS_TO_NEUTRALIZE` expects a list of 8-bit packed bit-arrays. Use `MOD_BIT(<kc>)` or `MOD_MASK_xxx` instead.
diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md
index 86dff89eca94..fd56a457258a 100644
--- a/docs/feature_led_matrix.md
+++ b/docs/feature_led_matrix.md
@@ -12,7 +12,7 @@ There is basic support for addressable LED matrix lighting with the I2C IS31FL37
 
 ```make
 LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = IS31FL3731
+LED_MATRIX_DRIVER = is31fl3731
 ```
 
 You can use between 1 and 4 IS31FL3731 IC's. Do not specify `LED_DRIVER_ADDR_<N>` defines for IC's that are not present on your keyboard. You can define the following items in `config.h`:
@@ -139,7 +139,7 @@ Currently only 4 drivers are supported, but it would be trivial to support for m
 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 
 ```c
-const is31_led __flash g_is31_leds[LED_MATRIX_LED_COUNT] = {
+const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *    driver
  *    |  LED address
@@ -158,7 +158,7 @@ Eg `#define ISSI_MANUAL_SCALING 3`
 Then Define the array listing all the LEDs you want to override in your `<keyboard>.c`:
 
 ```c
-const is31_led __flash g_is31_scaling[ISSI_MANUAL_SCALING] = {
+const is31_led PROGMEM g_is31_scaling[ISSI_MANUAL_SCALING] = {
  *   LED Index
  *   |  Scaling
  *   |  | */
@@ -247,7 +247,6 @@ enum led_matrix_effects {
     LED_MATRIX_CYCLE_UP_DOWN,       // Full gradient scrolling top to bottom
     LED_MATRIX_CYCLE_OUT_IN,        // Full gradient scrolling out to in
     LED_MATRIX_DUAL_BEACON,         // Full gradient spinning around center of keyboard
-#if defined(LED_MATRIX_KEYPRESSES) || defined(LED_MATRIX_KEYRELEASES)
     LED_MATRIX_SOLID_REACTIVE_SIMPLE,   // Pulses keys hit then fades out
     LED_MATRIX_SOLID_REACTIVE_WIDE       // Value pulses near a single key hit then fades out
     LED_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Value pulses near multiple key hits then fades out
@@ -257,7 +256,6 @@ enum led_matrix_effects {
     LED_MATRIX_SOLID_REACTIVE_MULTINEXUS // Value pulses away on the same column and row of multiple key hits then fades out
     LED_MATRIX_SOLID_SPLASH,             // Value pulses away from a single key hit then fades out
     LED_MATRIX_SOLID_MULTISPLASH,        // Value pulses away from multiple key hits then fades out
-#endif
     LED_MATRIX_WAVE_LEFT_RIGHT           // Sine wave scrolling from left to right
     LED_MATRIX_WAVE_UP_DOWN              // Sine wave scrolling from up to down
     LED_MATRIX_EFFECT_MAX
@@ -281,8 +279,6 @@ You can enable a single effect by defining `ENABLE_[EFFECT_NAME]` in your `confi
 |`#define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT`            |Enables `LED_MATRIX_WAVE_LEFT_RIGHT`          |
 |`#define ENABLE_LED_MATRIX_WAVE_UP_DOWN`               |Enables `LED_MATRIX_WAVE_UP_DOWN`             |
 
-?> These modes don't require any additional defines.
-
 |Reactive Defines                                       |Description                                   |
 |-------------------------------------------------------|----------------------------------------------|
 |`#define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE`      |Enables `LED_MATRIX_SOLID_REACTIVE_SIMPLE`    |
@@ -295,7 +291,7 @@ You can enable a single effect by defining `ENABLE_[EFFECT_NAME]` in your `confi
 |`#define ENABLE_LED_MATRIX_SOLID_SPLASH`               |Enables `LED_MATRIX_SOLID_SPLASH`             |
 |`#define ENABLE_LED_MATRIX_SOLID_MULTISPLASH`          |Enables `LED_MATRIX_SOLID_MULTISPLASH`        |
 
-?> These modes also require the `LED_MATRIX_KEYPRESSES` or `LED_MATRIX_KEYRELEASES` define to be available.
+?> These modes introduce additional logic that can increase firmware size.
 
 ## Custom LED Matrix Effects :id=custom-led-matrix-effects
 
@@ -361,9 +357,7 @@ For inspiration and examples, check out the built-in effects under `quantum/led_
 ## Additional `config.h` Options :id=additional-configh-options
 
 ```c
-#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 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_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)
@@ -373,7 +367,7 @@ For inspiration and examples, check out the built-in effects under `quantum/led_
 #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_SPLIT { X, Y }   // (Optional) For split keyboards, the number of LEDs connected on each half. X = left, Y = Right.
-                                    // If LED_MATRIX_KEYPRESSES or LED_MATRIX_KEYRELEASES is enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
+                                    // If reactive effects are enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
 ```
 
 ## EEPROM storage :id=eeprom-storage
diff --git a/docs/feature_macros.md b/docs/feature_macros.md
index 08310555fb77..c7d6c1a918a5 100644
--- a/docs/feature_macros.md
+++ b/docs/feature_macros.md
@@ -27,7 +27,7 @@ You can define up to 32 macros in a `keymap.json` file, as used by [Configurator
         ],
         [
             {"action":"tap", "keycodes": ["F1"]},
-            {"action":"delay", "duration": "1000"},
+            {"action":"delay", "duration": 1000},
             {"action":"tap", "keycodes": ["PGDN"]}
         ]
     ],
diff --git a/docs/feature_mouse_keys.md b/docs/feature_mouse_keys.md
index eed4f4f4aaaf..42448325c9f6 100644
--- a/docs/feature_mouse_keys.md
+++ b/docs/feature_mouse_keys.md
@@ -67,6 +67,7 @@ This is the default mode. You can adjust the cursor and scrolling acceleration u
 |`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_DELTA`      |1      |Wheel movement step size                                 |
 |`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               |
 
@@ -101,7 +102,7 @@ This is an extension of the accelerated mode. The kinetic mode uses a quadratic
 Tips:
 
 * The smoothness of the cursor movement depends on the `MOUSEKEY_INTERVAL` setting. The shorter the interval is set the smoother the movement will be.  Setting the value too low makes the cursor unresponsive.  Lower settings are possible if the micro processor is fast enough. For example: At an interval of `8` milliseconds, `125` movements per second will be initiated.  With a base speed of `1000` each movement will move the cursor by `8` pixels.
-* Mouse wheel movements are implemented differently from cursor movements. While it's okay for the cursor to move multiple pixels at once for the mouse wheel this would lead to jerky movements. Instead, the mouse wheel operates at step size `2`. Setting mouse wheel speed is done by adjusting the number of wheel movements per second.
+* Mouse wheel movements are implemented differently from cursor movements. While it's okay for the cursor to move multiple pixels at once for the mouse wheel this would lead to jerky movements. Instead, the mouse wheel operates at step size `1`. Setting mouse wheel speed is done by adjusting the number of wheel movements per second.
 
 ### Constant mode
 
diff --git a/docs/feature_oled_driver.md b/docs/feature_oled_driver.md
index a62294b23a62..e67f80c879e6 100644
--- a/docs/feature_oled_driver.md
+++ b/docs/feature_oled_driver.md
@@ -10,6 +10,7 @@ Tested combinations:
 |SSD1306  |128x32 |AVR     |Primary support         |
 |SSD1306  |128x64 |AVR     |Verified working        |
 |SSD1306  |128x32 |Arm     |                        |
+|SSD1306  |128x64 |Arm     |Verified working        |
 |SH1106   |128x64 |AVR     |No scrolling            |
 |SH1107   |64x128 |AVR     |No scrolling            |
 |SH1107   |64x128 |Arm     |No scrolling            |
@@ -29,17 +30,17 @@ OLED_ENABLE = yes
 
 |OLED Driver        |Supported Device                    |
 |-------------------|------------------------------------|
-|SSD1306 (default)  |For both SSD1306, SH1106, and SH1107|
+|`ssd1306` (default)|For both SSD1306, SH1106, and SH1107|
 
 e.g.
 ```make
-OLED_DRIVER = SSD1306
+OLED_DRIVER = ssd1306
 ```
 
 |OLED Transport |                                                |
 |---------------|------------------------------------------------|
-|i2c (default)  | Uses I2C for communication with the OLED panel |
-|spi            | Uses SPI for communication with the OLED panel |
+|`i2c` (default)| Uses I2C for communication with the OLED panel |
+|`spi`          | Uses SPI for communication with the OLED panel |
 
 e.g.
 ```make
@@ -398,7 +399,7 @@ void oled_scroll_set_area(uint8_t start_line, uint8_t end_line);
 // Sets scroll speed, 0-7, fastest to slowest. Default is three.
 // Does not take effect until scrolling is either started or restarted
 // the ssd1306 supports 8 speeds with the delay
-// listed below betwen each frame of the scrolling effect
+// listed below between each frame of the scrolling effect
 // 0=2, 1=3, 2=4, 3=5, 4=25, 5=64, 6=128, 7=256
 void oled_scroll_set_speed(uint8_t speed);
 
diff --git a/docs/feature_programmable_button.md b/docs/feature_programmable_button.md
index 43a9e7fc1602..091464e19c03 100644
--- a/docs/feature_programmable_button.md
+++ b/docs/feature_programmable_button.md
@@ -2,7 +2,7 @@
 
 Programmable Buttons are keys that have no predefined meaning. This means they can be processed on the host side by custom software without the operating system trying to interpret them.
 
-The keycodes are emitted according to the HID Telephony Device page (`0x0B`), Programmable Button usage (`0x07`). On Linux (> 5.14) they are handled automatically and translated to `KEY_MACRO#` keycodes (up to `KEY_MACRO30`).
+The keycodes are emitted according to the HID Telephony Device page (`0x0B`), Programmable Button usage (`0x09`). On Linux (> 5.14) they are handled automatically and translated to `KEY_MACRO#` keycodes (up to `KEY_MACRO30`).
 
 ?> Currently there is no known support in Windows or macOS. It may be possible to write a custom HID driver to receive these usages, but this is out of the scope of the QMK documentation.
 
diff --git a/docs/feature_ps2_mouse.md b/docs/feature_ps2_mouse.md
index e714d9b86763..766fd6fe78f5 100644
--- a/docs/feature_ps2_mouse.md
+++ b/docs/feature_ps2_mouse.md
@@ -155,6 +155,29 @@ In your keyboard config.h:
 #endif
 ```
 
+### RP2040 PIO Version :id=rp2040-pio-version
+
+The `PIO` subsystem is a Raspberry Pi RP2040 specific implementation, using the integrated PIO peripheral and is therefore only available on this MCU.
+
+There are strict requirements for pin ordering but any pair of GPIO pins can be used. The GPIO used for clock must be directly after data, see the included info.json snippet for an example of correct order.
+
+You may optionally switch the PIO peripheral used with the following define in config.h:
+```c
+#define PS2_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the PS2 implementation uses the PIO0 peripheral
+```
+
+Example info.json content:
+
+```json
+    "ps2": {
+        "clock_pin": "GP1",
+        "data_pin": "GP0",
+        "driver": "vendor",
+        "enabled": true,
+        "mouse_enabled": true
+    }
+```
+
 ## Additional Settings :id=additional-settings
 
 ### PS/2 Mouse Features :id=ps2-mouse-features
diff --git a/docs/feature_rawhid.md b/docs/feature_rawhid.md
index 558a23a80fb0..094dd21c7e9a 100644
--- a/docs/feature_rawhid.md
+++ b/docs/feature_rawhid.md
@@ -1,69 +1,156 @@
-# Raw HID
+# Raw HID :id=raw-hid
 
-Raw HID allows for bidirectional communication between QMK and the host computer over an HID interface. This has many potential use cases, such as switching keymaps on the fly or changing RGB LED colors and modes.
+The Raw HID feature allows for bidirectional communication between QMK and the host computer over an HID interface. This has many potential use cases, such as switching keymaps on the fly or sending useful metrics like CPU/RAM usage.
 
-There are two main components to getting raw HID working with your keyboard.
+In order to communicate with the keyboard using this feature, you will need to write a program that runs on the host. As such, some basic programming skills are required - more if you intend to implement complex behaviour.
 
-## Keyboard firmware
+## Usage :id=usage
 
-The implementation is fairly straightforward for the firmware.
-In your `rules.mk` add:
+Add the following to your `rules.mk`:
 
 ```make
 RAW_ENABLE = yes
 ```
 
-In your `keymap.c` include `"raw_hid.h"` and implement the following:
+## Basic Configuration :id=basic-configuration
+
+By default, the HID Usage Page and Usage ID for the Raw HID interface are `0xFF60` and `0x61`. However, they can be changed if necessary by adding the following to your `config.h`:
+
+|Define          |Default |Description                            |
+|----------------|--------|---------------------------------------|
+|`RAW_USAGE_PAGE`|`0xFF60`|The usage page of the Raw HID interface|
+|`RAW_USAGE_ID`  |`0x61`  |The usage ID of the Raw HID interface  |
+
+## Sending Data to the Keyboard :id=sending-data-to-the-keyboard
+
+To send data to the keyboard, you must first find a library for communicating with HID devices in the programming language of your choice. Here are some examples:
+
+* **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/)
+
+Please refer to these libraries' own documentation for instructions on usage. Remember to close the device once you are finished with it!
+
+Next, you will need to know the USB Vendor and Product IDs of the device. These can easily be found by looking at your keyboard's `info.json`, under the `usb` object (alternatively, you can also use Device Manager on Windows, System Information on macOS, or `lsusb` on Linux). For example, the Vendor ID for the Planck Rev 6 is `0x03A8`, and the Product ID is `0xA4F9`.
+
+It's also a good idea to narrow down the list of potential HID devices the library may give you by filtering on the usage page and usage ID, to avoid accidentally opening the interface on the same device for the keyboard, or mouse, or media keys, etc.
+
+Once you are able to open the HID device and send reports to it, it's time to handle them on the keyboard side. Implement the following function in your `keymap.c` and start coding:
 
 ```c
 void raw_hid_receive(uint8_t *data, uint8_t length) {
-    // Your code goes here. data is the packet received from host.
+    // Your code goes here
+    // `data` is a pointer to the buffer containing the received HID report
+    // `length` is the length of the report - always `RAW_EPSIZE`
 }
 ```
 
-The `"raw_hid.h"` header also declares `void raw_hid_send(uint8_t *data, uint8_t length);` which allows sending packets from keyboard to host. As an example, it can also be used for debugging when building your host application by returning all data back to the host.
+!> Because the HID specification does not support variable length reports, all reports in both directions must be exactly `RAW_EPSIZE` (currently 32) bytes long, regardless of actual payload length. However, variable length payloads can potentially be implemented on top of this by creating your own data structure that may span multiple reports.
+
+## Receiving Data from the Keyboard :id=receiving-data-from-the-keyboard
+
+If you need the keyboard to send data back to the host, simply call the `raw_hid_send()` function. It requires two arguments - a pointer to a 32-byte buffer containing the data you wish to send, and the length (which should always be `RAW_EPSIZE`).
+
+The received report can then be handled in whichever way your HID library provides.
+
+## Simple Example :id=simple-example
+
+The following example reads the first byte of the received report from the host, and if it is an ASCII "A", responds with "B". `memset()` is used to fill the response buffer (which could still contain the previous response) with null bytes.
 
 ```c
 void raw_hid_receive(uint8_t *data, uint8_t length) {
-    raw_hid_send(data, length);
+    uint8_t response[length];
+    memset(response, 0, length);
+    response[0] = 'B';
+
+    if(data[0] == 'A') {
+        raw_hid_send(response, length);
+    }
 }
 ```
 
-These two functions send and receive packets of length `RAW_EPSIZE` bytes to and from the host (32 on LUFA/ChibiOS/V-USB, 64 on ATSAM).
+On the host side (here we are using Python and the `pyhidapi` library), the HID device is opened by enumerating the interfaces on the USB device, then filtering on the usage page and usage ID. Then, a report containing a single ASCII "A" (hex `0x41`) is constructed and sent.
+
+For demonstration purposes, the manufacturer and product strings of the device, along with the request and response, are also printed.
+
+```python
+import sys
+import hid
+
+vendor_id     = 0x4335
+product_id    = 0x0002
+
+usage_page    = 0xFF60
+usage         = 0x61
+report_length = 32
+
+def get_raw_hid_interface():
+    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:
+        return None
 
-Make sure to flash raw enabled firmware before proceeding with working on the host side.
+    interface = hid.Device(path=raw_hid_interfaces[0]['path'])
 
-## Host (Windows/macOS/Linux)
+    print(f"Manufacturer: {interface.manufacturer}")
+    print(f"Product: {interface.product}")
 
-This is the more complicated part as it will require some digging.
+    return interface
 
-To connect your host computer to your keyboard with raw HID you need four pieces of information about your keyboard:
+def send_raw_report(data):
+    interface = get_raw_hid_interface()
 
-1. Vendor ID
-2. Product ID
-3. Usage Page
-4. Usage
+    if interface is None:
+        print("No device found")
+        sys.exit(1)
+
+    request_data = [0x00] * (report_length + 1) # First byte is Report ID
+    request_data[1:len(data) + 1] = data
+    request_report = bytes(request_data)
+
+    print("Request:")
+    print(request_report)
+
+    try:
+        interface.write(request_report)
+
+        response_report = interface.read(report_length, timeout=1000)
+
+        print("Response:")
+        print(response_report)
+    finally:
+        interface.close()
+
+if __name__ == '__main__':
+    send_raw_report([
+        0x41
+    ])
+```
 
-The first two can easily be found in your keyboard's `config.h` in the keyboard's main directory under `VENDOR_ID` and `PRODUCT_ID`.
+## API :id=api
 
-The final two can be overridden in your keyboard's `config.h` in the keyboard's main directory by redefining the values: `#define RAW_USAGE_PAGE 0xFF60` and `#define RAW_USAGE_ID 0x61`.
+### `void raw_hid_receive(uint8_t *data, uint8_t length)` :id=api-raw-hid-receive
 
-By default, **Usage Page** is `0xFF60` and **Usage** is `0x61`.
+Callback, invoked when a raw HID report has been received from the host.
 
-### Building your host
+#### Arguments :id=api-raw-hid-receive-arguments
 
-You can build your host using any language that has an available HID implementation library if you don't wish to make your own. The ones we know of for popular languages are:
+ - `uint8_t *data`  
+   A pointer to the received data. Always 32 bytes in length.
+ - `uint8_t length`  
+   The length of the buffer. Always 32.
 
-* Node: [node-hid](https://github.com/node-hid/node-hid).
-* 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/).
+---
 
-This is not an exhaustive cross-platform list but should get you started. There are no special requirements for using raw HID so any HID library should work.
+### `void raw_hid_send(uint8_t *data, uint8_t length)` :id=api-raw-hid-send
 
-Now that you have all four pieces of information required to open HID interface to your keyboard. All you need to do is use your library's available functions to open the device with its ID parameters.
+Send an HID report.
 
-Note that Vendor ID and Product ID are not actually required to open the device. They are used only to filter to a specific device out of the many HID devices you have plugged in. Many libraries will give you the option to open the device using Product Name or Manufacturer Name instead, `node-hid` being a prime example. This will create issues for devices with builtin USB Hub or any extra HID interfaces where you will have multiple interfaces with the same name or from the same manufacturer. The Vendor ID together with Product ID create a unique designation to a single interface and will not exhibit this problem. Therefore, even if your library doesn't require you to, it is best to use them to avoid issues.
-Unlike Vendor ID and Product ID though, Usage Page and Usage are necessary for successful communication.
+#### Arguments :id=api-raw-hid-send-arguments
 
-It should go without saying that regardless of the library you're using, you should always make sure to close the interface when finished. Depending on the operating system and your particular environment there may be issues connecting to it again afterwards with another client or another instance of the same client if it's not explicitly closed.
+ - `uint8_t *data`  
+   A pointer to the data to send. Must always be 32 bytes in length.
+ - `uint8_t length`  
+   The length of the buffer. Must always be 32.
diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 822bc8f73485..44899d70d9d2 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -12,7 +12,7 @@ There is basic support for addressable RGB matrix lighting with the I2C IS31FL37
 
 ```make
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731
+RGB_MATRIX_DRIVER = is31fl3731
 ```
 
 You can use between 1 and 4 IS31FL3731 IC's. Do not specify `DRIVER_ADDR_<N>` defines for IC's that are not present on your keyboard. You can define the following items in `config.h`:
@@ -76,7 +76,7 @@ There is basic support for addressable RGB matrix lighting with the I2C IS31FL37
 
 ```make
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
+RGB_MATRIX_DRIVER = is31fl3733
 ```
 
 You can use between 1 and 4 IS31FL3733 IC's. Do not specify `DRIVER_ADDR_<N>` defines for IC's that are not present on your keyboard. You can define the following items in `config.h`:
@@ -162,7 +162,7 @@ There is basic support for addressable RGB matrix lighting with the I2C IS31FL37
 
 ```make
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3736
+RGB_MATRIX_DRIVER = is31fl3736
 ```
 You can use between 1 and 4 IS31FL3736 IC's. Do not specify `DRIVER_ADDR_<N>` defines for IC's that are not present on your keyboard.
 
@@ -238,7 +238,7 @@ There is basic support for addressable RGB matrix lighting with the I2C IS31FL37
 
 ```make
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3737
+RGB_MATRIX_DRIVER = is31fl3737
 ```
 You can use between 1 and 4 IS31FL3737 IC's. Do not specify `DRIVER_ADDR_<N>` defines for IC's that are not present on your keyboard.
 
@@ -386,7 +386,7 @@ Currently only 4 drivers are supported, but it would be trivial to support for m
 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 
 ```c
-const is31_led __flash g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location
@@ -406,7 +406,7 @@ Eg `#define ISSI_MANUAL_SCALING 3`
 Then Define the array listing all the LEDs you want to override in your `<keyboard>.c`:
 
 ```c
-const is31_led __flash g_is31_scaling[ISSI_MANUAL_SCALING] = {
+const is31_led PROGMEM g_is31_scaling[ISSI_MANUAL_SCALING] = {
  *   LED Index
  *   |  R scaling
  *   |  |    G scaling
@@ -428,7 +428,7 @@ There is basic support for addressable RGB matrix lighting with a WS2811/WS2812{
 
 ```make
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
+RGB_MATRIX_DRIVER = ws2812
 ```
 
 Configure the hardware via your `config.h`:
@@ -450,7 +450,7 @@ There is basic support for APA102 based addressable LED strands. To enable it, a
 
 ```make
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = APA102
+RGB_MATRIX_DRIVER = apa102
 ```
 
 Configure the hardware via your `config.h`:
@@ -470,7 +470,7 @@ There is basic support for addressable RGB matrix lighting with the SPI AW20216
 
 ```make
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = AW20216
+RGB_MATRIX_DRIVER = aw20216
 ```
 
 You can use up to 2 AW20216 IC's. Do not specify `DRIVER_<N>_xxx` defines for IC's that are not present on your keyboard. You can define the following items in `config.h`:
@@ -650,11 +650,8 @@ enum rgb_matrix_effects {
     RGB_MATRIX_PIXEL_FRACTAL,       // Single hue fractal filled keys pulsing horizontally out to edges
     RGB_MATRIX_PIXEL_FLOW,          // Pulsing RGB flow along LED wiring with random hues
     RGB_MATRIX_PIXEL_RAIN,          // Randomly light keys with random hues
-#if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
     RGB_MATRIX_TYPING_HEATMAP,      // How hot is your WPM!
     RGB_MATRIX_DIGITAL_RAIN,        // That famous computer simulation
-#endif
-#if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
     RGB_MATRIX_SOLID_REACTIVE_SIMPLE,   // Pulses keys hit to hue & value then fades value out
     RGB_MATRIX_SOLID_REACTIVE,      // Static single hue, pulses keys hit to shifted hue then fades to current hue
     RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
@@ -667,7 +664,6 @@ enum rgb_matrix_effects {
     RGB_MATRIX_MULTISPLASH,         // Full gradient & value pulse away from multiple key hits then fades value out
     RGB_MATRIX_SOLID_SPLASH,        // Hue & value pulse away from a single key hit then fades value out
     RGB_MATRIX_SOLID_MULTISPLASH,   // Hue & value pulse away from multiple key hits then fades value out
-#endif
     RGB_MATRIX_EFFECT_MAX
 };
 ```
@@ -707,14 +703,12 @@ You can enable a single effect by defining `ENABLE_[EFFECT_NAME]` in your `confi
 |`#define ENABLE_RGB_MATRIX_PIXEL_FLOW`                |Enables `RGB_MATRIX_PIXEL_FLOW`               |
 |`#define ENABLE_RGB_MATRIX_PIXEL_RAIN`                |Enables `RGB_MATRIX_PIXEL_RAIN`               |
 
-?> These modes don't require any additional defines.
-
 |Framebuffer Defines                                   |Description                                   |
 |------------------------------------------------------|----------------------------------------------|
 |`#define ENABLE_RGB_MATRIX_TYPING_HEATMAP`            |Enables `RGB_MATRIX_TYPING_HEATMAP`           |
 |`#define ENABLE_RGB_MATRIX_DIGITAL_RAIN`              |Enables `RGB_MATRIX_DIGITAL_RAIN`             |
 
-?> These modes also require the `RGB_MATRIX_FRAMEBUFFER_EFFECTS` define to be available.
+?> These modes introduce additional logic that can increase firmware size.
 
 |Reactive Defines                                    |Description                                   |
 |------------------------------------------------------|----------------------------------------------|
@@ -731,7 +725,7 @@ You can enable a single effect by defining `ENABLE_[EFFECT_NAME]` in your `confi
 |`#define ENABLE_RGB_MATRIX_SOLID_SPLASH`              |Enables `RGB_MATRIX_SOLID_SPLASH`             |
 |`#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH`         |Enables `RGB_MATRIX_SOLID_MULTISPLASH`        |
 
-?> These modes also require the `RGB_MATRIX_KEYPRESSES` or `RGB_MATRIX_KEYRELEASES` define to be available.
+?> These modes introduce additional logic that can increase firmware size.
 
 
 ### RGB Matrix Effect Typing Heatmap :id=rgb-matrix-effect-typing-heatmap
@@ -872,9 +866,7 @@ These are defined in [`color.h`](https://github.com/qmk/qmk_firmware/blob/master
 ## Additional `config.h` Options :id=additional-configh-options
 
 ```c
-#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_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_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)
@@ -887,7 +879,7 @@ These are defined in [`color.h`](https://github.com/qmk/qmk_firmware/blob/master
 #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 RGB_MATRIX_SPLIT { X, Y } 	// (Optional) For split keyboards, the number of LEDs connected on each half. X = left, Y = Right.
-                              		// If RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
+                              		// If reactive effects are enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
 #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/docs/feature_rgblight.md b/docs/feature_rgblight.md
index 948bbb241e3a..0288fb04b2a7 100644
--- a/docs/feature_rgblight.md
+++ b/docs/feature_rgblight.md
@@ -28,7 +28,7 @@ For APA102 LEDs, add the following to your `rules.mk`:
 
 ```make
 RGBLIGHT_ENABLE = yes
-RGBLIGHT_DRIVER = APA102
+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.
@@ -524,38 +524,6 @@ By defining `RGBLIGHT_LED_MAP` as in the example below, you can specify the LED
 ```
 <img src="https://user-images.githubusercontent.com/2170248/55743725-08ad7a80-5a6e-11e9-83ed-126a2b0209fc.JPG" alt="simple mapped" width="50%"/>
 
-For keyboards that use the RGB LEDs as a backlight for each key, you can also define it as in the example below.
-
-```c
-// config.h
-
-#define RGBLED_NUM 30
-
-/* RGB LED Conversion macro from physical array to electric array */
-#define LED_LAYOUT( \
-    L00, L01, L02, L03, L04, L05,  \
-    L10, L11, L12, L13, L14, L15,  \
-    L20, L21, L22, L23, L24, L25,  \
-    L30, L31, L32, L33, L34, L35,  \
-    L40, L41, L42, L43, L44, L45 ) \
-  { \
-    L05, L04, L03, L02, L01, L00,   \
-    L10, L11, L12, L13, L14, L15,   \
-    L25, L24, L23, L22, L21, L20,   \
-    L30, L31, L32, L33, L34, L35,   \
-    L46, L45, L44, L43, L42, L41    \
-  }
-
-/* RGB LED logical order map */
-/* Top->Bottom, Right->Left */
-#define RGBLIGHT_LED_MAP LED_LAYOUT( \
-  25, 20, 15, 10,  5,  0,       \
-  26, 21, 16, 11,  6,  1,       \
-  27, 22, 17, 12,  7,  2,       \
-  28, 23, 18, 13,  8,  3,       \
-  29, 24, 19, 14,  9,  4 )
-
-```
 ## Clipping Range
 
 Using the `rgblight_set_clipping_range()` function, you can prepare more buffers than the actual number of LEDs, and output some of the buffers to the LEDs. This is useful if you want the split keyboard to treat left and right LEDs as logically contiguous.
@@ -575,8 +543,8 @@ In addition to setting the Clipping Range, you can use `RGBLIGHT_LED_MAP` togeth
 #define RGBLED_NUM 8
 #define RGBLIGHT_LED_MAP { 7, 6, 5, 4, 3, 2, 1, 0 }
 
-// some soruce
-  rgblight_set_clipping_range(3, 4);
+// some source
+rgblight_set_clipping_range(3, 4);
 ```
 <img src="https://user-images.githubusercontent.com/2170248/55743747-119e4c00-5a6e-11e9-91e5-013203ffae8a.JPG" alt="clip mapped" width="70%"/>
 
diff --git a/docs/feature_send_string.md b/docs/feature_send_string.md
index 67df0224e93b..7d3f3ba32a15 100644
--- a/docs/feature_send_string.md
+++ b/docs/feature_send_string.md
@@ -1,4 +1,4 @@
-# Send String
+# Send String :id=send-string
 
 The Send String API is part of QMK's macro system. It allows for sequences of keystrokes to be sent automatically.
 
@@ -6,7 +6,7 @@ The full ASCII character set is supported, along with all of the keycodes in the
 
 ?> Unicode characters are **not** supported with this API -- see the [Unicode](feature_unicode.md) feature instead.
 
-## Usage
+## Usage :id=usage
 
 Send String is enabled by default, so there is usually no need for any special setup. However, if it is disabled, add the following to your `rules.mk`:
 
@@ -14,7 +14,7 @@ Send String is enabled by default, so there is usually no need for any special s
 SEND_STRING_ENABLE = yes
 ```
 
-## Basic Configuration
+## Basic Configuration :id=basic-configuration
 
 Add the following to your `config.h`:
 
@@ -23,7 +23,7 @@ Add the following to your `config.h`:
 |`SENDSTRING_BELL`|*Not defined*   |If the [Audio](feature_audio.md) feature is enabled, the `\a` character (ASCII `BEL`) will beep the speaker.|
 |`BELL_SOUND`     |`TERMINAL_SOUND`|The song to play when the `\a` character is encountered. By default, this is an eighth note of C5.          |
 
-## Keycodes
+## Keycodes :id=keycodes
 
 The Send String functions accept C string literals, but specific keycodes can be injected with the below macros. All of the keycodes in the [Basic Keycode range](keycodes_basic.md) are supported (as these are the only ones that will actually be sent to the host), but with an `X_` prefix instead of `KC_`.
 
@@ -44,13 +44,13 @@ The following characters are also mapped to their respective keycodes for conven
 |`\t`     |`\x1B`|`TAB`|`KC_TAB`      |
 |         |`\x7F`|`DEL`|`KC_DELETE`   |
 
-### Language Support
+### Language Support :id=language-support
 
 By default, Send String assumes your OS keyboard layout is set to US ANSI. If you are using a different keyboard layout, you can [override the lookup tables used to convert ASCII characters to keystrokes](reference_keymap_extras.md#sendstring-support).
 
-## Examples
+## Examples :id=examples
 
-### Hello World
+### Hello World :id=example-hello-world
 
 A simple custom keycode which types out "Hello, world!" and the Enter key when pressed.
 
@@ -70,7 +70,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 ```
 
-### Keycode Injection
+### Keycode Injection :id=example-keycode-injection
 
 This example types out opening and closing curly braces, then taps the left arrow key to move the cursor between the two.
 
@@ -84,26 +84,26 @@ This example types Ctrl+A, then Ctrl+C, without releasing Ctrl.
 SEND_STRING(SS_LCTL("ac"));
 ```
 
-## API
+## API :id=api
 
-### `void send_string(const char *string)`
+### `void send_string(const char *string)` :id=api-send-string
 
 Type out a string of ASCII characters.
 
 This function simply calls `send_string_with_delay(string, 0)`.
 
-#### Arguments
+#### Arguments :id=api-send-string-arguments
 
  - `const char *string`  
    The string to type out.
 
 ---
 
-### `void send_string_with_delay(const char *string, uint8_t interval)`
+### `void send_string_with_delay(const char *string, uint8_t interval)` :id=api-send-string-with-delay
 
 Type out a string of ASCII characters, with a delay between each character.
 
-#### Arguments
+#### Arguments :id=api-send-string-with-delay-arguments
 
  - `const char *string`  
    The string to type out.
@@ -112,26 +112,26 @@ Type out a string of ASCII characters, with a delay between each character.
 
 ---
 
-### `void send_string_P(const char *string)`
+### `void send_string_P(const char *string)` :id=api-send-string-p
 
 Type out a PROGMEM string of ASCII characters.
 
 On ARM devices, this function is simply an alias for `send_string_with_delay(string, 0)`.
 
-#### Arguments
+#### Arguments :id=api-send-string-p-arguments
 
  - `const char *string`  
    The string to type out.
 
 ---
 
-### `void send_string_with_delay_P(const char *string, uint8_t interval)`
+### `void send_string_with_delay_P(const char *string, uint8_t interval)` :id=api-send-string-with-delay-p
 
 Type out a PROGMEM string of ASCII characters, with a delay between each character.
 
 On ARM devices, this function is simply an alias for `send_string_with_delay(string, interval)`.
 
-#### Arguments
+#### Arguments :id=api-send-string-with-delay-p-arguments
 
  - `const char *string`  
    The string to type out.
@@ -140,76 +140,76 @@ On ARM devices, this function is simply an alias for `send_string_with_delay(str
 
 ---
 
-### `void send_char(char ascii_code)`
+### `void send_char(char ascii_code)` :id=api-send-char
 
 Type out an ASCII character.
 
-#### Arguments
+#### Arguments :id=api-send-char-arguments
 
  - `char ascii_code`  
    The character to type.
 
 ---
 
-### `void send_dword(uint32_t number)`
+### `void send_dword(uint32_t number)` :id=api-send-dword
 
 Type out an eight digit (unsigned 32-bit) hexadecimal value.
 
 The format is `[0-9a-f]{8}`, eg. `00000000` through `ffffffff`.
 
-#### Arguments
+#### Arguments :id=api-send-dword-arguments
 
  - `uint32_t number`  
    The value to type, from 0 to 4,294,967,295.
 
 ---
 
-### `void send_word(uint16_t number)`
+### `void send_word(uint16_t number)` :id=api-send-word
 
 Type out a four digit (unsigned 16-bit) hexadecimal value.
 
 The format is `[0-9a-f]{4}`, eg. `0000` through `ffff`.
 
-#### Arguments
+#### Arguments :id=api-send-word-arguments
 
  - `uint16_t number`  
    The value to type, from 0 to 65,535.
 
 ---
 
-### `void send_byte(uint8_t number)`
+### `void send_byte(uint8_t number)` :id=api-send-bytes
 
 Type out a two digit (8-bit) hexadecimal value.
 
 The format is `[0-9a-f]{2}`, eg. `00` through `ff`.
 
-#### Arguments
+#### Arguments :id=api-send-byte-arguments
 
  - `uint8_t number`  
    The value to type, from 0 to 255.
 
 ---
 
-### `void send_nibble(uint8_t number)`
+### `void send_nibble(uint8_t number)` :id=api-send-nibble
 
 Type out a single hexadecimal digit.
 
 The format is `[0-9a-f]{1}`, eg. `0` through `f`.
 
-#### Arguments
+#### Arguments :id=api-send-nibble-arguments
 
  - `uint8_t number`  
    The value to type, from 0 to 15.
 
 ---
 
-### `void tap_random_base64(void)`
+### `void tap_random_base64(void)` :id=api-tap-random-base64
 
 Type a pseudorandom character from the set `A-Z`, `a-z`, `0-9`, `+` and `/`.
 
 ---
 
-### `SEND_STRING(string)`
+### `SEND_STRING(string)` :id=api-send-string-macro
 
 Shortcut macro for `send_string_with_delay_P(PSTR(string), 0)`.
 
@@ -217,7 +217,7 @@ On ARM devices, this define evaluates to `send_string_with_delay(string, 0)`.
 
 ---
 
-### `SEND_STRING_DELAY(string, interval)`
+### `SEND_STRING_DELAY(string, interval)` :id=api-send-string-delay-macro
 
 Shortcut macro for `send_string_with_delay_P(PSTR(string), interval)`.
 
diff --git a/docs/feature_tap_dance.md b/docs/feature_tap_dance.md
index b7d8a5528fb8..42ea23396235 100644
--- a/docs/feature_tap_dance.md
+++ b/docs/feature_tap_dance.md
@@ -28,7 +28,7 @@ After this, you'll want to use the `tap_dance_actions` array to specify what act
 * `ACTION_TAP_DANCE_LAYER_TOGGLE(kc, layer)`: Sends the `kc` keycode when tapped once, or toggles the state of `layer`. (this functions like the `TG` layer keycode).
 * `ACTION_TAP_DANCE_FN(fn)`: Calls the specified function - defined in the user keymap - with the final tap count of the tap dance action.
 * `ACTION_TAP_DANCE_FN_ADVANCED(on_each_tap_fn, on_dance_finished_fn, on_dance_reset_fn)`: Calls the first specified function - defined in the user keymap - on every tap, the second function when the dance action finishes (like the previous option), and the last function when the tap dance action resets.
-
+* `ACTION_TAP_DANCE_FN_ADVANCED_WITH_RELEASE(on_each_tap_fn, on_each_release_fn, on_dance_finished_fn, on_dance_reset_fn)`: This macro is identical to `ACTION_TAP_DANCE_FN_ADVANCED` with the addition of `on_each_release_fn` which is invoked every time the key for the tap dance is released. It is worth noting that `on_each_release_fn` will still be called even when the key is released after the dance finishes (e.g. if the key is released after being pressed and held for longer than the `TAPPING_TERM`).
 
 The first option is enough for a lot of cases, that just want dual roles. For example, `ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_ENT)` will result in `Space` being sent on single-tap, `Enter` otherwise. 
 
diff --git a/docs/feature_tri_layer.md b/docs/feature_tri_layer.md
index aa6c87719ca6..ade0040cc7b1 100644
--- a/docs/feature_tri_layer.md
+++ b/docs/feature_tri_layer.md
@@ -40,7 +40,7 @@ Eg, if you wanted to set the "Adjust" layer to be layer 5, you'd add this to you
 | `set_tri_layer_lower_layer(layer)`           | Changes the "lower" layer*.                     |
 | `set_tri_layer_upper_layer(layer)`           | Changes the "upper" layer*.                     |
 | `set_tri_layer_adjust_layer(layer)`          | Changes the "adjust" layer*.                    |
-| `set_tri_layer_layers(lower, upper, adjust)` | Stes the "lower", "upper" and "adjust" layers*. |
+| `set_tri_layer_layers(lower, upper, adjust)` | Sets the "lower", "upper" and "adjust" layers*. |
 | `get_tri_layer_lower_layer()`                | Gets the current "lower" layer.                 |
 | `get_tri_layer_upper_layer()`                | Gets the current "upper" layer.                 |
 | `get_tri_layer_adjust_layer()`               | Gets the current "adjust" layer.                |
diff --git a/docs/feature_unicode.md b/docs/feature_unicode.md
index 455596dab5e1..2c6d2ef002e5 100644
--- a/docs/feature_unicode.md
+++ b/docs/feature_unicode.md
@@ -1,48 +1,77 @@
-# Unicode Support
+# Unicode :id=unicode
 
-Unicode characters can be input straight from your keyboard! There are some limitations, however.
+With a little help from your OS, practically any Unicode character can be input using your keyboard.
 
-In order to enable Unicode support on your keyboard, you will need to do the following:
+## Caveats :id=caveats
 
-1. Choose one of three supported Unicode implementations: [Basic Unicode](#basic-unicode), [Unicode Map](#unicode-map), [UCIS](#ucis).
-2. Find which [input mode](#input-modes) is the best match for your operating system and setup.
-3. [Set](#setting-the-input-mode) the appropriate input mode (or modes) in your configuration.
-4. Add Unicode keycodes to your keymap.
+There are some limitations to this feature. Because there is no "standard" method of Unicode input across all operating systems, each of them require their own setup process on both the host *and* in the firmware, which may involve installation of additional software. This also means Unicode input will not "just work" when the keyboard is plugged into another device.
 
+## Usage :id=usage
 
-## 1. Methods :id=methods
+The core Unicode API can be used purely programmatically. However, there are also additional subsystems which build on top of it and come with keycodes to make things easier. See below for more details.
 
-QMK supports three different methods for enabling Unicode input and adding Unicode characters to your keymap. Each has its pros and cons in terms of flexibility and ease of use. Choose the one that best fits your use case.
+Add the following to your keymap's `rules.mk`:
 
-The Basic method should be enough for most users. However, if you need a wider range of supported characters (including emoji, rare symbols etc.), you should use Unicode Map.
+```make
+UNICODE_COMMON = yes
+```
+
+## Basic Configuration :id=basic-configuration
+
+Add the following to your `config.h`:
+
+|Define                  |Default           |Description                                                                     |
+|------------------------|------------------|--------------------------------------------------------------------------------|
+|`UNICODE_KEY_MAC`       |`KC_LEFT_ALT`     |The key to hold when beginning a Unicode sequence with the macOS input mode     |
+|`UNICODE_KEY_LNX`       |`LCTL(LSFT(KC_U))`|The key to tap when beginning a Unicode sequence with the Linux input mode      |
+|`UNICODE_KEY_WINC`      |`KC_RIGHT_ALT`    |The key to hold when beginning a Unicode sequence with the WinCompose input mode|
+|`UNICODE_SELECTED_MODES`|`-1`              |A comma separated list of input modes for cycling through                       |
+|`UNICODE_CYCLE_PERSIST` |`true`            |Whether to persist the current Unicode input mode to EEPROM                     |
+|`UNICODE_TYPE_DELAY`    |`10`              |The amount of time to wait, in milliseconds, between Unicode sequence keystrokes|
+
+### Audio Feedback :id=audio-feedback
 
-<br>
+If you have the [Audio](feature_audio.md) feature enabled on your board, you can configure it to play sounds when the input mode is changed.
 
-### 1.1. Basic Unicode :id=basic-unicode
+Add the following to your `config.h`:
 
-The easiest to use method, albeit somewhat limited. It stores Unicode characters as keycodes in the keymap itself, so it only supports code points up to `0x7FFF`. This covers characters for most modern languages (including East Asian), as well as symbols, but it doesn't cover emoji.
+|Define             |Default|Description                                                |
+|-------------------|-------|-----------------------------------------------------------|
+|`UNICODE_SONG_MAC` |*n/a*  |The song to play when the macOS input mode is selected     |
+|`UNICODE_SONG_LNX` |*n/a*  |The song to play when the Linux input mode is selected     |
+|`UNICODE_SONG_BSD` |*n/a*  |The song to play when the BSD input mode is selected       |
+|`UNICODE_SONG_WIN` |*n/a*  |The song to play when the Windows input mode is selected   |
+|`UNICODE_SONG_WINC`|*n/a*  |The song to play when the WinCompose input mode is selected|
 
-Add the following to your `rules.mk`:
+## Input Subsystems :id=input-subsystems
+
+Each of these subsystems have their own pros and cons in terms of flexibility and ease of use. Choose the one that best fits your needs.
+
+<!-- tabs:start -->
+
+### ** Basic **
+
+This is the easiest to use, albeit somewhat limited. It supports code points up to `U+7FFF`, which covers characters for most modern languages (including East Asian), as well as many symbols, but does not include emoji.
+
+To enable Basic Unicode, add the following to your `rules.mk`:
 
 ```make
 UNICODE_ENABLE = yes
 ```
 
-Then add `UC(c)` keycodes to your keymap, where _c_ is the code point of the desired character (preferably in hexadecimal, up to 4 digits long). For example, `UC(0x40B)` will output [Ћ](https://unicode-table.com/en/040B/), and `UC(0x30C4)` will output [ツ](https://unicode-table.com/en/30C4).
-
-<br>
+You can then add `UC(c)` keycodes to your keymap, where *c* is the code point of the desired character (in hexadecimal - the `U+` prefix will not work). For example, `UC(0x40B)` will output [Ћ](https://unicode-table.com/en/040B/), and `UC(0x30C4)` will output [ツ](https://unicode-table.com/en/30C4).
 
-### 1.2. Unicode Map :id=unicode-map
+### ** Unicode Map **
 
-In addition to standard character ranges, this method also covers emoji, ancient scripts, rare symbols etc. In fact, all possible code points (up to `0x10FFFF`) are supported. Here, Unicode characters are stored in a separate mapping table. You need to maintain a `unicode_map` array in your keymap file, which may contain at most 16384 entries.
+Unicode Map supports all possible code points (up to `U+10FFFF`). Here, the code points are stored in a separate mapping table (which may contain at most 16,384 entries), instead of directly in the keymap.
 
-Add the following to your `rules.mk`:
+To enable Unicode Map, add the following to your `rules.mk`:
 
 ```make
 UNICODEMAP_ENABLE = yes
 ```
 
-Then add `X(i)` keycodes to your keymap, where _i_ is the desired character's index in the mapping table. This can be a numeric value, but it's recommended to keep the indices in an enum and access them by name.
+Then, you will need to create a mapping table in your `keymap.c`, and (optionally) an enum for naming the array indices, like so:
 
 ```c
 enum unicode_names {
@@ -51,242 +80,373 @@ enum unicode_names {
     SNEK
 };
 
-const uint32_t unicode_map[] PROGMEM = {
+const uint32_t PROGMEM unicode_map[] = {
     [BANG]  = 0x203D,  // ‽
     [IRONY] = 0x2E2E,  // ⸮
     [SNEK]  = 0x1F40D, // 🐍
 };
 ```
 
-Then you can use `X(BANG)`, `X(SNEK)` etc. in your keymap.
+Finally, add `UM(i)` keycodes to your keymap, where *i* is an index into the `unicode_map[]` array. If you defined the enum above, you can use those names instead, for example `UM(BANG)` or `UM(SNEK)`.
 
-#### Lower and Upper Case
+#### Lower and Upper Case Pairs :id=unicodemap-pairs
 
-Characters often come in lower and upper case pairs, such as å and Å. To make inputting these characters easier, you can use `XP(i, j)` in your keymap, where _i_ and _j_ are the mapping table indices of the lower and upper case character, respectively. If you're holding down Shift or have Caps Lock turned on when you press the key, the second (upper case) character will be inserted; otherwise, the first (lower case) version will appear.
+Some writing systems have lowercase and uppercase variants of each character, such as å and Å. To make inputting these characters easier, you can use the `UP(i, j)` keycode in your keymap, where *i* and *j* are the mapping table indices of the lowercase and uppercase characters, respectively. If you're holding down Shift or have Caps Lock turned on when you press the key, the uppercase character will be inserted; otherwise, the lowercase character will be inserted.
 
-This is most useful when creating a keymap for an international layout with special characters. Instead of having to put the lower and upper case versions of a character on separate keys, you can have them both on the same key by using `XP()`. This helps blend Unicode keys in with regular alphas.
+```c
+const uint32_t PROGMEM unicode_map[] = {
+    [AE_LOWER] = 0x00E6,  // æ
+    [AE_UPPER] = 0x00C6,  // Æ
+};
+```
 
-Due to keycode size constraints, _i_ and _j_ can each only refer to one of the first 128 characters in your `unicode_map`. In other words, 0 ≤ _i_ ≤ 127 and 0 ≤ _j_ ≤ 127. This is enough for most use cases, but if you'd like to customize the index calculation, you can override the [`unicodemap_index()`](https://github.com/qmk/qmk_firmware/blob/71f640d47ee12c862c798e1f56392853c7b1c1a8/quantum/process_keycode/process_unicodemap.c#L36) function. This also allows you to, say, check Ctrl instead of Shift/Caps.
+This is most useful when creating a keymap for an international layout with special characters. Instead of having to put the lower and upper case versions of a character on separate keys, you can have them both on the same key. This helps blend Unicode keys in with regular keycodes.
 
-<br>
+Due to keycode size constraints, *i* and *j* can each only refer to one of the first 128 characters in your `unicode_map`. In other words, 0 ≤ *i* ≤ 127 and 0 ≤ *j* ≤ 127.
 
-### 1.3. UCIS :id=ucis
+### ** UCIS **
 
-This method also supports all possible code points. As with the Unicode Map method, you need to maintain a mapping table in your keymap file. However, there are no built-in keycodes for this feature — you have to create a custom keycode or function that invokes this functionality.
+As with Unicode Map, the UCIS method also supports all possible code points, and requires the use of a mapping table. However, it works much differently - Unicode characters are input by replacing a typed mnemonic.
 
-Add the following to your `rules.mk`:
+To enable UCIS, add the following to your keymap's `rules.mk`:
 
 ```make
 UCIS_ENABLE = yes
 ```
 
-Then define a table like this in your keymap file:
+Then, create a mapping table in your `keymap.c`:
 
 ```c
 const ucis_symbol_t ucis_symbol_table[] = UCIS_TABLE(
     UCIS_SYM("poop", 0x1F4A9),                // 💩
     UCIS_SYM("rofl", 0x1F923),                // 🤣
-    UCIS_SYM("cuba", 0x1F1E8, 0x1F1FA),       // 🇨🇺
+    UCIS_SYM("ukr", 0x1F1FA, 0x1F1E6),        // 🇺🇦
     UCIS_SYM("look", 0x0CA0, 0x005F, 0x0CA0)  // ಠ_ಠ
 );
 ```
 
-By default, each table entry may be up to 3 code points long. This number can be changed by adding `#define UCIS_MAX_CODE_POINTS n` to your `config.h` file.
+By default, each table entry may be up to three code points long. This can be changed by adding `#define UCIS_MAX_CODE_POINTS n` to your keymap's `config.h`.
 
-To use UCIS input, call `ucis_start()`. Then, type the mnemonic for the character (such as "rofl") and hit Space, Enter or Esc. QMK should erase the "rofl" text and insert the laughing emoji.
+To invoke UCIS input, the `ucis_start()` function must first be called (for example, in a custom "Unicode" keycode). Then, type the mnemonic for the mapping table entry (such as "rofl"), and hit Space or Enter. The "rofl" text will be backspaced and the emoji inserted.
 
-#### Customization
+<!-- tabs:end -->
 
-There are several functions that you can define in your keymap to customize the functionality of this feature.
+## Input Modes :id=input-modes
 
-* `void ucis_start_user(void)` – This runs when you call the "start" function, and can be used to provide feedback. By default, it types out a keyboard emoji.
-* `void ucis_success(uint8_t symbol_index)` – This runs when the input has matched something and has completed. By default, it doesn't do anything.
-* `void ucis_symbol_fallback (void)` – This runs when the input doesn't match anything. By default, it falls back to trying that input as a Unicode code.
+Unicode input works by typing a sequence of characters, similar to a macro. However, since this sequence depends on your OS, you will need to prepare both your host machine and QMK to recognise and send the correct Unicode input sequences respectively.
 
-You can find the default implementations of these functions in [`process_ucis.c`](https://github.com/qmk/qmk_firmware/blob/master/quantum/process_keycode/process_ucis.c).
+To set the list of enabled input modes, add the `UNICODE_SELECTED_MODES` define to your keymap's `config.h`, for example:
 
+```c
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
+// or
+#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_WINCOMPOSE
+```
 
-## 2. Input Modes :id=input-modes
+These modes can then be cycled through using the `UC_NEXT` and `UC_PREV` keycodes. You can also switch to any input mode, even if it is not specified in `UNICODE_SELECTED_MODES`, using their respective keycodes.
 
-Unicode input in QMK works by inputting a sequence of characters to the OS, sort of like a macro. Unfortunately, the way this is done differs for each platform. Specifically, each platform requires a different combination of keys to trigger Unicode input. Therefore, a corresponding input mode has to be set in QMK.
+If your keyboard has working EEPROM, it will remember the last used input mode and continue using it on the next power up. This can be disabled by defining `UNICODE_CYCLE_PERSIST` to `false`.
 
-The following input modes are available:
+<!-- tabs:start -->
 
-* **`UNICODE_MODE_MACOS`**: macOS built-in Unicode hex input. Supports code points up to `0x10FFFF` (all possible code points).
+### ** macOS **
 
-  To enable, go to _System Preferences > Keyboard > Input Sources_, add _Unicode Hex Input_ to the list (it's under _Other_), then activate it from the input dropdown in the Menu Bar.
-  By default, this mode uses the left Option key (`KC_LALT`) for Unicode input, but this can be changed by defining [`UNICODE_KEY_MAC`](#input-key-configuration) with a different keycode.
+**Mode Name:** `UNICODE_MODE_MACOS`
 
-  !> Using the _Unicode Hex Input_ input source may disable some Option-based shortcuts, such as Option+Left and Option+Right.
+macOS has built-in support for Unicode input as its own input source. It supports all possible code points by way of surrogate pairs for code points above `U+FFFF`.
 
-* **`UNICODE_MODE_LINUX`**: Linux built-in IBus Unicode input. Supports code points up to `0x10FFFF` (all possible code points).
+To enable, go to **System Preferences → Keyboard → Input Sources**, then add Unicode Hex Input to the list (under Other), and activate it from the input dropdown in the menu bar. Note that this may disable some Option-based shortcuts such as Option+Left and Option+Right.
 
-  Enabled by default and works almost anywhere on IBus-enabled distros. Without IBus, this mode works under GTK apps, but rarely anywhere else.
-  By default, this mode uses Ctrl+Shift+U (`LCTL(LSFT(KC_U))`) to start Unicode input, but this can be changed by defining [`UNICODE_KEY_LNX`](#input-key-configuration) with a different keycode. This might be required for IBus versions ≥1.5.15, where Ctrl+Shift+U behavior is consolidated into Ctrl+Shift+E.
+### ** Linux (IBus) **
 
-  Users who wish support in non-GTK apps without IBus may need to resort to a more indirect method, such as creating a custom keyboard layout ([more on this method](#custom-linux-layout)).
+**Mode Name:** `UNICODE_MODE_LINUX`
 
-* **`UNICODE_MODE_WINDOWS`**: _(not recommended)_ Windows built-in hex numpad Unicode input. Supports code points up to `0xFFFF`.
+For Linux distros with IBus, Unicode input is enabled by default, supports all possible code points, and works almost anywhere. Without IBus, it works under GTK apps, but rarely anywhere else.
 
-  To enable, create a registry key under `HKEY_CURRENT_USER\Control Panel\Input Method` of type `REG_SZ` called `EnableHexNumpad` and set its value to `1`. This can be done from the Command Prompt by running `reg add "HKCU\Control Panel\Input Method" -v EnableHexNumpad -t REG_SZ -d 1` with administrator privileges. Reboot afterwards.
-  This mode is not recommended because of reliability and compatibility issues; use the `UNICODE_MODE_WINCOMPOSE` mode instead.
+Users who would like support in non-GTK apps without IBus may need to resort to a more indirect method, such as creating a custom keyboard layout.
 
-* **`UNICODE_MODE_BSD`**: _(non implemented)_ Unicode input under BSD. Not implemented at this time. If you're a BSD user and want to help add support for it, please [open an issue on GitHub](https://github.com/qmk/qmk_firmware/issues).
+### ** Windows (WinCompose) **
 
-* **`UNICODE_MODE_WINCOMPOSE`**: Windows Unicode input using [WinCompose](https://github.com/samhocevar/wincompose). As of v0.9.0, supports code points up to `0x10FFFF` (all possible code points).
+**Mode Name:** `UNICODE_MODE_WINCOMPOSE`
 
-  To enable, install the [latest release](https://github.com/samhocevar/wincompose/releases/latest). Once installed, WinCompose will automatically run on startup. This mode works reliably under all version of Windows supported by the app.
-  By default, this mode uses right Alt (`KC_RALT`) as the Compose key, but this can be changed in the WinCompose settings and by defining [`UNICODE_KEY_WINC`](#input-key-configuration) with a different keycode.
+This mode requires a third-party tool called [WinCompose](https://github.com/samhocevar/wincompose). It supports all possible code points, and is the recommended input mode for Windows.
 
+To enable, install the [latest release from GitHub](https://github.com/samhocevar/wincompose/releases/latest). Once installed, it will automatically run on startup. This works reliably under all versions of Windows supported by WinCompose.
 
-## 3. Setting the Input Mode :id=setting-the-input-mode
+### ** Windows (HexNumpad) **
 
-To set your desired input mode, add the following define to your `config.h`:
+**Mode Name:** `UNICODE_MODE_WINDOWS`
 
-```c
-#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
-```
+!> This input mode is *not* the "Alt code" system. Alt codes are not Unicode; they instead follow [the Windows-1252 character set](https://en.wikipedia.org/wiki/Alt_code).
 
-This example sets the board's default input mode to `UNICODE_MODE_LINUX`. You can replace this with `UNICODE_MODE_MACOS`, `UNICODE_MODE_WINCOMPOSE`, or any of the other modes listed [above](#input-modes). The board will automatically use the selected mode on startup, unless you manually switch to another mode (see [below](#keycodes)).
+This is Windows' built-in hex numpad Unicode input mode. It only supports code points up to `U+FFFF`, and is not recommended due to reliability and compatibility issues.
 
-You can also select multiple input modes, which allows you to easily cycle through them using the `UC_NEXT`/`UC_PREV` keycodes.
+To enable, run the following as an administrator, then reboot:
 
-```c
-#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE
+```
+reg add "HKCU\Control Panel\Input Method" -v EnableHexNumpad -t REG_SZ -d 1
 ```
 
-Note that the values are separated by commas. The board will remember the last used input mode and will continue using it on next power-up. You can disable this and force it to always start with the first mode in the list by adding `#define UNICODE_CYCLE_PERSIST false` to your `config.h`.
+### ** Emacs **
 
-#### Keycodes
+**Mode Name:** `UNICODE_MODE_EMACS`
 
-You can switch the input mode at any time by using the following keycodes. Adding these to your keymap allows you to quickly switch to a specific input mode, including modes not listed in `UNICODE_SELECTED_MODES`.
+Emacs supports code point input with the `insert-char` command.
 
-|Keycode                     |Alias    |Input Mode               |Description                                                                  |
-|----------------------------|---------|-------------------------|-----------------------------------------------------------------------------|
-|`QK_UNICODE_MODE_NEXT`      |`UC_NEXT`|Next in list             |Cycle through selected modes, reverse direction when Shift is held           |
-|`QK_UNICODE_MODE_PREVIOUS`  |`UC_PREV`|Prev in list             |Cycle through selected modes in reverse, forward direction when Shift is held|
-|`QK_UNICODE_MODE_MACOS`     |`UC_MAC` |`UNICODE_MODE_MACOS`     |Switch to macOS input                                                        |
-|`QK_UNICODE_MODE_LINUX`     |`UC_LINX`|`UNICODE_MODE_LINUX`     |Switch to Linux input                                                        |
-|`QK_UNICODE_MODE_WINDOWS`   |`UC_WIN` |`UNICODE_MODE_WINDOWS`   |Switch to Windows input                                                      |
-|`QK_UNICODE_MODE_BSD`       |`UC_BSD` |`UNICODE_MODE_BSD`       |Switch to BSD input _(not implemented)_                                      |
-|`QK_UNICODE_MODE_WINCOMPOSE`|`UC_WINC`|`UNICODE_MODE_WINCOMPOSE`|Switch to Windows input using WinCompose                                     |
-|`QK_UNICODE_MODE_EMACS`     |`UC_EMAC`|`UNICODE_MODE_EMACS`     |Switch to emacs (`C-x-8 RET`)                                                |
+### ** BSD **
 
-You can also switch the input mode by calling `set_unicode_input_mode(x)` in your code, where _x_ is one of the above input mode constants (e.g. `UNICODE_MODE_LINUX`).
+**Mode Name:** `UNICODE_MODE_BSD`
 
-?> Using `UNICODE_SELECTED_MODES` is preferable to calling `set_unicode_input_mode()` in `matrix_init_user()` or similar functions, since it's better integrated into the Unicode system and has the added benefit of avoiding unnecessary writes to EEPROM.
+Not currently implemented. If you're a BSD user and want to contribute support for this input mode, please [feel free](contributing.md)!
 
-#### Audio Feedback
+<!-- tabs:end -->
 
-If you have the [Audio feature](feature_audio.md) enabled on the board, you can set melodies to be played when you press the above keys. That way you can have some audio feedback when switching input modes.
+## Keycodes :id=keycodes
 
-For instance, you can add these definitions to your `config.h` file:
+|Key                         |Aliases  |Description                                                     |
+|----------------------------|---------|----------------------------------------------------------------|
+|`UC(c)`                     |         |Send Unicode code point `c`, up to `0x7FFF`                     |
+|`UM(i)`                     |         |Send Unicode code point at index `i` in `unicode_map`           |
+|`UP(i, j)`                  |         |Send Unicode code point at index `i`, or `j` if Shift/Caps is on|
+|`QK_UNICODE_MODE_NEXT`      |`UC_NEXT`|Cycle through selected input modes                              |
+|`QK_UNICODE_MODE_PREVIOUS`  |`UC_PREV`|Cycle through selected input modes in reverse                   |
+|`QK_UNICODE_MODE_MACOS`     |`UC_MAC` |Switch to macOS input                                           |
+|`QK_UNICODE_MODE_LINUX`     |`UC_LINX`|Switch to Linux input                                           |
+|`QK_UNICODE_MODE_WINDOWS`   |`UC_WIN` |Switch to Windows input                                         |
+|`QK_UNICODE_MODE_BSD`       |`UC_BSD` |Switch to BSD input (not implemented)                           |
+|`QK_UNICODE_MODE_WINCOMPOSE`|`UC_WINC`|Switch to Windows input using WinCompose                        |
+|`QK_UNICODE_MODE_EMACS`     |`UC_EMAC`|Switch to emacs (`C-x-8 RET`)                                   |
 
-```c
-#define UNICODE_SONG_MAC  AUDIO_ON_SOUND
-#define UNICODE_SONG_LNX  UNICODE_LINUX
-#define UNICODE_SONG_BSD  TERMINAL_SOUND
-#define UNICODE_SONG_WIN  UNICODE_WINDOWS
-#define UNICODE_SONG_WINC UNICODE_WINDOWS
-```
+## API :id=api
 
+### `uint8_t get_unicode_input_mode(void)` :id=api-get-unicode-input-mode
 
-## Additional Customization
+Get the current Unicode input mode.
 
-Because Unicode is a large and versatile feature, there are a number of options you can customize to make it work better on your system.
+#### Return Value :id=api-get-unicode-input-mode-return-value
 
-### Start and Finish Input Functions
+The currently active Unicode input mode.
 
-The functions for starting and finishing Unicode input on your platform can be overridden locally. Possible uses include customizing input mode behavior if you don't use the default keys, or adding extra visual/audio feedback to Unicode input.
+---
 
-* `void unicode_input_start(void)` – This sends the initial sequence that tells your platform to enter Unicode input mode. For example, it holds the left Alt key followed by Num+ on Windows, and presses the `UNICODE_KEY_LNX` combination (default: Ctrl+Shift+U) on Linux.
-* `void unicode_input_finish(void)` – This is called to exit Unicode input mode, for example by pressing Space or releasing the Alt key.
+### `void set_unicode_input_mode(uint8_t mode)` :id=api-set-unicode-input-mode
 
-You can find the default implementations of these functions in [`process_unicode_common.c`](https://github.com/qmk/qmk_firmware/blob/master/quantum/process_keycode/process_unicode_common.c).
+Set the Unicode input mode.
 
-### Input Mode Callbacks
+#### Arguments :id=api-set-unicode-input-mode-arguments
 
-There are callbacks functions available that are called whenever the unicode input mode changes. The new input mode is passed to the function.
+ - `uint8_t mode`  
+   The input mode to set.
 
-|Callback                                           |Description                                          |
-|---------------------------------------------------|-----------------------------------------------------|
-| `unicode_input_mode_set_kb(uint8_t input_mode)`   | Callback for unicode input mode set, for keyboard.  |
-| `unicode_input_mode_set_user(uint8_t input_mode)` | Callback for unicode input mode set, for users.     |
+---
 
-This feature can be used, for instance, to implement LED indicators for the current unicode input mode.
+### `void unicode_input_mode_step(void)` : id=api-unicode-input-mode-step
 
-### Input Key Configuration
+Change to the next Unicode input mode.
 
-You can customize the keys used to trigger Unicode input for macOS, Linux and WinCompose by adding corresponding defines to your `config.h`. The default values match the platforms' default settings, so you shouldn't need to change this unless Unicode input isn't working, or you want to use a different key (e.g. in order to free up left or right Alt).
+---
 
-|Define            |Type      |Default           |Example                                    |
-|------------------|----------|------------------|-------------------------------------------|
-|`UNICODE_KEY_MAC` |`uint8_t` |`KC_LALT`         |`#define UNICODE_KEY_MAC  KC_RALT`         |
-|`UNICODE_KEY_LNX` |`uint16_t`|`LCTL(LSFT(KC_U))`|`#define UNICODE_KEY_LNX  LCTL(LSFT(KC_E))`|
-|`UNICODE_KEY_WINC`|`uint8_t` |`KC_RALT`         |`#define UNICODE_KEY_WINC KC_RGUI`         |
+### `void unicode_input_mode_step_reverse(void)` : id=api-unicode-input-mode-step-reverse
 
+Change to the previous Unicode input mode.
 
-## Sending Unicode Strings
+---
 
-QMK provides several functions that allow you to send Unicode input to the host programmatically:
+### `void unicode_input_mode_set_user(uint8_t input_mode)` :id=api-unicode-input-mode-set-user
 
-### `send_unicode_string()`
+User-level callback, invoked when the input mode is changed.
 
-This function is much like `send_string()`, but it allows you to input UTF-8 characters directly. It supports all code points, provided the selected input mode also supports it. Make sure your `keymap.c` file is formatted using UTF-8 encoding.
+#### Arguments :id=api-unicode-input-mode-set-user-arguments
 
-```c
-send_unicode_string("(ノಠ痊ಠ)ノ彡┻━┻");
-```
+ - `uint8_t input_mode`  
+   The new input mode.
 
-Example uses include sending Unicode strings when a key is pressed, as described in [Macros](feature_macros.md).
+---
 
-## Additional Language Support
+### `void unicode_input_mode_set_kb(uint8_t input_mode)` :id=api-unicode-input-mode-set-kb
 
-In `quantum/keymap_extras`, you'll see various language files — these work the same way as the ones for alternative layouts such as Colemak or BÉPO. When you include one of these language headers, you gain access to keycodes specific to that language / national layout. Such keycodes are defined by a 2-letter country/language code, followed by an underscore and a 4-letter abbreviation of the character to which the key corresponds. For example, including `keymap_french.h` and using `FR_UGRV` in your keymap will output `ù` when typed on a system with a native French AZERTY layout.
+Keyboard-level callback, invoked when the input mode is changed.
 
-If the primary system layout you use on your machine is different from US ANSI, using these language-specific keycodes can help your QMK keymaps better match what will actually be output on the screen. However, keep in mind that these keycodes are just aliases for the corresponding default US keycodes under the hood, and that the HID protocol used by keyboards is itself inherently based on US ANSI.
+#### Arguments :id=api-unicode-input-mode-set-kb-arguments
 
+ - `uint8_t input_mode`  
+   The new input mode.
 
-## International Characters on Windows
+---
 
-### AutoHotkey
+### `void unicode_input_start(void)` :id=api-unicode-input-start
 
-The method does not require Unicode support in the keyboard itself but instead depends on [AutoHotkey](https://autohotkey.com) running in the background.
+Begin the Unicode input sequence. The exact behavior depends on the currently selected input mode:
 
-First you need to select a modifier combination that is not in use by any of your programs.
-Ctrl+Alt+Win is not used very widely and should therefore be perfect for this.
-There is a macro defined for a mod-tab combo `LCAG_T`.
-Add this mod-tab combo to a key on your keyboard, e.g.: `LCAG_T(KC_TAB)`.
-This makes the key behave like a tab key if pressed and released immediately but changes it to the modifier if used with another key.
+ - **macOS**: Hold `UNICODE_KEY_MAC`
+ - **Linux**: Tap `UNICODE_KEY_LNX`
+ - **WinCompose**: Tap `UNICODE_KEY_WINC`, then U
+ - **HexNumpad**: Hold Left Alt, then tap Numpad +
+ - **Emacs**: Tap Ctrl+X, then 8, then Enter
 
-In the default script of AutoHotkey you can define custom hotkeys.
+This function is weakly defined, and can be overridden in user code.
 
-    <^<!<#a::Send, ä
-    <^<!<#<+a::Send, Ä
+---
 
-The hotkeys above are for the combination CtrlAltGui and CtrlAltGuiShift plus the letter a.
-AutoHotkey inserts the Text right of `Send, ` when this combination is pressed.
+### `void unicode_input_finish(void)` :id=api-unicode-input-finish
 
-### US International
+Complete the Unicode input sequence. The exact behavior depends on the currently selected input mode:
 
-If you enable the US International layout on the system, it will use punctuation to accent the characters. For instance, typing "\`a" will result in à.
-You can find details on how to enable this [here](https://support.microsoft.com/en-us/help/17424/windows-change-keyboard-layout).
+ - **macOS**: Release `UNICODE_KEY_MAC`
+ - **Linux**: Tap Space
+ - **WinCompose**: Tap Enter
+ - **HexNumpad**: Release Left Alt
+ - **Emacs**: Tap Enter
 
-## Software keyboard layout on Linux :id=custom-linux-layout
+This function is weakly defined, and can be overridden in user code.
 
-This method does not require Unicode support on the keyboard itself but instead uses a custom keyboard layout for Xorg. This is how special characters are inserted by regular keyboards. This does not require IBus and works in practically all software. Help on creating a custom layout can be found [here](https://www.linux.com/news/creating-custom-keyboard-layouts-x11-using-xkb/), [here](http://karols.github.io/blog/2013/11/18/creating-custom-keyboard-layouts-for-linux/) and [here](https://wiki.archlinux.org/index.php/X_keyboard_extension). An example of how you could edit the `us` layout to gain 🤣 on `RALT(KC_R)`:
+---
 
-Edit the keyboard layout file `/usr/share/X11/xkb/symbols/us`.
+### `void unicode_input_cancel(void)` :id=api-unicode-input-cancel
 
-Inside `xkb_symbols "basic" {`, add `include "level3(ralt_switch)"`.
+Cancel the Unicode input sequence. The exact behavior depends on the currently selected input mode:
 
-Find the line defining the R key and add an entry to the list, making it look like this:
-```
-key <AD04> {	[	  r,	R, U1F923		]	};
-```
+ - **macOS**: Release `UNICODE_KEY_MAC`
+ - **Linux**: Tap Escape
+ - **WinCompose**: Tap Escape
+ - **HexNumpad**: Release Left Alt
+ - **Emacs**: Tap Ctrl+G
+
+This function is weakly defined, and can be overridden in user code.
+
+---
+
+### `void register_unicode(uint32_t code_point)` :id=api-register-unicode
+
+Input a single Unicode character. A surrogate pair will be sent if required by the input mode.
+
+#### Arguments :id=api-register-unicode-arguments
+
+ - `uint32_t code_point`  
+   The code point of the character to send.
+
+---
+
+### `void send_unicode_string(const char *str)` :id=api-send-unicode-string
+
+Send a string containing Unicode characters.
+
+#### Arguments :id=api-send-unicode-string-arguments
+
+ - `const char *str`  
+   The string to send.
+
+---
+
+### `uint8_t unicodemap_index(uint16_t keycode)` :id=api-unicodemap-index
+
+Get the index into the `unicode_map` array for the given keycode, respecting shift state for pair keycodes.
+
+#### Arguments :id=api-unicodemap-index-arguments
+
+ - `uint16_t keycode`  
+   The Unicode Map keycode to get the index of.
+
+#### Return Value :id=api-unicodemap-index-return-value
+
+An index into the `unicode_map` array.
+
+---
+
+### `uint32_t unicodemap_get_code_point(uint8_t index)` :id=api-unicodemap-get-code-point
+
+Get the code point for the given index in the `unicode_map` array.
+
+#### Arguments :id=unicodemap-get-code-point-arguments
+
+ - `uint8_t index`  
+   The index into  the `unicode_map` array.
+
+#### Return Value :id=unicodemap-get-code-point-return-value
+
+A Unicode code point value.
+
+---
+
+### `void register_unicodemap(uint8_t index)` :id=api-register-unicodemap
+
+Send the code point for the given index in the `unicode_map` array.
+
+#### Arguments :id=api-register-unicodemap-arguments
+
+ - `uint8_t index`  
+   The index into the `unicode_map` array.
+
+---
+
+### `void ucis_start(void)` :id=api-ucis-start
+
+Begin the input sequence.
+
+---
+
+### `bool ucis_active(void)` :id=api-ucis-active
+
+Whether UCIS is currently active.
+
+#### Return Value :id=api-ucis-active-return-value
+
+`true` if UCIS is active.
+
+---
+
+### `uint8_t ucis_count(void)` :id=api-ucis-count
+
+Get the number of characters in the input sequence buffer.
+
+#### Return Value :id=api-ucis-count-return-value
+
+The current input sequence buffer length.
+
+---
+
+### `bool ucis_add(uint16_t keycode)` :id=api-ucis-add
+
+Add the given keycode to the input sequence buffer.
+
+#### Arguments :id=api-ucis-add-arguments
+
+ - `uint16_t keycode`  
+   The keycode to add. Must be between `KC_A` and `KC_Z`, or `KC_1` and `KC_0`.
+
+#### Return Value :id=api-ucis-add-return-value
+
+`true` if the keycode was added.
+
+---
+
+### `bool ucis_remove_last(void)` :id=api-ucis-remove-last
+
+Remove the last character from the input sequence buffer.
+
+#### Return Value :id=api-ucis-remove-last
+
+`true` if the sequence was not empty.
+
+---
+
+### `void ucis_finish(void)` :id=api-ucis-finish
+
+Mark the input sequence as complete, and attempt to match.
+
+---
+
+### `void ucis_cancel(void)` :id=api-ucis-cancel
+
+Cancel the input sequence.
+
+---
+
+### `void register_ucis(void)` :id=api-register-ucis
 
-Save the file and run the command `setxkbmap us` to reload the layout.
+Send the code point(s) for the given UCIS index.
 
-You can define one custom character for key defined in the layout, and another if you populate the fourth layer. Additional layers up to 8th are also possible.
+#### Arguments :id=api-register-ucis-arguments
 
-This method is specific to the computer on which you set the custom layout. The custom keys will be available only when Xorg is running. To avoid accidents, you should always reload the layout using `setxkbmap`, otherwise an invalid layout could prevent you from logging into your system, locking you out.
+ - `uint8_t index`  
+   The index into the UCIS symbol table.
diff --git a/docs/flashing.md b/docs/flashing.md
index 443fa3123e1b..113d90ca38ff 100644
--- a/docs/flashing.md
+++ b/docs/flashing.md
@@ -322,6 +322,29 @@ Flashing sequence:
 3. Flash a .bin file
 4. Reset the device into application mode (may be done automatically)
 
+## WB32 DFU
+
+Some keyboards produced for several commercial brands (GMMK, Akko, MonsGeek, Inland) use this bootloader. The `wb32-dfu-updater` utility is bundled with [QMK MSYS](https://msys.qmk.fm/) and [Glorious's build of QMK Toolbox](https://www.gloriousgaming.com/blogs/guides-resources/gmmk-2-qmk-installation-guide). If neither of these flashing methods is available for your OS, you will likely need to [compile the CLI version from source](https://github.com/WestberryTech/wb32-dfu-updater).
+
+The `info.json` setting for this bootloader is `wb32-dfu`.
+
+Compatible flashers:
+
+* [Glorious's build of QMK Toolbox](https://www.gloriousgaming.com/blogs/guides-resources/gmmk-2-qmk-installation-guide) (recommended GUI)
+* [wb32-dfu-updater_cli](https://github.com/WestberryTech/wb32-dfu-updater) / `:flash` target in QMK (recommended command line)
+  ```
+  wb32-dfu-updater_cli -t -s 0x8000000 -D <filename>
+  ```
+
+Flashing sequence:
+
+1. Enter the bootloader using any of the following methods:
+    * Tap the `QK_BOOT` keycode
+    * Press the `RESET` button on the PCB
+2. Wait for the OS to detect the device
+3. Flash a .bin file
+4. Reset the device into application mode (may be done automatically)
+
 ## tinyuf2
 
 Keyboards may opt into supporting the tinyuf2 bootloader. This is currently only supported on F303/F401/F411.
diff --git a/docs/getting_started_make_guide.md b/docs/getting_started_make_guide.md
index 1a7e276098a7..3d98e4602b48 100644
--- a/docs/getting_started_make_guide.md
+++ b/docs/getting_started_make_guide.md
@@ -109,7 +109,7 @@ This allows you to send Unicode characters using `UC(<code point>)` in your keym
 
 `UNICODEMAP_ENABLE`
 
-This allows you to send Unicode characters using `X(<map index>)` in your keymap. You will need to maintain a mapping table in your keymap file. All possible code points (up to `0x10FFFF`) are supported.
+This allows you to send Unicode characters using `UM(<map index>)` in your keymap. You will need to maintain a mapping table in your keymap file. All possible code points (up to `0x10FFFF`) are supported.
 
 `UCIS_ENABLE`
 
diff --git a/docs/i2c_driver.md b/docs/i2c_driver.md
index f4e6c6619e64..92b666b5e34a 100644
--- a/docs/i2c_driver.md
+++ b/docs/i2c_driver.md
@@ -72,7 +72,7 @@ Configuration-wise, you'll need to set up the peripheral as per your MCU's datas
 
 The following configuration values depend on the specific MCU in use.
 
-### I2Cv1 :id=i2cv1
+### I2Cv1 :id=arm-configuration-i2cv1
 
 * STM32F1xx
 * STM32F2xx
@@ -88,7 +88,7 @@ See [this page](https://www.playembedded.org/blog/stm32-i2c-chibios/#7_I2Cv1_con
 |`I2C1_CLOCK_SPEED` |`100000`        |
 |`I2C1_DUTY_CYCLE`  |`STD_DUTY_CYCLE`|
 
-### I2Cv2 :id=i2cv2
+### I2Cv2 :id=arm-configuration-i2cv2
 
 * STM32F0xx
 * STM32F3xx
@@ -105,9 +105,9 @@ See [this page](https://www.playembedded.org/blog/stm32-i2c-chibios/#8_I2Cv2_I2C
 |`I2C1_TIMINGR_SCLH`  |`38U`  |
 |`I2C1_TIMINGR_SCLL`  |`129U` |
 
-## Functions :id=functions
+## API :id=api
 
-### `void i2c_init(void)`
+### `void i2c_init(void)` :id=api-i2c-init
 
 Initialize the I2C driver. This function must be called only once, before any of the below functions can be called.
 
@@ -126,28 +126,28 @@ void i2c_init(void) {
 
 ---
 
-### `i2c_status_t i2c_start(uint8_t address, uint16_t timeout)`
+### `i2c_status_t i2c_start(uint8_t address, uint16_t timeout)` :id=api-i2c-start
 
 Start an I2C transaction.
 
-#### Arguments
+#### 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
+#### 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)`
+### `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.
 
-#### Arguments
+#### Arguments :id=api-i2c-transmit-arguments
 
  - `uint8_t address`  
    The 7-bit I2C address of the device.
@@ -158,17 +158,17 @@ Send multiple bytes to the selected I2C device.
  - `uint16_t timeout`  
    The time in milliseconds to wait for a response from the target device.
 
-#### Return Value
+#### Return Value :id=api-i2c-transmit-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_receive(uint8_t address, 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)` :id=api-i2c-receive
 
 Receive multiple bytes from the selected I2C device.
 
-#### Arguments
+#### Arguments :id=api-i2c-receive-arguments
 
  - `uint8_t address`  
    The 7-bit I2C address of the device.
@@ -179,17 +179,17 @@ Receive multiple bytes from the selected I2C device.
  - `uint16_t timeout`  
    The time in milliseconds to wait for a response from the target device.
 
-#### Return Value
+#### Return Value :id=api-i2c-receive-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_writeReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout)`
+### `i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout)` :id=api-i2c-writereg
 
 Writes to a register with an 8-bit address on the I2C device.
 
-#### Arguments
+#### Arguments :id=api-i2c-writereg-arguments
 
  - `uint8_t devaddr`  
    The 7-bit I2C address of the device.
@@ -202,17 +202,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
+#### Return Value :id=api-i2c-writereg-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)`
+### `i2c_status_t i2c_writeReg16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout)` :id=api-i2c-writereg16
 
 Writes to a register with a 16-bit address (big endian) on the I2C device.
 
-#### Arguments
+#### Arguments :id=api-i2c-writereg16-arguments
 
  - `uint8_t devaddr`  
    The 7-bit I2C address of the device.
@@ -225,17 +225,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
+#### Return Value :id=api-i2c-writereg16-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)`
+### `i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout)` :id=api-i2c-readreg
 
 Reads from a register with an 8-bit address on the I2C device.
 
-#### Arguments
+#### Arguments :id=api-i2c-readreg-arguments
 
  - `uint8_t devaddr`  
    The 7-bit I2C address of the device.
@@ -246,7 +246,7 @@ 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
+#### Return Value :id=api-i2c-readreg-return
 
 `I2C_STATUS_TIMEOUT` if the timeout period elapses, `I2C_STATUS_ERROR` if some other error occurs, otherwise `I2C_STATUS_SUCCESS`.
 
@@ -256,7 +256,7 @@ Reads from a register with an 8-bit address on the I2C device.
 
 Reads from a register with a 16-bit address (big endian) on the I2C device.
 
-#### Arguments
+#### Arguments :id=api-i2c-readreg16-arguments
 
  - `uint8_t devaddr`  
    The 7-bit I2C address of the device.
@@ -267,12 +267,12 @@ 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
+#### Return Value :id=api-i2c-readreg16-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)`
+### `i2c_status_t i2c_stop(void)` :id=api-i2c-stop
 
 Stop the current I2C transaction.
diff --git a/docs/ja/data_driven_config.md b/docs/ja/data_driven_config.md
index bc8f4d24a542..6296173b66ae 100644
--- a/docs/ja/data_driven_config.md
+++ b/docs/ja/data_driven_config.md
@@ -109,8 +109,8 @@ QMK が完全な `info.json` を生成するときはいつでも、`config.h` 
 パズルの最後のピースは、ビルドシステムに新しいオプションを提供することです。
 これは、2つのファイルを生成することによって行われます。
 
-* `.build/obj_<keyboard>/src/info_config.h`
-* `.build/obj_<keyboard>/src/rules.mk`
+* `.build/obj_<keyboard>_<keymap>/src/info_config.h`
+* `.build/obj_<keyboard>_<keymap>/src/rules.mk`
 
 この2つのファイルは、次のコードによって生成されます。
 
diff --git a/docs/keycodes.md b/docs/keycodes.md
index e5b6246af794..65762234a448 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -848,8 +848,8 @@ See also: [Unicode Support](feature_unicode.md)
 |Key                         |Aliases  |Description                                                     |
 |----------------------------|---------|----------------------------------------------------------------|
 |`UC(c)`                     |         |Send Unicode code point `c`, up to `0x7FFF`                     |
-|`X(i)`                      |         |Send Unicode code point at index `i` in `unicode_map`           |
-|`XP(i, j)`                  |         |Send Unicode code point at index `i`, or `j` if Shift/Caps is on|
+|`UM(i)`                     |         |Send Unicode code point at index `i` in `unicode_map`           |
+|`UP(i, j)`                  |         |Send Unicode code point at index `i`, or `j` if Shift/Caps is on|
 |`QK_UNICODE_MODE_NEXT`      |`UC_NEXT`|Cycle through selected input modes                              |
 |`QK_UNICODE_MODE_PREVIOUS`  |`UC_PREV`|Cycle through selected input modes in reverse                   |
 |`QK_UNICODE_MODE_MACOS`     |`UC_MAC` |Switch to macOS input                                           |
diff --git a/docs/newbs_getting_started.md b/docs/newbs_getting_started.md
index a16207f267b1..68e37679b80b 100644
--- a/docs/newbs_getting_started.md
+++ b/docs/newbs_getting_started.md
@@ -56,7 +56,7 @@ QMK maintains a Homebrew tap and formula which will automatically install the CL
 
 You will need to install Homebrew. Follow the instructions on https://brew.sh.
 
-!> **NOTE:** If you are using Apple Silicon, such as the M1, you will need to install a rosetta compatible version of Homebrew. This version does not override the base Homebrew. This can be done by running `arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"`. See here: [Rosetta-compatible Homebrew](https://stackoverflow.com/questions/64882584/how-to-run-the-homebrew-installer-under-rosetta-2-on-m1-macbook)
+?> If you are using an Apple Silicon machine, the installation process will take significantly longer because GitHub actions do not have native runners to build binary packages for the ARM and AVR toolchains.
 
 #### Installation
 
@@ -64,10 +64,6 @@ Install the QMK CLI by running:
 
     brew install qmk/qmk/qmk
     
-Install the QMK CLI on an Apple Silicon Mac by running:
-
-    arch -x86_64 brew install qmk/qmk/qmk
-
 ### ** Linux/WSL **
 
 ?> **Note for WSL users**: By default, the installation process will clone the QMK repository into your WSL home directory, but if you have cloned manually, ensure that it is located inside the WSL instance instead of the Windows filesystem (ie. not in `/mnt`), as accessing it is currently [extremely slow](https://github.com/microsoft/WSL/issues/4197).
diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index 0d6b4db206a1..38c268369433 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -11,7 +11,6 @@ If there are any inconsistencies with these recommendations, you're best off [cr
     - 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)
 - 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
-        - exception: keymaps for a single user targeting multiple keyboards and/or userspace is acceptable
     - **the smaller the PR, the higher likelihood of a quicker review, higher likelihood of quicker merge, and less chance of conflicts**
 - newly-added directories and filenames must be lowercase
     - the lowercase requirement may be relaxed if upstream sources originally had uppercase characters (e.g. LUFA, ChibiOS, or imported files from other repositories etc.)
@@ -40,6 +39,8 @@ 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.
+
 - `#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`
@@ -79,6 +80,7 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
       - Encoder Configuration
       - Bootmagic Configuration
       - LED Indicator 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)
     - flash command is present, and has `:flash` at end
@@ -136,7 +138,7 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
     - standard layouts preferred in these keymaps, if possible
     - should use [encoder map feature](https://docs.qmk.fm/#/feature_encoders?id=encoder-map), rather than `encoder_update_user()`
     - default keymap should not enable VIA -- the VIA integration documentation requires a keymap called `via`
-- submitters can have a personal (or bells-and-whistles) keymap showcasing capabilities in the same PR but it shouldn't be embedded in the 'default' keymap
+- submitters can add an example (or bells-and-whistles) keymap showcasing capabilities in the same PR but it shouldn't be embedded in the 'default' keymap
 - submitters can also have a "manufacturer-matching" keymap that mirrors existing functionality of the commercial product, if porting an existing board
 - Do not include VIA json files in the PR. These do not belong in the QMK repository as they are not used by QMK firmware -- they belong in the [VIA Keyboard Repo](https://github.com/the-via/keyboards)
 - Do not include KLE json files in the PR. These have no use within QMK.
diff --git a/docs/qmk_custom_dark.css b/docs/qmk_custom_dark.css
index 35498fbd8636..ffa5539922a5 100644
--- a/docs/qmk_custom_dark.css
+++ b/docs/qmk_custom_dark.css
@@ -2,9 +2,13 @@
     background-color: #555;
 }
 
-.markdown-section p.tip,
 .markdown-section tr:nth-child(2n) {
- background-color:#444;
+    background-color:#444;
+}
+
+.markdown-section p.tip {
+    background-color:#555;
+    color:#FFF;
 }
 
 .markdown-section tr {
@@ -16,7 +20,7 @@
 }
 
 .markdown-section p.tip code {
-    background-color: #555;
+    background-color: #333;
     color: #fff;
 }
 
diff --git a/docs/reference_glossary.md b/docs/reference_glossary.md
index ace6b5f330bb..31855606be78 100644
--- a/docs/reference_glossary.md
+++ b/docs/reference_glossary.md
@@ -113,7 +113,7 @@ A modifier that acts as if it is held down until another key is released, so you
 A low cost AVR development board. Clones of this device are often found on ebay very inexpensively (under $5) but people often struggle with flashing their pro micros.
 
 ## Pull Request
-A request to submit code to QMK. We encourage all users to submit Pull Requests for their personal keymaps.
+A request to submit code to QMK. We encourage all users to submit Pull Requests for bugfixes and new features.
 
 ## QWERTY
 The standard English keyboard layout, and often a shortcut for other language's standard layouts. Named for the first 6 letters on the keyboard.
diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md
index b5c9b3be9966..91581afc73ba 100644
--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
@@ -1,369 +1,691 @@
-# `info.json`
+# `info.json` Reference :id=info-json-reference
 
 The information contained in `info.json` is combined with the `config.h` and `rules.mk` files, dynamically generating the necessary configuration for your keyboard at compile time. It is also used by the [QMK API](https://github.com/qmk/qmk_api), and contains the information [QMK Configurator](https://config.qmk.fm/) needs to display a representation of your keyboard. Its key/value pairs are ruled by the [`data/schemas/keyboard.jsonschema`](https://github.com/qmk/qmk_firmware/blob/master/data/schemas/keyboard.jsonschema) file. To learn more about the why and how of the schema file see the [Data Driven Configuration](https://docs.qmk.fm/#/data_driven_config) page.
 
-You can create `info.json` files at every level under `qmk_firmware/keyboards/<name>`. These files are combined, with more specific files overriding keys in less specific files. This means you do not need to duplicate your metadata information. For example, `qmk_firmware/keyboards/clueboard/info.json` specifies `manufacturer` and `maintainer`, while `qmk_firmware/keyboards/clueboard/66/info.json` specifies more specific information about Clueboard 66%.
+You can create `info.json` files at every level under `qmk_firmware/keyboards/<keyboard_name>`. These files are combined, with more specific files overriding keys in less specific files. This means you do not need to duplicate your metadata information. For example, `qmk_firmware/keyboards/clueboard/info.json` specifies information common to all Clueboard products, such as `manufacturer` and `maintainer`, while `qmk_firmware/keyboards/clueboard/66/info.json` contains more specific information about Clueboard 66%.
 
-## `info.json` Format
+## General Metadata :id=general-metadata
 
-The `info.json` file is a JSON formatted dictionary. The first six keys noted here must be defined in `info.json`, or your keyboard will not be accepted into the QMK repository.
-
-* `keyboard_name`
-    * A free-form text string describing the keyboard.
-    * Example: `Clueboard 66%`
-* `manufacturer`
-    * A free-form text string describing the keyboard's manufacturer.
-    * Example: `Clueboard`
-* `url`
-    * A URL to the keyboard's product page, [QMK.fm/keyboards](https://qmk.fm/keyboards) page, or other page describing information about the keyboard.
-    * Example: `https://clueboard.co`
-* `maintainer`
+* `keyboard_name` (Required)
+    * A free-form text string describing the keyboard. This will be used as the USB product string. Can include Unicode characters, escaped to ASCII eg. `\u03A8` (Ψ).
+    * Example: `"Clueboard 66%"`
+* `maintainer` (Required)
     * GitHub username of the maintainer, or `qmk` for community maintained boards.
-    * Example: `skullydazed`
-* `usb`
-    * Configure USB VID, PID, and device version. See the [USB](#USB) section for more detail.
-* `debounce`
-    * The amount of time in milliseconds to wait for debounce to happen.
-    * Default: `5`
-* `diode_direction`
-    * The direction diodes face. See [`DIRECT_PINS` in the hardware configuration](https://docs.qmk.fm/#/config_options?id=hardware-options) for more details.
-* `layout_aliases`
-    * A dictionary containing layout aliases. The key is the alias and the value is a layout in `layouts` it maps to.
-* `layouts`
-    * Physical Layout representations. See the [Layout Format](#layout-format) section for more detail.
-* `matrix_pins`
-    * Configure the pins corresponding to columns and rows, or direct pins. See the [Matrix Pins](#matrix-pins) section for more detail.
-* `rgblight`
-    * Configure the [RGB Lighting feature](feature_rgblight.md). See the [RGB Lighting](#rgb-lighting) section for more detail.
-
-
-?> For all the available keys and their allowed values refer back to the [`data/schemas/keyboard.jsonschema`](https://github.com/qmk/qmk_firmware/blob/master/data/schemas/keyboard.jsonschema) file.
-
-## Layout Format
-
-Within our `info.json` file the `layouts` portion of the dictionary contains several nested dictionaries. The outer layer consists of QMK layout macros, for example `LAYOUT_ansi` or `LAYOUT_iso`.
-
-* `layout`
-    * A list of Key Dictionaries describing the physical layout. See the next section for more details.
-
-### Key Dictionary Format
-
-Each Key Dictionary in a layout describes the physical properties of a key. If you are familiar with the Raw Data for <https://keyboard-layout-editor.com> you will find many of the concepts the same. We re-use the same key names and layout choices wherever possible, but unlike keyboard-layout-editor each key is stateless, inheriting no properties from the keys that came before it.
-
-All key positions and rotations are specified in relation to the top-left corner of the keyboard, and the top-left corner of each key.
-
-* `x`
-    * **Required**. The absolute position of the key in the horizontal axis, in Key Units.
-* `y`
-    * **Required**. The absolute position of the key in the vertical axis, in Key Units.
-* `w`
-    * The width of the key, in Key Units.
-    * Default: `1`
-* `h`
-    * The height of the key, in Key Units.
-    * Default: `1`
-* `label`
-    * What to name this position in the matrix. This should usually correspond to the keycode for the first layer of the default keymap.
-* `matrix`
-    * A two item list describing the row and column location for this key.
-    * Example: `[0, 4]`
-
-## Matrix Pins
-
-Currently QMK supports connecting switches either directly to GPIO pins or via a switch matrix. At this time you can not combine these, they are mutually exclusive.
-
-### Switch Matrix
-
-Most keyboards use a switch matrix to connect keyswitches to the MCU. You can define your pin columns and rows to configure your switch matrix. When defining switch matrices you should also define your `diode_direction`.
-
-Example:
-
-```json
-{
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "cols": ["F4", "E6", "B1", "D2"],
-        "rows": ["B0", "D3", "D5", "D4", "D6"]
-    }
-}
-```
-
-### Direct Pins
-
-Direct pins are when you connect one side of the switch to GND and the other side to a GPIO pin on your MCU. No diode is required, but there is a 1:1 mapping between switches and pins.
-
-When specifying direct pins you need to arrange them in nested arrays. The outer array consists of rows, while the inner array uses text strings to identify the pins used in each row. You can use `null` to indicate an empty spot in the matrix.
-
-Notice that when using direct pins, `diode_direction` is left undefined.
-
-Example:
-
-```json
-{
-    "matrix_pins": {
-        "direct": [
-            ["A10", "A9"],
-            ["A0", "B8"],
-            [null, "B11"],
-            ["B9", "A8"],
-            ["A7", "B1"],
-            [null, "B2"]
-        ]
+    * Example: `"skullydazed"`
+* `manufacturer` (Required)
+    * A free-form text string describing the keyboard's manufacturer. This will be used as the USB manufacturer string. Can include Unicode characters, escaped to ASCII eg. `\u03A8` (Ψ).
+    * Example: `"Clueboard"`
+* `url` (Required)
+    * A URL to the keyboard's product page, [QMK.fm/keyboards](https://qmk.fm/keyboards) page, or other page describing information about the keyboard.
+    * Example: `"https://clueboard.co"`
+* `bootloader_instructions`
+    * Instructions for putting the keyboard into a mode that allows for firmware flashing.
+    * Example: `"Press the button marked RESET on the back of the PCB"`
+* `tags`
+    * A list of tags describing the keyboard.
+    * Example: `["ortho", "split", "rgb"]`
+
+## Hardware Configuration :id=hardware-configuration
+
+* `board`
+    * Override the default ChibiOS board name (ARM-based keyboards only).
+    * Example: `"BLACKPILL_STM32_F411"`
+* `bootloader`
+    * The bootloader in use on the keyboard. Required if `development_board` is not specified.
+* `development_board`
+    * The microcontroller development board, if applicable.
+    * Example: `"promicro"`
+* `pin_compatible`
+    * The form factor of the development board, if applicable. Must be one of `elite_c`, `promicro`.
+* `processor`
+    * The microcontroller in use on the keyboard. Required if `development_board` is not specified.
+
+## Firmware Configuration :id=firmware-configuration
+
+* `build`
+    * `debounce_type`
+        * The debounce algorithm to use. Must be one of `asym_eager_defer_pk`, `custom`, `sym_defer_g`, `sym_defer_pk`, `sym_defer_pr`, `sym_eager_pk`, `sym_eager_pr`.
+    * `firmware_format`
+        * The format of the final output binary. Must be one of `bin`, `hex`, `uf2`.
+    * `lto`
+        * Enable Link-Time Optimization.
+        * Default: `false`
+* `features`
+    * A dictionary of features to enable or disable.
+    * Example:
+    ```json
+    {
+        "rgb_matrix": true,
+        "rgblight": false
     }
-}
-```
+    ```
+* `qmk`
+    * `tap_capslock_delay`
+        * The delay between keydown and keyup for Caps Lock tap events in milliseconds.
+        * Default: `80` (80 ms)
+    * `tap_keycode_delay`
+        * The delay between keydown and keyup for tap events in milliseconds.
+        * Default: `0` (no delay)
+* `tapping`
+    * `hold_on_other_key_press`
+        * Default: `false`
+    * `hold_on_other_key_press_per_key`
+        * Default: `false`
+    * `permissive_hold`
+        * Default: `false`
+    * `permissive_hold_per_key`
+        * Default: `false`
+    * `retro`
+        * Default: `false`
+    * `retro_per_key`
+        * Default: `false`
+    * `term`
+        * Default: `200` (200 ms)
+    * `term_per_key`
+        * Default: `false`
+    * `toggle`
+        * Default: `5`
+
+## APA102 :id=apa102
+
+Configures the APA102 driver.
+
+* `apa102`
+    * `clock_pin` (Required)
+        * The GPIO pin connected to `CI` on the first LED in the chain.
+    * `data_pin` (Required)
+        * The GPIO pin connected to `DI` on the first LED in the chain.
+    * `default_brightness`
+        * The initial global brightness level (independent of the RGB data), from 0 to 31.
+        * Default: `31`
+
+## Audio :id=audio
+
+Configures the [Audio](feature_audio.md) feature.
+
+* `audio`
+    * `macro_beep`
+        * Play a short beep for `\a` (ASCII `BEL`) characters in Send String macros.
+        * Default: `false`
+    * `pins` (Required)
+        * The GPIO pin(s) connected to the speaker(s).
+    * `voices`
+        * Use multiple audio voices.
+        * Default: `false`
+
+## Backlight :id=backlight
+
+Configures the [Backlight](feature_backlight.md) feature.
+
+* `backlight`
+    * `as_caps_lock`
+        * Use the backlight as a Caps Lock indicator.
+        * Default: `false`
+    * `breathing`
+        * Whether backlight breathing is enabled.
+        * Default: `false`
+    * `breathing_period`
+        * The length of one backlight breathing cycle in seconds.
+        * Default: `6` (6 seconds)
+    * `driver`
+        * The driver to use. Must be one of `custom`, `pwm`, `software`, `timer`.
+        * Default: `"pwm"`
+    * `levels`
+        * The number of brightness levels (excluding off), from 1 to 31.
+        * Default: `3`
+    * `max_brightness`
+        * The maximum PWM value which brightness is scaled to, from 0 to 255.
+        * Default: `255`
+    * `on_state`
+        * The logical GPIO state required to turn the LEDs on.
+        * Default: `1` (on = high)
+    * `pin`
+        * The GPIO pin connected to the backlight circuit.
+    * `pins`
+        * A list of GPIO pins connected to the backlight LEDs (`software` and `timer` drivers only).
+
+## Bluetooth :id=bluetooth
+
+Configures the [Bluetooth](feature_bluetooth.md) feature.
+
+* `bluetooth`
+    * `driver`
+        * The driver to use. Must be one of `custom`, `bluefruit_le`, `rn42`.
+
+## Bootmagic :id=bootmagic
+
+Configures the [Bootmagic](feature_bootmagic.md) feature.
+
+* `bootmagic`
+    * `enabled`
+        * Enables the Bootmagic feature.
+        * Default: `false`
+    * `matrix`
+        * The matrix position of the key to check during startup. This should generally be set to the (physically) top left key.
+        * Default: `[0, 0]`
+
+## Caps Word :id=caps-word
+
+Configures the [Caps Word](feature_caps_word.md) feature.
+
+* `caps_word`
+    * `both_shifts_turns_on`
+        * Activate Caps Word by pressing both Shift keys.
+        * Default: `false`
+    * `double_tap_shift_turns_on`
+        * Activate Caps Word by pressing Left Shift twice.
+        * Default: `false`
+    * `enabled`
+        * Enables the Caps Word feature.
+        * Default: `false`
+    * `idle_timeout`
+        * The amount of time before Caps Word automatically deactivates in milliseconds.
+        * Default: `5000` (5 seconds)
+    * `invert_on_shift`
+        * Invert shift state instead of deactivating Caps Word when Shift is pressed.
+        * Default: `false`
+
+## Combo :id=combo
+
+Configures the [Combo](feature_combo.md) feature.
+
+* `combo`
+    * `term`
+        * The amount of time to recognize a combo in milliseconds.
+        * Default: `50` (50 ms)
+
+## EEPROM :id=eeprom
+
+Configures the [EEPROM](eeprom_driver.md) driver.
+
+* `eeprom`
+    * `driver`
+        * The EEPROM backend to use. Must be one of `custom`, `i2c`, `legacy_stm32_flash`, `spi`, `transient`, `vendor`, `wear_leveling`.
+        * Default: `"vendor"`
+
+## Encoder :id=encoder
+
+Configures the [Encoder](feature_encoders.md) feature.
+
+* `encoder`
+    * `rotary`
+        * A list of encoder objects.
+            * `pin_a` (Required)
+                * The GPIO pin connected to the encoder's `A` pin.
+            * `pin_b` (Required)
+                * The GPIO pin connected to the encoder's `B` pin.
+            * `resolution`
+                * The number of edge transitions on both pins required to register an input.
+                * Default: `4`
+
+## Indicators :id=indicators
+
+Configures the [LED Indicators](feature_led_indicators.md) feature.
+
+* `indicators`
+    * `caps_lock`
+        * The GPIO pin connected to the Caps Lock LED.
+    * `compose`
+        * The GPIO pin connected to the Compose LED.
+    * `kana`
+        * The GPIO pin connected to the Kana LED.
+    * `num_lock`
+        * The GPIO pin connected to the Num Lock LED.
+    * `on_state`
+        * The logical GPIO state required to turn the LEDs on.
+        * Default: `1` (on = high)
+    * `scroll_lock`
+        * The GPIO pin connected to the Scroll Lock LED.
+
+## Layouts :id=layouts
+
+The `layouts` portion of the dictionary contains several nested dictionaries. The outer layer consists of QMK layout names, for example `LAYOUT_60_ansi` or `LAYOUT_60_iso`.
 
-### Additional Options
+Each key dictionary in a layout describes the physical properties of a key. If you are familiar with the Raw Data format for [Keyboard Layout Editor](https://keyboard-layout-editor.com), you will find many of the concepts the same. Key names and layout choices are reused wherever possible, but unlike KLE each key is stateless, inheriting no properties from the keys that came before it.
 
-* `input_pressed_state`
-    * This configures state of the GPIO pins when the key is pressed - `1` for high, `0` for low
-    * Default: `0`
-
-Example:
-
-```json
-    "matrix_pins": {
-        "input_pressed_state": 1,
-},
-```
-
-## Non-RGB LED Lighting
-
-This section controls basic 2-pin LEDs, which typically pass through keyswitches and are soldered into the PCB, or are placed in PCB sockets.
-### Backlight
+All key positions and rotations are specified in relation to the top-left corner of the keyboard, and the top-left corner of each key.
 
-Enable by setting
+The ISO enter key is represented by a 1.25u×2uh key. Renderers which utilize info.json layout data (such as `qmk info -l` and the QMK Configurator) should display this key as expected.
 
-```json
-    "features": {
-        "backlight": true
-    }
-```
-
-* `breathing`
-    * Enable backlight breathing, if supported
-* `breathing_period`
-    * The length of one backlight “breath” in seconds
-* `levels`
-    * The number of brightness levels (maximum 31, excluding off)
-* `max_brightness`
-    * The maximum duty cycle of the backlight LED(s) (0-255)
-* `pin`
-    * The pin that controls the backlight LED(s)
-* `pins`
-    * Array of pins that controls the backlight LED(s) (See [Multiple Backlight Pins](feature_backlight.md#multiple-backlight-pins))
-* `on_state`
-    * The state of the indicator pins when the LED is "on" - `1` for high, `0` for low
-    * Default: `1`
-
-Example:
-
-```json
-{
-    "backlight": {
-        "breathing": true,
-        "breathing_period": 5,
-        "levels": 15,
-        "pin": "B7"
-    }
-}
-```
-
-### LED Indicators
-
-Used for indicating Num Lock, Caps Lock, and Scroll Lock. May be soldered in-switch or in a dedicated area.
-
-* `num_lock`
-    * The pin that controls the `Num Lock` LED
-* `caps_lock`
-    * The pin that controls the `Caps Lock` LED
-* `scroll_lock`
-    * The pin that controls the `Scroll Lock` LED
-* `compose`
-    * The pin that controls the `Compose` LED
-* `kana`
-    * The pin that controls the `Kana` LED
-* `on_state`
-    * The state of the indicator pins when the LED is "on" - `1` for high, `0` for low
-    * Default: `1`
-
-Example:
-
-```json
-{
-    "indicators": {
-        "num_lock": "B6",
-        "caps_lock": "D2",
-        "scroll_lock": "A3"
+* `community_layouts`
+    * A list of community layouts supported by the keyboard.
+    * Example: `["60_ansi", "60_iso"]`
+* `layout_aliases`
+    * A mapping of layout aliases to layout definitions.
+    * Example:
+    ```json
+    {
+        "LAYOUT_ansi": "LAYOUT_60_ansi",
+        "LAYOUT_iso": "LAYOUT_60_iso"
     }
-}
-
-```
-
-## RGB Lighting
-
-This section controls the legacy WS2812 support in QMK. This should not be confused with the RGB Matrix feature, which can be used to control both WS2812 and ISSI RGB LEDs.
-
-The following items can be set. Not every value is required.
-
-* `led_count`
-    * The number of LEDs in your strip
-* `pin`
-    * The GPIO pin that your LED strip is connected to
-* `animations`
-    * A dictionary that lists enabled and disabled animations. See [RGB Light Animations](#rgb_light_animations) below.
-* `sleep`
-    * Set to `true` to enable lighting during host sleep
-* `split`
-    * Set to `true` to enable synchronization functionality between split halves
-* `split_count`
-    * For split keyboards, the number of LEDs on each side
-    * Example `[ 10 , 10 ]`
-* `max_brightness`
-    * What the maximum brightness (value) level is (0-255)
-* `hue_steps`
-    * How many steps of adjustment to have for hue
-* `saturation_steps`
-    * How many steps of adjustment to have for saturation
-* `brightness_steps`
-    * How many steps of adjustment to have for brightness (value)
-
-Example:
-
-```json
-{
-    "rgblight": {
-        "led_count": 4,
-        "pin": "F6",
-        "hue_steps": 10,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
-        "animations": {
-            "knight": true,
-            "rainbow_swirl": true
+    ```
+* `layouts`
+    * A dictionary of layouts supported by the keyboard.
+    * `LAYOUT_<layout_name>`
+        * `layout`
+            * A list of key dictionaries comprising the layout. Each key dictionary contains:
+                * `matrix` (Required)
+                    * The matrix position for the key.
+                    * Example: `[0, 4]` (row 0, column 4)
+                * `x` (Required)
+                    * The absolute position of the key in the horizontal axis, in key units.
+                * `y` (Required)
+                    * The absolute position of the key in the vertical axis, in key units.
+                * `h`
+                    * The height of the key, in key units.
+                    * Default: `1` (1u)
+                * `label`
+                    * What to name the key. This is *not* a key assignment as in the keymap, but should usually correspond to the keycode for the first layer of the default keymap.
+                    * Example: `"Escape"`
+                * `r`
+                    * The rotation angle in degrees. Currently not implemented.
+                * `rx`
+                    * The absolute X position of the rotation axis. Currently not implemented.
+                * `ry`
+                    * The absolute Y position of the rotation axis. Currently not implemented.
+                * `w`
+                    * The width of the key, in key units.
+                    * Default: `1` (1u)
+                * Example: `{"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}`
+
+## Leader Key :id=leader-key
+
+Configures the [Leader Key](feature_leader_key.md) feature.
+
+* `leader_key`
+    * `timing`
+        * Reset the `timeout` on each keypress.
+        * Default: `false`
+    * `strict_processing`
+        * Do not extract the tap keycodes from Layer-Tap and Mod-Tap key events.
+        * Default: `false`
+    * `timeout`
+        * The amount of time to complete a leader sequence in milliseconds.
+        * Default: `300` (300 ms)
+
+## LED Matrix :id=led-matrix
+
+Configures the [LED Matrix](feature_led_matrix.md) feature.
+
+* `led_matrix`
+    * `animations`
+        * A dictionary of effects to enable or disable. Effects which are absent default to `false`.
+        * Example:
+        ```json
+        {
+            "alpha_mods": true,
+            "breathing": true,
+            "cycle_left_right": false
         }
-    }
-}
-```
-
-### RGBLight Animations
-
-The following animations can be enabled:
-
-|Key              |Description                           |
-|-----------------|--------------------------------------|
-|`alternating`    |Enable alternating animation mode.    |
-|`breathing`      |Enable breathing animation mode.      |
-|`christmas`      |Enable christmas animation mode.      |
-|`knight`         |Enable knight animation mode.         |
-|`rainbow_mood`   |Enable rainbow mood animation mode.   |
-|`rainbow_swirl`  |Enable rainbow swirl animation mode.  |
-|`rgb_test`       |Enable RGB test animation mode.       |
-|`snake`          |Enable snake animation mode.          |
-|`static_gradient`|Enable static gradient mode.          |
-|`twinkle`        |Enable twinkle animation mode.        |
-
-## USB
-
-Every USB keyboard needs to have its USB parameters defined. At a minimum you need to set the Vendor ID, Product ID, and device version.
-
-Example:
-
-```json
-{
-    "usb": {
-        "vid": "0xC1ED",
-        "pid": "0x23B0",
-        "device_version": "1.0.0"
-    }
-}
-```
-
-The device version is a BCD (binary coded decimal) value, in the format `MMmr`, so the below value would look like `0x0100` in the generated code. This also means the maximum valid values for each part are `99.9.9`, despite it being a hexadecimal value under the hood.
-
-## Encoders
+        ```
+    * `center_point`
+        * The centroid (geometric center) of the LEDs. Used for certain effects.
+        * Default: `[112, 32]`
+    * `driver` (Required)
+        * The driver to use. Must be one of `ckled2001`, `custom`, `is31fl3731`, `is31fl3742a`, `is31fl3743a`, `is31fl3745`, `is31fl3746a`.
+    * `layout` (Required)
+        * List of LED configuration dictionaries. Each dictionary contains:
+            * `flags` (Required)
+                * A bitfield of flags describing the type of LED.
+            * `x` (Required)
+                * The position of the LED in the horizontal axis, from 0 to 224.
+            * `y` (Required)
+                * The position of the LED in the vertical axis, from 0 to 64.
+            * `matrix`
+                * The key matrix position associated with the LED.
+                * Example: `[0, 2]`
+            * Example: `{"matrix": [2, 1], "x": 20, "y": 48, "flags": 2}`
+    * `max_brightness`
+        * The maximum value which brightness is scaled to, from 0 to 255.
+        * Default: `255`
+    * `speed_steps`
+        * The number of speed adjustment steps.
+        * Default: `16`
+    * `split_count`
+        * For split keyboards, the number of LEDs on each half.
+        * Example: `[16, 16]`
+    * `timeout`
+        * The LED activity timeout in milliseconds.
+        * Default: `0` (no timeout)
+    * `val_steps`
+        * The number of brightness adjustment steps.
+        * Default: `8`
+
+## Matrix :id=matrix
 
-This section controls the basic [rotary encoder](feature_encoders.md) support.
-
-Enable by setting
-
-```json
-    "features": {
-        "encoder": true
-    }
-```
-
-The following items can be set. Not every value is required.
-
-* `pin_a`
-  * __Required__. A pad definition
-* `pin_b`
-  * __Required__. B pad definition
-* `resolution`
-  * How many pulses the encoder registers between each detent
-
-Examples:
-
-```json
-{
-    "encoder": {
-        "rotary": [
-            { "pin_a": "B5", "pin_b": "A2" }
-        ]
-    }
-}
-```
-
-```json
-{
-    "encoder": {
-        "rotary": [
-            { "pin_a": "B5", "pin_b": "A2", "resolution": 4 }
-            { "pin_a": "B6", "pin_b": "A3", "resolution": 2 }
+* `debounce`
+    * The debounce time in milliseconds.
+    * Default: `5` (5 ms)
+* `diode_direction`
+    * Which way the diodes are "pointing". Unused for `matrix_pins.direct`. Must be one of `COL2ROW`, `ROW2COL`.
+* `matrix_pins`
+    * `cols`
+        * A list of GPIO pins connected to the matrix columns.
+        * Example: `["A0", "A1", "A2"]`
+    * `custom`
+        * Whether to use a custom matrix scanning implementation.
+        * Default: `false`
+    * `custom_lite`
+        * Whether to use a "lite" custom matrix scanning implementation.
+        * Default: `false`
+    * `direct`
+        * A 2-dimensional list of GPIO pins connected to each keyswitch, forming the "matrix" rows and columns.
+        * Example:
+        ```json
+        [
+            ["A0", "A1", "A2"],
+            ["B0", "B1", "B2"],
+            ["C0", "C1", "C2"]
         ]
-    }
-}
-```
-
-## Secure
-
-The following options can be configured:
-
-|Key               |Description                                                                      |
-|------------------|---------------------------------------------------------------------------------|
-|`unlock_sequence` | Timeout for the user to perform the configured unlock sequence - `0` to disable |
-|`unlock_timeout`  | Timeout while unlocked before returning to locked - `0` to disable              |
-|`idle_timeout`    | Array of matrix locations describing a sequential sequence of keypresses        |
-
-Example:
-
-```json
-{
-    "secure": {
-        "unlock_sequence": [ [0,0], [0,1] ],
-        "unlock_timeout": 5000,
-        "idle_timeout": 60000
-    }
-}
-```
-
-## Bootmagic
-
-This section configures [Bootmagic Lite](feature_bootmagic.md) support.
+        ```
+    * `ghost`
+        * Whether the matrix has no anti-ghosting diodes.
+        * Default: `false`
+    * `input_pressed_state`
+        * The logical GPIO state of the input pins when a key is pressed.
+        * Default: `0` (pressed = low)
+    * `io_delay`
+        * The amount of time to wait between row/col selection and col/row pin reading, in microseconds.
+        * Default: `30` (30 µs)
+    * `rows`
+        * A list of GPIO pins connected to the matrix rows.
+        * Example: `["B0", "B1", "B2"]`
+
+## Mouse Keys :id=mouse-keys
+
+Configures the [Mouse Keys](feature_mouse_keys.md) feature.
+
+* `mouse_key`
+    * `delay`
+    * `enabled`
+        * Enables the Mouse Keys feature.
+        * Default: `false`
+    * `interval`
+    * `max_speed`
+    * `time_to_max`
+    * `wheel_delay`
+
+## One Shot :id=one-shot
+
+Configures [One Shot keys](one_shot_keys.md).
+
+* `oneshot`
+    * `tap_toggle`
+        * The number of times to tap the key in order to hold it.
+    * `timeout`
+        * The amount of time before the key is released in milliseconds.
+
+## PS/2 :id=ps2
+
+Configures the [PS/2](feature_ps2_mouse.md) feature.
+
+* `ps2`
+    * `clock_pin`
+        * The GPIO pin connected to `CLK` on the PS/2 device.
+    * `data_pin`
+        * The GPIO pin connected to `DATA` on the PS/2 device.
+    * `driver`
+        * The PS/2 driver to use. Must be one of `busywait`, `interrupt`, `usart`, `vendor`.
+        * Default: `"busywait"`
+    * `enabled`
+        * Enable the PS/2 feature.
+        * Default: `false`
+    * `mouse_enabled`
+        * Enable the PS/2 mouse handling.
+        * Default: `false`
+
+## QMK LUFA Bootloader :id=qmk-lufa-bootloader
+
+* `qmk_lufa_bootloader`
+    * `esc_input` (Required)
+        * The GPIO pin connected to the designated "exit bootloader" key's row (if `COL2ROW`).
+    * `esc_output` (Required)
+        * The GPIO pin connected to the designated "exit bootloader" key's column (if `COL2ROW`).
+    * `led`
+        * The GPIO pin connected to an LED to flash.
+    * `speaker`
+        * The GPIO pin connected to a speaker to click (can also be used for a second LED).
+
+## RGBLight :id=rgblight
+
+Configures the [RGB Lighting](feature_rgblight.md) feature.
 
-The following options can be configured:
-
-|Key      |Description                                                                  |
-|---------|-----------------------------------------------------------------------------|
-|`matrix` | A two item list describing the row and column location for the trigger key. |
+* `rgblight`
+    * `led_count` (Required)
+        * The number of LEDs in the chain.
+    * `animations`
+        * A dictionary of effects to enable or disable. Effects which are absent default to `false`.
+        * Example:
+        ```json
+        {
+            "breathing": true,
+            "rainbow_mood": true,
+            "snake": false
+        }
+        ```
+    * `brightness_steps`
+        * The number of brightness adjustment steps.
+        * Default: `17`
+    * `driver`
+        * The driver to use. Must be one of `apa102`, `custom`, `ws2812`.
+        * Default: `"ws2812"`
+    * `hue_steps`
+        * The number of hue adjustment steps.
+        * Default: `8`
+    * `layers`
+        * `blink`
+            * Enable layer blinking API.
+            * Default: `false`
+        * `enabled`
+            * Enable RGB Lighting Layers.
+            * Default: `false`
+        * `max`
+            * The maximum layer count, from 1 to 32.
+            * Default: `8`
+    * `led_map`
+        * Remap LED indices.
+        * Example: `[4, 3, 2, 1, 0]`
+    * `max_brightness`
+        * The maximum value which the HSV "V" component is scaled to, from 0 to 255.
+        * Default: `255`
+    * `rgbw`
+        * Enable RGBW LEDs.
+        * Default: `false`
+    * `saturation_steps`
+        * The number of saturation adjustment steps.
+        * Default: `17`
+    * `sleep`
+        * Turn off the LEDs when the host goes to sleep.
+        * Default: `false`
+    * `split`
+        * Enable synchronization between split halves.
+        * Default: `false`
+    * `split_count`
+        * When `rgblight.split` is enabled, the number of LEDs on each half.
+        * Example: `[10, 10]`
+
+## RGB Matrix :id=rgb-matrix
+
+Configures the [RGB Matrix](feature_rgb_matrix.md) feature.
+
+* `rgb_matrix`
+    * `animations`
+        * A dictionary of effects to enable or disable. Effects which are absent default to `false`.
+        * Example:
+        ```json
+        {
+            "alpha_mods": true,
+            "breathing": true,
+            "cycle_left_right": false
+        }
+        ```
+    * `center_point`
+        * The centroid (geometric center) of the LEDs. Used for certain effects.
+        * Default: `[112, 32]`
+    * `driver` (Required)
+        * The driver to use. Must be one of `aw20216`, `ckled2001`, `custom`, `is31fl3731`, `is31fl3733`, `is31fl3736`, `is31fl3737`, `is31fl3741`, `is31fl3742a`, `is31fl3743a`, `is31fl3745`, `is31fl3746a`, `ws2812`.
+    * `hue_steps`
+        * The number of hue adjustment steps.
+        * Default: `8`
+    * `layout` (Required)
+        * List of LED configuration dictionaries. Each dictionary contains:
+            * `flags` (Required)
+                * A bitfield of flags describing the type of LED.
+            * `x` (Required)
+                * The position of the LED in the horizontal axis, from 0 to 224.
+            * `y` (Required)
+                * The position of the LED in the vertical axis, from 0 to 64.
+            * `matrix`
+                * The key matrix position associated with the LED.
+                * Example: `[0, 2]`
+            * Example: `{"matrix": [2, 1], "x": 20, "y": 48, "flags": 2}`
+    * `max_brightness`
+        * The maximum value which the HSV "V" component is scaled to, from 0 to 255.
+        * Default: `255`
+    * `sat_steps`
+        * The number of saturation adjustment steps.
+        * Default: `16`
+    * `speed_steps`
+        * The number of speed adjustment steps.
+        * Default: `16`
+    * `split_count`
+        * For split keyboards, the number of LEDs on each half.
+        * Example: `[16, 16]`
+    * `timeout`
+        * The LED activity timeout in milliseconds.
+        * Default: `0` (no timeout)
+    * `val_steps`
+        * The number of brightness adjustment steps.
+        * Default: `16`
+
+## Secure :id=secure
+
+Configures the [Secure](feature_secure.md) feature.
+
+* `secure`
+    * `enabled`
+        * Enable the Secure feature.
+        * Default: `false`
+    * `idle_timeout`
+        * Timeout while unlocked before returning to the locked state. Set to `0` to disable.
+        * Default: `60000` (1 minute)
+    * `unlock_sequence`
+        * A list of up to five matrix locations comprising the "unlock sequence".
+        * Example: `[[0, 0], [0, 1], [4, 3]]`
+    * `unlock_timeout`
+        * Timeout for the user to perform the unlock sequence. Set to `0` to disable.
+        * Default: `5000` (5 seconds)
+
+## Split Keyboard :id=split-keyboard
+
+Configures the [Split Keyboard](feature_split_keyboard.md) feature.
 
-Example:
+* `split`
+    * `bootmagic`
+        * `matrix`
+            * See [Bootmagic](#bootmagic) config.
+    * `enabled`
+        * Enable the Split Keyboard feature.
+        * Default: `false`
+    * `encoder`
+        * `right`
+            * `rotary`
+                * See [Encoder](#encoder) config.
+    * `matrix_pins`
+        * `right`
+            * See [Matrix](#matrix) config.
+    * `soft_serial_pin`
+        * The GPIO pin to use (`serial` transport protocol only).
+    * `soft_serial_speed`
+        * The protocol speed, from `0` to `5` (`serial` transport protocol only).
+        * Default: `1`
+    * `transport`
+        * `protocol`
+            * The split transport protocol to use. Must be one of `custom`, `i2c`, `serial`, `serial_usart`.
+        * `sync_matrix_state`
+            * Mirror the main/primary half's matrix state to the secondary half.
+            * Default: `false`
+        * `sync_modifiers`
+            * Mirror the modifier state to the secondary half.
+            * Default: `false`
+        * `watchdog`
+            * Reboot the secondary half if it loses connection.
+            * Default: `false`
+        * `watchdog_timeout`
+            * The amount of time to wait for communication from the primary half in milliseconds.
+    * `usb_detect`
+        * `enabled`
+            * Detect USB connection when determining split half roles.
+        * `polling_interval`
+            * The polling frequency in milliseconds.
+            * Default: `10` (10 ms)
+        * `timeout`
+            * The amount of time to wait for a USB connection in milliseconds.
+            * Default: `2000` (2 seconds)
+
+## Stenography :id=stenography
+
+Configures the [Stenography](feature_stenography.md) feature.
+
+* `stenography`
+    * `enabled`
+        * Enable the Stenography feature.
+        * Default: `false`
+    * `protocol`
+        * The Steno protocol to use. Must be one of `all`, `geminipr`, `txbolt`.
+        * Default: `"all"`
+
+## USB :id=usb
 
-```json
-{
-    "bootmagic": {
-        "enabled": true,
-        "matrix": [0, 0]
-    },
-}
-```
+* `usb`
+    * `device_version` (Required)
+        * A BCD version number in the format `MM.m.r` (up to `99.9.9`).
+        * Example: `"1.0.0"`
+    * `pid` (Required)
+        * The USB product ID as a four-digit hexadecimal number.
+        * Example: `"0x23B0"`
+    * `vid` (Required)
+        * The USB vendor ID as a four-digit hexadecimal number.
+        * Example: `"0xC1ED"`
+    * `force_nkro`
+        * Force NKRO to be active.
+        * Default: `false`
+    * `max_power`
+        * The maximum current draw the host should expect from the device. This does not control the actual current usage.
+        * Default: `500` (500 mA)
+    * `no_startup_check`
+        * Disable USB suspend check after keyboard startup.
+        * Default: `false`
+    * `polling_interval`
+        * The frequency at which the host should poll the keyboard for reports.
+        * Default: `1` (1 ms/1000 Hz)
+    * `shared_endpoint`
+        * `keyboard`
+            * Send keyboard reports through the "shared" USB endpoint.
+            * Default: `false`
+        * `mouse`
+            * Send mouse reports through the "shared" USB endpoint.
+            * Default: `true`
+    * `suspend_wakeup_delay`
+        * The amount of time to wait after sending a wakeup packet, in milliseconds.
+        * Default: `0` (disabled)
+    * `wait_for`
+        * Force the keyboard to wait for USB enumeration before starting up.
+        * Default: `false`
+
+## WS2812 :id=ws2812
+
+Configures the [WS2812](ws2812_driver.md) driver.
+
+* `ws2812`
+    * `driver`
+        * The driver to use. Must be one of `bitbang`, `custom`, `i2c`, `pwm`, `spi`, `vendor`.
+        * Default: `"bitbang"`
+    * `pin` (Required)
+        * The GPIO pin connected to `DI` on the first LED in the chain (`bitbang`, `pwm`, `spi` and `vendor` drivers only).
+    * `i2c_address`
+        * The I²C address of the WS2812 controller (`i2c` driver only).
+        * Default: `"0xB0"`
+    * `i2c_timeout`
+        * The I²C timeout in milliseconds (`i2c` driver only).
+        * Default: `100` (100 ms)
diff --git a/docs/serial_driver.md b/docs/serial_driver.md
index c4b42f38ddd2..b7e803154b3c 100644
--- a/docs/serial_driver.md
+++ b/docs/serial_driver.md
@@ -235,7 +235,7 @@ Where 'n' matches the peripheral number of your selected USART on the MCU.
 
 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.
 
-Configure the hardware via your config.h:
+You may optionally switch the PIO peripheral used 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/spi_driver.md b/docs/spi_driver.md
index a27a3a13d084..c1c6831e7379 100644
--- a/docs/spi_driver.md
+++ b/docs/spi_driver.md
@@ -1,8 +1,8 @@
-# SPI Master Driver
+# SPI Master Driver :id=spi-master-driver
 
 The SPI Master drivers used in QMK have a set of common functions to allow portability between MCUs.
 
-## AVR Configuration
+## AVR Configuration :id=avr-configuration
 
 No special setup is required - just connect the `SS`, `SCK`, `MOSI` and `MISO` pins of your SPI devices to the matching pins on the MCU:
 
@@ -16,7 +16,7 @@ No special setup is required - just connect the `SS`, `SCK`, `MOSI` and `MISO` p
 You may use more than one slave select pin, not just the `SS` pin. This is useful when you have multiple devices connected and need to communicate with them individually.
 `SPI_SS_PIN` can be passed to `spi_start()` to refer to `SS`.
 
-## ChibiOS/ARM Configuration
+## ChibiOS/ARM Configuration :id=arm-configuration
 
 You'll need to determine which pins can be used for SPI -- as an example, STM32 parts generally have multiple SPI peripherals, labeled SPI1, SPI2, SPI3 etc.
 
@@ -49,19 +49,19 @@ Configuration-wise, you'll need to set up the peripheral as per your MCU's datas
 
 As per the AVR configuration, you may choose any other standard GPIO as a slave select pin, which should be supplied to `spi_start()`.
 
-## Functions
+## API :id=api
 
-### `void spi_init(void)`
+### `void spi_init(void)` :id=api-spi-init
 
 Initialize the SPI driver. This function must be called only once, before any of the below functions can be called.
 
 ---
 
-### `bool spi_start(pin_t slavePin, bool lsbFirst, uint8_t mode, uint16_t divisor)`
+### `bool spi_start(pin_t slavePin, bool lsbFirst, uint8_t mode, uint16_t divisor)` :id=api-spi-start
 
 Start an SPI transaction.
 
-#### Arguments
+#### Arguments :id=api-spi-start-arguments
 
  - `pin_t slavePin`  
    The QMK pin to assert as the slave select pin, eg. `B4`.
@@ -80,71 +80,71 @@ Start an SPI transaction.
  - `uint16_t divisor`  
    The SPI clock divisor, will be rounded up to the nearest power of two. This number can be calculated by dividing the MCU's clock speed by the desired SPI clock speed. For example, an MCU running at 8 MHz wanting to talk to an SPI device at 4 MHz would set the divisor to `2`.
 
-#### Return Value
+#### Return Value :id=api-spi-start-return
 
 `false` if the supplied parameters are invalid or the SPI peripheral is already in use, or `true`.
 
 ---
 
-### `spi_status_t spi_write(uint8_t data)`
+### `spi_status_t spi_write(uint8_t data)` :id=api-spi-write
 
 Write a byte to the selected SPI device.
 
-#### Arguments
+#### Arguments :id=api-spi-write-arguments
 
  - `uint8_t data`  
    The byte to write.
 
-#### Return Value
+#### Return Value :id=api-spi-write-return
 
 `SPI_STATUS_TIMEOUT` if the timeout period elapses, or `SPI_STATUS_SUCCESS`.
 
 ---
 
-### `spi_status_t spi_read(void)`
+### `spi_status_t spi_read(void)` :id=api-spi-read
 
 Read a byte from the selected SPI device.
 
-#### Return Value
+#### Return Value :id=api-spi-read-return
 
 `SPI_STATUS_TIMEOUT` if the timeout period elapses, or the byte read from the device.
 
 ---
 
-### `spi_status_t spi_transmit(const uint8_t *data, uint16_t length)`
+### `spi_status_t spi_transmit(const uint8_t *data, uint16_t length)` :id=api-spi-transmit
 
 Send multiple bytes to the selected SPI device.
 
-#### Arguments
+#### Arguments :id=api-spi-transmit-arguments
 
  - `const uint8_t *data`  
    A pointer to the data to write from.
  - `uint16_t length`  
    The number of bytes to write. Take care not to overrun the length of `data`.
 
-#### Return Value
+#### Return Value :id=api-spi-transmit-return
 
 `SPI_STATUS_TIMEOUT` if the timeout period elapses, `SPI_STATUS_ERROR` if some other error occurs, otherwise `SPI_STATUS_SUCCESS`.
 
 ---
 
-### `spi_status_t spi_receive(uint8_t *data, uint16_t length)`
+### `spi_status_t spi_receive(uint8_t *data, uint16_t length)` :id=api-spi-receive
 
 Receive multiple bytes from the selected SPI device.
 
-#### Arguments
+#### Arguments :id=api-spi-receive-arguments
 
  - `uint8_t *data`  
    A pointer to the buffer to read into.
  - `uint16_t length`  
    The number of bytes to read. Take care not to overrun the length of `data`.
 
-#### Return Value
+#### Return Value :id=api-spi-receive-return
 
 `SPI_STATUS_TIMEOUT` if the timeout period elapses, `SPI_STATUS_ERROR` if some other error occurs, otherwise `SPI_STATUS_SUCCESS`.
 
 ---
 
-### `void spi_stop(void)`
+### `void spi_stop(void)` :id=api-spi-stop
 
 End the current SPI transaction. This will deassert the slave select pin and reset the endianness, mode and divisor configured by `spi_start()`.
diff --git a/docs/squeezing_avr.md b/docs/squeezing_avr.md
index 241b3e7826be..b437901bdb12 100644
--- a/docs/squeezing_avr.md
+++ b/docs/squeezing_avr.md
@@ -27,8 +27,7 @@ SPACE_CADET_ENABLE = no
 GRAVE_ESC_ENABLE = no 
 MAGIC_ENABLE = no
 ```
-These features are enabled by default, but may not be needed. Double check to make sure, though. 
-Largest in size is "magic" -- the QMK magic keycodes -- which control things like NKRO toggling, GUI and ALT/CTRL swapping, etc. Disabling it will disable those functions.
+These features are enabled by default, but they may not be needed. Double check to make sure. The [Magic Keycodes](keycodes_magic.md) are the largest and control things like NKRO toggling, GUI and ALT/CTRL swapping, etc. Disabling them will disable those functions. See [Magic Functions](#magic-functions) for disabling related functions.
 
 If you use `sprintf` or `snprintf` functions you can save around ~400 Bytes by enabling this option.
 ```make
@@ -88,7 +87,7 @@ Or if you're not using layers at all, you can outright remove the functionality
 #define NO_ACTION_LAYER
 ```
 
-## Magic keycodes
+## Magic Functions
 
 There are two `__attribute__ ((weak))` placeholder functions available to customize magic keycodes. If you are not using that feature to swap keycodes, such as backslash with backspace, add the following to your `keymap.c` or user space code:
 ```c
diff --git a/docs/tap_hold.md b/docs/tap_hold.md
index c50acdb84d86..094a10753a1a 100644
--- a/docs/tap_hold.md
+++ b/docs/tap_hold.md
@@ -460,6 +460,31 @@ bool get_retro_tapping(uint16_t keycode, keyrecord_t *record) {
 }
 ```
 
+If the programs you use bind an action to taps of modifier keys (e.g. tapping left GUI to bring up the applications menu or tapping left Alt to focus the menu bar), you may find that using retro-tapping falsely triggers those actions. To counteract this, you can define a `DUMMY_MOD_NEUTRALIZER_KEYCODE` in `config.h` that will get sent in between the register and unregister events of a held mod-tap key. That way, the programs on your computer will no longer interpret the mod suppression induced by retro-tapping as a lone tap of a modifier key and will thus not falsely trigger the undesired action.
+
+Naturally, for this technique to be effective, you must choose a `DUMMY_MOD_NEUTRALIZER_KEYCODE` for which no keyboard shortcuts are bound to. Recommended values are: `KC_RIGHT_CTRL` or `KC_F18`. 
+Please note that `DUMMY_MOD_NEUTRALIZER_KEYCODE` must be a basic, unmodified, HID keycode so values like `KC_NO`, `KC_TRANSPARENT` or `KC_PIPE` aka `S(KC_BACKSLASH)` are not permitted.
+
+By default, only left Alt and left GUI are neutralized. If you want to change the list of applicable modifier masks, use the following in your `config.h`:
+
+```c
+#define MODS_TO_NEUTRALIZE { <mod_mask_1>, <mod_mask_2>, ... }
+```
+
+Examples:
+
+```c
+#define DUMMY_MOD_NEUTRALIZER_KEYCODE KC_RIGHT_CTRL
+
+// Neutralize left alt and left GUI (Default value)
+#define MODS_TO_NEUTRALIZE { MOD_BIT(KC_LEFT_ALT), MOD_BIT(KC_LEFT_GUI) }
+
+// Neutralize left alt, left GUI, right GUI and left Control+Shift
+#define MODS_TO_NEUTRALIZE { MOD_BIT(KC_LEFT_ALT), MOD_BIT(KC_LEFT_GUI), MOD_BIT(KC_RIGHT_GUI), MOD_BIT(KC_LEFT_CTRL)|MOD_BIT(KC_LEFT_SHIFT) }
+```
+
+!> Do not use `MOD_xxx` constants like `MOD_LSFT` or `MOD_RALT`, since they're 5-bit packed bit-arrays while `MODS_TO_NEUTRALIZE` expects a list of 8-bit packed bit-arrays. Use `MOD_BIT(<kc>)` or `MOD_MASK_xxx` instead.
+
 ### Retro Shift
 
 [Auto Shift,](feature_auto_shift.md) has its own version of `retro tapping` called `retro shift`. It is extremely similar to `retro tapping`, but holding the key past `AUTO_SHIFT_TIMEOUT` results in the value it sends being shifted. Other configurations also affect it differently; see [here](feature_auto_shift.md#retro-shift) for more information.
diff --git a/docs/uart_driver.md b/docs/uart_driver.md
index 340b64818920..a44f2c28d993 100644
--- a/docs/uart_driver.md
+++ b/docs/uart_driver.md
@@ -1,10 +1,10 @@
-# UART Driver
+# UART Driver :id=uart-driver
 
 The UART drivers used in QMK have a set of common functions to allow portability between MCUs.
 
 Currently, this driver does not support enabling hardware flow control (the `RTS` and `CTS` pins) if available, but may do so in future.
 
-## AVR Configuration
+## AVR Configuration :id=avr-configuration
 
 No special setup is required - just connect the `RX` and `TX` pins of your UART device to the opposite pins on the MCU:
 
@@ -16,7 +16,7 @@ No special setup is required - just connect the `RX` and `TX` pins of your UART
 |ATmega32A    |`D1`|`D0`|*n/a*|*n/a*|
 |ATmega328/P  |`D1`|`D0`|*n/a*|*n/a*|
 
-## ChibiOS/ARM Configuration
+## ChibiOS/ARM Configuration :id=arm-configuration
 
 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.
 
@@ -47,45 +47,45 @@ Configuration-wise, you'll need to set up the peripheral as per your MCU's datas
 |`#define SD1_RTS_PIN`     |The pin to use for RTS                                         |`A12`        |
 |`#define SD1_RTS_PAL_MODE`|The alternate function mode for RTS                            |`7`          |
 
-## Functions
+## API :id=api
 
-### `void uart_init(uint32_t baud)`
+### `void uart_init(uint32_t baud)` :id=api-uart-init
 
 Initialize the UART driver. This function must be called only once, before any of the below functions can be called.
 
-#### Arguments
+#### Arguments :id=api-uart-init-arguments
 
  - `uint32_t 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_write(uint8_t data)`
+### `void uart_write(uint8_t data)` :id=api-uart-write
 
 Transmit a single byte.
 
-#### Arguments
+#### Arguments :id=api-uart-write-arguments
 
  - `uint8_t data`  
    The byte to write.
 
 ---
 
-### `uint8_t uart_read(void)`
+### `uint8_t uart_read(void)` :id=api-uart-read
 
 Receive a single byte.
 
-#### Return Value
+#### Return Value :id=api-uart-read-return
 
 The byte read from the receive buffer. This function will block if the buffer is empty (ie. no data to read).
 
 ---
 
-### `void uart_transmit(const uint8_t *data, uint16_t length)`
+### `void uart_transmit(const uint8_t *data, uint16_t length)` :id=api-uart-transmit
 
 Transmit multiple bytes.
 
-#### Arguments
+#### Arguments :id=api-uart-transmit-arguments
 
  - `const uint8_t *data`  
    A pointer to the data to write from.
@@ -94,11 +94,11 @@ Transmit multiple bytes.
 
 ---
 
-### `void uart_receive(char *data, uint16_t length)`
+### `void uart_receive(char *data, uint16_t length)` :id=api-uart-receive
 
 Receive multiple bytes.
 
-#### Arguments
+#### Arguments :id=api-uart-receive-arguments
 
  - `uint8_t *data`  
    A pointer to the buffer to read into.
@@ -107,10 +107,10 @@ Receive multiple bytes.
 
 ---
 
-### `bool uart_available(void)`
+### `bool uart_available(void)` :id=api-uart-available
 
 Return whether the receive buffer contains data. Call this function to determine if `uart_read()` will return data immediately.
 
-#### Return Value
+#### Return Value :id=api-uart-available-return
 
 `true` if the receive buffer length is non-zero.
diff --git a/docs/ws2812_driver.md b/docs/ws2812_driver.md
index f8cad20ce0c0..9b79cfa905ef 100644
--- a/docs/ws2812_driver.md
+++ b/docs/ws2812_driver.md
@@ -170,7 +170,7 @@ To configure it, add this to your rules.mk:
 WS2812_DRIVER = vendor
 ```
 
-Configure the hardware via your config.h:
+You may optionally switch the PIO peripheral used with the following define in config.h:
 ```c
 #define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
 ```
diff --git a/quantum/backlight/backlight_software.c b/drivers/backlight/backlight_software.c
similarity index 98%
rename from quantum/backlight/backlight_software.c
rename to drivers/backlight/backlight_software.c
index 27ccbd2c9ff9..f2af3e918e55 100644
--- a/quantum/backlight/backlight_software.c
+++ b/drivers/backlight/backlight_software.c
@@ -1,6 +1,6 @@
-#include "quantum.h"
 #include "backlight.h"
 #include "backlight_driver_common.h"
+#include "util.h"
 
 #ifdef BACKLIGHT_BREATHING
 #    error "Backlight breathing is not available for software PWM. Please disable."
diff --git a/drivers/haptic/DRV2605L.c b/drivers/haptic/DRV2605L.c
deleted file mode 100644
index 5a1d2ca0afb3..000000000000
--- a/drivers/haptic/DRV2605L.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Copyright 2018 ishtob
- * Driver for DRV2605L written for 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 "DRV2605L.h"
-#include "print.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-
-uint8_t DRV2605L_transfer_buffer[2];
-uint8_t DRV2605L_read_register;
-
-void DRV_write(uint8_t drv_register, uint8_t settings) {
-    DRV2605L_transfer_buffer[0] = drv_register;
-    DRV2605L_transfer_buffer[1] = settings;
-    i2c_transmit(DRV2605L_BASE_ADDRESS << 1, DRV2605L_transfer_buffer, 2, 100);
-}
-
-uint8_t DRV_read(uint8_t regaddress) {
-    i2c_readReg(DRV2605L_BASE_ADDRESS << 1, regaddress, &DRV2605L_read_register, 1, 100);
-
-    return DRV2605L_read_register;
-}
-
-void DRV_init(void) {
-    i2c_init();
-    /* 0x07 sets DRV2605 into calibration mode */
-    DRV_write(DRV_MODE, 0x07);
-
-    //  DRV_write(DRV_FEEDBACK_CTRL,0xB6);
-
-#if FB_ERM_LRA == 0
-    /* ERM settings */
-    DRV_write(DRV_RATED_VOLT, (RATED_VOLTAGE / 21.33) * 1000);
-#    if ERM_OPEN_LOOP == 0
-    DRV_write(DRV_OVERDRIVE_CLAMP_VOLT, (((V_PEAK * (DRIVE_TIME + BLANKING_TIME + IDISS_TIME)) / 0.02133) / (DRIVE_TIME - 0.0003)));
-#    elif ERM_OPEN_LOOP == 1
-    DRV_write(DRV_OVERDRIVE_CLAMP_VOLT, (V_PEAK / 0.02196));
-#    endif
-#elif FB_ERM_LRA == 1
-    DRV_write(DRV_RATED_VOLT, ((V_RMS * sqrt(1 - ((4 * ((150 + (SAMPLE_TIME * 50)) * 0.000001)) + 0.0003) * F_LRA) / 0.02071)));
-#    if LRA_OPEN_LOOP == 0
-    DRV_write(DRV_OVERDRIVE_CLAMP_VOLT, ((V_PEAK / sqrt(1 - (F_LRA * 0.0008)) / 0.02133)));
-#    elif LRA_OPEN_LOOP == 1
-    DRV_write(DRV_OVERDRIVE_CLAMP_VOLT, (V_PEAK / 0.02196));
-#    endif
-#endif
-
-    DRVREG_FBR FB_SET;
-    FB_SET.Bits.ERM_LRA      = FB_ERM_LRA;
-    FB_SET.Bits.BRAKE_FACTOR = FB_BRAKEFACTOR;
-    FB_SET.Bits.LOOP_GAIN    = FB_LOOPGAIN;
-    FB_SET.Bits.BEMF_GAIN    = 0; /* auto-calibration populates this field*/
-    DRV_write(DRV_FEEDBACK_CTRL, (uint8_t)FB_SET.Byte);
-    DRVREG_CTRL1 C1_SET;
-    C1_SET.Bits.C1_DRIVE_TIME    = DRIVE_TIME;
-    C1_SET.Bits.C1_AC_COUPLE     = AC_COUPLE;
-    C1_SET.Bits.C1_STARTUP_BOOST = STARTUP_BOOST;
-    DRV_write(DRV_CTRL_1, (uint8_t)C1_SET.Byte);
-    DRVREG_CTRL2 C2_SET;
-    C2_SET.Bits.C2_BIDIR_INPUT   = BIDIR_INPUT;
-    C2_SET.Bits.C2_BRAKE_STAB    = BRAKE_STAB;
-    C2_SET.Bits.C2_SAMPLE_TIME   = SAMPLE_TIME;
-    C2_SET.Bits.C2_BLANKING_TIME = BLANKING_TIME;
-    C2_SET.Bits.C2_IDISS_TIME    = IDISS_TIME;
-    DRV_write(DRV_CTRL_2, (uint8_t)C2_SET.Byte);
-    DRVREG_CTRL3 C3_SET;
-    C3_SET.Bits.C3_LRA_OPEN_LOOP   = LRA_OPEN_LOOP;
-    C3_SET.Bits.C3_N_PWM_ANALOG    = N_PWM_ANALOG;
-    C3_SET.Bits.C3_LRA_DRIVE_MODE  = LRA_DRIVE_MODE;
-    C3_SET.Bits.C3_DATA_FORMAT_RTO = DATA_FORMAT_RTO;
-    C3_SET.Bits.C3_SUPPLY_COMP_DIS = SUPPLY_COMP_DIS;
-    C3_SET.Bits.C3_ERM_OPEN_LOOP   = ERM_OPEN_LOOP;
-    C3_SET.Bits.C3_NG_THRESH       = NG_THRESH;
-    DRV_write(DRV_CTRL_3, (uint8_t)C3_SET.Byte);
-    DRVREG_CTRL4 C4_SET;
-    C4_SET.Bits.C4_ZC_DET_TIME   = ZC_DET_TIME;
-    C4_SET.Bits.C4_AUTO_CAL_TIME = AUTO_CAL_TIME;
-    DRV_write(DRV_CTRL_4, (uint8_t)C4_SET.Byte);
-    DRV_write(DRV_LIB_SELECTION, LIB_SELECTION);
-
-    DRV_write(DRV_GO, 0x01);
-
-    /* 0x00 sets DRV2605 out of standby and to use internal trigger
-     * 0x01 sets DRV2605 out of standby and to use external trigger */
-    DRV_write(DRV_MODE, 0x00);
-
-    // Play greeting sequence
-    DRV_write(DRV_GO, 0x00);
-    DRV_write(DRV_WAVEFORM_SEQ_1, DRV_GREETING);
-    DRV_write(DRV_GO, 0x01);
-}
-
-void DRV_rtp_init(void) {
-    DRV_write(DRV_GO, 0x00);
-    DRV_write(DRV_RTP_INPUT, 20); // 20 is the lowest value I've found where haptics can still be felt.
-    DRV_write(DRV_MODE, 0x05);
-    DRV_write(DRV_GO, 0x01);
-}
-
-void DRV_amplitude(uint8_t amplitude) {
-    DRV_write(DRV_RTP_INPUT, amplitude);
-}
-
-void DRV_pulse(uint8_t sequence) {
-    DRV_write(DRV_GO, 0x00);
-    DRV_write(DRV_WAVEFORM_SEQ_1, sequence);
-    DRV_write(DRV_GO, 0x01);
-}
diff --git a/drivers/haptic/DRV2605L.h b/drivers/haptic/DRV2605L.h
deleted file mode 100644
index 8b8eae38b8e1..000000000000
--- a/drivers/haptic/DRV2605L.h
+++ /dev/null
@@ -1,406 +0,0 @@
-/* Copyright 2018 ishtob
- * Driver for DRV2605L written for 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 "i2c_master.h"
-
-/* Initialization settings
-
- * Feedback Control Settings */
-#ifndef FB_ERM_LRA
-#    define FB_ERM_LRA 1 /* For ERM:0 or LRA:1*/
-#endif
-#ifndef FB_BRAKEFACTOR
-#    define FB_BRAKEFACTOR 3 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
-#endif
-#ifndef FB_LOOPGAIN
-#    define FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
-#endif
-
-/* LRA specific settings */
-#if FB_ERM_LRA == 1
-#    ifndef V_RMS
-#        define V_RMS 2.0
-#    endif
-#    ifndef V_PEAK
-#        define V_PEAK 2.1
-#    endif
-#    ifndef F_LRA
-#        define F_LRA 205
-#    endif
-#    ifndef RATED_VOLTAGE
-#        define RATED_VOLTAGE 2 /* 2v as safe range in case device voltage is not set */
-#    endif
-#endif
-
-#ifndef RATED_VOLTAGE
-#    define RATED_VOLTAGE 2 /* 2v as safe range in case device voltage is not set */
-#endif
-#ifndef V_PEAK
-#    define V_PEAK 2.8
-#endif
-
-/* Library Selection */
-#ifndef LIB_SELECTION
-#    if FB_ERM_LRA == 1
-#        define LIB_SELECTION 6 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
-#    else
-#        define LIB_SELECTION 1
-#    endif
-#endif
-
-#ifndef DRV_GREETING
-#    define DRV_GREETING alert_750ms
-#endif
-#ifndef DRV_MODE_DEFAULT
-#    define DRV_MODE_DEFAULT strong_click1
-#endif
-
-/* Control 1 register settings */
-#ifndef DRIVE_TIME
-#    define DRIVE_TIME 25
-#endif
-#ifndef AC_COUPLE
-#    define AC_COUPLE 0
-#endif
-#ifndef STARTUP_BOOST
-#    define STARTUP_BOOST 1
-#endif
-
-/* Control 2 Settings */
-#ifndef BIDIR_INPUT
-#    define BIDIR_INPUT 1
-#endif
-#ifndef BRAKE_STAB
-#    define BRAKE_STAB 1 /* Loopgain is reduced when braking is almost complete to improve stability */
-#endif
-#ifndef SAMPLE_TIME
-#    define SAMPLE_TIME 3
-#endif
-#ifndef BLANKING_TIME
-#    define BLANKING_TIME 1
-#endif
-#ifndef IDISS_TIME
-#    define IDISS_TIME 1
-#endif
-
-/* Control 3 settings */
-#ifndef NG_THRESH
-#    define NG_THRESH 2
-#endif
-#ifndef ERM_OPEN_LOOP
-#    define ERM_OPEN_LOOP 1
-#endif
-#ifndef SUPPLY_COMP_DIS
-#    define SUPPLY_COMP_DIS 0
-#endif
-#ifndef DATA_FORMAT_RTO
-#    define DATA_FORMAT_RTO 0
-#endif
-#ifndef LRA_DRIVE_MODE
-#    define LRA_DRIVE_MODE 0
-#endif
-#ifndef N_PWM_ANALOG
-#    define N_PWM_ANALOG 0
-#endif
-#ifndef LRA_OPEN_LOOP
-#    define LRA_OPEN_LOOP 0
-#endif
-
-/* Control 4 settings */
-#ifndef ZC_DET_TIME
-#    define ZC_DET_TIME 0
-#endif
-#ifndef AUTO_CAL_TIME
-#    define AUTO_CAL_TIME 3
-#endif
-
-/* register defines -------------------------------------------------------- */
-#define DRV2605L_BASE_ADDRESS 0x5A /* DRV2605L Base address */
-#define DRV_STATUS 0x00
-#define DRV_MODE 0x01
-#define DRV_RTP_INPUT 0x02
-#define DRV_LIB_SELECTION 0x03
-#define DRV_WAVEFORM_SEQ_1 0x04
-#define DRV_WAVEFORM_SEQ_2 0x05
-#define DRV_WAVEFORM_SEQ_3 0x06
-#define DRV_WAVEFORM_SEQ_4 0x07
-#define DRV_WAVEFORM_SEQ_5 0x08
-#define DRV_WAVEFORM_SEQ_6 0x09
-#define DRV_WAVEFORM_SEQ_7 0x0A
-#define DRV_WAVEFORM_SEQ_8 0x0B
-#define DRV_GO 0x0C
-#define DRV_OVERDRIVE_TIME_OFFSET 0x0D
-#define DRV_SUSTAIN_TIME_OFFSET_P 0x0E
-#define DRV_SUSTAIN_TIME_OFFSET_N 0x0F
-#define DRV_BRAKE_TIME_OFFSET 0x10
-#define DRV_AUDIO_2_VIBE_CTRL 0x11
-#define DRV_AUDIO_2_VIBE_MIN_IN 0x12
-#define DRV_AUDIO_2_VIBE_MAX_IN 0x13
-#define DRV_AUDIO_2_VIBE_MIN_OUTDRV 0x14
-#define DRV_AUDIO_2_VIBE_MAX_OUTDRV 0x15
-#define DRV_RATED_VOLT 0x16
-#define DRV_OVERDRIVE_CLAMP_VOLT 0x17
-#define DRV_AUTO_CALIB_COMP_RESULT 0x18
-#define DRV_AUTO_CALIB_BEMF_RESULT 0x19
-#define DRV_FEEDBACK_CTRL 0x1A
-#define DRV_CTRL_1 0x1B
-#define DRV_CTRL_2 0x1C
-#define DRV_CTRL_3 0x1D
-#define DRV_CTRL_4 0x1E
-#define DRV_CTRL_5 0x1F
-#define DRV_OPEN_LOOP_PERIOD 0x20
-#define DRV_VBAT_VOLT_MONITOR 0x21
-#define DRV_LRA_RESONANCE_PERIOD 0x22
-
-void    DRV_init(void);
-void    DRV_write(const uint8_t drv_register, const uint8_t settings);
-uint8_t DRV_read(const uint8_t regaddress);
-void    DRV_rtp_init(void);
-void    DRV_amplitude(const uint8_t amplitude);
-void    DRV_pulse(const uint8_t sequence);
-
-typedef enum DRV_EFFECT {
-    clear_sequence                       = 0,
-    strong_click                         = 1,
-    strong_click_60                      = 2,
-    strong_click_30                      = 3,
-    sharp_click                          = 4,
-    sharp_click_60                       = 5,
-    sharp_click_30                       = 6,
-    soft_bump                            = 7,
-    soft_bump_60                         = 8,
-    soft_bump_30                         = 9,
-    dbl_click                            = 10,
-    dbl_click_60                         = 11,
-    trp_click                            = 12,
-    soft_fuzz                            = 13,
-    strong_buzz                          = 14,
-    alert_750ms                          = 15,
-    alert_1000ms                         = 16,
-    strong_click1                        = 17,
-    strong_click2_80                     = 18,
-    strong_click3_60                     = 19,
-    strong_click4_30                     = 20,
-    medium_click1                        = 21,
-    medium_click2_80                     = 22,
-    medium_click3_60                     = 23,
-    sharp_tick1                          = 24,
-    sharp_tick2_80                       = 25,
-    sharp_tick3_60                       = 26,
-    sh_dblclick_str                      = 27,
-    sh_dblclick_str_80                   = 28,
-    sh_dblclick_str_60                   = 29,
-    sh_dblclick_str_30                   = 30,
-    sh_dblclick_med                      = 31,
-    sh_dblclick_med_80                   = 32,
-    sh_dblclick_med_60                   = 33,
-    sh_dblsharp_tick                     = 34,
-    sh_dblsharp_tick_80                  = 35,
-    sh_dblsharp_tick_60                  = 36,
-    lg_dblclick_str                      = 37,
-    lg_dblclick_str_80                   = 38,
-    lg_dblclick_str_60                   = 39,
-    lg_dblclick_str_30                   = 40,
-    lg_dblclick_med                      = 41,
-    lg_dblclick_med_80                   = 42,
-    lg_dblclick_med_60                   = 43,
-    lg_dblsharp_tick                     = 44,
-    lg_dblsharp_tick_80                  = 45,
-    lg_dblsharp_tick_60                  = 46,
-    buzz                                 = 47,
-    buzz_80                              = 48,
-    buzz_60                              = 49,
-    buzz_40                              = 50,
-    buzz_20                              = 51,
-    pulsing_strong                       = 52,
-    pulsing_strong_80                    = 53,
-    pulsing_medium                       = 54,
-    pulsing_medium_80                    = 55,
-    pulsing_sharp                        = 56,
-    pulsing_sharp_80                     = 57,
-    transition_click                     = 58,
-    transition_click_80                  = 59,
-    transition_click_60                  = 60,
-    transition_click_40                  = 61,
-    transition_click_20                  = 62,
-    transition_click_10                  = 63,
-    transition_hum                       = 64,
-    transition_hum_80                    = 65,
-    transition_hum_60                    = 66,
-    transition_hum_40                    = 67,
-    transition_hum_20                    = 68,
-    transition_hum_10                    = 69,
-    transition_rampdown_long_smooth1     = 70,
-    transition_rampdown_long_smooth2     = 71,
-    transition_rampdown_med_smooth1      = 72,
-    transition_rampdown_med_smooth2      = 73,
-    transition_rampdown_short_smooth1    = 74,
-    transition_rampdown_short_smooth2    = 75,
-    transition_rampdown_long_sharp1      = 76,
-    transition_rampdown_long_sharp2      = 77,
-    transition_rampdown_med_sharp1       = 78,
-    transition_rampdown_med_sharp2       = 79,
-    transition_rampdown_short_sharp1     = 80,
-    transition_rampdown_short_sharp2     = 81,
-    transition_rampup_long_smooth1       = 82,
-    transition_rampup_long_smooth2       = 83,
-    transition_rampup_med_smooth1        = 84,
-    transition_rampup_med_smooth2        = 85,
-    transition_rampup_short_smooth1      = 86,
-    transition_rampup_short_smooth2      = 87,
-    transition_rampup_long_sharp1        = 88,
-    transition_rampup_long_sharp2        = 89,
-    transition_rampup_med_sharp1         = 90,
-    transition_rampup_med_sharp2         = 91,
-    transition_rampup_short_sharp1       = 92,
-    transition_rampup_short_sharp2       = 93,
-    transition_rampdown_long_smooth1_50  = 94,
-    transition_rampdown_long_smooth2_50  = 95,
-    transition_rampdown_med_smooth1_50   = 96,
-    transition_rampdown_med_smooth2_50   = 97,
-    transition_rampdown_short_smooth1_50 = 98,
-    transition_rampdown_short_smooth2_50 = 99,
-    transition_rampdown_long_sharp1_50   = 100,
-    transition_rampdown_long_sharp2_50   = 101,
-    transition_rampdown_med_sharp1_50    = 102,
-    transition_rampdown_med_sharp2_50    = 103,
-    transition_rampdown_short_sharp1_50  = 104,
-    transition_rampdown_short_sharp2_50  = 105,
-    transition_rampup_long_smooth1_50    = 106,
-    transition_rampup_long_smooth2_50    = 107,
-    transition_rampup_med_smooth1_50     = 108,
-    transition_rampup_med_smooth2_50     = 109,
-    transition_rampup_short_smooth1_50   = 110,
-    transition_rampup_short_smooth2_50   = 111,
-    transition_rampup_long_sharp1_50     = 112,
-    transition_rampup_long_sharp2_50     = 113,
-    transition_rampup_med_sharp1_50      = 114,
-    transition_rampup_med_sharp2_50      = 115,
-    transition_rampup_short_sharp1_50    = 116,
-    transition_rampup_short_sharp2_50    = 117,
-    long_buzz_for_programmatic_stopping  = 118,
-    smooth_hum1_50                       = 119,
-    smooth_hum2_40                       = 120,
-    smooth_hum3_30                       = 121,
-    smooth_hum4_20                       = 122,
-    smooth_hum5_10                       = 123,
-    drv_effect_max                       = 124,
-} DRV_EFFECT;
-
-/* Register bit array unions */
-
-typedef union DRVREG_STATUS { /* register 0x00 */
-    uint8_t Byte;
-    struct {
-        uint8_t OC_DETECT : 1; /* set to 1 when overcurrent event is detected */
-        uint8_t OVER_TEMP : 1; /* set to 1 when device exceeds temp threshold */
-        uint8_t FB_STS : 1;    /* set to 1 when feedback controller has timed out */
-        /* auto-calibration routine and diagnostic result
-         * result  |  auto-calibation  |      diagnostic       |
-         *   0     |      passed       | actuator func normal  |
-         *   1     |      failed       | actuator func fault*  |
-         * * actuator is not present or is shorted, timing out, or giving out–of-range back-EMF */
-        uint8_t DIAG_RESULT : 1;
-        uint8_t : 1;
-        uint8_t DEVICE_ID : 3; /* Device IDs 3: DRV2605  4: DRV2604  5: DRV2604L  6: DRV2605L */
-    } Bits;
-} DRVREG_STATUS;
-
-typedef union DRVREG_MODE { /* register 0x01 */
-    uint8_t Byte;
-    struct {
-        uint8_t MODE : 3; /* Mode setting */
-        uint8_t : 3;
-        uint8_t STANDBY : 1; /* 0:standby 1:ready */
-    } Bits;
-} DRVREG_MODE;
-
-typedef union DRVREG_WAIT {
-    uint8_t Byte;
-    struct {
-        uint8_t WAIT_MODE : 1; /* Set to 1 to interpret as wait for next 7 bits x10ms */
-        uint8_t WAIT_TIME : 7;
-    } Bits;
-} DRVREG_WAIT;
-
-typedef union DRVREG_FBR { /* register 0x1A */
-    uint8_t Byte;
-    struct {
-        uint8_t BEMF_GAIN : 2;
-        uint8_t LOOP_GAIN : 2;
-        uint8_t BRAKE_FACTOR : 3;
-        uint8_t ERM_LRA : 1;
-    } Bits;
-} DRVREG_FBR;
-
-typedef union DRVREG_CTRL1 { /* register 0x1B */
-    uint8_t Byte;
-    struct {
-        uint8_t C1_DRIVE_TIME : 5;
-        uint8_t C1_AC_COUPLE : 1;
-        uint8_t : 1;
-        uint8_t C1_STARTUP_BOOST : 1;
-    } Bits;
-} DRVREG_CTRL1;
-
-typedef union DRVREG_CTRL2 { /* register 0x1C */
-    uint8_t Byte;
-    struct {
-        uint8_t C2_IDISS_TIME : 2;
-        uint8_t C2_BLANKING_TIME : 2;
-        uint8_t C2_SAMPLE_TIME : 2;
-        uint8_t C2_BRAKE_STAB : 1;
-        uint8_t C2_BIDIR_INPUT : 1;
-    } Bits;
-} DRVREG_CTRL2;
-
-typedef union DRVREG_CTRL3 { /* register 0x1D */
-    uint8_t Byte;
-    struct {
-        uint8_t C3_LRA_OPEN_LOOP : 1;
-        uint8_t C3_N_PWM_ANALOG : 1;
-        uint8_t C3_LRA_DRIVE_MODE : 1;
-        uint8_t C3_DATA_FORMAT_RTO : 1;
-        uint8_t C3_SUPPLY_COMP_DIS : 1;
-        uint8_t C3_ERM_OPEN_LOOP : 1;
-        uint8_t C3_NG_THRESH : 2;
-    } Bits;
-} DRVREG_CTRL3;
-
-typedef union DRVREG_CTRL4 { /* register 0x1E */
-    uint8_t Byte;
-    struct {
-        uint8_t C4_OTP_PROGRAM : 1;
-        uint8_t : 1;
-        uint8_t C4_OTP_STATUS : 1;
-        uint8_t : 1;
-        uint8_t C4_AUTO_CAL_TIME : 2;
-        uint8_t C4_ZC_DET_TIME : 2;
-    } Bits;
-} DRVREG_CTRL4;
-
-typedef union DRVREG_CTRL5 { /* register 0x1F */
-    uint8_t Byte;
-    struct {
-        uint8_t C5_IDISS_TIME : 2;
-        uint8_t C5_BLANKING_TIME : 2;
-        uint8_t C5_PLAYBACK_INTERVAL : 1;
-        uint8_t C5_LRA_AUTO_OPEN_LOOP : 1;
-        uint8_t C5_AUTO_OL_CNT : 2;
-    } Bits;
-} DRVREG_CTRL5;
diff --git a/drivers/haptic/drv2605l.c b/drivers/haptic/drv2605l.c
new file mode 100644
index 000000000000..1ad2ad385f2a
--- /dev/null
+++ b/drivers/haptic/drv2605l.c
@@ -0,0 +1,126 @@
+/* Copyright 2018 ishtob
+ * Driver for DRV2605L written for 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 "drv2605l.h"
+#include "i2c_master.h"
+#include <math.h>
+
+uint8_t drv2605l_write_buffer[2];
+uint8_t drv2605l_read_buffer;
+
+void drv2605l_write(uint8_t reg_addr, uint8_t data) {
+    drv2605l_write_buffer[0] = reg_addr;
+    drv2605l_write_buffer[1] = data;
+    i2c_transmit(DRV2605L_I2C_ADDRESS << 1, drv2605l_write_buffer, 2, 100);
+}
+
+uint8_t drv2605l_read(uint8_t reg_addr) {
+    i2c_readReg(DRV2605L_I2C_ADDRESS << 1, reg_addr, &drv2605l_read_buffer, 1, 100);
+
+    return drv2605l_read_buffer;
+}
+
+void drv2605l_init(void) {
+    i2c_init();
+    /* 0x07 sets DRV2605 into calibration mode */
+    drv2605l_write(DRV2605L_REG_MODE, 0x07);
+
+    //  drv2605l_write(DRV2605L_REG_FEEDBACK_CTRL,0xB6);
+
+#if DRV2605L_FB_ERM_LRA == 0
+    /* ERM settings */
+    drv2605l_write(DRV2605L_REG_RATED_VOLTAGE, (DRV2605L_RATED_VOLTAGE / 21.33) * 1000);
+#    if DRV2605L_ERM_OPEN_LOOP == 0
+    drv2605l_write(DRV2605L_REG_OVERDRIVE_CLAMP_VOLTAGE, (((DRV2605L_V_PEAK * (DRV2605L_DRIVE_TIME + DRV2605L_BLANKING_TIME + DRV2605L_IDISS_TIME)) / 0.02133) / (DRV2605L_DRIVE_TIME - 0.0003)));
+#    elif DRV2605L_ERM_OPEN_LOOP == 1
+    drv2605l_write(DRV2605L_REG_OVERDRIVE_CLAMP_VOLTAGE, (DRV2605L_V_PEAK / 0.02196));
+#    endif
+#elif DRV2605L_FB_ERM_LRA == 1
+    drv2605l_write(DRV2605L_REG_RATED_VOLTAGE, ((DRV2605L_V_RMS * sqrt(1 - ((4 * ((150 + (DRV2605L_SAMPLE_TIME * 50)) * 0.000001)) + 0.0003) * DRV2605L_F_LRA) / 0.02071)));
+#    if DRV2605L_LRA_OPEN_LOOP == 0
+    drv2605l_write(DRV2605L_REG_OVERDRIVE_CLAMP_VOLTAGE, ((DRV2605L_V_PEAK / sqrt(1 - (DRV2605L_F_LRA * 0.0008)) / 0.02133)));
+#    elif DRV2605L_LRA_OPEN_LOOP == 1
+    drv2605l_write(DRV2605L_REG_OVERDRIVE_CLAMP_VOLTAGE, (DRV2605L_V_PEAK / 0.02196));
+#    endif
+#endif
+
+    drv2605l_reg_feedback_ctrl_t reg_feedback_ctrl;
+    reg_feedback_ctrl.bits.ERM_LRA      = DRV2605L_FB_ERM_LRA;
+    reg_feedback_ctrl.bits.BRAKE_FACTOR = DRV2605L_FB_BRAKEFACTOR;
+    reg_feedback_ctrl.bits.LOOP_GAIN    = DRV2605L_FB_LOOPGAIN;
+    reg_feedback_ctrl.bits.BEMF_GAIN    = 0; /* auto-calibration populates this field*/
+    drv2605l_write(DRV2605L_REG_FEEDBACK_CTRL, (uint8_t)reg_feedback_ctrl.raw);
+
+    drv2605l_reg_ctrl1_t reg_ctrl1;
+    reg_ctrl1.bits.C1_DRIVE_TIME    = DRV2605L_DRIVE_TIME;
+    reg_ctrl1.bits.C1_AC_COUPLE     = DRV2605L_AC_COUPLE;
+    reg_ctrl1.bits.C1_STARTUP_BOOST = DRV2605L_STARTUP_BOOST;
+    drv2605l_write(DRV2605L_REG_CTRL1, (uint8_t)reg_ctrl1.raw);
+
+    drv2605l_reg_ctrl2_t reg_ctrl2;
+    reg_ctrl2.bits.C2_BIDIR_INPUT   = DRV2605L_BIDIR_INPUT;
+    reg_ctrl2.bits.C2_BRAKE_STAB    = DRV2605L_BRAKE_STAB;
+    reg_ctrl2.bits.C2_SAMPLE_TIME   = DRV2605L_SAMPLE_TIME;
+    reg_ctrl2.bits.C2_BLANKING_TIME = DRV2605L_BLANKING_TIME;
+    reg_ctrl2.bits.C2_IDISS_TIME    = DRV2605L_IDISS_TIME;
+    drv2605l_write(DRV2605L_REG_CTRL2, (uint8_t)reg_ctrl2.raw);
+
+    drv2605l_reg_ctrl3_t reg_ctrl3;
+    reg_ctrl3.bits.C3_LRA_OPEN_LOOP   = DRV2605L_LRA_OPEN_LOOP;
+    reg_ctrl3.bits.C3_N_PWM_ANALOG    = DRV2605L_N_PWM_ANALOG;
+    reg_ctrl3.bits.C3_LRA_DRIVE_MODE  = DRV2605L_LRA_DRIVE_MODE;
+    reg_ctrl3.bits.C3_DATA_FORMAT_RTO = DRV2605L_DATA_FORMAT_RTO;
+    reg_ctrl3.bits.C3_SUPPLY_COMP_DIS = DRV2605L_SUPPLY_COMP_DIS;
+    reg_ctrl3.bits.C3_ERM_OPEN_LOOP   = DRV2605L_ERM_OPEN_LOOP;
+    reg_ctrl3.bits.C3_NG_THRESH       = DRV2605L_NG_THRESH;
+    drv2605l_write(DRV2605L_REG_CTRL3, (uint8_t)reg_ctrl3.raw);
+
+    drv2605l_reg_ctrl4_t reg_ctrl4;
+    reg_ctrl4.bits.C4_ZC_DET_TIME   = DRV2605L_ZC_DET_TIME;
+    reg_ctrl4.bits.C4_AUTO_CAL_TIME = DRV2605L_AUTO_CAL_TIME;
+    drv2605l_write(DRV2605L_REG_CTRL4, (uint8_t)reg_ctrl4.raw);
+
+    drv2605l_write(DRV2605L_REG_LIBRARY_SELECTION, DRV2605L_LIBRARY);
+
+    drv2605l_write(DRV2605L_REG_GO, 0x01);
+
+    /* 0x00 sets DRV2605 out of standby and to use internal trigger
+     * 0x01 sets DRV2605 out of standby and to use external trigger */
+    drv2605l_write(DRV2605L_REG_MODE, 0x00);
+
+    // Play greeting sequence
+    drv2605l_write(DRV2605L_REG_GO, 0x00);
+    drv2605l_write(DRV2605L_REG_WAVEFORM_SEQUENCER_1, DRV2605L_GREETING);
+    drv2605l_write(DRV2605L_REG_GO, 0x01);
+}
+
+void drv2605l_rtp_init(void) {
+    drv2605l_write(DRV2605L_REG_GO, 0x00);
+    drv2605l_write(DRV2605L_REG_RTP_INPUT, 20); // 20 is the lowest value I've found where haptics can still be felt.
+    drv2605l_write(DRV2605L_REG_MODE, 0x05);
+    drv2605l_write(DRV2605L_REG_GO, 0x01);
+}
+
+void drv2605l_amplitude(uint8_t amplitude) {
+    drv2605l_write(DRV2605L_REG_RTP_INPUT, amplitude);
+}
+
+void drv2605l_pulse(uint8_t sequence) {
+    drv2605l_write(DRV2605L_REG_GO, 0x00);
+    drv2605l_write(DRV2605L_REG_WAVEFORM_SEQUENCER_1, sequence);
+    drv2605l_write(DRV2605L_REG_GO, 0x01);
+}
diff --git a/drivers/haptic/drv2605l.h b/drivers/haptic/drv2605l.h
new file mode 100644
index 000000000000..a7cf856a86c1
--- /dev/null
+++ b/drivers/haptic/drv2605l.h
@@ -0,0 +1,362 @@
+/* Copyright 2018 ishtob
+ * Driver for DRV2605L written for 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 <stdint.h>
+
+/* Initialization settings
+
+ * Feedback Control Settings */
+#ifndef DRV2605L_FB_ERM_LRA
+#    define DRV2605L_FB_ERM_LRA 1 /* For ERM:0 or LRA:1*/
+#endif
+#ifndef DRV2605L_FB_BRAKEFACTOR
+#    define DRV2605L_FB_BRAKEFACTOR 3 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
+#endif
+#ifndef DRV2605L_FB_LOOPGAIN
+#    define DRV2605L_FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
+#endif
+
+/* LRA specific settings */
+#if DRV2605L_FB_ERM_LRA == 1
+#    ifndef DRV2605L_V_RMS
+#        define DRV2605L_V_RMS 2.0
+#    endif
+#    ifndef DRV2605L_V_PEAK
+#        define DRV2605L_V_PEAK 2.1
+#    endif
+#    ifndef DRV2605L_F_LRA
+#        define DRV2605L_F_LRA 205
+#    endif
+#    ifndef DRV2605L_RATED_VOLTAGE
+#        define DRV2605L_RATED_VOLTAGE 2 /* 2v as safe range in case device voltage is not set */
+#    endif
+#endif
+
+#ifndef DRV2605L_RATED_VOLTAGE
+#    define DRV2605L_RATED_VOLTAGE 2 /* 2v as safe range in case device voltage is not set */
+#endif
+#ifndef DRV2605L_V_PEAK
+#    define DRV2605L_V_PEAK 2.8
+#endif
+
+/* Library Selection */
+#ifndef DRV2605L_LIBRARY
+#    if DRV2605L_FB_ERM_LRA == 1
+#        define DRV2605L_LIBRARY 6 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
+#    else
+#        define DRV2605L_LIBRARY 1
+#    endif
+#endif
+
+#ifndef DRV2605L_GREETING
+#    define DRV2605L_GREETING DRV2605L_EFFECT_750_MS_ALERT_100
+#endif
+#ifndef DRV2605L_DEFAULT_MODE
+#    define DRV2605L_DEFAULT_MODE DRV2605L_EFFECT_STRONG_CLICK_1_100
+#endif
+
+/* Control 1 register settings */
+#ifndef DRV2605L_DRIVE_TIME
+#    define DRV2605L_DRIVE_TIME 25
+#endif
+#ifndef DRV2605L_AC_COUPLE
+#    define DRV2605L_AC_COUPLE 0
+#endif
+#ifndef DRV2605L_STARTUP_BOOST
+#    define DRV2605L_STARTUP_BOOST 1
+#endif
+
+/* Control 2 Settings */
+#ifndef DRV2605L_BIDIR_INPUT
+#    define DRV2605L_BIDIR_INPUT 1
+#endif
+#ifndef DRV2605L_BRAKE_STAB
+#    define DRV2605L_BRAKE_STAB 1 /* Loopgain is reduced when braking is almost complete to improve stability */
+#endif
+#ifndef DRV2605L_SAMPLE_TIME
+#    define DRV2605L_SAMPLE_TIME 3
+#endif
+#ifndef DRV2605L_BLANKING_TIME
+#    define DRV2605L_BLANKING_TIME 1
+#endif
+#ifndef DRV2605L_IDISS_TIME
+#    define DRV2605L_IDISS_TIME 1
+#endif
+
+/* Control 3 settings */
+#ifndef DRV2605L_NG_THRESH
+#    define DRV2605L_NG_THRESH 2
+#endif
+#ifndef DRV2605L_ERM_OPEN_LOOP
+#    define DRV2605L_ERM_OPEN_LOOP 1
+#endif
+#ifndef DRV2605L_SUPPLY_COMP_DIS
+#    define DRV2605L_SUPPLY_COMP_DIS 0
+#endif
+#ifndef DRV2605L_DATA_FORMAT_RTO
+#    define DRV2605L_DATA_FORMAT_RTO 0
+#endif
+#ifndef DRV2605L_LRA_DRIVE_MODE
+#    define DRV2605L_LRA_DRIVE_MODE 0
+#endif
+#ifndef DRV2605L_N_PWM_ANALOG
+#    define DRV2605L_N_PWM_ANALOG 0
+#endif
+#ifndef DRV2605L_LRA_OPEN_LOOP
+#    define DRV2605L_LRA_OPEN_LOOP 0
+#endif
+
+/* Control 4 settings */
+#ifndef DRV2605L_ZC_DET_TIME
+#    define DRV2605L_ZC_DET_TIME 0
+#endif
+#ifndef DRV2605L_AUTO_CAL_TIME
+#    define DRV2605L_AUTO_CAL_TIME 3
+#endif
+
+#define DRV2605L_I2C_ADDRESS 0x5A
+
+#define DRV2605L_REG_STATUS 0x00
+#define DRV2605L_REG_MODE 0x01
+#define DRV2605L_REG_RTP_INPUT 0x02
+#define DRV2605L_REG_LIBRARY_SELECTION 0x03
+#define DRV2605L_REG_WAVEFORM_SEQUENCER_1 0x04
+#define DRV2605L_REG_WAVEFORM_SEQUENCER_2 0x05
+#define DRV2605L_REG_WAVEFORM_SEQUENCER_3 0x06
+#define DRV2605L_REG_WAVEFORM_SEQUENCER_4 0x07
+#define DRV2605L_REG_WAVEFORM_SEQUENCER_5 0x08
+#define DRV2605L_REG_WAVEFORM_SEQUENCER_6 0x09
+#define DRV2605L_REG_WAVEFORM_SEQUENCER_7 0x0A
+#define DRV2605L_REG_WAVEFORM_SEQUENCER_8 0x0B
+#define DRV2605L_REG_GO 0x0C
+#define DRV2605L_REG_OVERDRIVE_TIME_OFFSET 0x0D
+#define DRV2605L_REG_SUSTAIN_TIME_OFFSET_P 0x0E
+#define DRV2605L_REG_SUSTAIN_TIME_OFFSET_N 0x0F
+#define DRV2605L_REG_BRAKE_TIME_OFFSET 0x10
+#define DRV2605L_REG_AUDIO_TO_VIBE_CTRL 0x11
+#define DRV2605L_REG_AUDIO_TO_VIBE_MIN_INPUT 0x12
+#define DRV2605L_REG_AUDIO_TO_VIBE_MAX_INPUT 0x13
+#define DRV2605L_REG_AUDIO_TO_VIBE_MIN_OUTPUT_DRIVE 0x14
+#define DRV2605L_REG_AUDIO_TO_VIBE_MAX_OUTPUT_DRIVE 0x15
+#define DRV2605L_REG_RATED_VOLTAGE 0x16
+#define DRV2605L_REG_OVERDRIVE_CLAMP_VOLTAGE 0x17
+#define DRV2605L_REG_AUTO_CALIBRATION_COMPENSATION_RESULT 0x18
+#define DRV2605L_REG_AUTO_CALIBRATION_BACK_EMF_RESULT 0x19
+#define DRV2605L_REG_FEEDBACK_CTRL 0x1A
+#define DRV2605L_REG_CTRL1 0x1B
+#define DRV2605L_REG_CTRL2 0x1C
+#define DRV2605L_REG_CTRL3 0x1D
+#define DRV2605L_REG_CTRL4 0x1E
+#define DRV2605L_REG_CTRL5 0x1F
+#define DRV2605L_REG_LRA_OPEN_LOOP_PERIOD 0x20
+#define DRV2605L_REG_VBAT_VOLTAGE_MONITOR 0x21
+#define DRV2605L_REG_LRA_RESONANCE_PERIOD 0x22
+
+void    drv2605l_init(void);
+void    drv2605l_write(const uint8_t reg_addr, const uint8_t data);
+uint8_t drv2605l_read(const uint8_t reg_addr);
+void    drv2605l_rtp_init(void);
+void    drv2605l_amplitude(const uint8_t amplitude);
+void    drv2605l_pulse(const uint8_t sequence);
+
+typedef enum drv2605l_effect_t {
+    DRV2605L_EFFECT_CLEAR_SEQUENCE,
+    DRV2605L_EFFECT_STRONG_CLICK_100,
+    DRV2605L_EFFECT_STRONG_CLICK_60,
+    DRV2605L_EFFECT_STRONG_CLICK_30,
+    DRV2605L_EFFECT_SHARP_CLICK_100,
+    DRV2605L_EFFECT_SHARP_CLICK_60,
+    DRV2605L_EFFECT_SHARP_CLICK_30,
+    DRV2605L_EFFECT_SOFT_BUMP_100,
+    DRV2605L_EFFECT_SOFT_BUMP_60,
+    DRV2605L_EFFECT_SOFT_BUMP_30,
+    DRV2605L_EFFECT_DOUBLE_CLICK_100,
+    DRV2605L_EFFECT_DOUBLE_CLICK_60,
+    DRV2605L_EFFECT_TRIPLE_CLICK_100,
+    DRV2605L_EFFECT_SOFT_FUZZ_60,
+    DRV2605L_EFFECT_STRONG_BUZZ_100,
+    DRV2605L_EFFECT_750_MS_ALERT_100,
+    DRV2605L_EFFECT_1000_MS_ALERT_100,
+    DRV2605L_EFFECT_STRONG_CLICK_1_100,
+    DRV2605L_EFFECT_STRONG_CLICK_2_80,
+    DRV2605L_EFFECT_STRONG_CLICK_3_60,
+    DRV2605L_EFFECT_STRONG_CLICK_4_30,
+    DRV2605L_EFFECT_MEDIUM_CLICK_1_100,
+    DRV2605L_EFFECT_MEDIUM_CLICK_2_80,
+    DRV2605L_EFFECT_MEDIUM_CLICK_3_60,
+    DRV2605L_EFFECT_SHARP_TICK_1_100,
+    DRV2605L_EFFECT_SHARP_TICK_2_80,
+    DRV2605L_EFFECT_SHARP_TICK_3_60,
+    DRV2605L_EFFECT_SHORT_DOUBLE_CLICK_STRONG_1_100,
+    DRV2605L_EFFECT_SHORT_DOUBLE_CLICK_STRONG_2_80,
+    DRV2605L_EFFECT_SHORT_DOUBLE_CLICK_STRONG_3_60,
+    DRV2605L_EFFECT_SHORT_DOUBLE_CLICK_STRONG_4_30,
+    DRV2605L_EFFECT_SHORT_DOUBLE_CLICK_MEDIUM_1_100,
+    DRV2605L_EFFECT_SHORT_DOUBLE_CLICK_MEDIUM_2_80,
+    DRV2605L_EFFECT_SHORT_DOUBLE_CLICK_MEDIUM_3_60,
+    DRV2605L_EFFECT_SHORT_DOUBLE_SHARP_TICK_1_100,
+    DRV2605L_EFFECT_SHORT_DOUBLE_SHARP_TICK_2_80,
+    DRV2605L_EFFECT_SHORT_DOUBLE_SHARP_TICK_3_60,
+    DRV2605L_EFFECT_LONG_DOUBLE_SHARP_CLICK_STRONG_1_100,
+    DRV2605L_EFFECT_LONG_DOUBLE_SHARP_CLICK_STRONG_2_80,
+    DRV2605L_EFFECT_LONG_DOUBLE_SHARP_CLICK_STRONG_3_60,
+    DRV2605L_EFFECT_LONG_DOUBLE_SHARP_CLICK_STRONG_4_30,
+    DRV2605L_EFFECT_LONG_DOUBLE_SHARP_CLICK_MEDIUM_1_100,
+    DRV2605L_EFFECT_LONG_DOUBLE_SHARP_CLICK_MEDIUM_2_80,
+    DRV2605L_EFFECT_LONG_DOUBLE_SHARP_CLICK_MEDIUM_3_60,
+    DRV2605L_EFFECT_LONG_DOUBLE_SHARP_TICK_1_100,
+    DRV2605L_EFFECT_LONG_DOUBLE_SHARP_TICK_2_80,
+    DRV2605L_EFFECT_LONG_DOUBLE_SHARP_TICK_3_60,
+    DRV2605L_EFFECT_BUZZ_1_100,
+    DRV2605L_EFFECT_BUZZ_2_80,
+    DRV2605L_EFFECT_BUZZ_3_60,
+    DRV2605L_EFFECT_BUZZ_4_40,
+    DRV2605L_EFFECT_BUZZ_5_20,
+    DRV2605L_EFFECT_PULSING_STRONG_1_100,
+    DRV2605L_EFFECT_PULSING_STRONG_2_60,
+    DRV2605L_EFFECT_PULSING_MEDIUM_1_100,
+    DRV2605L_EFFECT_PULSING_MEDIUM_2_60,
+    DRV2605L_EFFECT_PULSING_SHARP_1_100,
+    DRV2605L_EFFECT_PULSING_SHARP_2_60,
+    DRV2605L_EFFECT_TRANSITION_CLICK_1_100,
+    DRV2605L_EFFECT_TRANSITION_CLICK_2_80,
+    DRV2605L_EFFECT_TRANSITION_CLICK_3_60,
+    DRV2605L_EFFECT_TRANSITION_CLICK_4_40,
+    DRV2605L_EFFECT_TRANSITION_CLICK_5_20,
+    DRV2605L_EFFECT_TRANSITION_CLICK_6_10,
+    DRV2605L_EFFECT_TRANSITION_HUM_1_100,
+    DRV2605L_EFFECT_TRANSITION_HUM_2_80,
+    DRV2605L_EFFECT_TRANSITION_HUM_3_60,
+    DRV2605L_EFFECT_TRANSITION_HUM_4_40,
+    DRV2605L_EFFECT_TRANSITION_HUM_5_20,
+    DRV2605L_EFFECT_TRANSITION_HUM_6_10,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_LONG_SMOOTH_1_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_LONG_SMOOTH_2_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_MEDIUM_SMOOTH_1_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_MEDIUM_SMOOTH_2_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_SHORT_SMOOTH_1_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_SHORT_SMOOTH_2_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_LONG_SHARP_1_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_LONG_SHARP_2_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_MEDIUM_SHARP_1_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_MEDIUM_SHARP_2_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_SHORT_SHARP_1_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_SHORT_SHARP_2_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_LONG_SMOOTH_1_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_LONG_SMOOTH_2_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_MEDIUM_SMOOTH_1_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_MEDIUM_SMOOTH_2_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_SHORT_SMOOTH_1_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_SHORT_SMOOTH_2_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_LONG_SHARP_1_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_LONG_SHARP_2_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_MEDIUM_SHARP_1_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_MEDIUM_SHARP_2_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_SHORT_SHARP_1_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_SHORT_SHARP_2_100,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_LONG_SMOOTH_1_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_LONG_SMOOTH_2_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_MEDIUM_SMOOTH_1_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_MEDIUM_SMOOTH_2_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_SHORT_SMOOTH_1_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_SHORT_SMOOTH_2_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_LONG_SHARP_1_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_LONG_SHARP_2_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_MEDIUM_SHARP_1_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_MEDIUM_SHARP_2_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_SHORT_SHARP_1_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_DOWN_SHORT_SHARP_2_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_LONG_SMOOTH_1_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_LONG_SMOOTH_2_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_MEDIUM_SMOOTH_1_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_MEDIUM_SMOOTH_2_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_SHORT_SMOOTH_1_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_SHORT_SMOOTH_2_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_LONG_SHARP_1_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_LONG_SHARP_2_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_MEDIUM_SHARP_1_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_MEDIUM_SHARP_2_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_SHORT_SHARP_1_50,
+    DRV2605L_EFFECT_TRANSITION_RAMP_UP_SHORT_SHARP_2_50,
+    DRV2605L_EFFECT_LONG_BUZZ_FOR_PROGRAMMATIC_STOPPING,
+    DRV2605L_EFFECT_SMOOTH_HUM_1_50,
+    DRV2605L_EFFECT_SMOOTH_HUM_2_40,
+    DRV2605L_EFFECT_SMOOTH_HUM_3_30,
+    DRV2605L_EFFECT_SMOOTH_HUM_4_20,
+    DRV2605L_EFFECT_SMOOTH_HUM_5_10,
+    DRV2605L_EFFECT_COUNT
+} drv2605l_effect_t;
+
+/* Register bit array unions */
+
+typedef union { /* register 0x1A */
+    uint8_t raw;
+    struct {
+        uint8_t BEMF_GAIN : 2;
+        uint8_t LOOP_GAIN : 2;
+        uint8_t BRAKE_FACTOR : 3;
+        uint8_t ERM_LRA : 1;
+    } bits;
+} drv2605l_reg_feedback_ctrl_t;
+
+typedef union { /* register 0x1B */
+    uint8_t raw;
+    struct {
+        uint8_t C1_DRIVE_TIME : 5;
+        uint8_t C1_AC_COUPLE : 1;
+        uint8_t : 1;
+        uint8_t C1_STARTUP_BOOST : 1;
+    } bits;
+} drv2605l_reg_ctrl1_t;
+
+typedef union { /* register 0x1C */
+    uint8_t raw;
+    struct {
+        uint8_t C2_IDISS_TIME : 2;
+        uint8_t C2_BLANKING_TIME : 2;
+        uint8_t C2_SAMPLE_TIME : 2;
+        uint8_t C2_BRAKE_STAB : 1;
+        uint8_t C2_BIDIR_INPUT : 1;
+    } bits;
+} drv2605l_reg_ctrl2_t;
+
+typedef union { /* register 0x1D */
+    uint8_t raw;
+    struct {
+        uint8_t C3_LRA_OPEN_LOOP : 1;
+        uint8_t C3_N_PWM_ANALOG : 1;
+        uint8_t C3_LRA_DRIVE_MODE : 1;
+        uint8_t C3_DATA_FORMAT_RTO : 1;
+        uint8_t C3_SUPPLY_COMP_DIS : 1;
+        uint8_t C3_ERM_OPEN_LOOP : 1;
+        uint8_t C3_NG_THRESH : 2;
+    } bits;
+} drv2605l_reg_ctrl3_t;
+
+typedef union { /* register 0x1E */
+    uint8_t raw;
+    struct {
+        uint8_t C4_OTP_PROGRAM : 1;
+        uint8_t : 1;
+        uint8_t C4_OTP_STATUS : 1;
+        uint8_t : 1;
+        uint8_t C4_AUTO_CAL_TIME : 2;
+        uint8_t C4_ZC_DET_TIME : 2;
+    } bits;
+} drv2605l_reg_ctrl4_t;
diff --git a/drivers/led/apa102.c b/drivers/led/apa102.c
index 40fc68e4f11c..766d8cd2eb7e 100644
--- a/drivers/led/apa102.c
+++ b/drivers/led/apa102.c
@@ -16,14 +16,14 @@
  */
 
 #include "apa102.h"
-#include "quantum.h"
+#include "gpio.h"
 
 #ifndef APA102_NOPS
 #    if defined(__AVR__)
 #        define APA102_NOPS 0 // AVR at 16 MHz already spends 62.5 ns per clock, so no extra delay is needed
 #    elif defined(PROTOCOL_CHIBIOS)
-
 #        include "hal.h"
+#        include "chibios_config.h"
 #        if defined(STM32F0XX) || defined(STM32F1XX) || defined(STM32F3XX) || defined(STM32F4XX) || defined(STM32L0XX) || defined(GD32VF103)
 #            define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4))) // This calculates how many loops of 4 nops to run to delay 100 ns
 #        else
diff --git a/drivers/led/aw20216.c b/drivers/led/aw20216.c
index 7895f1497b0f..479643add483 100644
--- a/drivers/led/aw20216.c
+++ b/drivers/led/aw20216.c
@@ -71,7 +71,7 @@
 uint8_t g_pwm_buffer[DRIVER_COUNT][AW_PWM_REGISTER_COUNT];
 bool    g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
 
-bool AW20216_write(pin_t cs_pin, uint8_t page, uint8_t reg, uint8_t* data, uint8_t len) {
+bool aw20216_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};
 
     if (!spi_start(cs_pin, false, AW_SPI_MODE, AW_SPI_DIVISOR)) {
@@ -96,70 +96,73 @@ bool AW20216_write(pin_t cs_pin, uint8_t page, uint8_t reg, uint8_t* data, uint8
     return true;
 }
 
-static inline bool AW20216_write_register(pin_t cs_pin, uint8_t page, uint8_t reg, uint8_t value) {
+static inline bool aw20216_write_register(pin_t cs_pin, uint8_t page, uint8_t reg, uint8_t value) {
     // Little wrapper so callers need not care about sending a buffer
-    return AW20216_write(cs_pin, page, reg, &value, 1);
+    return aw20216_write(cs_pin, page, reg, &value, 1);
 }
 
-void AW20216_soft_reset(pin_t cs_pin) {
-    AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_RESET, AW_RESET_CMD);
+void aw20216_soft_reset(pin_t cs_pin) {
+    aw20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_RESET, AW_RESET_CMD);
 }
 
-static void AW20216_init_scaling(pin_t cs_pin) {
+static void aw20216_init_scaling(pin_t cs_pin) {
     // Set constant current to the max, control brightness with PWM
     for (uint8_t i = 0; i < AW_PWM_REGISTER_COUNT; i++) {
-        AW20216_write_register(cs_pin, AW_PAGE_SCALING, i, AW_SCALING_MAX);
+        aw20216_write_register(cs_pin, AW_PAGE_SCALING, i, AW_SCALING_MAX);
     }
 }
 
-static inline void AW20216_init_current_limit(pin_t cs_pin) {
+static inline void aw20216_init_current_limit(pin_t cs_pin) {
     // Push config
-    AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_GLOBALCURRENT, AW_GLOBAL_CURRENT_MAX);
+    aw20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_GLOBALCURRENT, AW_GLOBAL_CURRENT_MAX);
 }
 
-static inline void AW20216_soft_enable(pin_t cs_pin) {
+static inline void aw20216_soft_enable(pin_t cs_pin) {
     // Push config
-    AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_CONFIGURATION, AW_CONFIG_DEFAULT | AW_CHIPEN);
+    aw20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_CONFIGURATION, AW_CONFIG_DEFAULT | AW_CHIPEN);
 }
 
-static inline void AW20216_auto_lowpower(pin_t cs_pin) {
-    AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_MIXFUNCTION, AW_MIXCR_DEFAULT | AW_LPEN);
+static inline void aw20216_auto_lowpower(pin_t cs_pin) {
+    aw20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_MIXFUNCTION, AW_MIXCR_DEFAULT | AW_LPEN);
 }
 
-void AW20216_init(pin_t cs_pin, pin_t en_pin) {
+void aw20216_init(pin_t cs_pin, pin_t en_pin) {
     setPinOutput(en_pin);
     writePinHigh(en_pin);
 
-    AW20216_soft_reset(cs_pin);
+    aw20216_soft_reset(cs_pin);
     wait_ms(2);
 
     // Drivers should start with all scaling and PWM registers as off
-    AW20216_init_current_limit(cs_pin);
-    AW20216_init_scaling(cs_pin);
+    aw20216_init_current_limit(cs_pin);
+    aw20216_init_scaling(cs_pin);
 
-    AW20216_soft_enable(cs_pin);
-    AW20216_auto_lowpower(cs_pin);
+    aw20216_soft_enable(cs_pin);
+    aw20216_auto_lowpower(cs_pin);
 }
 
-void AW20216_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+void aw20216_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     aw_led led;
     memcpy_P(&led, (&g_aw_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) {
+        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;
 }
 
-void AW20216_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+void aw20216_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
     for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        AW20216_set_color(i, red, green, blue);
+        aw20216_set_color(i, red, green, blue);
     }
 }
 
-void AW20216_update_pwm_buffers(pin_t cs_pin, uint8_t index) {
+void aw20216_update_pwm_buffers(pin_t cs_pin, uint8_t index) {
     if (g_pwm_buffer_update_required[index]) {
-        AW20216_write(cs_pin, AW_PAGE_PWM, 0, g_pwm_buffer[index], AW_PWM_REGISTER_COUNT);
+        aw20216_write(cs_pin, AW_PAGE_PWM, 0, g_pwm_buffer[index], AW_PWM_REGISTER_COUNT);
     }
     g_pwm_buffer_update_required[index] = false;
 }
diff --git a/drivers/led/aw20216.h b/drivers/led/aw20216.h
index c6e71b4b4e21..e342cb6bacdf 100644
--- a/drivers/led/aw20216.h
+++ b/drivers/led/aw20216.h
@@ -30,10 +30,10 @@ typedef struct aw_led {
 
 extern const aw_led PROGMEM g_aw_leds[RGB_MATRIX_LED_COUNT];
 
-void AW20216_init(pin_t cs_pin, pin_t en_pin);
-void AW20216_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
-void AW20216_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
-void AW20216_update_pwm_buffers(pin_t cs_pin, uint8_t index);
+void aw20216_init(pin_t cs_pin, pin_t en_pin);
+void aw20216_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
+void aw20216_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
+void aw20216_update_pwm_buffers(pin_t cs_pin, uint8_t index);
 
 #define CS1_SW1 0x00
 #define CS2_SW1 0x01
diff --git a/drivers/led/ckled2001-simple.c b/drivers/led/ckled2001-simple.c
index 6c4ffd398e56..c4d4c0a4cc27 100644
--- a/drivers/led/ckled2001-simple.c
+++ b/drivers/led/ckled2001-simple.c
@@ -42,7 +42,7 @@ uint8_t g_twi_transfer_buffer[20];
 // 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 CKLED2001_write_pwm_buffer() but it's
+// buffers and the transfers in ckled2001_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
 uint8_t g_pwm_buffer[DRIVER_COUNT][192];
 bool    g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
@@ -50,7 +50,7 @@ bool    g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
 uint8_t g_led_control_registers[DRIVER_COUNT][24]             = {0};
 bool    g_led_control_registers_update_required[DRIVER_COUNT] = {false};
 
-bool CKLED2001_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
+bool ckled2001_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;
@@ -69,7 +69,7 @@ bool CKLED2001_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
     return true;
 }
 
-bool CKLED2001_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
+bool ckled2001_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.
@@ -100,69 +100,72 @@ bool CKLED2001_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
     return true;
 }
 
-void CKLED2001_init(uint8_t addr) {
+void ckled2001_init(uint8_t addr) {
     // Select to function page
-    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
+    ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
     // Setting LED driver to shutdown mode
-    CKLED2001_write_register(addr, CONFIGURATION_REG, MSKSW_SHUT_DOWN_MODE);
+    ckled2001_write_register(addr, CONFIGURATION_REG, MSKSW_SHUT_DOWN_MODE);
     // Setting internal channel pulldown/pullup
-    CKLED2001_write_register(addr, PDU_REG, MSKSET_CA_CB_CHANNEL);
+    ckled2001_write_register(addr, PDU_REG, MSKSET_CA_CB_CHANNEL);
     // Select number of scan phase
-    CKLED2001_write_register(addr, SCAN_PHASE_REG, PHASE_CHANNEL);
+    ckled2001_write_register(addr, SCAN_PHASE_REG, PHASE_CHANNEL);
     // Setting PWM Delay Phase
-    CKLED2001_write_register(addr, SLEW_RATE_CONTROL_MODE1_REG, MSKPWM_DELAY_PHASE_ENABLE);
+    ckled2001_write_register(addr, SLEW_RATE_CONTROL_MODE1_REG, MSKPWM_DELAY_PHASE_ENABLE);
     // Setting Driving/Sinking Channel Slew Rate
-    CKLED2001_write_register(addr, SLEW_RATE_CONTROL_MODE2_REG, MSKDRIVING_SINKING_CHHANNEL_SLEWRATE_ENABLE);
+    ckled2001_write_register(addr, SLEW_RATE_CONTROL_MODE2_REG, MSKDRIVING_SINKING_CHHANNEL_SLEWRATE_ENABLE);
     // Setting Iref
-    CKLED2001_write_register(addr, SOFTWARE_SLEEP_REG, MSKSLEEP_DISABLE);
+    ckled2001_write_register(addr, SOFTWARE_SLEEP_REG, MSKSLEEP_DISABLE);
     // Set LED CONTROL PAGE (Page 0)
-    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_CONTROL_PAGE);
+    ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_CONTROL_PAGE);
     for (int i = 0; i < LED_CONTROL_ON_OFF_LENGTH; i++) {
-        CKLED2001_write_register(addr, i, 0x00);
+        ckled2001_write_register(addr, i, 0x00);
     }
 
     // Set PWM PAGE (Page 1)
-    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_PWM_PAGE);
+    ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_PWM_PAGE);
     for (int i = 0; i < LED_CURRENT_TUNE_LENGTH; i++) {
-        CKLED2001_write_register(addr, i, 0x00);
+        ckled2001_write_register(addr, i, 0x00);
     }
 
     // Set CURRENT PAGE (Page 4)
     uint8_t current_tuen_reg_list[LED_CURRENT_TUNE_LENGTH] = CKLED2001_CURRENT_TUNE;
-    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, CURRENT_TUNE_PAGE);
+    ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, CURRENT_TUNE_PAGE);
     for (int i = 0; i < LED_CURRENT_TUNE_LENGTH; i++) {
-        CKLED2001_write_register(addr, i, current_tuen_reg_list[i]);
+        ckled2001_write_register(addr, i, current_tuen_reg_list[i]);
     }
 
     // Enable LEDs ON/OFF
-    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_CONTROL_PAGE);
+    ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_CONTROL_PAGE);
     for (int i = 0; i < LED_CONTROL_ON_OFF_LENGTH; i++) {
-        CKLED2001_write_register(addr, i, 0xFF);
+        ckled2001_write_register(addr, i, 0xFF);
     }
 
     // Select to function page
-    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
+    ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
     // Setting LED driver to normal mode
-    CKLED2001_write_register(addr, CONFIGURATION_REG, MSKSW_NORMAL_MODE);
+    ckled2001_write_register(addr, CONFIGURATION_REG, MSKSW_NORMAL_MODE);
 }
 
-void CKLED2001_set_value(int index, uint8_t value) {
+void ckled2001_set_value(int index, uint8_t value) {
     ckled2001_led led;
     if (index >= 0 && index < LED_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_ckled2001_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 CKLED2001_set_value_all(uint8_t value) {
+void ckled2001_set_value_all(uint8_t value) {
     for (int i = 0; i < LED_MATRIX_LED_COUNT; i++) {
-        CKLED2001_set_value(i, value);
+        ckled2001_set_value(i, value);
     }
 }
 
-void CKLED2001_set_led_control_register(uint8_t index, bool value) {
+void ckled2001_set_led_control_register(uint8_t index, bool value) {
     ckled2001_led led;
     memcpy_P(&led, (&g_ckled2001_leds[index]), sizeof(led));
 
@@ -178,41 +181,41 @@ void CKLED2001_set_led_control_register(uint8_t index, bool value) {
     g_led_control_registers_update_required[led.driver] = true;
 }
 
-void CKLED2001_update_pwm_buffers(uint8_t addr, uint8_t index) {
+void ckled2001_update_pwm_buffers(uint8_t addr, uint8_t index) {
     if (g_pwm_buffer_update_required[index]) {
-        CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_PWM_PAGE);
+        ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_PWM_PAGE);
 
         // If any of the transactions fail we risk writing dirty PG0,
         // refresh page 0 just in case.
-        if (!CKLED2001_write_pwm_buffer(addr, g_pwm_buffer[index])) {
+        if (!ckled2001_write_pwm_buffer(addr, g_pwm_buffer[index])) {
             g_led_control_registers_update_required[index] = true;
         }
     }
     g_pwm_buffer_update_required[index] = false;
 }
 
-void CKLED2001_update_led_control_registers(uint8_t addr, uint8_t index) {
+void ckled2001_update_led_control_registers(uint8_t addr, uint8_t index) {
     if (g_led_control_registers_update_required[index]) {
-        CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_CONTROL_PAGE);
+        ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_CONTROL_PAGE);
         for (int i = 0; i < 24; i++) {
-            CKLED2001_write_register(addr, i, g_led_control_registers[index][i]);
+            ckled2001_write_register(addr, i, g_led_control_registers[index][i]);
         }
     }
     g_led_control_registers_update_required[index] = false;
 }
 
-void CKLED2001_sw_return_normal(uint8_t addr) {
+void ckled2001_sw_return_normal(uint8_t addr) {
     // Select to function page
-    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
+    ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
     // Setting LED driver to normal mode
-    CKLED2001_write_register(addr, CONFIGURATION_REG, MSKSW_NORMAL_MODE);
+    ckled2001_write_register(addr, CONFIGURATION_REG, MSKSW_NORMAL_MODE);
 }
 
-void CKLED2001_sw_shutdown(uint8_t addr) {
+void ckled2001_sw_shutdown(uint8_t addr) {
     // Select to function page
-    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
+    ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
     // Setting LED driver to shutdown mode
-    CKLED2001_write_register(addr, CONFIGURATION_REG, MSKSW_SHUT_DOWN_MODE);
+    ckled2001_write_register(addr, CONFIGURATION_REG, MSKSW_SHUT_DOWN_MODE);
     // Write SW Sleep Register
-    CKLED2001_write_register(addr, SOFTWARE_SLEEP_REG, MSKSLEEP_ENABLE);
+    ckled2001_write_register(addr, SOFTWARE_SLEEP_REG, MSKSLEEP_ENABLE);
 }
diff --git a/drivers/led/ckled2001-simple.h b/drivers/led/ckled2001-simple.h
index a56cad3461bb..c94df62dd2ee 100644
--- a/drivers/led/ckled2001-simple.h
+++ b/drivers/led/ckled2001-simple.h
@@ -27,24 +27,24 @@ typedef struct ckled2001_led {
 
 extern const ckled2001_led PROGMEM g_ckled2001_leds[LED_MATRIX_LED_COUNT];
 
-void CKLED2001_init(uint8_t addr);
-bool CKLED2001_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-bool CKLED2001_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
+void ckled2001_init(uint8_t addr);
+bool ckled2001_write_register(uint8_t addr, uint8_t reg, uint8_t data);
+bool ckled2001_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
 
-void CKLED2001_set_value(int index, uint8_t value);
-void CKLED2001_set_value_all(uint8_t value);
+void ckled2001_set_value(int index, uint8_t value);
+void ckled2001_set_value_all(uint8_t value);
 
-void CKLED2001_set_led_control_register(uint8_t index, bool value);
+void ckled2001_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 CKLED2001_update_pwm_buffers(uint8_t addr, uint8_t index);
-void CKLED2001_update_led_control_registers(uint8_t addr, uint8_t index);
+void ckled2001_update_pwm_buffers(uint8_t addr, uint8_t index);
+void ckled2001_update_led_control_registers(uint8_t addr, uint8_t index);
 
-void CKLED2001_sw_return_normal(uint8_t addr);
-void CKLED2001_sw_shutdown(uint8_t addr);
+void ckled2001_sw_return_normal(uint8_t addr);
+void ckled2001_sw_shutdown(uint8_t addr);
 
 // Registers Page Define
 #define CONFIGURE_CMD_PAGE 0xFD
diff --git a/drivers/led/ckled2001.c b/drivers/led/ckled2001.c
index a99b479d1cbb..6ababf55e906 100644
--- a/drivers/led/ckled2001.c
+++ b/drivers/led/ckled2001.c
@@ -42,7 +42,7 @@ uint8_t g_twi_transfer_buffer[65];
 // 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 CKLED2001_write_pwm_buffer() but it's
+// buffers and the transfers in ckled2001_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
 uint8_t g_pwm_buffer[DRIVER_COUNT][192];
 bool    g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
@@ -50,7 +50,7 @@ bool    g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
 uint8_t g_led_control_registers[DRIVER_COUNT][24]             = {0};
 bool    g_led_control_registers_update_required[DRIVER_COUNT] = {false};
 
-bool CKLED2001_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
+bool ckled2001_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;
@@ -69,7 +69,7 @@ bool CKLED2001_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
     return true;
 }
 
-bool CKLED2001_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
+bool ckled2001_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 3 transfers of 64 bytes.
@@ -99,57 +99,60 @@ bool CKLED2001_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
     return true;
 }
 
-void CKLED2001_init(uint8_t addr) {
+void ckled2001_init(uint8_t addr) {
     // Select to function page
-    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
+    ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
     // Setting LED driver to shutdown mode
-    CKLED2001_write_register(addr, CONFIGURATION_REG, MSKSW_SHUT_DOWN_MODE);
+    ckled2001_write_register(addr, CONFIGURATION_REG, MSKSW_SHUT_DOWN_MODE);
     // Setting internal channel pulldown/pullup
-    CKLED2001_write_register(addr, PDU_REG, MSKSET_CA_CB_CHANNEL);
+    ckled2001_write_register(addr, PDU_REG, MSKSET_CA_CB_CHANNEL);
     // Select number of scan phase
-    CKLED2001_write_register(addr, SCAN_PHASE_REG, PHASE_CHANNEL);
+    ckled2001_write_register(addr, SCAN_PHASE_REG, PHASE_CHANNEL);
     // Setting PWM Delay Phase
-    CKLED2001_write_register(addr, SLEW_RATE_CONTROL_MODE1_REG, MSKPWM_DELAY_PHASE_ENABLE);
+    ckled2001_write_register(addr, SLEW_RATE_CONTROL_MODE1_REG, MSKPWM_DELAY_PHASE_ENABLE);
     // Setting Driving/Sinking Channel Slew Rate
-    CKLED2001_write_register(addr, SLEW_RATE_CONTROL_MODE2_REG, MSKDRIVING_SINKING_CHHANNEL_SLEWRATE_ENABLE);
+    ckled2001_write_register(addr, SLEW_RATE_CONTROL_MODE2_REG, MSKDRIVING_SINKING_CHHANNEL_SLEWRATE_ENABLE);
     // Setting Iref
-    CKLED2001_write_register(addr, SOFTWARE_SLEEP_REG, MSKSLEEP_DISABLE);
+    ckled2001_write_register(addr, SOFTWARE_SLEEP_REG, MSKSLEEP_DISABLE);
     // Set LED CONTROL PAGE (Page 0)
-    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_CONTROL_PAGE);
+    ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_CONTROL_PAGE);
     for (int i = 0; i < LED_CONTROL_ON_OFF_LENGTH; i++) {
-        CKLED2001_write_register(addr, i, 0x00);
+        ckled2001_write_register(addr, i, 0x00);
     }
 
     // Set PWM PAGE (Page 1)
-    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_PWM_PAGE);
+    ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_PWM_PAGE);
     for (int i = 0; i < LED_CURRENT_TUNE_LENGTH; i++) {
-        CKLED2001_write_register(addr, i, 0x00);
+        ckled2001_write_register(addr, i, 0x00);
     }
 
     // Set CURRENT PAGE (Page 4)
     uint8_t current_tuen_reg_list[LED_CURRENT_TUNE_LENGTH] = CKLED2001_CURRENT_TUNE;
-    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, CURRENT_TUNE_PAGE);
+    ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, CURRENT_TUNE_PAGE);
     for (int i = 0; i < LED_CURRENT_TUNE_LENGTH; i++) {
-        CKLED2001_write_register(addr, i, current_tuen_reg_list[i]);
+        ckled2001_write_register(addr, i, current_tuen_reg_list[i]);
     }
 
     // Enable LEDs ON/OFF
-    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_CONTROL_PAGE);
+    ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_CONTROL_PAGE);
     for (int i = 0; i < LED_CONTROL_ON_OFF_LENGTH; i++) {
-        CKLED2001_write_register(addr, i, 0xFF);
+        ckled2001_write_register(addr, i, 0xFF);
     }
 
     // Select to function page
-    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
+    ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
     // Setting LED driver to normal mode
-    CKLED2001_write_register(addr, CONFIGURATION_REG, MSKSW_NORMAL_MODE);
+    ckled2001_write_register(addr, CONFIGURATION_REG, MSKSW_NORMAL_MODE);
 }
 
-void CKLED2001_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+void ckled2001_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     ckled2001_led led;
     if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_ckled2001_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) {
+            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;
@@ -157,13 +160,13 @@ void CKLED2001_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     }
 }
 
-void CKLED2001_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+void ckled2001_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
     for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        CKLED2001_set_color(i, red, green, blue);
+        ckled2001_set_color(i, red, green, blue);
     }
 }
 
-void CKLED2001_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
+void ckled2001_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
     ckled2001_led led;
     memcpy_P(&led, (&g_ckled2001_leds[index]), sizeof(led));
 
@@ -193,41 +196,41 @@ void CKLED2001_set_led_control_register(uint8_t index, bool red, bool green, boo
     g_led_control_registers_update_required[led.driver] = true;
 }
 
-void CKLED2001_update_pwm_buffers(uint8_t addr, uint8_t index) {
+void ckled2001_update_pwm_buffers(uint8_t addr, uint8_t index) {
     if (g_pwm_buffer_update_required[index]) {
-        CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_PWM_PAGE);
+        ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_PWM_PAGE);
 
         // If any of the transactions fail we risk writing dirty PG0,
         // refresh page 0 just in case.
-        if (!CKLED2001_write_pwm_buffer(addr, g_pwm_buffer[index])) {
+        if (!ckled2001_write_pwm_buffer(addr, g_pwm_buffer[index])) {
             g_led_control_registers_update_required[index] = true;
         }
     }
     g_pwm_buffer_update_required[index] = false;
 }
 
-void CKLED2001_update_led_control_registers(uint8_t addr, uint8_t index) {
+void ckled2001_update_led_control_registers(uint8_t addr, uint8_t index) {
     if (g_led_control_registers_update_required[index]) {
-        CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_CONTROL_PAGE);
+        ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, LED_CONTROL_PAGE);
         for (int i = 0; i < 24; i++) {
-            CKLED2001_write_register(addr, i, g_led_control_registers[index][i]);
+            ckled2001_write_register(addr, i, g_led_control_registers[index][i]);
         }
     }
     g_led_control_registers_update_required[index] = false;
 }
 
-void CKLED2001_sw_return_normal(uint8_t addr) {
+void ckled2001_sw_return_normal(uint8_t addr) {
     // Select to function page
-    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
+    ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
     // Setting LED driver to normal mode
-    CKLED2001_write_register(addr, CONFIGURATION_REG, MSKSW_NORMAL_MODE);
+    ckled2001_write_register(addr, CONFIGURATION_REG, MSKSW_NORMAL_MODE);
 }
 
-void CKLED2001_sw_shutdown(uint8_t addr) {
+void ckled2001_sw_shutdown(uint8_t addr) {
     // Select to function page
-    CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
+    ckled2001_write_register(addr, CONFIGURE_CMD_PAGE, FUNCTION_PAGE);
     // Setting LED driver to shutdown mode
-    CKLED2001_write_register(addr, CONFIGURATION_REG, MSKSW_SHUT_DOWN_MODE);
+    ckled2001_write_register(addr, CONFIGURATION_REG, MSKSW_SHUT_DOWN_MODE);
     // Write SW Sleep Register
-    CKLED2001_write_register(addr, SOFTWARE_SLEEP_REG, MSKSLEEP_ENABLE);
+    ckled2001_write_register(addr, SOFTWARE_SLEEP_REG, MSKSLEEP_ENABLE);
 }
diff --git a/drivers/led/ckled2001.h b/drivers/led/ckled2001.h
index aa70a0623f93..32da137fb7ac 100644
--- a/drivers/led/ckled2001.h
+++ b/drivers/led/ckled2001.h
@@ -29,24 +29,24 @@ typedef struct ckled2001_led {
 
 extern const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT];
 
-void CKLED2001_init(uint8_t addr);
-bool CKLED2001_write_register(uint8_t addr, uint8_t reg, uint8_t data);
-bool CKLED2001_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
+void ckled2001_init(uint8_t addr);
+bool ckled2001_write_register(uint8_t addr, uint8_t reg, uint8_t data);
+bool ckled2001_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
 
-void CKLED2001_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
-void CKLED2001_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
+void ckled2001_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
+void ckled2001_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
 
-void CKLED2001_set_led_control_register(uint8_t index, bool red, bool green, bool blue);
+void ckled2001_set_led_control_register(uint8_t index, bool red, bool green, bool 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 CKLED2001_update_pwm_buffers(uint8_t addr, uint8_t index);
-void CKLED2001_update_led_control_registers(uint8_t addr, uint8_t index);
+void ckled2001_update_pwm_buffers(uint8_t addr, uint8_t index);
+void ckled2001_update_led_control_registers(uint8_t addr, uint8_t index);
 
-void CKLED2001_sw_return_normal(uint8_t addr);
-void CKLED2001_sw_shutdown(uint8_t addr);
+void ckled2001_sw_return_normal(uint8_t addr);
+void ckled2001_sw_shutdown(uint8_t addr);
 
 // Registers Page Define
 #define CONFIGURE_CMD_PAGE 0xFD
diff --git a/drivers/led/issi/is31fl3218.c b/drivers/led/issi/is31fl3218.c
index c2300ebe899a..970e9a0be98a 100644
--- a/drivers/led/issi/is31fl3218.c
+++ b/drivers/led/issi/is31fl3218.c
@@ -37,58 +37,61 @@ uint8_t g_twi_transfer_buffer[20];
 uint8_t g_pwm_buffer[18];
 bool    g_pwm_buffer_update_required = false;
 
-void IS31FL3218_write_register(uint8_t reg, uint8_t data) {
+void is31fl3218_write_register(uint8_t reg, uint8_t data) {
     g_twi_transfer_buffer[0] = reg;
     g_twi_transfer_buffer[1] = data;
     i2c_transmit(ISSI_ADDRESS, g_twi_transfer_buffer, 2, ISSI_TIMEOUT);
 }
 
-void IS31FL3218_write_pwm_buffer(uint8_t *pwm_buffer) {
+void is31fl3218_write_pwm_buffer(uint8_t *pwm_buffer) {
     g_twi_transfer_buffer[0] = ISSI_REG_PWM;
     memcpy(g_twi_transfer_buffer + 1, pwm_buffer, 18);
 
     i2c_transmit(ISSI_ADDRESS, g_twi_transfer_buffer, 19, ISSI_TIMEOUT);
 }
 
-void IS31FL3218_init(void) {
+void is31fl3218_init(void) {
     // In case we ever want to reinitialize (?)
-    IS31FL3218_write_register(ISSI_REG_RESET, 0x00);
+    is31fl3218_write_register(ISSI_REG_RESET, 0x00);
 
     // Turn off software shutdown
-    IS31FL3218_write_register(ISSI_REG_SHUTDOWN, 0x01);
+    is31fl3218_write_register(ISSI_REG_SHUTDOWN, 0x01);
 
     // Set all PWM values to zero
     for (uint8_t i = 0; i < 18; i++) {
-        IS31FL3218_write_register(ISSI_REG_PWM + i, 0x00);
+        is31fl3218_write_register(ISSI_REG_PWM + i, 0x00);
     }
 
     // Enable all channels
     for (uint8_t i = 0; i < 3; i++) {
-        IS31FL3218_write_register(ISSI_REG_CONTROL + i, 0b00111111);
+        is31fl3218_write_register(ISSI_REG_CONTROL + i, 0b00111111);
     }
 
     // Load PWM registers and LED Control register data
-    IS31FL3218_write_register(ISSI_REG_UPDATE, 0x01);
+    is31fl3218_write_register(ISSI_REG_UPDATE, 0x01);
 }
 
-void IS31FL3218_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+void is31fl3218_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+    if (g_pwm_buffer[index * 3 + 0] == red && g_pwm_buffer[index * 3 + 1] == green && g_pwm_buffer[index * 3 + 2] == blue) {
+        return;
+    }
     g_pwm_buffer[index * 3 + 0]  = red;
     g_pwm_buffer[index * 3 + 1]  = green;
     g_pwm_buffer[index * 3 + 2]  = blue;
     g_pwm_buffer_update_required = true;
 }
 
-void IS31FL3218_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+void is31fl3218_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
     for (int i = 0; i < 6; i++) {
-        IS31FL3218_set_color(i, red, green, blue);
+        is31fl3218_set_color(i, red, green, blue);
     }
 }
 
-void IS31FL3218_update_pwm_buffers(void) {
+void is31fl3218_update_pwm_buffers(void) {
     if (g_pwm_buffer_update_required) {
-        IS31FL3218_write_pwm_buffer(g_pwm_buffer);
+        is31fl3218_write_pwm_buffer(g_pwm_buffer);
         // Load PWM registers and LED Control register data
-        IS31FL3218_write_register(ISSI_REG_UPDATE, 0x01);
+        is31fl3218_write_register(ISSI_REG_UPDATE, 0x01);
     }
     g_pwm_buffer_update_required = false;
 }
diff --git a/drivers/led/issi/is31fl3218.h b/drivers/led/issi/is31fl3218.h
index 26bb01a01477..2fe37684320f 100644
--- a/drivers/led/issi/is31fl3218.h
+++ b/drivers/led/issi/is31fl3218.h
@@ -20,7 +20,7 @@
 #include <stdbool.h>
 #include <string.h>
 
-void IS31FL3218_init(void);
-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);
-void IS31FL3218_update_pwm_buffers(void);
+void is31fl3218_init(void);
+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);
+void is31fl3218_update_pwm_buffers(void);
diff --git a/drivers/led/issi/is31fl3731-simple.c b/drivers/led/issi/is31fl3731-simple.c
index a62b21cc6b1a..f7f6980a3b68 100644
--- a/drivers/led/issi/is31fl3731-simple.c
+++ b/drivers/led/issi/is31fl3731-simple.c
@@ -64,7 +64,7 @@ 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
+// buffers and the transfers in is31fl3731_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
 uint8_t g_pwm_buffer[LED_DRIVER_COUNT][144];
 bool    g_pwm_buffer_update_required[LED_DRIVER_COUNT] = {false};
@@ -95,7 +95,7 @@ bool g_led_control_registers_update_required[LED_DRIVER_COUNT] = {false};
 // 0x0E - R17,G15,G14,G13,G12,G11,G10,G09
 // 0x10 - R16,R15,R14,R13,R12,R11,R10,R09
 
-void IS31FL3731_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
+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;
 
@@ -110,7 +110,7 @@ void IS31FL3731_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
 #endif
 }
 
-void IS31FL3731_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
+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
@@ -135,79 +135,83 @@ void IS31FL3731_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
     }
 }
 
-void IS31FL3731_init(uint8_t addr) {
+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, ISSI_COMMANDREGISTER, ISSI_BANK_FUNCTIONREG);
+    is31fl3731_write_register(addr, ISSI_COMMANDREGISTER, ISSI_BANK_FUNCTIONREG);
 
     // enable software shutdown
-    IS31FL3731_write_register(addr, ISSI_REG_SHUTDOWN, 0x00);
+    is31fl3731_write_register(addr, ISSI_REG_SHUTDOWN, 0x00);
 #ifdef ISSI_3731_DEGHOST // set to enable de-ghosting of the array
-    IS31FL3731_write_register(addr, ISSI_REG_GHOST_IMAGE_PREVENTION, 0x10);
+    is31fl3731_write_register(addr, ISSI_REG_GHOST_IMAGE_PREVENTION, 0x10);
 #endif
 
     // this delay was copied from other drivers, might not be needed
     wait_ms(10);
 
     // picture mode
-    IS31FL3731_write_register(addr, ISSI_REG_CONFIG, ISSI_REG_CONFIG_PICTUREMODE);
+    is31fl3731_write_register(addr, ISSI_REG_CONFIG, ISSI_REG_CONFIG_PICTUREMODE);
     // display frame 0
-    IS31FL3731_write_register(addr, ISSI_REG_PICTUREFRAME, 0x00);
+    is31fl3731_write_register(addr, ISSI_REG_PICTUREFRAME, 0x00);
     // audio sync off
-    IS31FL3731_write_register(addr, ISSI_REG_AUDIOSYNC, 0x00);
+    is31fl3731_write_register(addr, ISSI_REG_AUDIOSYNC, 0x00);
 
     // select bank 0
-    IS31FL3731_write_register(addr, ISSI_COMMANDREGISTER, 0);
+    is31fl3731_write_register(addr, ISSI_COMMANDREGISTER, 0);
 
     // turn off all LEDs in the LED control register
     for (int i = 0x00; i <= 0x11; i++) {
-        IS31FL3731_write_register(addr, i, 0x00);
+        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);
+        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);
+        is31fl3731_write_register(addr, i, 0x00);
     }
 
     // select "function register" bank
-    IS31FL3731_write_register(addr, ISSI_COMMANDREGISTER, ISSI_BANK_FUNCTIONREG);
+    is31fl3731_write_register(addr, ISSI_COMMANDREGISTER, ISSI_BANK_FUNCTIONREG);
 
     // disable software shutdown
-    IS31FL3731_write_register(addr, ISSI_REG_SHUTDOWN, 0x01);
+    is31fl3731_write_register(addr, ISSI_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, ISSI_COMMANDREGISTER, 0);
+    is31fl3731_write_register(addr, ISSI_COMMANDREGISTER, 0);
 }
 
-void IS31FL3731_set_value(int index, uint8_t value) {
+void is31fl3731_set_value(int index, uint8_t value) {
     is31_led led;
     if (index >= 0 && index < LED_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_is31_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) {
+void is31fl3731_set_value_all(uint8_t value) {
     for (int i = 0; i < LED_MATRIX_LED_COUNT; i++) {
-        IS31FL3731_set_value(i, value);
+        is31fl3731_set_value(i, value);
     }
 }
 
-void IS31FL3731_set_led_control_register(uint8_t index, bool value) {
+void is31fl3731_set_led_control_register(uint8_t index, bool value) {
     is31_led led;
     memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
@@ -223,17 +227,17 @@ void IS31FL3731_set_led_control_register(uint8_t index, bool value) {
     g_led_control_registers_update_required[led.driver] = true;
 }
 
-void IS31FL3731_update_pwm_buffers(uint8_t addr, uint8_t index) {
+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]);
+        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) {
+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 < 18; i++) {
-            IS31FL3731_write_register(addr, i, g_led_control_registers[index][i]);
+            is31fl3731_write_register(addr, i, g_led_control_registers[index][i]);
         }
         g_led_control_registers_update_required[index] = false;
     }
diff --git a/drivers/led/issi/is31fl3731-simple.h b/drivers/led/issi/is31fl3731-simple.h
index 7834766b94ee..69fba14a0b38 100644
--- a/drivers/led/issi/is31fl3731-simple.h
+++ b/drivers/led/issi/is31fl3731-simple.h
@@ -30,21 +30,21 @@ typedef struct is31_led {
 
 extern const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT];
 
-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 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_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);
+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_update_pwm_buffers(uint8_t addr, uint8_t index);
+void is31fl3731_update_led_control_registers(uint8_t addr, uint8_t index);
 
 #define C1_1 0x24
 #define C1_2 0x25
diff --git a/drivers/led/issi/is31fl3731.c b/drivers/led/issi/is31fl3731.c
index 80344ca721e9..15a01b6d75c6 100644
--- a/drivers/led/issi/is31fl3731.c
+++ b/drivers/led/issi/is31fl3731.c
@@ -63,7 +63,7 @@ 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
+// buffers and the transfers in is31fl3731_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
 uint8_t g_pwm_buffer[DRIVER_COUNT][144];
 bool    g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
@@ -85,7 +85,7 @@ bool    g_led_control_registers_update_required[DRIVER_COUNT] = {false};
 // 0x0E - R17,G15,G14,G13,G12,G11,G10,G09
 // 0x10 - R16,R15,R14,R13,R12,R11,R10,R09
 
-void IS31FL3731_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
+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;
 
@@ -98,7 +98,7 @@ void IS31FL3731_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
 #endif
 }
 
-void IS31FL3731_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
+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
@@ -123,67 +123,70 @@ void IS31FL3731_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
     }
 }
 
-void IS31FL3731_init(uint8_t addr) {
+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, ISSI_COMMANDREGISTER, ISSI_BANK_FUNCTIONREG);
+    is31fl3731_write_register(addr, ISSI_COMMANDREGISTER, ISSI_BANK_FUNCTIONREG);
 
     // enable software shutdown
-    IS31FL3731_write_register(addr, ISSI_REG_SHUTDOWN, 0x00);
+    is31fl3731_write_register(addr, ISSI_REG_SHUTDOWN, 0x00);
 #ifdef ISSI_3731_DEGHOST // set to enable de-ghosting of the array
-    IS31FL3731_write_register(addr, ISSI_REG_GHOST_IMAGE_PREVENTION, 0x10);
+    is31fl3731_write_register(addr, ISSI_REG_GHOST_IMAGE_PREVENTION, 0x10);
 #endif
 
     // this delay was copied from other drivers, might not be needed
     wait_ms(10);
 
     // picture mode
-    IS31FL3731_write_register(addr, ISSI_REG_CONFIG, ISSI_REG_CONFIG_PICTUREMODE);
+    is31fl3731_write_register(addr, ISSI_REG_CONFIG, ISSI_REG_CONFIG_PICTUREMODE);
     // display frame 0
-    IS31FL3731_write_register(addr, ISSI_REG_PICTUREFRAME, 0x00);
+    is31fl3731_write_register(addr, ISSI_REG_PICTUREFRAME, 0x00);
     // audio sync off
-    IS31FL3731_write_register(addr, ISSI_REG_AUDIOSYNC, 0x00);
+    is31fl3731_write_register(addr, ISSI_REG_AUDIOSYNC, 0x00);
 
     // select bank 0
-    IS31FL3731_write_register(addr, ISSI_COMMANDREGISTER, 0);
+    is31fl3731_write_register(addr, ISSI_COMMANDREGISTER, 0);
 
     // turn off all LEDs in the LED control register
     for (int i = 0x00; i <= 0x11; i++) {
-        IS31FL3731_write_register(addr, i, 0x00);
+        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);
+        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);
+        is31fl3731_write_register(addr, i, 0x00);
     }
 
     // select "function register" bank
-    IS31FL3731_write_register(addr, ISSI_COMMANDREGISTER, ISSI_BANK_FUNCTIONREG);
+    is31fl3731_write_register(addr, ISSI_COMMANDREGISTER, ISSI_BANK_FUNCTIONREG);
 
     // disable software shutdown
-    IS31FL3731_write_register(addr, ISSI_REG_SHUTDOWN, 0x01);
+    is31fl3731_write_register(addr, ISSI_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, ISSI_COMMANDREGISTER, 0);
+    is31fl3731_write_register(addr, ISSI_COMMANDREGISTER, 0);
 }
 
-void IS31FL3731_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+void is31fl3731_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     is31_led led;
     if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_is31_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) {
+            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;
@@ -191,13 +194,13 @@ 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) {
+void is31fl3731_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
     for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        IS31FL3731_set_color(i, red, green, blue);
+        is31fl3731_set_color(i, red, green, blue);
     }
 }
 
-void IS31FL3731_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
+void is31fl3731_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
     is31_led led;
     memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
@@ -227,17 +230,17 @@ void IS31FL3731_set_led_control_register(uint8_t index, bool red, bool green, bo
     g_led_control_registers_update_required[led.driver] = true;
 }
 
-void IS31FL3731_update_pwm_buffers(uint8_t addr, uint8_t index) {
+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]);
+        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) {
+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 < 18; i++) {
-            IS31FL3731_write_register(addr, i, g_led_control_registers[index][i]);
+            is31fl3731_write_register(addr, i, g_led_control_registers[index][i]);
         }
     }
     g_led_control_registers_update_required[index] = false;
diff --git a/drivers/led/issi/is31fl3731.h b/drivers/led/issi/is31fl3731.h
index 4c79cb81464c..bdf03de1ee16 100644
--- a/drivers/led/issi/is31fl3731.h
+++ b/drivers/led/issi/is31fl3731.h
@@ -31,21 +31,21 @@ typedef struct is31_led {
 
 extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT];
 
-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 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_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);
+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);
 
-void IS31FL3731_set_led_control_register(uint8_t index, bool red, bool green, bool blue);
+void is31fl3731_set_led_control_register(uint8_t index, bool red, bool green, bool 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 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 addr, uint8_t index);
+void is31fl3731_update_led_control_registers(uint8_t addr, uint8_t index);
 
 #define C1_1 0x24
 #define C1_2 0x25
diff --git a/drivers/led/issi/is31fl3733-simple.c b/drivers/led/issi/is31fl3733-simple.c
index 21138c6e05cb..f9a0a271a89c 100644
--- a/drivers/led/issi/is31fl3733-simple.c
+++ b/drivers/led/issi/is31fl3733-simple.c
@@ -81,7 +81,7 @@ uint8_t g_twi_transfer_buffer[20];
 // 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
+// buffers and the transfers in is31fl3733_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
 uint8_t g_pwm_buffer[LED_DRIVER_COUNT][192];
 bool    g_pwm_buffer_update_required[LED_DRIVER_COUNT] = {false};
@@ -98,7 +98,7 @@ uint8_t g_led_control_registers[LED_DRIVER_COUNT][24] = {{0}, {0}, {0}, {0}};
 #endif
 bool g_led_control_registers_update_required[LED_DRIVER_COUNT] = {false};
 
-bool IS31FL3733_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
+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;
@@ -117,7 +117,7 @@ bool IS31FL3733_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
     return true;
 }
 
-bool IS31FL3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
+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.
@@ -146,7 +146,7 @@ bool IS31FL3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
     return true;
 }
 
-void IS31FL3733_init(uint8_t addr, uint8_t sync) {
+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,
@@ -154,61 +154,66 @@ void IS31FL3733_init(uint8_t addr, uint8_t sync) {
     // Sync is passed so set it according to the datasheet.
 
     // Unlock the command register.
-    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+    is31fl3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
 
     // Select PG0
-    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
+    is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
     // Turn off all LEDs.
     for (int i = 0x00; i <= 0x17; i++) {
-        IS31FL3733_write_register(addr, i, 0x00);
+        is31fl3733_write_register(addr, i, 0x00);
     }
 
     // Unlock the command register.
-    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+    is31fl3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
 
     // Select PG1
-    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
+    is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
     // Set PWM on all LEDs to 0
     // No need to setup Breath registers to PWM as that is the default.
     for (int i = 0x00; i <= 0xBF; i++) {
-        IS31FL3733_write_register(addr, i, 0x00);
+        is31fl3733_write_register(addr, i, 0x00);
     }
 
     // Unlock the command register.
-    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+    is31fl3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
 
     // Select PG3
-    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION);
+    is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION);
     // Set de-ghost pull-up resistors (SWx)
-    IS31FL3733_write_register(addr, ISSI_REG_SWPULLUP, ISSI_SWPULLUP);
+    is31fl3733_write_register(addr, ISSI_REG_SWPULLUP, ISSI_SWPULLUP);
     // Set de-ghost pull-down resistors (CSx)
-    IS31FL3733_write_register(addr, ISSI_REG_CSPULLUP, ISSI_CSPULLUP);
+    is31fl3733_write_register(addr, ISSI_REG_CSPULLUP, ISSI_CSPULLUP);
     // Set global current to maximum.
-    IS31FL3733_write_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT);
+    is31fl3733_write_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT);
     // Disable software shutdown.
-    IS31FL3733_write_register(addr, ISSI_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((ISSI_PWM_FREQUENCY & 0b111) << 3) | 0x01);
+    is31fl3733_write_register(addr, ISSI_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((ISSI_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) {
+void is31fl3733_set_value(int index, uint8_t value) {
+    is31_led led;
     if (index >= 0 && index < LED_MATRIX_LED_COUNT) {
-        is31_led led = g_is31_leds[index];
+        memcpy_P(&led, (&g_is31_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) {
+void is31fl3733_set_value_all(uint8_t value) {
     for (int i = 0; i < LED_MATRIX_LED_COUNT; i++) {
-        IS31FL3733_set_value(i, value);
+        is31fl3733_set_value(i, value);
     }
 }
 
-void IS31FL3733_set_led_control_register(uint8_t index, bool value) {
-    is31_led led = g_is31_leds[index];
+void is31fl3733_set_led_control_register(uint8_t index, bool value) {
+    is31_led led;
+    memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
     uint8_t control_register = led.v / 8;
     uint8_t bit_value        = led.v % 8;
@@ -222,28 +227,28 @@ void IS31FL3733_set_led_control_register(uint8_t index, bool value) {
     g_led_control_registers_update_required[led.driver] = true;
 }
 
-void IS31FL3733_update_pwm_buffers(uint8_t addr, uint8_t index) {
+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, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
-        IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
+        is31fl3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+        is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_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])) {
+        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) {
+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, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
-        IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
+        is31fl3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+        is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
         for (int i = 0; i < 24; i++) {
-            IS31FL3733_write_register(addr, i, g_led_control_registers[index][i]);
+            is31fl3733_write_register(addr, i, g_led_control_registers[index][i]);
         }
         g_led_control_registers_update_required[index] = false;
     }
diff --git a/drivers/led/issi/is31fl3733-simple.h b/drivers/led/issi/is31fl3733-simple.h
index 1571fdd3d582..1458f7ac8dd4 100644
--- a/drivers/led/issi/is31fl3733-simple.h
+++ b/drivers/led/issi/is31fl3733-simple.h
@@ -30,23 +30,23 @@ typedef struct is31_led {
     uint8_t v;
 } __attribute__((packed)) is31_led;
 
-extern const is31_led __flash g_is31_leds[LED_MATRIX_LED_COUNT];
+extern const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT];
 
-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 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_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);
+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_update_pwm_buffers(uint8_t addr, uint8_t index);
+void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index);
 
 #define PUR_0R 0x00   // No PUR resistor
 #define PUR_05KR 0x02 // 0.5k Ohm resistor in t_NOL
diff --git a/drivers/led/issi/is31fl3733.c b/drivers/led/issi/is31fl3733.c
index 379eaa0ae305..ca431838ef53 100644
--- a/drivers/led/issi/is31fl3733.c
+++ b/drivers/led/issi/is31fl3733.c
@@ -80,7 +80,7 @@ uint8_t g_twi_transfer_buffer[20];
 // 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
+// buffers and the transfers in is31fl3733_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
 uint8_t g_pwm_buffer[DRIVER_COUNT][192];
 bool    g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
@@ -88,7 +88,7 @@ bool    g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
 uint8_t g_led_control_registers[DRIVER_COUNT][24]             = {0};
 bool    g_led_control_registers_update_required[DRIVER_COUNT] = {false};
 
-bool IS31FL3733_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
+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;
@@ -107,7 +107,7 @@ bool IS31FL3733_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
     return true;
 }
 
-bool IS31FL3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
+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.
@@ -138,7 +138,7 @@ bool IS31FL3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
     return true;
 }
 
-void IS31FL3733_init(uint8_t addr, uint8_t sync) {
+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,
@@ -146,49 +146,52 @@ void IS31FL3733_init(uint8_t addr, uint8_t sync) {
     // Sync is passed so set it according to the datasheet.
 
     // Unlock the command register.
-    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+    is31fl3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
 
     // Select PG0
-    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
+    is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
     // Turn off all LEDs.
     for (int i = 0x00; i <= 0x17; i++) {
-        IS31FL3733_write_register(addr, i, 0x00);
+        is31fl3733_write_register(addr, i, 0x00);
     }
 
     // Unlock the command register.
-    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+    is31fl3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
 
     // Select PG1
-    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
+    is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
     // Set PWM on all LEDs to 0
     // No need to setup Breath registers to PWM as that is the default.
     for (int i = 0x00; i <= 0xBF; i++) {
-        IS31FL3733_write_register(addr, i, 0x00);
+        is31fl3733_write_register(addr, i, 0x00);
     }
 
     // Unlock the command register.
-    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+    is31fl3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
 
     // Select PG3
-    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION);
+    is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION);
     // Set de-ghost pull-up resistors (SWx)
-    IS31FL3733_write_register(addr, ISSI_REG_SWPULLUP, ISSI_SWPULLUP);
+    is31fl3733_write_register(addr, ISSI_REG_SWPULLUP, ISSI_SWPULLUP);
     // Set de-ghost pull-down resistors (CSx)
-    IS31FL3733_write_register(addr, ISSI_REG_CSPULLUP, ISSI_CSPULLUP);
+    is31fl3733_write_register(addr, ISSI_REG_CSPULLUP, ISSI_CSPULLUP);
     // Set global current to maximum.
-    IS31FL3733_write_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT);
+    is31fl3733_write_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT);
     // Disable software shutdown.
-    IS31FL3733_write_register(addr, ISSI_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((ISSI_PWM_FREQUENCY & 0b111) << 3) | 0x01);
+    is31fl3733_write_register(addr, ISSI_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((ISSI_PWM_FREQUENCY & 0b111) << 3) | 0x01);
 
     // Wait 10ms to ensure the device has woken up.
     wait_ms(10);
 }
 
-void IS31FL3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+void is31fl3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     is31_led led;
     if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_is31_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) {
+            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;
@@ -196,13 +199,13 @@ 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) {
+void is31fl3733_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
     for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        IS31FL3733_set_color(i, red, green, blue);
+        is31fl3733_set_color(i, red, green, blue);
     }
 }
 
-void IS31FL3733_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
+void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
     is31_led led;
     memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
@@ -232,28 +235,28 @@ void IS31FL3733_set_led_control_register(uint8_t index, bool red, bool green, bo
     g_led_control_registers_update_required[led.driver] = true;
 }
 
-void IS31FL3733_update_pwm_buffers(uint8_t addr, uint8_t index) {
+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, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
-        IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
+        is31fl3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+        is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_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])) {
+        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) {
+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, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
-        IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
+        is31fl3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+        is31fl3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
         for (int i = 0; i < 24; i++) {
-            IS31FL3733_write_register(addr, i, g_led_control_registers[index][i]);
+            is31fl3733_write_register(addr, i, g_led_control_registers[index][i]);
         }
     }
     g_led_control_registers_update_required[index] = false;
diff --git a/drivers/led/issi/is31fl3733.h b/drivers/led/issi/is31fl3733.h
index 29441846acc5..f37a58de0f90 100644
--- a/drivers/led/issi/is31fl3733.h
+++ b/drivers/led/issi/is31fl3733.h
@@ -32,21 +32,21 @@ typedef struct is31_led {
 
 extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT];
 
-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 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_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);
+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);
 
-void IS31FL3733_set_led_control_register(uint8_t index, bool red, bool green, bool blue);
+void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bool 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 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 addr, uint8_t index);
+void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index);
 
 #define PUR_0R 0x00   // No PUR resistor
 #define PUR_05KR 0x02 // 0.5k Ohm resistor in t_NOL
diff --git a/drivers/led/issi/is31fl3736.c b/drivers/led/issi/is31fl3736.c
index d6b0881139d3..0de8b3bbaef4 100644
--- a/drivers/led/issi/is31fl3736.c
+++ b/drivers/led/issi/is31fl3736.c
@@ -74,7 +74,7 @@ uint8_t g_twi_transfer_buffer[20];
 // 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
+// buffers and the transfers in is31fl3736_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
 uint8_t g_pwm_buffer[DRIVER_COUNT][192];
 bool    g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
@@ -82,7 +82,7 @@ bool    g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
 uint8_t g_led_control_registers[DRIVER_COUNT][24] = {{0}, {0}};
 bool    g_led_control_registers_update_required   = false;
 
-void IS31FL3736_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
+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;
 
@@ -95,7 +95,7 @@ void IS31FL3736_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
 #endif
 }
 
-void IS31FL3736_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
+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
@@ -119,56 +119,59 @@ void IS31FL3736_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
     }
 }
 
-void IS31FL3736_init(uint8_t addr) {
+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, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+    is31fl3736_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
 
     // Select PG0
-    IS31FL3736_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
+    is31fl3736_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
     // Turn off all LEDs.
     for (int i = 0x00; i <= 0x17; i++) {
-        IS31FL3736_write_register(addr, i, 0x00);
+        is31fl3736_write_register(addr, i, 0x00);
     }
 
     // Unlock the command register.
-    IS31FL3736_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+    is31fl3736_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
 
     // Select PG1
-    IS31FL3736_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
+    is31fl3736_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
     // Set PWM on all LEDs to 0
     // No need to setup Breath registers to PWM as that is the default.
     for (int i = 0x00; i <= 0xBF; i++) {
-        IS31FL3736_write_register(addr, i, 0x00);
+        is31fl3736_write_register(addr, i, 0x00);
     }
 
     // Unlock the command register.
-    IS31FL3736_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+    is31fl3736_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
 
     // Select PG3
-    IS31FL3736_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION);
+    is31fl3736_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION);
     // Set de-ghost pull-up resistors (SWx)
-    IS31FL3736_write_register(addr, ISSI_REG_SWPULLUP, ISSI_SWPULLUP);
+    is31fl3736_write_register(addr, ISSI_REG_SWPULLUP, ISSI_SWPULLUP);
     // Set de-ghost pull-down resistors (CSx)
-    IS31FL3736_write_register(addr, ISSI_REG_CSPULLUP, ISSI_CSPULLUP);
+    is31fl3736_write_register(addr, ISSI_REG_CSPULLUP, ISSI_CSPULLUP);
     // Set global current to maximum.
-    IS31FL3736_write_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT);
+    is31fl3736_write_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT);
     // Disable software shutdown.
-    IS31FL3736_write_register(addr, ISSI_REG_CONFIGURATION, 0x01);
+    is31fl3736_write_register(addr, ISSI_REG_CONFIGURATION, 0x01);
 
     // Wait 10ms to ensure the device has woken up.
     wait_ms(10);
 }
 
-void IS31FL3736_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+void is31fl3736_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     is31_led led;
     if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_is31_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) {
+            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;
@@ -176,13 +179,13 @@ 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) {
+void is31fl3736_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
     for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        IS31FL3736_set_color(i, red, green, blue);
+        is31fl3736_set_color(i, red, green, blue);
     }
 }
 
-void IS31FL3736_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
+void is31fl3736_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
     is31_led led;
     memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
@@ -226,7 +229,7 @@ void IS31FL3736_set_led_control_register(uint8_t index, bool red, bool green, bo
     g_led_control_registers_update_required = true;
 }
 
-void IS31FL3736_mono_set_brightness(int index, uint8_t value) {
+void is31fl3736_mono_set_brightness(int index, uint8_t value) {
     if (index >= 0 && index < 96) {
         // Index in range 0..95 -> A1..A8, B1..B8, etc.
         // Map index 0..95 to registers 0x00..0xBE (interleaved)
@@ -236,13 +239,13 @@ void IS31FL3736_mono_set_brightness(int index, uint8_t value) {
     }
 }
 
-void IS31FL3736_mono_set_brightness_all(uint8_t value) {
+void is31fl3736_mono_set_brightness_all(uint8_t value) {
     for (int i = 0; i < 96; i++) {
-        IS31FL3736_mono_set_brightness(i, value);
+        is31fl3736_mono_set_brightness(i, value);
     }
 }
 
-void IS31FL3736_mono_set_led_control_register(uint8_t index, bool enabled) {
+void is31fl3736_mono_set_led_control_register(uint8_t index, bool enabled) {
     // Index in range 0..95 -> A1..A8, B1..B8, etc.
 
     // Map index 0..95 to registers 0x00..0xBE (interleaved)
@@ -260,25 +263,25 @@ void IS31FL3736_mono_set_led_control_register(uint8_t index, bool enabled) {
     g_led_control_registers_update_required = true;
 }
 
-void IS31FL3736_update_pwm_buffers(uint8_t addr, uint8_t index) {
+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, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
-        IS31FL3736_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
+        is31fl3736_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+        is31fl3736_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
 
-        IS31FL3736_write_pwm_buffer(addr, g_pwm_buffer[index]);
+        is31fl3736_write_pwm_buffer(addr, g_pwm_buffer[index]);
     }
     g_pwm_buffer_update_required[index] = false;
 }
 
-void IS31FL3736_update_led_control_registers(uint8_t addr1, uint8_t addr2) {
+void is31fl3736_update_led_control_registers(uint8_t addr1, uint8_t addr2) {
     if (g_led_control_registers_update_required) {
         // Firstly we need to unlock the command register and select PG0
-        IS31FL3736_write_register(addr1, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
-        IS31FL3736_write_register(addr1, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
+        is31fl3736_write_register(addr1, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+        is31fl3736_write_register(addr1, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
         for (int i = 0; i < 24; i++) {
-            IS31FL3736_write_register(addr1, i, g_led_control_registers[0][i]);
-            // IS31FL3736_write_register(addr2, i, g_led_control_registers[1][i]);
+            is31fl3736_write_register(addr1, i, g_led_control_registers[0][i]);
+            // is31fl3736_write_register(addr2, i, g_led_control_registers[1][i]);
         }
         g_led_control_registers_update_required = false;
     }
diff --git a/drivers/led/issi/is31fl3736.h b/drivers/led/issi/is31fl3736.h
index 332b2035f302..32bdef4a8082 100644
--- a/drivers/led/issi/is31fl3736.h
+++ b/drivers/led/issi/is31fl3736.h
@@ -42,25 +42,25 @@ typedef struct is31_led {
 
 extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT];
 
-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 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_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);
+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);
 
-void IS31FL3736_set_led_control_register(uint8_t index, bool red, bool green, bool blue);
+void is31fl3736_set_led_control_register(uint8_t index, bool red, bool green, bool blue);
 
-void IS31FL3736_mono_set_brightness(int index, uint8_t value);
-void IS31FL3736_mono_set_brightness_all(uint8_t value);
-void IS31FL3736_mono_set_led_control_register(uint8_t index, bool enabled);
+void is31fl3736_mono_set_brightness(int index, uint8_t value);
+void is31fl3736_mono_set_brightness_all(uint8_t value);
+void is31fl3736_mono_set_led_control_register(uint8_t index, bool enabled);
 
 // 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_update_pwm_buffers(uint8_t addr, uint8_t index);
+void is31fl3736_update_led_control_registers(uint8_t addr, uint8_t index);
 
 #define PUR_0R 0x00   // No PUR resistor
 #define PUR_05KR 0x01 // 0.5k Ohm resistor
diff --git a/drivers/led/issi/is31fl3737.c b/drivers/led/issi/is31fl3737.c
index b6ed6b262950..947c0a1d1ace 100644
--- a/drivers/led/issi/is31fl3737.c
+++ b/drivers/led/issi/is31fl3737.c
@@ -80,7 +80,7 @@ uint8_t g_twi_transfer_buffer[20];
 // 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
+// buffers and the transfers in is31fl3737_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
 
 uint8_t g_pwm_buffer[DRIVER_COUNT][192];
@@ -89,7 +89,7 @@ bool    g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
 uint8_t g_led_control_registers[DRIVER_COUNT][24]             = {0};
 bool    g_led_control_registers_update_required[DRIVER_COUNT] = {false};
 
-void IS31FL3737_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
+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;
 
@@ -102,7 +102,7 @@ void IS31FL3737_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
 #endif
 }
 
-void IS31FL3737_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
+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
@@ -126,56 +126,59 @@ void IS31FL3737_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
     }
 }
 
-void IS31FL3737_init(uint8_t addr) {
+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, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+    is31fl3737_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
 
     // Select PG0
-    IS31FL3737_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
+    is31fl3737_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
     // Turn off all LEDs.
     for (int i = 0x00; i <= 0x17; i++) {
-        IS31FL3737_write_register(addr, i, 0x00);
+        is31fl3737_write_register(addr, i, 0x00);
     }
 
     // Unlock the command register.
-    IS31FL3737_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+    is31fl3737_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
 
     // Select PG1
-    IS31FL3737_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
+    is31fl3737_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
     // Set PWM on all LEDs to 0
     // No need to setup Breath registers to PWM as that is the default.
     for (int i = 0x00; i <= 0xBF; i++) {
-        IS31FL3737_write_register(addr, i, 0x00);
+        is31fl3737_write_register(addr, i, 0x00);
     }
 
     // Unlock the command register.
-    IS31FL3737_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+    is31fl3737_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
 
     // Select PG3
-    IS31FL3737_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION);
+    is31fl3737_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION);
     // Set de-ghost pull-up resistors (SWx)
-    IS31FL3737_write_register(addr, ISSI_REG_SWPULLUP, ISSI_SWPULLUP);
+    is31fl3737_write_register(addr, ISSI_REG_SWPULLUP, ISSI_SWPULLUP);
     // Set de-ghost pull-down resistors (CSx)
-    IS31FL3737_write_register(addr, ISSI_REG_CSPULLUP, ISSI_CSPULLUP);
+    is31fl3737_write_register(addr, ISSI_REG_CSPULLUP, ISSI_CSPULLUP);
     // Set global current to maximum.
-    IS31FL3737_write_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT);
+    is31fl3737_write_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT);
     // Disable software shutdown.
-    IS31FL3737_write_register(addr, ISSI_REG_CONFIGURATION, ((ISSI_PWM_FREQUENCY & 0b111) << 3) | 0x01);
+    is31fl3737_write_register(addr, ISSI_REG_CONFIGURATION, ((ISSI_PWM_FREQUENCY & 0b111) << 3) | 0x01);
 
     // Wait 10ms to ensure the device has woken up.
     wait_ms(10);
 }
 
-void IS31FL3737_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+void is31fl3737_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     is31_led led;
     if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_is31_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) {
+            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;
@@ -183,13 +186,13 @@ 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) {
+void is31fl3737_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
     for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        IS31FL3737_set_color(i, red, green, blue);
+        is31fl3737_set_color(i, red, green, blue);
     }
 }
 
-void IS31FL3737_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
+void is31fl3737_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
     is31_led led;
     memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
@@ -219,24 +222,24 @@ void IS31FL3737_set_led_control_register(uint8_t index, bool red, bool green, bo
     g_led_control_registers_update_required[led.driver] = true;
 }
 
-void IS31FL3737_update_pwm_buffers(uint8_t addr, uint8_t index) {
+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, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
-        IS31FL3737_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
+        is31fl3737_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+        is31fl3737_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
 
-        IS31FL3737_write_pwm_buffer(addr, g_pwm_buffer[index]);
+        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) {
+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, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
-        IS31FL3737_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
+        is31fl3737_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+        is31fl3737_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
         for (int i = 0; i < 24; i++) {
-            IS31FL3737_write_register(addr, i, g_led_control_registers[index][i]);
+            is31fl3737_write_register(addr, i, g_led_control_registers[index][i]);
         }
     }
     g_led_control_registers_update_required[index] = false;
diff --git a/drivers/led/issi/is31fl3737.h b/drivers/led/issi/is31fl3737.h
index ca9a917ee2bc..e7fc97872c50 100644
--- a/drivers/led/issi/is31fl3737.h
+++ b/drivers/led/issi/is31fl3737.h
@@ -33,21 +33,21 @@ typedef struct is31_led {
 
 extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT];
 
-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 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_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);
+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);
 
-void IS31FL3737_set_led_control_register(uint8_t index, bool red, bool green, bool blue);
+void is31fl3737_set_led_control_register(uint8_t index, bool red, bool green, bool 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 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 addr, uint8_t index);
+void is31fl3737_update_led_control_registers(uint8_t addr, uint8_t index);
 
 #define PUR_0R 0x00   // No PUR resistor
 #define PUR_05KR 0x01 // 0.5k Ohm resistor in t_NOL
diff --git a/drivers/led/issi/is31fl3741.c b/drivers/led/issi/is31fl3741.c
index 2f43473fc15c..70671c2a40fc 100644
--- a/drivers/led/issi/is31fl3741.c
+++ b/drivers/led/issi/is31fl3741.c
@@ -82,7 +82,7 @@ uint8_t g_twi_transfer_buffer[20] = {0xFF};
 // 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
+// buffers and the transfers in is31fl3741_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
 uint8_t g_pwm_buffer[DRIVER_COUNT][ISSI_MAX_LEDS];
 bool    g_pwm_buffer_update_required[DRIVER_COUNT]        = {false};
@@ -90,7 +90,7 @@ bool    g_scaling_registers_update_required[DRIVER_COUNT] = {false};
 
 uint8_t g_scaling_registers[DRIVER_COUNT][ISSI_MAX_LEDS];
 
-void IS31FL3741_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
+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;
 
@@ -103,14 +103,14 @@ void IS31FL3741_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
 #endif
 }
 
-bool IS31FL3741_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
+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, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
-            IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM1);
+            is31fl3741_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+            is31fl3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM1);
         }
 
         g_twi_transfer_buffer[0] = i % 180;
@@ -148,7 +148,7 @@ bool IS31FL3741_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
     return true;
 }
 
-void IS31FL3741_init(uint8_t addr) {
+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,
@@ -156,44 +156,47 @@ void IS31FL3741_init(uint8_t addr) {
     // Unlock the command register.
 
     // Unlock the command register.
-    IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+    is31fl3741_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
 
     // Select PG4
-    IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION);
+    is31fl3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION);
 
     // Set to Normal operation
-    IS31FL3741_write_register(addr, ISSI_REG_CONFIGURATION, 0x01);
+    is31fl3741_write_register(addr, ISSI_REG_CONFIGURATION, 0x01);
 
     // Set Golbal Current Control Register
-    IS31FL3741_write_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT);
+    is31fl3741_write_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT);
     // Set Pull up & Down for SWx CSy
-    IS31FL3741_write_register(addr, ISSI_REG_PULLDOWNUP, ((ISSI_CSPULLUP << 4) | ISSI_SWPULLUP));
+    is31fl3741_write_register(addr, ISSI_REG_PULLDOWNUP, ((ISSI_CSPULLUP << 4) | ISSI_SWPULLUP));
 
-    // IS31FL3741_update_led_scaling_registers(addr, 0xFF, 0xFF, 0xFF);
+    // is31fl3741_update_led_scaling_registers(addr, 0xFF, 0xFF, 0xFF);
 
     // Wait 10ms to ensure the device has woken up.
     wait_ms(10);
 }
 
-void IS31FL3741_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+void is31fl3741_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     is31_led led;
     if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_is31_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) {
+            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;
-        g_pwm_buffer_update_required[led.driver] = true;
     }
 }
 
-void IS31FL3741_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+void is31fl3741_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
     for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        IS31FL3741_set_color(i, red, green, blue);
+        is31fl3741_set_color(i, red, green, blue);
     }
 }
 
-void IS31FL3741_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
+void is31fl3741_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
     is31_led led;
     memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
@@ -218,19 +221,19 @@ void IS31FL3741_set_led_control_register(uint8_t index, bool red, bool green, bo
     g_scaling_registers_update_required[led.driver] = true;
 }
 
-void IS31FL3741_update_pwm_buffers(uint8_t addr, uint8_t index) {
+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, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
-        IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM0);
+        is31fl3741_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+        is31fl3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM0);
 
-        IS31FL3741_write_pwm_buffer(addr, g_pwm_buffer[index]);
+        is31fl3741_write_pwm_buffer(addr, g_pwm_buffer[index]);
     }
 
     g_pwm_buffer_update_required[index] = false;
 }
 
-void IS31FL3741_set_pwm_buffer(const is31_led *pled, uint8_t red, uint8_t green, uint8_t blue) {
+void is31fl3741_set_pwm_buffer(const is31_led *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;
@@ -238,31 +241,31 @@ void IS31FL3741_set_pwm_buffer(const is31_led *pled, uint8_t red, uint8_t green,
     g_pwm_buffer_update_required[pled->driver] = true;
 }
 
-void IS31FL3741_update_led_control_registers(uint8_t addr, uint8_t index) {
+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, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
-        IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_SCALING_0);
+        is31fl3741_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+        is31fl3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_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]);
+            is31fl3741_write_register(addr, i, g_scaling_registers[index][i]);
         }
 
         // unlock the command register and select PG3
-        IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
-        IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_SCALING_1);
+        is31fl3741_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+        is31fl3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_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]);
+            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 is31_led *pled, uint8_t red, uint8_t green, uint8_t blue) {
+void is31fl3741_set_scaling_registers(const is31_led *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;
diff --git a/drivers/led/issi/is31fl3741.h b/drivers/led/issi/is31fl3741.h
index b0089ea5babf..4ae84dc3c65a 100644
--- a/drivers/led/issi/is31fl3741.h
+++ b/drivers/led/issi/is31fl3741.h
@@ -32,24 +32,24 @@ typedef struct is31_led {
 
 extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT];
 
-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 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_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);
+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);
 
-void IS31FL3741_set_led_control_register(uint8_t index, bool red, bool green, bool blue);
+void is31fl3741_set_led_control_register(uint8_t index, bool red, bool green, bool 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 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 is31_led *pled, uint8_t red, uint8_t green, uint8_t blue);
+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 is31_led *pled, uint8_t red, uint8_t green, uint8_t blue);
 
-void IS31FL3741_set_pwm_buffer(const is31_led *pled, uint8_t red, uint8_t green, uint8_t blue);
+void is31fl3741_set_pwm_buffer(const is31_led *pled, uint8_t red, uint8_t green, uint8_t blue);
 
 #define PUR_0R 0x00   // No PUR resistor
 #define PUR_05KR 0x01 // 0.5k Ohm resistor
diff --git a/drivers/led/issi/is31flcommon.c b/drivers/led/issi/is31flcommon.c
index 106890a8bf0c..4b78947ada3a 100644
--- a/drivers/led/issi/is31flcommon.c
+++ b/drivers/led/issi/is31flcommon.c
@@ -133,19 +133,28 @@ void IS31FL_common_update_pwm_register(uint8_t addr, uint8_t index) {
 
 #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++) {
-        is31_led scale = g_is31_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) {
-            is31_led led = g_is31_leds[scale.driver];
+            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) {
-            is31_led led = g_is31_leds[scale.driver];
+            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;
@@ -169,7 +178,8 @@ void IS31FL_common_update_scaling_register(uint8_t addr, uint8_t index) {
 // 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 = g_is31_leds[index];
+        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;
@@ -186,7 +196,8 @@ void IS31FL_RGB_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
 
 // Setup Scaling register that decides the peak current of each LED
 void IS31FL_RGB_set_scaling_buffer(uint8_t index, bool red, bool green, bool blue) {
-    is31_led led = g_is31_leds[index];
+    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 {
@@ -208,7 +219,8 @@ void IS31FL_RGB_set_scaling_buffer(uint8_t index, bool red, bool green, bool blu
 #elif defined(LED_MATRIX_ENABLE)
 // LED Matrix Specific scripts
 void IS31FL_simple_set_scaling_buffer(uint8_t index, bool value) {
-    is31_led led = g_is31_leds[index];
+    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 {
@@ -219,7 +231,9 @@ void IS31FL_simple_set_scaling_buffer(uint8_t index, bool value) {
 
 void IS31FL_simple_set_brightness(int index, uint8_t value) {
     if (index >= 0 && index < LED_MATRIX_LED_COUNT) {
-        is31_led led = g_is31_leds[index];
+        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;
     }
diff --git a/drivers/led/issi/is31flcommon.h b/drivers/led/issi/is31flcommon.h
index 18432ffc312a..4b3add558b6b 100644
--- a/drivers/led/issi/is31flcommon.h
+++ b/drivers/led/issi/is31flcommon.h
@@ -43,7 +43,7 @@ typedef struct is31_led {
     uint8_t b;
 } __attribute__((packed)) is31_led;
 
-extern const is31_led __flash g_is31_leds[RGB_MATRIX_LED_COUNT];
+extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT];
 
 #elif defined(LED_MATRIX_ENABLE)
 typedef struct is31_led {
@@ -51,11 +51,11 @@ typedef struct is31_led {
     uint8_t v;
 } __attribute__((packed)) is31_led;
 
-extern const is31_led __flash g_is31_leds[LED_MATRIX_LED_COUNT];
+extern const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT];
 #endif
 
 #ifdef ISSI_MANUAL_SCALING
-extern const is31_led __flash g_is31_scaling[];
+extern const is31_led PROGMEM g_is31_scaling[];
 void                          IS31FL_set_manual_scaling_buffer(void);
 #endif
 
diff --git a/drivers/oled/oled_driver.c b/drivers/oled/oled_driver.c
index 8ff6e0426cb9..b9f720781377 100644
--- a/drivers/oled/oled_driver.c
+++ b/drivers/oled/oled_driver.c
@@ -19,6 +19,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "spi_master.h"
 #elif defined(OLED_TRANSPORT_I2C)
 #    include "i2c_master.h"
+#    if defined(USE_I2C) && defined(SPLIT_KEYBOARD)
+#        include "keyboard.h"
+#    endif
 #endif
 #include "oled_driver.h"
 #include OLED_FONT_H
diff --git a/drivers/oled/oled_driver.h b/drivers/oled/oled_driver.h
index 627a3da0ba59..91c376ec2731 100644
--- a/drivers/oled/oled_driver.h
+++ b/drivers/oled/oled_driver.h
@@ -454,7 +454,7 @@ void oled_scroll_set_area(uint8_t start_line, uint8_t end_line);
 // Sets scroll speed, 0-7, fastest to slowest. Default is three.
 // Does not take effect until scrolling is either started or restarted
 // the ssd1306 supports 8 speeds with the delay
-// listed below betwen each frame of the scrolling effect
+// listed below between each frame of the scrolling effect
 // 0=2, 1=3, 2=4, 3=5, 4=25, 5=64, 6=128, 7=256
 void oled_scroll_set_speed(uint8_t speed);
 
diff --git a/drivers/painter/ili9xxx/qp_ili9xxx_opcodes.h b/drivers/painter/ili9xxx/qp_ili9xxx_opcodes.h
index 47bb70364898..f57e638e0348 100644
--- a/drivers/painter/ili9xxx/qp_ili9xxx_opcodes.h
+++ b/drivers/painter/ili9xxx/qp_ili9xxx_opcodes.h
@@ -19,8 +19,8 @@
 #define ILI9XXX_CMD_SLEEP_OFF 0x11          // Exist sleep mode
 #define ILI9XXX_CMD_PARTIAL_ON 0x12         // Enter partial mode
 #define ILI9XXX_CMD_PARTIAL_OFF 0x13        // Exit partial mode
-#define ILI9XXX_CMD_INVERT_ON 0x20          // Enter inverted mode
-#define ILI9XXX_CMD_INVERT_OFF 0x21         // Exit inverted mode
+#define ILI9XXX_CMD_INVERT_OFF 0x20         // Exit inverted mode
+#define ILI9XXX_CMD_INVERT_ON 0x21          // Enter inverted mode
 #define ILI9XXX_SET_GAMMA 0x26              // Set gamma params
 #define ILI9XXX_CMD_DISPLAY_OFF 0x28        // Disable display
 #define ILI9XXX_CMD_DISPLAY_ON 0x29         // Enable display
diff --git a/drivers/ps2/ps2_mouse.c b/drivers/ps2/ps2_mouse.c
index d6911d66f214..ae594c94bc5e 100644
--- a/drivers/ps2/ps2_mouse.c
+++ b/drivers/ps2/ps2_mouse.c
@@ -191,13 +191,12 @@ static inline void ps2_mouse_convert_report_to_hid(report_mouse_t *mouse_report)
 
 #ifdef PS2_MOUSE_INVERT_BUTTONS
     // swap left & right buttons
-    uint8_t needs_left    = mouse_report->buttons & PS2_MOUSE_BTN_RIGHT;
-    uint8_t needs_right   = mouse_report->buttons & PS2_MOUSE_BTN_LEFT;
-    mouse_report->buttons = (mouse_report->buttons & ~(PS2_MOUSE_BTN_MASK)) | (needs_left ? PS2_MOUSE_BTN_LEFT : 0) | (needs_right ? PS2_MOUSE_BTN_RIGHT : 0);
-#else
+    bool needs_left       = mouse_report->buttons & (1 << PS2_MOUSE_BTN_RIGHT);
+    bool needs_right      = mouse_report->buttons & (1 << PS2_MOUSE_BTN_LEFT);
+    mouse_report->buttons = (mouse_report->buttons & ~((1 << PS2_MOUSE_BTN_LEFT) | (1 << PS2_MOUSE_BTN_RIGHT))) | (needs_left << PS2_MOUSE_BTN_LEFT) | (needs_right << PS2_MOUSE_BTN_RIGHT);
+#endif
     // remove sign and overflow flags
     mouse_report->buttons &= PS2_MOUSE_BTN_MASK;
-#endif
 
 #ifdef PS2_MOUSE_INVERT_X
     mouse_report->x = -mouse_report->x;
diff --git a/drivers/sensors/pmw33xx_common.h b/drivers/sensors/pmw33xx_common.h
index 88523b8420ac..b30ee3d59667 100644
--- a/drivers/sensors/pmw33xx_common.h
+++ b/drivers/sensors/pmw33xx_common.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "quantum.h" //to get is_keyboard_left
+#include "keyboard.h"
 #include <stdint.h>
 #include "spi_master.h"
 #include "util.h"
diff --git a/keyboards/0_sixty/underglow/config.h b/keyboards/0_sixty/underglow/config.h
index 6efe6e18cdb1..0d5edf494ea8 100644
--- a/keyboards/0_sixty/underglow/config.h
+++ b/keyboards/0_sixty/underglow/config.h
@@ -16,21 +16,6 @@
 
 #pragma once
 
-
-/* underglow */
-#define RGBLED_NUM 24
-#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 
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/0_sixty/underglow/info.json b/keyboards/0_sixty/underglow/info.json
index 24914915616a..6227591f4458 100644
--- a/keyboards/0_sixty/underglow/info.json
+++ b/keyboards/0_sixty/underglow/info.json
@@ -10,6 +10,19 @@
         "pin": "B6"
     },
     "rgblight": {
-        "max_brightness": 185
+        "led_count": 24,
+        "max_brightness": 185,
+        "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
+        }
     }
 }
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h
index cf4ea821bf44..9527d6abae21 100644
--- a/keyboards/0xcb/1337/config.h
+++ b/keyboards/0xcb/1337/config.h
@@ -18,23 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // clang-format off
 
-#define TAP_CODE_DELAY 10
-
-  #define RGBLED_NUM 4
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
   /* default setup after eeprom reset */
   #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_BREATHING + 2
   #define RGBLIGHT_DEFAULT_HUE 152
diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json
index a0b04ba7df50..30b806aedc73 100644
--- a/keyboards/0xcb/1337/info.json
+++ b/keyboards/0xcb/1337/info.json
@@ -18,9 +18,30 @@
       {"pin_a": "F6", "pin_b": "F5"}
     ]
   },
+  "qmk": {
+    "tap_keycode_delay": 10
+  },
   "qmk_lufa_bootloader": {
     "led": "B0"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "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": "D3"
   },
diff --git a/keyboards/0xcb/1337/rules.mk b/keyboards/0xcb/1337/rules.mk
index 77dd67f53f8a..60cbfd4df605 100644
--- a/keyboards/0xcb/1337/rules.mk
+++ b/keyboards/0xcb/1337/rules.mk
@@ -14,4 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/0xcb/splaytoraid/info.json b/keyboards/0xcb/splaytoraid/info.json
index 5b7334ff9d25..c218d1ff781c 100644
--- a/keyboards/0xcb/splaytoraid/info.json
+++ b/keyboards/0xcb/splaytoraid/info.json
@@ -36,7 +36,7 @@
         ]
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 2], "x": 0, "y": 0},
             {"flags": 4, "matrix": [1, 0], "x": 20, "y": 0},
diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h
index 10b1f88216f1..179c84088bb3 100644
--- a/keyboards/0xcb/static/config.h
+++ b/keyboards/0xcb/static/config.h
@@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
 /* 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/0xcb/static/info.json b/keyboards/0xcb/static/info.json
index 7a678a01942a..97f5e53cadb9 100644
--- a/keyboards/0xcb/static/info.json
+++ b/keyboards/0xcb/static/info.json
@@ -18,6 +18,9 @@
       {"pin_a": "D0", "pin_b": "D1"}
     ]
   },
+  "qmk": {
+    "tap_keycode_delay": 10
+  },
   "processor": "atmega328p",
   "bootloader": "usbasploader",
   "layout_aliases": {
diff --git a/keyboards/0xcb/static/rules.mk b/keyboards/0xcb/static/rules.mk
index 24ff2f2cfd1f..fe8dabeab7ec 100644
--- a/keyboards/0xcb/static/rules.mk
+++ b/keyboards/0xcb/static/rules.mk
@@ -14,4 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/0xcb/tutelpad/config.h b/keyboards/0xcb/tutelpad/config.h
index f64205d126e5..6b9c1274a81a 100644
--- a/keyboards/0xcb/tutelpad/config.h
+++ b/keyboards/0xcb/tutelpad/config.h
@@ -16,24 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 4                    // Number of LEDs connected
-
-#define RGBLIGHT_HUE_STEP 10            // The number of steps to cycle through the hue by
-#define RGBLIGHT_SAT_STEP 17            // The number of steps to increment the saturation by
-#define RGBLIGHT_VAL_STEP 17            // The number of steps to increment the brightness by
-#define RGBLIGHT_SLEEP                  // RGB will switch off when host goes to sleep
-
-#define RGBLIGHT_EFFECT_BREATHING       // Enable all additional RGB animation modes
-#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 OLED_TIMEOUT 20000              // Turns off OLED after said amount of milliseconds
 #define OLED_BRIGHTNESS 128
 #define OLED_DISPLAY_128X64
diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/info.json
index 79fdf0af4581..e4c7fce98abf 100644
--- a/keyboards/0xcb/tutelpad/info.json
+++ b/keyboards/0xcb/tutelpad/info.json
@@ -11,6 +11,23 @@
     "bootmagic": {
         "matrix": [1, 0]
     },
+    "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": "D3"
     },
diff --git a/keyboards/0xcb/tutelpad/rules.mk b/keyboards/0xcb/tutelpad/rules.mk
index 9cc3b02a2279..f06d31c5f13b 100644
--- a/keyboards/0xcb/tutelpad/rules.mk
+++ b/keyboards/0xcb/tutelpad/rules.mk
@@ -10,6 +10,4 @@ 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
-OLED_DRIVER = SSD1306
\ No newline at end of file
diff --git a/keyboards/10bleoledhub/config.h b/keyboards/10bleoledhub/config.h
index ae376dfa5318..e3b721179297 100644
--- a/keyboards/10bleoledhub/config.h
+++ b/keyboards/10bleoledhub/config.h
@@ -16,20 +16,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 #pragma once
 
-#define SSD1306OLED
-
-#define RGBLED_NUM 4
-
-#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 OLED_FONT_H "./lib/glcdfont.c"
diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/info.json
index 9b536e0677f1..17ebcaf4587d 100644
--- a/keyboards/10bleoledhub/info.json
+++ b/keyboards/10bleoledhub/info.json
@@ -8,6 +8,24 @@
         "pid": "0x7C99",
         "device_version": "0.0.1"
     },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "rgblight": {
+        "led_count": 4,
+        "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"
     },
diff --git a/keyboards/10bleoledhub/rules.mk b/keyboards/10bleoledhub/rules.mk
index e30794f68e65..12bfe122d620 100644
--- a/keyboards/10bleoledhub/rules.mk
+++ b/keyboards/10bleoledhub/rules.mk
@@ -14,7 +14,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/1k/config.h b/keyboards/1k/config.h
index afdc6d4baabe..0d0cd3712a76 100644
--- a/keyboards/1k/config.h
+++ b/keyboards/1k/config.h
@@ -15,8 +15,6 @@
  */
 #pragma once
 
-#define RGBLED_NUM 1
-
 // Save as much space as we can...
 #define LAYER_STATE_8BIT
 #define NO_ACTION_LAYER
diff --git a/keyboards/1k/info.json b/keyboards/1k/info.json
index 090e93b94bdc..34f33d505953 100644
--- a/keyboards/1k/info.json
+++ b/keyboards/1k/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "led_count": 1
+  },
   "ws2812": {
     "pin": "B2"
   },
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
index bc0d7f0c4bcf..d876570c808e 100644
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ b/keyboards/1upkeyboards/1up60hse/config.h
@@ -17,22 +17,6 @@ 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 RGBLED_NUM 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-
 /* 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/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/info.json
index 475a93512374..ffc2d4d76574 100644
--- a/keyboards/1upkeyboards/1up60hse/info.json
+++ b/keyboards/1upkeyboards/1up60hse/info.json
@@ -18,6 +18,24 @@
         "levels": 5,
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "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": "F0"
     },
diff --git a/keyboards/1upkeyboards/1up60hse/keymaps/badger/keymap.c b/keyboards/1upkeyboards/1up60hse/keymaps/badger/keymap.c
new file mode 100644
index 000000000000..f5aa565e7ba2
--- /dev/null
+++ b/keyboards/1upkeyboards/1up60hse/keymaps/badger/keymap.c
@@ -0,0 +1,52 @@
+/*
+Copyright 2023 Dan White <opensource@bluetufa.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "badger.h"
+
+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,  \
+     MOVE_MAC,  KC_A,     KC_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,                                 LT_FUNC,  KC_RGUI,  KC_RALT,   J_MACRO),
+
+  [_MOVE]       = LAYOUT_60_ansi(\
+     MAC_FRC,   MM_LEFT,  MM_RGHT,  KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  P_PAREN,  KC_RPRN,  KC_UNDS,   KC_PLUS,  WD_DELE,  \
+     _______,   IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_NEXT,  IJ_STOP,  IJ_TOP,   WD_BACK,  KC_HOME,  KC_END,   WD_FRWD,  IJ_BACK,   IJ_FWD,   KC_PIPE,  \
+     _______,   MM_LH,    MM_MAX,   MM_RH,    IJ_FIND,  IJ_LINE,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_COLN,  KC_DQUO,             \
+     _______,   MM_UH,    MM_BH,    MAC_CPY,  MAC_SPS,  SHEBANG,  IJ_BOTT,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,  _______,   _______,  \
+     _______,   _______,  _______,                      _______,                                _______,  _______,  _______,   _______),
+
+  [_FUNCTION]   = 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,  \
+     _______,   _______,  _______,  _______,  IJ_RFMT,   IJ_TERM,  KC_MPLY,  KC_PGUP,  _______,  _______,  KC_PGDN,  KC_VOLD,  KC_VOLU,  KC_INS,  \
+     _______,   _______,  _______,  IJ_DEBG,  IJ_FILE,   _______,  _______,  _______,  _______,  _______,  _______,  _______,            \
+     _______,   _______,  _______,  KC_CAPS,  _______,   _______,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,  CONFIG,   \
+     _______,   _______,  _______,                       _______,                                _______,   _______, _______,  CONFIG),
+
+  [_MACRO]     = LAYOUT_60_ansi(\
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______, _______, \
+     _______,   SELECT,   KC_UP,    _______,  SED,       KC_MSTP,  _______,  _______,  BASH_IF,  _______,  _______,  P_BRACK,   _______, _______, \
+     _______,   KC_LEFT,  KC_DOWN,  KC_RGHT,  FOR_LOOP,  _______,  _______,  _______,  _______,  FOR_LOOP, _______,  _______,   _______, \
+     _______,   _______,  _______,  CONST,    _______,   SHEBANG,  TS_IMPT,  _______,  _______,  _______,  _______,  _______,            \
+     _______,   _______,  _______,                       _______,                                _______,  _______, _______,    _______),
+
+  [_CONFIG]     = LAYOUT_60_ansi(\
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______, _______, \
+     _______,   _______,  _______,  EE_CLR,   QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______, _______, \
+     _______,   _______,  _______,  DB_TOGG,  RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______, \
+     _______,   _______,  _______,  _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,            \
+     _______,   _______,  _______,                       _______,                                _______,  _______,  _______,   _______)
+};
diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h
index aeda8afd3381..eddf290b4c3f 100644
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ b/keyboards/1upkeyboards/1up60hte/config.h
@@ -23,18 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/info.json
index 712999df3256..99275bf251b6 100644
--- a/keyboards/1upkeyboards/1up60hte/info.json
+++ b/keyboards/1upkeyboards/1up60hte/info.json
@@ -20,6 +20,23 @@
         "caps_lock": "B6",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "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": "F0"
     },
diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c
index 197c449122fe..ca089bab444d 100644
--- a/keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c
+++ b/keyboards/1upkeyboards/1up60hte/keymaps/badger/keymap.c
@@ -15,45 +15,38 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "badger.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY_MAC]  = LAYOUT_tsangan(
-     KC_GRV,     KC_1,     KC_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,
-     MOVE_MAC,   KC_A,     KC_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,   CFG_MAC,
-     KC_LCTL,    KC_LALT,  KC_LGUI,  KC_SPC,   ADJUST,   KC_RALT,  KC_RGUI),
+  [_QWERTY]  = LAYOUT_tsangan(\
+     KC_GRV,     KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,   KC_EQL,   KC_PIPE, 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, \
+     MOVE_MAC,   KC_A,     KC_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,   J_MACRO,  \
+     KC_LCTL,    KC_LALT,  KC_LGUI,  KC_SPC,   FUNCTION, KC_RALT,  KC_RGUI),
 
-  [_MOVE_MAC]    = LAYOUT_tsangan(
-     MAC_FRC,    MM_LEFT,  MM_RGHT,  KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_0,     IJ_TOP,    IJ_BOTT,  _______, _______,
-     KC_BACK,    IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_RUN,   IJ_STOP,  _______,  WD_BACK,  KC_HOME,  KC_END,   WD_FRWD,  IJ_BACK,   IJ_FWD,   KC_NEXT,
-     _______,    MM_LH,    MM_MAX,   MM_RH,    IJ_FIND,  IJ_IMPS,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CM_RIGHT, CM_DOWN,   _______,
-     _______,    MM_UH,    MM_BH,    MAC_CPY,  MAC_PST,  IJ_IMPH,  _______,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,  _______,   _______,
+  [_MOVE]    = LAYOUT_tsangan(\
+     MAC_FRC,    MM_LEFT,  MM_RGHT,  KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_0,     IJ_TOP,    IJ_BOTT,  KC_DEL,  KC_BSPC, \
+     KC_BACK,    VS_STEP,  VS_INTO,  VS_OUT,   VS_RUN,   VS_STOP,  VS_MVUP,  WD_BACK,  KC_HOME,  KC_END,   WD_FRWD,  IJ_BACK,   IJ_FWD,   WD_DELE, \
+     _______,    MM_LH,    MM_MAX,   MM_RH,    IJ_FIND,  VS_LINE,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CM_RIGHT, CM_DOWN,   _______,  \
+     _______,    MM_UH,    MM_BH,    MAC_CPY,  MAC_PST,  _______,  VS_MVDN,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,  _______,   _______,  \
      _______,    _______,  _______,  _______,  _______,  _______,  _______),
 
-  [_QWERTY_LINUX] = LAYOUT_tsangan(
-     KC_GRV,     KC_1,     KC_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,
-     MOVE,       KC_A,     KC_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,   CFG_LNX,
-     KC_LCTL,    KC_LGUI,  KC_LALT,  KC_SPC,   ADJUST,   KC_RALT,  KC_RGUI),
+  [_FUNCTION] = LAYOUT_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,   _______, _______, \
+     _______,   VS_EXP,   VS_DBG,   VS_CMD,   VS_FILE,   VS_TERM,  KC_MPLY,  KC_PGUP,  _______,  _______,  KC_PGDN,  KC_VOLD,   KC_VOLU,  KC_INS, \
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  \
+     _______,   _______,  _______,  KC_CAPS,  _______,   KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,   _______,  \
+     _______,   _______,  _______,  _______,  _______,   _______,  CONFIG),
 
-  [_MOVE_LINUX] = LAYOUT_tsangan(
-     KC_GRV,     VD_1,     VD_2,     KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   _______, _______,
-     KC_BACK,    WM_VD1,   WM_UH,    WM_VD2,   QK_BOOT,  KC_MSTP,  KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  _______,   _______,  KC_NEXT,
-     _______,    WM_LH,    WM_MAX,   WM_RH,    WD_FRWD,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CS_RIGHT, CS_DOWN,   _______,
-     _______,    WM_VD3,   WM_BH,    OS_COPY,  OS_PAST,  WD_BACK,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  _______,  _______,   _______,
-     _______,    _______,  _______,  _______,  _______,  _______,  _______),
-
-  [_ADJUST]     = LAYOUT_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_WREF,   KC_MSTP,  KC_MPLY,  KC_PGUP,  _______,  _______,  KC_PGDN,  KC_VOLD,   KC_VOLU,  KC_INS,
-     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,
-     _______,   _______,  _______,  KC_CAPS,  _______,   KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,   _______,
-     _______,   _______,  _______,  _______,  _______,   _______,  _______),
+  [_MACRO]     = LAYOUT_tsangan(\
+     SHRUG,     DF_1,     DF_2,     KC_F3,    KC_F4,     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL,  KC_DEL, \
+     SHRUG,     _______,  _______,  _______,  SED,       KC_MSTP,  KC_MPLY,  KC_PGUP,  _______,  _______,  KC_PGDN,  KC_VOLD,   KC_VOLU,  KC_INS, \
+     _______,   _______,  SELECT,   _______,  FN,        _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  \
+     _______,   DF_1,     DF_2,     CONST,    _______,   KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,   _______,  \
+     _______,   _______,  _______,  _______,  _______,   _______,  CONFIG),
 
-  [_CONFIG]     = LAYOUT_tsangan(
-     _______,   KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   _______, _______,
-     _______,   NK_ON,    NK_OFF,   EE_CLR,   QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS,
-     _______,   GE_SWAP,  GE_NORM,  DB_TOGG,  RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,
-     _______,   DF_1,     DF_2,     _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,   _______,
+  [_CONFIG]     = LAYOUT_tsangan(\
+     _______,   DF_1,     DF_2,     DF_3,     DF_4,      _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______, _______, \
+     _______,   NK_ON,    NK_OFF,   EEP_RST,  RESET,     _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
+     _______,   GE_SWAP,  GE_NORM,  DEBUG,    RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,  \
+     _______,   _______,  _______,  _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,   _______,  \
      _______,   _______,  _______,  _______,  _______,   _______,  _______)
 };
diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
index 8bbb646e40d0..5f360813239b 100644
--- a/keyboards/1upkeyboards/1up60rgb/config.h
+++ b/keyboards/1upkeyboards/1up60rgb/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/info.json
index ee6914a4e595..0d288916cc41 100644
--- a/keyboards/1upkeyboards/1up60rgb/info.json
+++ b/keyboards/1upkeyboards/1up60rgb/info.json
@@ -17,6 +17,23 @@
     "pin": "B6",
     "levels": 5
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 16,
+    "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": "E2"
   },
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c
index 214316cd6572..439f1d37ed9e 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/badger/keymap.c
@@ -1,5 +1,6 @@
 /*
-Copyright 2020 Dan White <opensource@bluetufa.com>
+Copyright 2023 Dan White <opensource@bluetufa.com>
+
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or
@@ -14,46 +15,38 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "badger.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY_MAC]  = LAYOUT_60_ansi_tsangan_split_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,
-     KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_BSLS,
-     MOVE_MAC,   KC_A,     KC_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,   CFG_MAC,
-     KC_LCTL,    KC_LALT,  KC_LGUI,  KC_SPC,   ADJUST,   KC_RALT,  KC_RGUI),
+[_QWERTY]       = LAYOUT_60_ansi_split_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, \
+     KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_BSLS, \
+     MOVE_MAC,  KC_A,     KC_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,   J_MACRO,  \
+     KC_LCTL,   KC_LALT,  KC_LGUI,                      KC_SPC,                       LT_FUNC,  KC_RALT,  KC_RGUI,  KC_RCTL),
 
-  [_MOVE_MAC]   = LAYOUT_60_ansi_tsangan_split_rshift(
-     MAC_FRC,    MM_LEFT,  MM_RGHT,  KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_0,     IJ_TOP,    IJ_BOTT,  KC_DEL,
-     KC_BACK,    IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_RUN,   IJ_STOP,  _______,  WD_BACK,  KC_HOME,  KC_END,   WD_FRWD,  IJ_BACK,   IJ_FWD,   KC_NEXT,
-     _______,    MM_LH,    MM_MAX,   MM_RH,    IJ_FIND,  IJ_IMPS,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CM_RIGHT, CM_DOWN,   _______,
-     _______,    MM_UH,    MM_BH,    MAC_CPY,  MAC_PST,  IJ_IMPH,  _______,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,  _______,   _______,
-     _______,    _______,  _______,  _______,  _______,  _______,  _______),
-     
-  [_QWERTY_LINUX] = LAYOUT_60_ansi_tsangan_split_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,
-     KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_BSLS,
-     MOVE,       KC_A,     KC_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,   CFG_LNX,
-     KC_LCTL,    KC_LGUI,  KC_LALT,  KC_SPC,   ADJUST,   KC_LALT,  KC_RGUI),
+[_MOVE]         = LAYOUT_60_ansi_split_rshift(\
+     MAC_FRC,   MM_LEFT,  MM_RGHT,  KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  P_PAREN,  KC_RPRN,  KC_UNDS,   KC_PLUS,  WD_DELE,  \
+     _______,   IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_RUN,   IJ_STOP,  IJ_TOP,   WD_BACK,  KC_HOME,  KC_END,   WD_FRWD,  IJ_BACK,   IJ_FWD,   KC_PIPE,  \
+     _______,   MM_LH,    MM_MAX,   MM_RH,    IJ_FIND,  IJ_LINE,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_COLN,  KC_DQUO,   _______,  \
+     _______,   MM_UH,    MM_BH,    MAC_CPY,  MAC_SPS,  SHEBANG,  IJ_BOTT,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,  _______,   _______,  \
+     _______,   _______,  _______,                      _______,                      _______,  _______,  _______,  _______),
 
-  [_MOVE_LINUX]  = LAYOUT_60_ansi_tsangan_split_rshift(
-     KC_GRV,     VD_1,     VD_2,     VD_3,     KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL,
-     KC_BACK,    WM_VD1,   WM_UH,    WM_VD2,   QK_BOOT,  KC_MSTP,  KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  _______,   _______,  KC_NEXT,
-     _______,    WM_LH,    WM_MAX,   WM_RH,    WD_FRWD,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CS_RIGHT, CS_DOWN,   _______,
-     _______,    WM_VD3,   WM_BH,    OS_COPY,  OS_PAST,  WD_BACK,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  _______,  _______,   _______,
-     _______,    _______,  _______,  _______,  _______,  _______,  _______),
+[_FUNCTION]     = LAYOUT_60_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_DEL,  \
+     _______,   _______,  _______,  _______,  IJ_RFMT,   IJ_TERM,  KC_MPLY,  KC_PGUP,  _______,  _______,  KC_PGDN,  KC_VOLD,   KC_VOLU,  KC_INS,  \
+     _______,   _______,  _______,  IJ_DEBG,  IJ_FILE,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  \
+     _______,   _______,  _______,  KC_CAPS,  _______,   _______,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,   CONFIG,   \
+     _______,   _______,  _______,                       _______,                      _______,   _______,  _______,  CONFIG),
 
-  [_ADJUST]     = LAYOUT_60_ansi_tsangan_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_DEL,
-     _______,   _______,  _______,  _______,  KC_WREF,   KC_MSTP,  KC_MPLY,  KC_PGUP,  _______,  _______,  KC_PGDN,  KC_VOLD,   KC_VOLU,  KC_INS,
-     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,
-     _______,   DF_1,     DF_2,     KC_CAPS,  _______,   KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,   _______,
-     _______,   _______,  _______,  _______,  _______,   _______,  _______),
+  [_MACRO]     = LAYOUT_60_ansi_split_rshift(\
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______, \
+     _______,   SELECT,   KC_UP,    _______,  SED,       KC_MSTP,  _______,  _______,  BASH_IF,  _______,  _______,  P_BRACK,   _______,  _______, \
+     _______,   KC_LEFT,  KC_DOWN,  KC_RGHT,  FOR_LOOP,  _______,  _______,  _______,  _______,  FOR_LOOP, _______,  _______,   _______,  \
+     _______,   _______,  _______,  CONST,    _______,   SHEBANG,  TS_IMPT,  _______,  _______,  _______,  _______,  _______,   _______,  \
+     _______,   _______,  _______,                       _______,                      _______,   _______,  _______,  _______),
 
-  [_CONFIG]     = LAYOUT_60_ansi_tsangan_split_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_DEL,
-     _______,   NK_ON,    NK_OFF,   EE_CLR,   QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS,
-     _______,   GE_SWAP,  GE_NORM,  DB_TOGG,  RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,
-     _______,   LAG_SWP,  LAG_NRM,  _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,   _______,
-     _______,   _______,  _______,  _______,  _______,   _______,  _______)
+  [_CONFIG]     = LAYOUT_60_ansi_split_rshift(\
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______, \
+     _______,   _______,  _______,  EE_CLR,   QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______, \
+     _______,   _______,  _______,  DB_TOGG,  RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,  \
+     _______,   _______,  _______,  _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,   _______,  \
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______)
 };
-
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c
index 15b7c9faa71b..5792f51ca82e 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c
@@ -18,12 +18,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+	if (led_state.caps_lock) {
 		setPinOutput(B2);
 		writePinLow(B2);
 	} else {
 		setPinInput(B2);
 		writePinLow(B2);
 	}
+	return false;
 }
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c
index fd6087a23882..20783c22cba6 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c
@@ -18,12 +18,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+	if (led_state.caps_lock) {
 		setPinOutput(B2);
 		writePinLow(B2);
 	} else {
 		setPinInput(B2);
 		writePinLow(B2);
 	}
+	return false;
 }
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
index d0c47c526da6..453bf8c9617d 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
@@ -71,42 +71,12 @@ layer_state_t layer_state_set_user(layer_state_t state) {
   return update_tri_layer_state(state, _raise, _rgb, _adjust);
 }
 
-
-// scan matrix
-void matrix_scan_user(void) {
-}
-
 // support for standard mod state keys (caps lock, scroll lock, etc.)
-void led_set_user(uint8_t usb_led) {
-
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+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);
   }
-
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_KANA)) {
-
-  } else {
-
-  }
-
+  return false;
 }
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
index a45947de54b0..5cc922788590 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
@@ -18,12 +18,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+	if (led_state.caps_lock) {
 		setPinOutput(B2);
 		writePinLow(B2);
 	} else {
 		setPinInput(B2);
 		writePinLow(B2);
 	}
+	return false;
 }
diff --git a/keyboards/1upkeyboards/1upocarina/info.json b/keyboards/1upkeyboards/1upocarina/info.json
index 6b37eef2b5e1..fccf9d889981 100644
--- a/keyboards/1upkeyboards/1upocarina/info.json
+++ b/keyboards/1upkeyboards/1upocarina/info.json
@@ -40,7 +40,7 @@
         "pin": "GP24"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
         { "flags": 4, "matrix": [0, 0], "x": 23, "y": 26 },
         { "flags": 4, "matrix": [0, 1], "x": 62, "y": 26 },
diff --git a/keyboards/1upkeyboards/1upslider8/1upslider8.c b/keyboards/1upkeyboards/1upslider8/1upslider8.c
new file mode 100644
index 000000000000..e6d6698ee9b7
--- /dev/null
+++ b/keyboards/1upkeyboards/1upslider8/1upslider8.c
@@ -0,0 +1,400 @@
+/* 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 "analog.h"
+#include "qmk_midi.h"
+
+#include "quantum.h"
+#include "quantum/midi/midi.h"
+#include "quantum/midi/midi_device.h"
+
+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));
+  uprintf("%d string", analogReadPin(SLIDER_PIN));
+}
+
+void housekeeping_task_kb(void) {
+    slider();
+    housekeeping_task_user();
+}
+
+static uint32_t oled_logo_timer = 0;
+static bool clear_logo = true;
+static const char PROGMEM my_logo[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0xC0,
+    0xE0, 0xF0, 0x70, 0x70, 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, 0x63, 0xE7, 0xE7, 0xCE, 0xCE,
+    0xCE, 0xCE, 0xFC, 0xFC, 0x78, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0xC0, 0xC0, 0xC1,
+    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, 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, 0x07, 0x07, 0x07, 0x07, 0x07,
+    0x07, 0x07, 0x07, 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,
+    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, 0x1F, 0x1F, 0x00,
+    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, 0x1C, 0x1C, 0x1C,
+    0x1C, 0x3C, 0xF8, 0xF8, 0xE0, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x7F, 0x7F, 0x7F, 0x70,
+    0x70, 0x70, 0x70, 0x78, 0x3F, 0x3F,
+    0x0F, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0xF0,
+    0xF0, 0xF0, 0x70, 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, 0xCE, 0xCE,
+    0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xC0, 0xC1, 0xC1, 0xC1,
+    0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0x81,
+    0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF,
+    0xFF, 0x39, 0x39, 0x79, 0xF9, 0xF9,
+    0xDF, 0x9F, 0x0F, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x07, 0x07, 0x07, 0x00, 0x00, 0x00,
+    0x00, 0x03, 0x07, 0x07, 0x06, 0x04,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x1C, 0xBE,
+    0xFF, 0x63, 0x63, 0xFF, 0xBE, 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,
+    0x07, 0x0F, 0x1F, 0x18, 0x18, 0x1F,
+    0x0F, 0x07, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00
+    };
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+	return OLED_ROTATION_270;
+}
+
+
+static const char PROGMEM ou_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, 0xFC, 0xFC, 0xCF, 0xCF,
+    0x03, 0x03, 0x03, 0x03, 0xFF, 0xFF,
+    0x03, 0x03, 0xFF, 0xFF, 0x03, 0x03,
+    0x03, 0x03, 0xFF, 0xFF, 0x03, 0x03,
+    0x03, 0x03, 0xF3, 0xF3, 0x03, 0x03,
+    0x0C, 0x0C, 0xFC, 0xFC, 0x00, 0x00,
+    0xFF, 0xFF, 0xC0, 0xC0, 0xC0, 0xC0,
+    0xFF, 0xFF, 0xF0, 0xF0, 0xC3, 0xC3,
+    0xC0, 0xC0, 0xF0, 0xF0, 0xFF, 0xFF,
+    0xC0, 0xC0, 0xC0, 0xC0, 0xFC, 0xFC,
+    0x0C, 0x0C, 0x0F, 0x0F, 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
+    };
+
+
+static char PROGMEM caps_on[] = {
+    0x00, 0x00, 0x00, 0xF8, 0x04, 0x04,
+    0x04, 0x88, 0x00, 0x00, 0xE0, 0x58,
+    0x44, 0x58, 0xE0, 0x00, 0x00, 0xFC,
+    0x24, 0x24, 0x24, 0x18, 0x00, 0x00,
+    0x98, 0x24, 0x24, 0x24, 0xC8, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x01, 0x01, 0x01, 0x00, 0x00, 0x81,
+    0xC0, 0xE0, 0xF0, 0xF0, 0xF0, 0xF1,
+    0xF0, 0xF1, 0xF0, 0xF0, 0xE0, 0xC0,
+    0x80, 0x00, 0x00, 0x01, 0x01, 0x01,
+    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, 0xFF, 0xFF, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x03, 0x07, 0x0F, 0x1F,
+    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,
+    0x3F, 0x3F, 0x1F, 0x0F, 0x07, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00
+    };
+
+static char PROGMEM caps_off[] = {
+    0x00, 0x00, 0x00, 0xF8, 0x04, 0x04,
+    0x04, 0x88, 0x00, 0x00, 0xE0, 0x58,
+    0x44, 0x58, 0xE0, 0x00, 0x00, 0xFC,
+    0x24, 0x24, 0x24, 0x18, 0x00, 0x00,
+    0x98, 0x24, 0x24, 0x24, 0xC8, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x01, 0x01, 0x01, 0x00, 0x00, 0x81,
+    0xC0, 0xE0, 0xF0, 0x70, 0x30, 0x31,
+    0x30, 0x31, 0x70, 0xF0, 0xE0, 0xC0,
+    0x80, 0x00, 0x00, 0x01, 0x01, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xFF, 0xFF, 0x03, 0x01, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x01, 0x03, 0xFF, 0xFF, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x03, 0x07, 0x0F, 0x1E,
+    0x3C, 0x38, 0x30, 0x30, 0x30, 0x30,
+    0x38, 0x3C, 0x1E, 0x0F, 0x07, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00
+    };
+
+static const char PROGMEM num_on[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0xFC,
+    0x18, 0x20, 0xC0, 0xFC, 0x00, 0x00,
+    0x00, 0xFC, 0x00, 0x00, 0x00, 0xFC,
+    0x00, 0x00, 0xFC, 0x18, 0x60, 0x80,
+    0x60, 0x18, 0xFC, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x00, 0x00, 0x81,
+    0xC0, 0xE0, 0xF0, 0xF0, 0xF1, 0xF1,
+    0xF1, 0xF0, 0xF0, 0xF0, 0xE1, 0xC0,
+    0x80, 0x01, 0x00, 0x00, 0x01, 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, 0xFF, 0xFF, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x03, 0x07, 0x0F, 0x1F,
+    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,
+    0x3F, 0x3F, 0x1F, 0x0F, 0x07, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00
+    };
+
+static const char PROGMEM num_off[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0xFC,
+    0x18, 0x20, 0xC0, 0xFC, 0x00, 0x00,
+    0x00, 0xFC, 0x00, 0x00, 0x00, 0xFC,
+    0x00, 0x00, 0xFC, 0x18, 0x60, 0x80,
+    0x60, 0x18, 0xFC, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x00, 0x00, 0x81,
+    0xC0, 0xE0, 0xF0, 0x70, 0x31, 0x31,
+    0x31, 0x30, 0x70, 0xF0, 0xE1, 0xC0,
+    0x80, 0x01, 0x00, 0x00, 0x01, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xFF, 0xFF, 0x03, 0x01, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x01, 0x03, 0xFF, 0xFF, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x03, 0x07, 0x0F, 0x1E,
+    0x3C, 0x38, 0x30, 0x30, 0x30, 0x30,
+    0x38, 0x3C, 0x1E, 0x0F, 0x07, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00
+    };
+
+static const char PROGMEM scrl_on[] = {
+    0x00, 0x00, 0x00, 0x98, 0x24, 0x24,
+    0x24, 0xC8, 0x00, 0x00, 0xF8, 0x04,
+    0x04, 0x04, 0x88, 0x00, 0x00, 0xFC,
+    0x24, 0x24, 0xE4, 0x18, 0x00, 0x00,
+    0x00, 0xFC, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x01, 0x01, 0x01, 0x00, 0x00, 0x80,
+    0xC0, 0xE1, 0xF1, 0xF1, 0xF0, 0xF0,
+    0xF0, 0xF1, 0xF0, 0xF0, 0xE0, 0xC1,
+    0x80, 0x00, 0x00, 0x01, 0x01, 0x01,
+    0x01, 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, 0xFF, 0xFF, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x03, 0x07, 0x0F, 0x1F,
+    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,
+    0x3F, 0x3F, 0x1F, 0x0F, 0x07, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00
+    };
+
+static const char PROGMEM scrl_off[] = {
+    0x00, 0x00, 0x00, 0x98, 0x24, 0x24,
+    0x24, 0xC8, 0x00, 0x00, 0xF8, 0x04,
+    0x04, 0x04, 0x88, 0x00, 0x00, 0xFC,
+    0x24, 0x24, 0xE4, 0x18, 0x00, 0x00,
+    0x00, 0xFC, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x01, 0x01, 0x01, 0x00, 0x00, 0x80,
+    0xC0, 0xE1, 0xF1, 0x71, 0x30, 0x30,
+    0x30, 0x31, 0x70, 0xF0, 0xE0, 0xC1,
+    0x80, 0x00, 0x00, 0x01, 0x01, 0x01,
+    0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xFF, 0xFF, 0x03, 0x01, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x01, 0x03, 0xFF, 0xFF, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x03, 0x07, 0x0F, 0x1E,
+    0x3C, 0x38, 0x30, 0x30, 0x30, 0x30,
+    0x38, 0x3C, 0x1E, 0x0F, 0x07, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00
+    };
+
+static void render_oled(void) {
+    const int combined_size = sizeof(ou_logo) + sizeof(caps_off) + sizeof(num_off) + sizeof(scrl_off);
+    char combined[combined_size];
+    led_t led_state = host_keyboard_led_state();
+
+    memcpy_P(combined, ou_logo, sizeof(ou_logo));
+
+    if (led_state.caps_lock) {
+        memcpy_P(combined + sizeof(ou_logo), caps_on, sizeof(caps_off));
+    }
+    else {
+        memcpy_P(combined + sizeof(ou_logo), caps_off, sizeof(caps_off));
+    }
+
+    if (led_state.num_lock) {
+        memcpy_P(combined + sizeof(ou_logo) + sizeof(caps_off), num_on, sizeof(num_off));
+    }
+    else {
+        memcpy_P(combined + sizeof(ou_logo) + sizeof(caps_off), num_off, sizeof(num_off));
+    }
+
+    if (led_state.scroll_lock) {
+        memcpy_P(combined + sizeof(ou_logo) + sizeof(caps_off) + sizeof(num_off), scrl_on, sizeof(scrl_off));
+    }
+    else {
+        memcpy_P(combined + sizeof(ou_logo) + sizeof(caps_off) + sizeof(num_off), scrl_off, sizeof(scrl_off));
+    }
+
+    oled_write_raw_P(combined, sizeof(combined));
+}
+
+void render_logo(void) {
+    oled_write_raw_P(my_logo, sizeof(my_logo));
+}
+
+void clear_screen(void) {
+    if (clear_logo){
+      for (uint8_t i = 0; i < OLED_DISPLAY_HEIGHT; ++i) {
+        for (uint8_t j = 0; j < OLED_DISPLAY_WIDTH; ++j) {
+          oled_write_raw_byte(0x0, i*OLED_DISPLAY_WIDTH + j);
+        }
+      }
+      clear_logo = false;
+    }
+}
+
+#define MIDI_CONTROL_CHANGE 0xB0
+
+MidiDevice _midi_device;
+
+void midi_callback(uint8_t cable, uint8_t *midi_data, uint16_t length) {
+  // Check if this is a MIDI CC message on channel 2
+  if ((midi_data[0] & 0xF0) == MIDI_CONTROL_CHANGE && midi_data[0] & (0x0F == 1)) {
+    uprintf("%s string", midi_data );
+    // ...
+  }
+}
+
+void slider8_cc_callback(struct _midi_device *dev, uint8_t cable, uint8_t code_index, uint8_t value) {
+    midi_callback(MIDI_CONTROL_CHANGE, &value, 1);
+}
+
+void init_timer(void){
+   oled_logo_timer = timer_read32();
+};
+
+void keyboard_post_init_kb(void) {
+    init_timer();
+
+    keyboard_post_init_user();
+}
+
+void matrix_init_kb(void) {
+    midi_register_cc_callback(&_midi_device, slider8_cc_callback);
+    matrix_init_user();
+}
+
+#ifndef SHOW_LOGO
+#    define SHOW_LOGO 5000
+#endif
+bool oled_task_kb(void) {
+    if (!oled_task_user()) { return false; }
+    if ((timer_elapsed32(oled_logo_timer) < SHOW_LOGO)){
+        render_logo();
+    }else{
+      clear_screen();
+      render_oled();
+    }
+    return false;
+}
diff --git a/keyboards/1upkeyboards/1upslider8/config.h b/keyboards/1upkeyboards/1upslider8/config.h
new file mode 100644
index 000000000000..059d16f3fab0
--- /dev/null
+++ b/keyboards/1upkeyboards/1upslider8/config.h
@@ -0,0 +1,29 @@
+/* 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 I2C1_SCL_PIN        GP11
+#define I2C1_SDA_PIN        GP10
+#define OLED_BRIGHTNESS 128
+
+#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/halconf.h b/keyboards/1upkeyboards/1upslider8/halconf.h
new file mode 100644
index 000000000000..bc09e4db56dc
--- /dev/null
+++ b/keyboards/1upkeyboards/1upslider8/halconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 ziptyze
+// SPDX-License-Identifier: GPL-2.0-or-later#pragma once
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+#define HAL_USE_ADC TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/1upkeyboards/1upslider8/info.json b/keyboards/1upkeyboards/1upslider8/info.json
new file mode 100644
index 000000000000..f2fe65106076
--- /dev/null
+++ b/keyboards/1upkeyboards/1upslider8/info.json
@@ -0,0 +1,115 @@
+{
+    "manufacturer": "1upkeyboards",
+    "keyboard_name": "1upslider8",
+    "maintainer": "ziptyze",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x5611",
+        "vid": "0x6F75"
+    },
+    "dynamic_keymap": {
+        "layer_count": 10
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "oled": true,
+        "midi":true,
+        "rgb_matrix": true,
+        "encoder": true
+    },
+    "encoder": {
+        "rotary": [
+            {
+                "pin_a": "GP21",
+                "pin_b": "GP22"
+            }
+        ]
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP27", "GP17", "GP18", "GP19", "GP20", "GP15", "GP14", "GP13", "GP16"]
+        ]
+    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
+    "ws2812": {
+        "pin": "GP26",
+        "driver": "vendor"
+    },
+    "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,
+            "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, 1], "x": 28, "y": 16 },
+            { "flags": 4, "matrix": [0, 2], "x": 84, "y": 16 },
+            { "flags": 4, "matrix": [0, 3], "x": 140, "y": 16 },
+            { "flags": 4, "matrix": [0, 4], "x": 196, "y": 16 },
+            { "flags": 4, "matrix": [0, 5], "x": 28, "y": 48 },
+            { "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 }
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "enc", "matrix": [0, 0], "x": 3, "y": 0 },
+                { "label": "1", "matrix": [0, 1], "x": 0, "y": 1 },
+                { "label": "2", "matrix": [0, 2], "x": 1, "y": 1 },
+                { "label": "3", "matrix": [0, 3], "x": 2, "y": 1 },
+                { "label": "4", "matrix": [0, 4], "x": 3, "y": 1 },
+                { "label": "5", "matrix": [0, 5], "x": 0, "y": 2 },
+                { "label": "6", "matrix": [0, 6], "x": 1, "y": 2 },
+                { "label": "7", "matrix": [0, 7], "x": 2, "y": 2 },
+                { "label": "8", "matrix": [0, 8], "x": 3, "y": 2 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c b/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c
new file mode 100644
index 000000000000..9e39f9d3e381
--- /dev/null
+++ b/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+/* 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(
+                                   RGB_TOG,
+        KC_1,     KC_2,     KC_3,     KC_4,
+        KC_5,     KC_6,     KC_7,     KC_8
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =  { ENCODER_CCW_CW(RGB_RMOD,  RGB_MOD)}
+};
+#endif
diff --git a/keyboards/1upkeyboards/1upslider8/keymaps/default/rules.mk b/keyboards/1upkeyboards/1upslider8/keymaps/default/rules.mk
new file mode 100644
index 000000000000..a40474b4d5c7
--- /dev/null
+++ b/keyboards/1upkeyboards/1upslider8/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c b/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c
new file mode 100644
index 000000000000..4178e7de58db
--- /dev/null
+++ b/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c
@@ -0,0 +1,31 @@
+/* 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+                                   RGB_TOG,
+        KC_1,     KC_2,     KC_3,     KC_4,
+        KC_5,     KC_6,     KC_7,     KC_8
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =  { ENCODER_CCW_CW(RGB_RMOD,  RGB_MOD)}
+};
+#endif
diff --git a/keyboards/1upkeyboards/1upslider8/keymaps/via/rules.mk b/keyboards/1upkeyboards/1upslider8/keymaps/via/rules.mk
new file mode 100644
index 000000000000..15a5eaf11a11
--- /dev/null
+++ b/keyboards/1upkeyboards/1upslider8/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/1upslider8/mcuconf.h b/keyboards/1upkeyboards/1upslider8/mcuconf.h
new file mode 100644
index 000000000000..df9ddc79ad64
--- /dev/null
+++ b/keyboards/1upkeyboards/1upslider8/mcuconf.h
@@ -0,0 +1,11 @@
+// Copyright 2023 ziptyze
+// SPDX-License-Identifier: GPL-2.0-or-later#pragma once
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_I2C_USE_I2C1
+#undef RP_ADC_USE_ADC1
+#define RP_I2C_USE_I2C1 TRUE
+#define RP_ADC_USE_ADC1 TRUE
diff --git a/keyboards/1upkeyboards/1upslider8/readme.md b/keyboards/1upkeyboards/1upslider8/readme.md
new file mode 100644
index 000000000000..d1ad304b463f
--- /dev/null
+++ b/keyboards/1upkeyboards/1upslider8/readme.md
@@ -0,0 +1,27 @@
+# slider8
+
+![slider8](https://i.imgur.com/AiVQySnh.jpg)
+
+
+This keyboard is the slider8 from 1upkeyboards.com, a small macropad with an oled, slide potentiometer, rotary encoder, and 8 switches in a 2x4 ortholinear arrangement with per-key in-switch rgb leds.
+
+The slide potentiometer presents to the computer as a midi device and will need a seperate program to map to device control.
+
+* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 1upkeyboards/1upslider8:default
+
+Flashing example for this keyboard:
+
+    make 1upkeyboards/1upslider8: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 key and plug in the keyboard
+* **Physical reset button**: Hold down the button on the pi pico and plug in the keyboard
diff --git a/keyboards/1upkeyboards/1upslider8/rules.mk b/keyboards/1upkeyboards/1upslider8/rules.mk
new file mode 100644
index 000000000000..8515c3fae029
--- /dev/null
+++ b/keyboards/1upkeyboards/1upslider8/rules.mk
@@ -0,0 +1 @@
+SRC += analog.c
diff --git a/keyboards/1upkeyboards/1upsuper16v3/config.h b/keyboards/1upkeyboards/1upsuper16v3/config.h
new file mode 100644
index 000000000000..41e1679d4887
--- /dev/null
+++ b/keyboards/1upkeyboards/1upsuper16v3/config.h
@@ -0,0 +1,22 @@
+/* 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
new file mode 100644
index 000000000000..b11654a9424a
--- /dev/null
+++ b/keyboards/1upkeyboards/1upsuper16v3/info.json
@@ -0,0 +1,164 @@
+{
+    "manufacturer": "1upkeyboards",
+    "keyboard_name": "1upsuper16v3",
+    "maintainer": "ziptyze",
+    "bootloader": "rp2040",
+    "dynamic_keymap": {
+        "layer_count": 10
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP20", "pin_b": "GP21"},
+            {"pin_a": "GP25", "pin_b": "GP26"},
+            {"pin_a": "GP2", "pin_b": "GP3"},
+            {"pin_a": "GP6", "pin_b": "GP7"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP23", "GP24", "GP4", "GP5"],
+            ["GP19", "GP27", "GP1", "GP8"],
+            ["GP18", "GP28", "GP0", "GP9"],
+            ["GP17", "GP16", "GP15", "GP11"]
+        ]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "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": 99, "y": 1, "flags": 2},
+            {"x": 70, "y": 1, "flags": 2},
+            {"x": 42, "y": 1, "flags": 2},
+            {"x": 14, "y": 1, "flags": 2},
+            {"x": 4, "y": 4, "flags": 2},
+            {"x": 4, "y": 12, "flags": 2},
+            {"matrix": [0, 0], "x": 28, "y": 8, "flags": 4},
+            {"matrix": [0, 1], "x": 84, "y": 8, "flags": 4},
+            {"x": 4, "y": 20, "flags": 2},
+            {"x": 4, "y": 28, "flags": 2},
+            {"matrix": [1, 0], "x": 28, "y": 24, "flags": 4},
+            {"matrix": [1, 1], "x": 84, "y": 24, "flags": 4},
+            {"x": 4, "y": 36, "flags": 2},
+            {"x": 4, "y": 44, "flags": 2},
+            {"matrix": [2, 0], "x": 28, "y": 40, "flags": 4},
+            {"matrix": [2, 1], "x": 84, "y": 40, "flags": 4},
+            {"x": 4, "y": 52, "flags": 2},
+            {"x": 4, "y": 60, "flags": 2},
+            {"x": 14, "y": 63, "flags": 2},
+            {"matrix": [3, 0], "x": 28, "y": 56, "flags": 4},
+            {"x": 42, "y": 63, "flags": 2},
+            {"x": 70, "y": 63, "flags": 2},
+            {"matrix": [3, 1], "x": 84, "y": 56, "flags": 4},
+            {"x": 99, "y": 63, "flags": 2},
+            {"x": 126, "y": 63, "flags": 2},
+            {"matrix": [3, 2], "x": 140, "y": 56, "flags": 4},
+            {"x": 154, "y": 63, "flags": 2},
+            {"x": 182, "y": 63, "flags": 2},
+            {"matrix": [3, 3], "x": 196, "y": 56, "flags": 4},
+            {"x": 210, "y": 63, "flags": 2},
+            {"x": 220, "y": 60, "flags": 2},
+            {"x": 220, "y": 52, "flags": 2},
+            {"x": 220, "y": 44, "flags": 2},
+            {"matrix": [2, 3], "x": 196, "y": 40, "flags": 4},
+            {"matrix": [2, 2], "x": 140, "y": 40, "flags": 4},
+            {"x": 220, "y": 36, "flags": 2},
+            {"x": 220, "y": 28, "flags": 2},
+            {"matrix": [1, 3], "x": 196, "y": 24, "flags": 4},
+            {"matrix": [1, 2], "x": 140, "y": 24, "flags": 4},
+            {"x": 220, "y": 20, "flags": 2},
+            {"x": 220, "y": 12, "flags": 2},
+            {"matrix": [0, 3], "x": 196, "y": 8, "flags": 4},
+            {"matrix": [0, 2], "x": 140, "y": 8, "flags": 4},
+            {"x": 220, "y": 4, "flags": 2},
+            {"x": 210, "y": 1, "flags": 2},
+            {"x": 182, "y": 1, "flags": 2},
+            {"x": 154, "y": 1, "flags": 2},
+            {"x": 126, "y": 1, "flags": 2}
+        ]
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x5610",
+        "vid": "0x6F75"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP29"
+    },
+    "community_layouts": ["ortho_4x4"],
+    "layouts": {
+        "LAYOUT_ortho_4x4": {
+            "layout": [
+                {"label": "00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "10", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "11", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "12", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "13", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "20", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "21", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "22", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "23", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "30", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "31", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "32", "matrix": [3, 2], "x": 2, "y": 3},
+                {"label": "33", "matrix": [3, 3], "x": 3, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/keymap.c b/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/keymap.c
new file mode 100644
index 000000000000..e7be96bd8132
--- /dev/null
+++ b/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/* 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_4x4(
+        KC_P7, KC_P8, KC_P9,   KC_PMNS,
+        KC_P4, KC_P5, KC_P6,   KC_PPLS,
+        KC_P1, KC_P2, KC_P3,   KC_PSLS,
+        MO(1), KC_P0, KC_PDOT, KC_PENT
+    ),
+    [1] = LAYOUT_ortho_4x4(
+        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
+    )
+};
+
+#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), 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), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
diff --git a/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/rules.mk b/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/1upkeyboards/1upsuper16v3/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/1upkeyboards/1upsuper16v3/keymaps/via/keymap.c b/keyboards/1upkeyboards/1upsuper16v3/keymaps/via/keymap.c
new file mode 100644
index 000000000000..e7be96bd8132
--- /dev/null
+++ b/keyboards/1upkeyboards/1upsuper16v3/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+/* 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_4x4(
+        KC_P7, KC_P8, KC_P9,   KC_PMNS,
+        KC_P4, KC_P5, KC_P6,   KC_PPLS,
+        KC_P1, KC_P2, KC_P3,   KC_PSLS,
+        MO(1), KC_P0, KC_PDOT, KC_PENT
+    ),
+    [1] = LAYOUT_ortho_4x4(
+        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
+    )
+};
+
+#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), 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), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
diff --git a/keyboards/1upkeyboards/1upsuper16v3/keymaps/via/rules.mk b/keyboards/1upkeyboards/1upsuper16v3/keymaps/via/rules.mk
new file mode 100644
index 000000000000..bf70b1f3e09f
--- /dev/null
+++ b/keyboards/1upkeyboards/1upsuper16v3/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/1upsuper16v3/readme.md b/keyboards/1upkeyboards/1upsuper16v3/readme.md
new file mode 100644
index 000000000000..516459083226
--- /dev/null
+++ b/keyboards/1upkeyboards/1upsuper16v3/readme.md
@@ -0,0 +1,22 @@
+# 1upSuper16v3
+
+This keyboard is the Super16v3 from 1upkeyboards, a 4x4 macropad with the option for up to four encoders in the top row.  Notable features include in-switch per-key addressable RGB LEDs and thirty two 1mm underglow RGB LEDs; for bright and smooth lighting effects. The Super16v3 utilises an rp2040 microcontroller, wired using direct pins.
+
+* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 1upkeyboards/1upsuper16v3:default
+
+Flashing example for this keyboard:
+
+    make 1upkeyboards/1upsuper16v3: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. For this keyboard it is the top left button
+* **Physical reset button**: Hold the button on the back of the PCB and plug in the keyboard
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/base/rules.mk b/keyboards/1upkeyboards/1upsuper16v3/rules.mk
similarity index 100%
rename from keyboards/capsunlocked/cu80/v2_ansi/base/rules.mk
rename to keyboards/1upkeyboards/1upsuper16v3/rules.mk
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
index 695d5cb9b799..c7028f4a4e36 100644
--- a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
+++ b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
@@ -40,7 +40,7 @@
         ]
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 1, "matrix": [0, 0], "x": 9, "y": 8},
             {"flags": 4, "matrix": [0, 1], "x": 28, "y": 8},
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
index ebd5d6493167..6b89f2c2ab48 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
@@ -40,7 +40,7 @@
         ]
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 1, "matrix": [0, 0], "x": 9, "y": 8},
             {"flags": 4, "matrix": [0, 1], "x": 28, "y": 8},
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/rules.mk b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/rules.mk
index 96f930ffa10a..b446776377ae 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/rules.mk
+++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/rules.mk
@@ -17,9 +17,6 @@ MOUSEKEY_ENABLE       = no        # Mouse keys
 
 LEADER_ENABLE         = yes
 RGB_MATRIX_ENABLE     = yes
-RGB_MATRIX_DRIVER     = WS2812
-WS2812_DRIVER         = vendor
 ENCODER_ENABLE        = yes
 ENCODER_MAP_ENABLE    = yes
 OLED_ENABLE           = yes
-OLED_DRIVER           = SSD1306
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
index 3ee2e738f17b..f19ef235d515 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
@@ -40,7 +40,7 @@
         ]
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 1, "matrix": [0, 0], "x": 9, "y": 8},
             {"flags": 4, "matrix": [0, 1], "x": 28, "y": 8},
diff --git a/keyboards/1upkeyboards/pi40/rules.mk b/keyboards/1upkeyboards/pi40/rules.mk
index e858deae6aa3..3451f44976a2 100644
--- a/keyboards/1upkeyboards/pi40/rules.mk
+++ b/keyboards/1upkeyboards/pi40/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 
 DEFAULT_FOLDER = 1upkeyboards/pi40/mit_v1_0
diff --git a/keyboards/1upkeyboards/pi50/info.json b/keyboards/1upkeyboards/pi50/info.json
index 1880c78d44e5..17345284cac8 100644
--- a/keyboards/1upkeyboards/pi50/info.json
+++ b/keyboards/1upkeyboards/pi50/info.json
@@ -38,7 +38,7 @@
         ]
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "max_brightness": 150,
         "animations": {
             "solid_color": true,
diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/info.json
index f599446e20e8..1f8bdb4592fe 100644
--- a/keyboards/1upkeyboards/pi60/info.json
+++ b/keyboards/1upkeyboards/pi60/info.json
@@ -41,7 +41,7 @@
         ]
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 2, "x": 17, "y": 50},
             {"flags": 2, "x": 37, "y": 50},
diff --git a/keyboards/1upkeyboards/pi60_hse/config.h b/keyboards/1upkeyboards/pi60_hse/config.h
index 02100955e4af..a47120f7d39a 100644
--- a/keyboards/1upkeyboards/pi60_hse/config.h
+++ b/keyboards/1upkeyboards/pi60_hse/config.h
@@ -6,7 +6,6 @@
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 10
 #define RGB_MATRIX_LED_COUNT 16
-#define RGBLED_NUM 16
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json
index 01b02369751f..310ad3d94b0b 100644
--- a/keyboards/1upkeyboards/pi60_hse/info.json
+++ b/keyboards/1upkeyboards/pi60_hse/info.json
@@ -32,7 +32,7 @@
         "rows": ["GP4", "GP3", "GP2", "GP1", "GP0", "GP21"]
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 2, "x": 98, "y": 51},
             {"flags": 2, "x": 68, "y": 51},
diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/badger/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/badger/keymap.c
new file mode 100644
index 000000000000..cd7e26be10ba
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_hse/keymaps/badger/keymap.c
@@ -0,0 +1,52 @@
+/*
+Copyright 2023 Dan White <opensource@bluetufa.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "badger.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY]     = 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,  _______, \
+     KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_BSLS,           \
+     MOVE_MAC,  KC_A,     KC_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,                                 LT_FUNC,  KC_RGUI,  KC_RALT,   J_MACRO),
+
+  [_MOVE]       = LAYOUT_60_ansi_split_bs_rshift(\
+     MAC_FRC,   MM_LEFT,  MM_RGHT,  KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  P_PAREN,  KC_RPRN,  KC_UNDS,   KC_PLUS,  WD_DELE,  _______, \
+     _______,   IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_RUN,   IJ_STOP,  IJ_TOP,   WD_BACK,  KC_HOME,  KC_END,   WD_FRWD,  IJ_BACK,   IJ_FWD,   KC_PIPE,           \
+     _______,   MM_LH,    MM_MAX,   MM_RH,    IJ_FIND,  IJ_LINE,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_COLN,  KC_DQUO,   _______,  \
+     _______,   MM_UH,    MM_BH,    MAC_CPY,  MAC_SPS,  SHEBANG,  IJ_BOTT,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,  _______,   _______,  \
+     _______,   _______,  _______,                      _______,                                _______,  _______,  _______,   _______),
+
+  [_FUNCTION]   = 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,  _______, \
+     _______,   _______,  _______,  _______,  IJ_RFMT,   IJ_TERM,  KC_MPLY,  KC_PGUP,  _______,  _______,  KC_PGDN,  KC_VOLD,  KC_VOLU,  KC_INS,           \
+     _______,   _______,  _______,  IJ_DEBG,  IJ_FILE,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  \
+     _______,   _______,  _______,  KC_CAPS,  _______,   _______,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,  CONFIG,   \
+     _______,   _______,  _______,                       _______,                                _______,  _______,  _______,  CONFIG),
+
+  [_MACRO]     = LAYOUT_60_ansi_split_bs_rshift(\
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______, _______, \
+     _______,   SELECT,   KC_UP,    _______,  SED,       KC_MSTP,  _______,  _______,  BASH_IF,  _______,  _______,  P_BRACK,  _______,  _______,           \
+     _______,   KC_LEFT,  KC_DOWN,  KC_RGHT,  FOR_LOOP,  _______,  _______,  _______,  _______,  FOR_LOOP, _______,  _______,  _______,  \
+     _______,   _______,  _______,  CONST,    _______,   SHEBANG,  TS_IMPT,  _______,  _______,  _______,  _______,  _______,  _______,  \
+     _______,   _______,  _______,                       _______,                                _______,  _______,  _______,  _______),
+
+  [_CONFIG]     = LAYOUT_60_ansi_split_bs_rshift(\
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, \
+     _______,   _______,  _______,  EE_CLR,   QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,          \
+     _______,   _______,  _______,  DB_TOGG,  RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,  _______,  \
+     _______,   _______,  _______,  _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,  _______,  \
+     _______,   _______,  _______,                       _______,                                _______,  _______,  _______,  _______)
+};
diff --git a/keyboards/1upkeyboards/pi60_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/info.json
index d78705352a99..68634f4da1f7 100644
--- a/keyboards/1upkeyboards/pi60_rgb/info.json
+++ b/keyboards/1upkeyboards/pi60_rgb/info.json
@@ -38,7 +38,7 @@
         "enabled": true
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 1, "matrix": [5, 5], "x": 103, "y": 58},
             {"flags": 1, "matrix": [5, 10], "x": 159, "y": 58},
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
index 8102cbda4c13..7a5c6e0e8336 100644
--- a/keyboards/1upkeyboards/super16/config.h
+++ b/keyboards/1upkeyboards/super16/config.h
@@ -17,24 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 16  // Add 12 if attaching the RGB LED ring
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    ifdef RGBLIGHT_ENABLE
-#        define RGBLIGHT_HUE_STEP 8
-#        define RGBLIGHT_SAT_STEP 8
-#        define RGBLIGHT_VAL_STEP 8
-#        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
-#    elif defined RGB_MATRIX_ENABLE
+#    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
diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/info.json
index 923f536ac8b4..6d63921f1b9a 100644
--- a/keyboards/1upkeyboards/super16/info.json
+++ b/keyboards/1upkeyboards/super16/info.json
@@ -11,8 +11,26 @@
   "ws2812": {
     "pin": "D3"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 16,
+    "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
+    }
+  },
   "rgb_matrix": {
-    "driver": "WS2812"
+    "driver": "ws2812"
   },
   "matrix_pins": {
     "cols": ["D4", "C6", "F6", "F7"],
diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json
index 39a8eefcc416..c4bdc441eeda 100644
--- a/keyboards/1upkeyboards/super16v2/info.json
+++ b/keyboards/1upkeyboards/super16v2/info.json
@@ -12,7 +12,7 @@
       "pin": "B5"
     },
     "rgb_matrix": {
-      "driver": "WS2812"
+      "driver": "ws2812"
     },
     "matrix_pins": {
       "cols": ["D5", "D6", "C2", "D0"],
diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h
index bed2edc0a668..c0ffe0213744 100644
--- a/keyboards/1upkeyboards/sweet16/v1/config.h
+++ b/keyboards/1upkeyboards/sweet16/v1/config.h
@@ -5,19 +5,3 @@
 #    define LED_CAPS_LOCK_PIN D5 // TXLED
 #    define LED_PIN_ON_STATE 0
 #endif
-
-/* Underglow options */
-#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 1
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json
index cb82e7fcfb37..bbecccae0206 100644
--- a/keyboards/1upkeyboards/sweet16/v1/info.json
+++ b/keyboards/1upkeyboards/sweet16/v1/info.json
@@ -3,6 +3,23 @@
         "pid": "0x0161",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "B1"
     },
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
index 88687335de7b..37a85b4711dd 100644
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
@@ -19,7 +19,6 @@
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 10
 #define RGB_MATRIX_LED_COUNT 20
-#define RGBLED_NUM 20
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
index b8705866c87a..f1ac861c8c72 100644
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
@@ -41,7 +41,7 @@
         ]
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 0], "x": 28, "y": 12},
             {"flags": 4, "matrix": [0, 1], "x": 84, "y": 12},
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
index fa98b70fbc8b..a8696ab64c9e 100644
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
+++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
@@ -39,7 +39,7 @@
         ]
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 0], "x": 28, "y": 12},
             {"flags": 4, "matrix": [0, 1], "x": 84, "y": 12},
diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
index 2c3ca34c5ec1..0d7a5de56056 100644
--- a/keyboards/25keys/aleth42/rev0/config.h
+++ b/keyboards/25keys/aleth42/rev0/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-   #define RGBLED_NUM 6
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #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
-
 /* 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/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/info.json
index f3741a80b148..675c741bf52a 100644
--- a/keyboards/25keys/aleth42/rev0/info.json
+++ b/keyboards/25keys/aleth42/rev0/info.json
@@ -13,6 +13,24 @@
             {"pin_a": "B5", "pin_b": "B4"}
         ]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "C7"
     },
diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
index a97ab1ea4986..0d7a5de56056 100644
--- a/keyboards/25keys/aleth42/rev1/config.h
+++ b/keyboards/25keys/aleth42/rev1/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-   #define RGBLED_NUM 8
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #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
-
 /* 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/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json
index 562020388953..fd4b07fe3ee2 100644
--- a/keyboards/25keys/aleth42/rev1/info.json
+++ b/keyboards/25keys/aleth42/rev1/info.json
@@ -13,6 +13,24 @@
             {"pin_a": "F5", "pin_b": "F6"}
         ]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "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": "B3"
     },
diff --git a/keyboards/25keys/cassette42/config.h b/keyboards/25keys/cassette42/config.h
index 07d9ab9b67df..915e161e8bdc 100644
--- a/keyboards/25keys/cassette42/config.h
+++ b/keyboards/25keys/cassette42/config.h
@@ -17,20 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 5
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 #define OLED_FONT_H "keyboards/25keys/cassette42/common/glcdfont.c"
diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/info.json
index 01701aedeb67..38a73368f635 100644
--- a/keyboards/25keys/cassette42/info.json
+++ b/keyboards/25keys/cassette42/info.json
@@ -14,6 +14,24 @@
             {"pin_a": "B3", "pin_b": "B1"}
         ]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 5,
+        "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": "D3"
     },
diff --git a/keyboards/25keys/cassette42/rules.mk b/keyboards/25keys/cassette42/rules.mk
index eaeebeff07fa..f8febbdec8d1 100644
--- a/keyboards/25keys/cassette42/rules.mk
+++ b/keyboards/25keys/cassette42/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 SRC += ./common/oled_helper.c
diff --git a/keyboards/25keys/zinc/info.json b/keyboards/25keys/zinc/info.json
index 1efe467be974..235024231680 100644
--- a/keyboards/25keys/zinc/info.json
+++ b/keyboards/25keys/zinc/info.json
@@ -8,7 +8,7 @@
     "device_version": "0.0.1"
    },
    "rgb_matrix": {
-     "driver": "WS2812"
+     "driver": "ws2812"
    },
   "processor": "atmega32u4",
   "bootloader": "caterina"
diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h
index e4b0d02f753e..27755e64c6a5 100644
--- a/keyboards/25keys/zinc/rev1/config.h
+++ b/keyboards/25keys/zinc/rev1/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
 
 /* Select hand configuration */
 #define MASTER_LEFT
diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/info.json
index 46692f6e4d12..47fb1f2e98e2 100644
--- a/keyboards/25keys/zinc/rev1/info.json
+++ b/keyboards/25keys/zinc/rev1/info.json
@@ -8,6 +8,12 @@
   "split": {
     "soft_serial_pin": "D2"
   },
+  "tapping": {
+    "term": 100
+  },
+  "rgblight": {
+    "hue_steps": 10
+  },
   "ws2812": {
     "pin": "D3"
   },
diff --git a/keyboards/25keys/zinc/rev1/post_config.h b/keyboards/25keys/zinc/rev1/post_config.h
index 15857d3b0b30..3d51de9e4c16 100644
--- a/keyboards/25keys/zinc/rev1/post_config.h
+++ b/keyboards/25keys/zinc/rev1/post_config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       #ifdef RGBLED_CONT
         #define RGBLED_NUM 60
         #define RGBLED_SPLIT { 30, 30 }
-//      #define RGBLIGHT_LED_MAP {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,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}
       #else
         #define RGBLED_NUM 30
       #endif
@@ -72,8 +71,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #endif
   #define RGBLIGHT_VAL_STEP 4
 #endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value
diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h
index e4b0d02f753e..27755e64c6a5 100644
--- a/keyboards/25keys/zinc/reva/config.h
+++ b/keyboards/25keys/zinc/reva/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
 
 /* Select hand configuration */
 #define MASTER_LEFT
diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/info.json
index 4db1d049107b..1ab2fb7e38f3 100644
--- a/keyboards/25keys/zinc/reva/info.json
+++ b/keyboards/25keys/zinc/reva/info.json
@@ -8,6 +8,12 @@
   "split": {
     "soft_serial_pin": "D2"
   },
+  "tapping": {
+    "term": 100
+  },
+  "rgblight": {
+    "hue_steps": 10
+  },
   "ws2812": {
     "pin": "D3"
   },
diff --git a/keyboards/25keys/zinc/reva/post_config.h b/keyboards/25keys/zinc/reva/post_config.h
index 15857d3b0b30..3d51de9e4c16 100644
--- a/keyboards/25keys/zinc/reva/post_config.h
+++ b/keyboards/25keys/zinc/reva/post_config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       #ifdef RGBLED_CONT
         #define RGBLED_NUM 60
         #define RGBLED_SPLIT { 30, 30 }
-//      #define RGBLIGHT_LED_MAP {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,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}
       #else
         #define RGBLED_NUM 30
       #endif
@@ -72,8 +71,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #endif
   #define RGBLIGHT_VAL_STEP 4
 #endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value
diff --git a/keyboards/2key2crawl/config.h b/keyboards/2key2crawl/config.h
index a4088e49256d..5f360813239b 100644
--- a/keyboards/2key2crawl/config.h
+++ b/keyboards/2key2crawl/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-
-#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 RGBLED_NUM 3
-#endif
diff --git a/keyboards/2key2crawl/info.json b/keyboards/2key2crawl/info.json
index 1752531ba17f..b8644a071293 100644
--- a/keyboards/2key2crawl/info.json
+++ b/keyboards/2key2crawl/info.json
@@ -18,6 +18,21 @@
             {"pin_a": "D0", "pin_b": "D1", "resolution": 1}
         ]
     },
+    "rgblight": {
+        "led_count": 3,
+        "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": "C6"
     },
diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/info.json
index f2d712072ea9..35cc3ee3c455 100644
--- a/keyboards/3keyecosystem/2key2/info.json
+++ b/keyboards/3keyecosystem/2key2/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F4", "D7"],
diff --git a/keyboards/40percentclub/4pack/info.json b/keyboards/40percentclub/4pack/info.json
index 9709807612c0..31d455988338 100644
--- a/keyboards/40percentclub/4pack/info.json
+++ b/keyboards/40percentclub/4pack/info.json
@@ -9,6 +9,7 @@
         "device_version": "0.0.1"
     },
     "backlight": {
+        "driver": "timer",
         "pins": ["F6", "F7"]
     },
     "processor": "atmega32u4",
diff --git a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
index ab2a1fa1c141..f4d3032857ce 100644
--- a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
@@ -59,16 +59,17 @@ void keyboard_pre_init_user(void) {
   setPinOutput(B0);
 }
 
-void led_set_user(uint8_t usb_led) {
-  if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.num_lock) {
     writePinLow(D5);
   } else {
     writePinHigh(D5);
   }
 
-  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+  if (led_state.caps_lock) {
     writePinLow(B0);
   } else {
     writePinHigh(B0);
   }
+  return false;
 }
diff --git a/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c b/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c
index 40c11739fb63..090fd1d29633 100644
--- a/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c
+++ b/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c
@@ -199,9 +199,6 @@ void music_scale_user(void)
 
 #endif
 
-void matrix_scan_user(void) {
-}
-
 //Tap Dance Definitions
 tap_dance_action_t tap_dance_actions[] = {
   //Tap once for Esc, twice for Caps Lock
@@ -211,40 +208,3 @@ tap_dance_action_t tap_dance_actions[] = {
   [TD_A_TAB]  = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_TAB),
   [TD_Q_ESC]  = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC)
 };
-
-// don't know what this is doing...
-/*
-void led_set_user(uint8_t usb_led) {
-
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-    DDRD |= (1 << 5); PORTD &= ~(1 << 5);
-  } else {
-    DDRD &= ~(1 << 5); PORTD &= ~(1 << 5);
-  }
-
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-    DDRB |= (1 << 0); PORTB &= ~(1 << 0);
-  } else {
-    DDRB &= ~(1 << 0); PORTB &= ~(1 << 0);
-  }
-
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_KANA)) {
-
-  } else {
-
-  }
-
-}
-*/
diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h
index e388bc970567..5f360813239b 100644
--- a/keyboards/40percentclub/luddite/config.h
+++ b/keyboards/40percentclub/luddite/config.h
@@ -5,19 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#    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
-// #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/info.json
index eb5c0e4a9d7c..a8c8c13b2a5f 100644
--- a/keyboards/40percentclub/luddite/info.json
+++ b/keyboards/40percentclub/luddite/info.json
@@ -17,6 +17,21 @@
     "pin": "B5",
     "levels": 4
   },
+  "rgblight": {
+    "led_count": 8,
+    "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": "B4"
   },
diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
index c3e359e24ea5..f7899ad886f4 100644
--- a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
+++ b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
@@ -157,11 +157,11 @@ void dynamic_macro_record_end_user(int8_t direction) {
 // Custom Caps Lock backlight behaviour
 // ------------------------------------
 
-void led_set_user(uint8_t usb_led) {
+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 = IS_LED_ON(usb_led, USB_LED_CAPS_LOCK);
+    bool is_caps_on = led_state.caps_lock;
 
     if (prev_is_caps_on != is_caps_on) {
         prev_is_caps_on = is_caps_on;
@@ -178,7 +178,7 @@ void led_set_user(uint8_t usb_led) {
     }
 
     // Turn on the Pro Micro's on-board LEDs for Caps Lock
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+    if (led_state.caps_lock) {
         // Set to low
         setPinOutput(B0);
         writePinLow(B0);
@@ -189,6 +189,7 @@ void led_set_user(uint8_t usb_led) {
         setPinInput(B0);
         setPinInput(D5);
     }
+    return false;
 }
 
 // Backlight idle timeout feature
diff --git a/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c b/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c
index ea659979ea86..3932a1ee9b9b 100644
--- a/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c
+++ b/keyboards/40percentclub/mf68/keymaps/emdarcher/keymap.c
@@ -35,11 +35,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-
-
-void led_set_user(uint8_t usb_led){
+bool led_update_user(led_t led_state){
     //turn on the Pro Micro's on board LEDs for CAPS LOCK
-    if(IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)){
+    if(led_state.caps_lock){
         //set led pins to low
         setPinOutput(B0);
         writePinLow(B0);
@@ -50,4 +48,5 @@ void led_set_user(uint8_t usb_led){
         setPinInput(B0);
         setPinInput(D5);
     }
+    return false;
 }
diff --git a/keyboards/40percentclub/mf68/keymaps/mf68_ble/rules.mk b/keyboards/40percentclub/mf68/keymaps/mf68_ble/rules.mk
index 975c58188334..dedd62afcbcb 100644
--- a/keyboards/40percentclub/mf68/keymaps/mf68_ble/rules.mk
+++ b/keyboards/40percentclub/mf68/keymaps/mf68_ble/rules.mk
@@ -5,5 +5,5 @@ F_CPU = 8000000
 #   change yes to no to disable
 #
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
+BLUETOOTH_DRIVER = bluefruit_le
 BACKLIGHT_ENABLE = no
diff --git a/keyboards/40percentclub/nano/config.h b/keyboards/40percentclub/nano/config.h
deleted file mode 100644
index 8641d6a37f88..000000000000
--- a/keyboards/40percentclub/nano/config.h
+++ /dev/null
@@ -1,31 +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
-
-/* ws2812 RGB LED */
-#    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
diff --git a/keyboards/40percentclub/nano/info.json b/keyboards/40percentclub/nano/info.json
index 21e5c2d1d2bb..4cfd3a9a295c 100644
--- a/keyboards/40percentclub/nano/info.json
+++ b/keyboards/40percentclub/nano/info.json
@@ -8,6 +8,21 @@
     "pid": "0x0007",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "led_count": 6,
+    "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": "D3"
   },
diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h
index 57981dd27ff8..0fe9b9df213c 100644
--- a/keyboards/40percentclub/nori/config.h
+++ b/keyboards/40percentclub/nori/config.h
@@ -16,22 +16,6 @@
 
 #pragma once
 
-// enable RGB underglow
-#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
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* 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/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json
index b58ee84edc8d..214d1da2a09e 100644
--- a/keyboards/40percentclub/nori/info.json
+++ b/keyboards/40percentclub/nori/info.json
@@ -16,6 +16,23 @@
     "backlight": {
       "pin": "B5"
     },
+    "rgblight": {
+      "saturation_steps": 8,
+      "brightness_steps": 8,
+      "led_count": 10,
+      "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": "B4"
     },
diff --git a/keyboards/40percentclub/sixpack/info.json b/keyboards/40percentclub/sixpack/info.json
index 3483c7d4df65..cd4864fbd127 100644
--- a/keyboards/40percentclub/sixpack/info.json
+++ b/keyboards/40percentclub/sixpack/info.json
@@ -9,6 +9,7 @@
       "device_version": "10.0.1"
     },
     "backlight": {
+      "driver": "timer",
       "pins": ["F4", "F5"],
       "levels": 6,
       "breathing": true
diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h
index 2199981c7c93..b46d357dd04e 100644
--- a/keyboards/40percentclub/tomato/config.h
+++ b/keyboards/40percentclub/tomato/config.h
@@ -5,19 +5,3 @@
 
 /* eliminate lag on space cadet mods */
 #define PERMISSIVE_HOLD
-
-/* setup lighting */
-#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
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/40percentclub/tomato/info.json b/keyboards/40percentclub/tomato/info.json
index c881f7c7d108..eabe3545683f 100644
--- a/keyboards/40percentclub/tomato/info.json
+++ b/keyboards/40percentclub/tomato/info.json
@@ -8,6 +8,23 @@
     "pid": "0x546F",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 30,
+    "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": "B5"
   },
diff --git a/keyboards/40percentclub/ut47/led.c b/keyboards/40percentclub/ut47/led.c
index f5d8ffc12ee9..867a6e2e2a37 100644
--- a/keyboards/40percentclub/ut47/led.c
+++ b/keyboards/40percentclub/ut47/led.c
@@ -19,20 +19,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdint.h>
 #include "led.h"
 
-
-void led_set(uint8_t usb_led)
+bool led_update_kb(led_t led_state)
 {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        // output low
-        DDRB |= (1<<0);
-        PORTB &= ~(1<<0);
-        DDRD |= (1<<5);
-        PORTD &= ~(1<<5);
-    } else {
-        // Hi-Z
-        DDRB &= ~(1<<0);
-        PORTB &= ~(1<<0);
-        DDRD &= ~(1<<5);
-        PORTD &= ~(1<<5);
+    bool res = led_update_user(led_state);
+    if (res) {
+        if (led_state.caps_lock) {
+            // output low
+            DDRB |= (1<<0);
+            PORTB &= ~(1<<0);
+            DDRD |= (1<<5);
+            PORTD &= ~(1<<5);
+        } else {
+            // Hi-Z
+            DDRB &= ~(1<<0);
+            PORTB &= ~(1<<0);
+            DDRD &= ~(1<<5);
+            PORTD &= ~(1<<5);
+        }
     }
+    return false;
 }
diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h
deleted file mode 100644
index 4ec3391a61e7..000000000000
--- a/keyboards/4pplet/aekiso60/rev_a/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#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
diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/info.json
index cbcf0f5997ca..7728ab50bb3a 100644
--- a/keyboards/4pplet/aekiso60/rev_a/info.json
+++ b/keyboards/4pplet/aekiso60/rev_a/info.json
@@ -4,6 +4,23 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "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": "D3"
     },
diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h
index e6f7c748a5a8..036d08cc73c4 100644
--- a/keyboards/4pplet/aekiso60/rev_b/config.h
+++ b/keyboards/4pplet/aekiso60/rev_b/config.h
@@ -16,18 +16,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define RGBLED_NUM 12
 #define WS2812_EXTERNAL_PULLUP
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/4pplet/aekiso60/rev_b/info.json b/keyboards/4pplet/aekiso60/rev_b/info.json
index 4e218f9365ed..b5ad58bc11df 100644
--- a/keyboards/4pplet/aekiso60/rev_b/info.json
+++ b/keyboards/4pplet/aekiso60/rev_b/info.json
@@ -4,6 +4,23 @@
         "pid": "0x0011",
         "device_version": "0.0.2"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "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": "A8"
     },
diff --git a/keyboards/4pplet/aekiso60/rev_b/rules.mk b/keyboards/4pplet/aekiso60/rev_b/rules.mk
index 041df45ecaa3..e539634d5898 100644
--- a/keyboards/4pplet/aekiso60/rev_b/rules.mk
+++ b/keyboards/4pplet/aekiso60/rev_b/rules.mk
@@ -14,5 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
index 6114950220c4..9bec945f24a8 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
@@ -18,27 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PWM_DRIVER    PWMD2
 #define BACKLIGHT_PWM_CHANNEL   4
-#define BACKLIGHT_PAL_MODE      2
 
 /* Underglow */
 #define WS2812_SPI  SPID1
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PIN A5
 #define WS2812_SPI_SCK_PAL_MODE 0
-#define RGBLED_NUM  16
-#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
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
index 02d4f3863273..c08f53f7b7de 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
@@ -18,12 +18,39 @@
         "levels": 10,
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "A7",
         "driver": "spi"
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan"
+    ],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -98,6 +125,75 @@
                 {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "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": [3, 6], "x": 13, "y": 0, "w": 2},
+
+                {"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": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "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": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"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": 2.75},
+
+                {"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": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
         "LAYOUT_60_ansi_split_bs_rshift": {
             "layout": [
                 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
@@ -169,6 +265,74 @@
                 {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "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": [3, 6], "x": 13, "y": 0, "w": 2},
+
+                {"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": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "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": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"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": 2.75},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
         "LAYOUT_60_tsangan_hhkb": {
             "layout": [
                 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
@@ -306,6 +470,288 @@
                 {"label": "GUI", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
                 {"label": "Alt", "matrix": [9, 5], "x": 12.5, "y": 4}
             ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "\"", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "\u00a3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "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": [3, 6], "x": 13, "y": 0, "w": 2},
+
+                {"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": "Caps Lock", "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": "~", "matrix": [4, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"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": 2.75},
+
+                {"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": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "\"", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "\u00a3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "Backspace", "matrix": [3, 6], "x": 14, "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": "Caps Lock", "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": "~", "matrix": [4, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"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": "Fn", "matrix": [9, 6], "x": 14, "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": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "\"", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "\u00a3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "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": [3, 6], "x": 13, "y": 0, "w": 2},
+
+                {"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": "Caps Lock", "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": "~", "matrix": [4, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"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": 2.75},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "\"", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "\u00a3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "Backspace", "matrix": [3, 6], "x": 14, "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": "Caps Lock", "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": "~", "matrix": [4, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"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": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/matrix_diagram.md b/keyboards/4pplet/eagle_viper_rep/rev_a/matrix_diagram.md
index 6a51e0447ea4..8ec59179b018 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/matrix_diagram.md
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/matrix_diagram.md
@@ -2,7 +2,7 @@
 
 ```
                                                     ┌───────┐
-                                       2u Backspace │36?    │
+                                       2u Backspace │36     │
                                                     └───────┘
 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
 │00 │10 │01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │16 │36 │
@@ -19,6 +19,6 @@
 │60      │ 2.25u LShift             2.75u RShift │66        │
 └────────┘                                       └──────────┘
 ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
-│80   │90 │91   │93                         │85   │95 │86   │ Tsangan/WKL/HHKB
+│80   │90 │91   │93                         │85   │95 │86   │ Tsangan/HHKB
 └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
 ```
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
index 4e3e37ff3dfc..30a36865b961 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
@@ -13,5 +13,3 @@ RGBLIGHT_ENABLE = yes
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
index 7c8c8a8cf225..5d5eefda2184 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
@@ -21,23 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PAL_MODE      1
 
 /* Underglow */
-#define RGBLED_NUM 16
 #define WS2812_EXTERNAL_PULLUP
 
-#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
-
 /* 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/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
index 73a2053979ef..ad7513c13d6e 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
@@ -23,6 +23,23 @@
         "num_lock": "B12",
         "scroll_lock": "B13"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "A8"
     },
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk
index 09e14f7540b6..428a48c46499 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk
@@ -13,5 +13,3 @@ RGBLIGHT_ENABLE = yes
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/4pplet/perk60_iso/rev_a/info.json b/keyboards/4pplet/perk60_iso/rev_a/info.json
index e961253a23c4..527f3d57726f 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/info.json
+++ b/keyboards/4pplet/perk60_iso/rev_a/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["A1", "B12", "B14", "A2", "A0", "A3", "A4"],
diff --git a/keyboards/4pplet/perk60_iso/rev_a/rules.mk b/keyboards/4pplet/perk60_iso/rev_a/rules.mk
index d89fef719474..6a7da3e998d8 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/rules.mk
+++ b/keyboards/4pplet/perk60_iso/rev_a/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/4pplet/steezy60/rev_b/rules.mk b/keyboards/4pplet/steezy60/rev_b/rules.mk
index 68bddfc74854..3787d8c241b5 100644
--- a/keyboards/4pplet/steezy60/rev_b/rules.mk
+++ b/keyboards/4pplet/steezy60/rev_b/rules.mk
@@ -6,5 +6,3 @@ KEY_LOCK_ENABLE = yes
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/4pplet/unextended_std/rev_a/rules.mk b/keyboards/4pplet/unextended_std/rev_a/rules.mk
index 68bddfc74854..3787d8c241b5 100644
--- a/keyboards/4pplet/unextended_std/rev_a/rules.mk
+++ b/keyboards/4pplet/unextended_std/rev_a/rules.mk
@@ -6,5 +6,3 @@ KEY_LOCK_ENABLE = yes
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h
deleted file mode 100644
index 2552b1e451f5..000000000000
--- a/keyboards/4pplet/waffling60/rev_b/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2020 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/>.
-*/
-#pragma once
-
-#define RGBLED_NUM 1
-
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json
index 90fe5d02a227..7ba1964c7ca7 100644
--- a/keyboards/4pplet/waffling60/rev_b/info.json
+++ b/keyboards/4pplet/waffling60/rev_b/info.json
@@ -8,6 +8,23 @@
         "pid": "0x0005",
         "device_version": "0.0.2"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h
deleted file mode 100644
index 06e5db9090cd..000000000000
--- a/keyboards/4pplet/waffling60/rev_c/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#define RGBLED_NUM 1
-
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json
index c33d2b0616c2..f2461aeaa9b5 100644
--- a/keyboards/4pplet/waffling60/rev_c/info.json
+++ b/keyboards/4pplet/waffling60/rev_c/info.json
@@ -12,6 +12,23 @@
         "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"],
         "rows": ["C2", "D0", "B0", "D6", "D5"]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/4pplet/waffling60/rev_d/config.h b/keyboards/4pplet/waffling60/rev_d/config.h
index 2ba774712abe..036d08cc73c4 100644
--- a/keyboards/4pplet/waffling60/rev_d/config.h
+++ b/keyboards/4pplet/waffling60/rev_d/config.h
@@ -16,9 +16,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define RGBLED_NUM 1
 #define WS2812_EXTERNAL_PULLUP
-
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/4pplet/waffling60/rev_d/info.json b/keyboards/4pplet/waffling60/rev_d/info.json
index 01aba228636b..692f99560528 100644
--- a/keyboards/4pplet/waffling60/rev_d/info.json
+++ b/keyboards/4pplet/waffling60/rev_d/info.json
@@ -8,6 +8,11 @@
         "pid": "0x000E",
         "device_version": "0.0.4"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 1
+    },
     "ws2812": {
         "pin": "A8"
     },
diff --git a/keyboards/4pplet/waffling60/rev_d/rules.mk b/keyboards/4pplet/waffling60/rev_d/rules.mk
index 041df45ecaa3..e539634d5898 100644
--- a/keyboards/4pplet/waffling60/rev_d/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_d/rules.mk
@@ -14,5 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk b/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk
index 519206564463..a64bf928ebb3 100644
--- a/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk
@@ -14,5 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/rules.mk b/keyboards/4pplet/waffling60/rev_d_iso/rules.mk
index e8184d57abad..e11c916b4fd3 100644
--- a/keyboards/4pplet/waffling60/rev_d_iso/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_d_iso/rules.mk
@@ -14,5 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/config.h b/keyboards/4pplet/waffling60/rev_e_ansi/config.h
new file mode 100644
index 000000000000..521ddf96a183
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/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_ansi/info.json b/keyboards/4pplet/waffling60/rev_e_ansi/info.json
new file mode 100644
index 000000000000..c2514700ff00
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/info.json
@@ -0,0 +1,255 @@
+{
+    "manufacturer": "4pplet",
+    "keyboard_name": "waffling60 Rev E ANSI 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": false,
+        "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": "0x0015",
+        "vid": "0x4444"
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "community_layouts": [
+        "60_tsangan_hhkb",
+        "60_hhkb"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "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": "|", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [1, 13], "x": 14, "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": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"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": "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": "Fn", "matrix": [3, 13], "x": 14, "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, 4], "x":4, "y":4, "w":3},
+                {"label": "Space", "matrix": [4, 6], "x":7, "y":4},
+                {"label": "Space", "matrix": [4, 8], "x":8, "y":4, "w":3},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "Esc", "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": "|", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [1, 13], "x": 14, "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": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"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": "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": "Fn", "matrix": [3, 13], "x": 14, "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": "Win", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label": "Esc", "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": "|", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [1, 13], "x": 14, "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": "Bsp", "matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Ctrl", "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": "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": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Win", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x":4, "y":4, "w": 7},
+                {"label": "Win", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4},
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/default/keymap.c
new file mode 100644
index 000000000000..706428c00e72
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/*
+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] = {
+// 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_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_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_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,  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/4pplet/waffling60/rev_e_ansi/keymaps/default/rules.mk b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/via/keymap.c b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/via/keymap.c
new file mode 100644
index 000000000000..706428c00e72
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/via/keymap.c
@@ -0,0 +1,40 @@
+/*
+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] = {
+// 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_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_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_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,  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/4pplet/waffling60/rev_e_ansi/keymaps/via/rules.mk b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/via/rules.mk
new file mode 100644
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/matrix_diagram.md b/keyboards/4pplet/waffling60/rev_e_ansi/matrix_diagram.md
new file mode 100644
index 000000000000..ae47900a9baa
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for 4pplet Waffling60 Rev E ANSI Hotswap
+
+```
+                                                    ┌───────┐
+                                       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 │2C   │      
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤  
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │   
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ 
+│30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │   
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┼───┴┬────┬┴───┤
+│40  │41  │42  │46                           │4B  │4C  │4D  │ Tsangan/WKL/HHKB
+└────┴────┴────┴─────────────────────────────┴────┴────┴────┘
+┌─────┬───┬─────┬───────────┬───┬───────────┬─────┬───┬─────┐
+│40   │41 │42   │44         │46 │48         │4B   │4C │4D   │ 7u split spacebar
+└─────┴───┴─────┴───────────┴───┴───────────┴─────┴───┴─────┘
+┌─────┬───┬───────────────────────────────────────┬───┬─────┐
+│40   │41 │46                                     │4C │4D   │ 10u Spacebar
+└─────┴───┴───────────────────────────────────────┴───┴─────┘
+```
diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/readme.md b/keyboards/4pplet/waffling60/rev_e_ansi/readme.md
new file mode 100644
index 000000000000..1b70d5aba864
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/readme.md
@@ -0,0 +1,26 @@
+# waffling60 Rev. E ANSI
+
+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_ansi:default
+
+Flashing example for this keyboard:
+
+    make 4pplet/waffling60/rev_e_ansi: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_ansi/rules.mk b/keyboards/4pplet/waffling60/rev_e_ansi/rules.mk
new file mode 100644
index 000000000000..04fe1eba2acd
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_e_ansi/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
diff --git a/keyboards/4pplet/waffling80/rev_a/config.h b/keyboards/4pplet/waffling80/rev_a/config.h
deleted file mode 100644
index e42bb68b370b..000000000000
--- a/keyboards/4pplet/waffling80/rev_a/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#define RGBLED_NUM 2
-
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/4pplet/waffling80/rev_a/info.json b/keyboards/4pplet/waffling80/rev_a/info.json
index 34ec33bbe21a..8c3a84be1e6b 100644
--- a/keyboards/4pplet/waffling80/rev_a/info.json
+++ b/keyboards/4pplet/waffling80/rev_a/info.json
@@ -4,6 +4,11 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 2
+    },
     "ws2812": {
         "pin": "D7"
     },
diff --git a/keyboards/4pplet/waffling80/rev_b/config.h b/keyboards/4pplet/waffling80/rev_b/config.h
index 1bf561d74ae1..036d08cc73c4 100644
--- a/keyboards/4pplet/waffling80/rev_b/config.h
+++ b/keyboards/4pplet/waffling80/rev_b/config.h
@@ -16,9 +16,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define RGBLED_NUM 2
 #define WS2812_EXTERNAL_PULLUP
-
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/4pplet/waffling80/rev_b/info.json b/keyboards/4pplet/waffling80/rev_b/info.json
index 61673e609d64..47d3d5d662fd 100644
--- a/keyboards/4pplet/waffling80/rev_b/info.json
+++ b/keyboards/4pplet/waffling80/rev_b/info.json
@@ -4,6 +4,11 @@
         "pid": "0x000F",
         "device_version": "0.0.2"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 2
+    },
     "ws2812": {
         "pin": "A8"
     },
diff --git a/keyboards/4pplet/waffling80/rev_b/rules.mk b/keyboards/4pplet/waffling80/rev_b/rules.mk
index 041df45ecaa3..e539634d5898 100644
--- a/keyboards/4pplet/waffling80/rev_b/rules.mk
+++ b/keyboards/4pplet/waffling80/rev_b/rules.mk
@@ -14,5 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/4pplet/yakiimo/rev_a/rules.mk b/keyboards/4pplet/yakiimo/rev_a/rules.mk
index 9e42693cb694..c3b8e77d77a9 100644
--- a/keyboards/4pplet/yakiimo/rev_a/rules.mk
+++ b/keyboards/4pplet/yakiimo/rev_a/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/7c8/framework/config.h b/keyboards/7c8/framework/config.h
deleted file mode 100644
index f6b4b30cf5eb..000000000000
--- a/keyboards/7c8/framework/config.h
+++ /dev/null
@@ -1,22 +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/>.
- */
-
-#pragma once
-
-#define TAP_CODE_DELAY 16
-
-#define LEADER_TIMEOUT 250
-#define LEADER_PER_KEY_TIMING 150
diff --git a/keyboards/7c8/framework/info.json b/keyboards/7c8/framework/info.json
index 18c0289c9a37..19325af9cbd3 100644
--- a/keyboards/7c8/framework/info.json
+++ b/keyboards/7c8/framework/info.json
@@ -18,6 +18,13 @@
             {"pin_a": "D0", "pin_b": "D1"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 16
+    },
+    "leader_key": {
+        "timeout": 250,
+        "timing": true
+    },
     "processor": "atmega328p",
     "bootloader": "usbasploader",
     "layouts": {
diff --git a/keyboards/8pack/config.h b/keyboards/8pack/config.h
index 5139d4cf6999..5f360813239b 100644
--- a/keyboards/8pack/config.h
+++ b/keyboards/8pack/config.h
@@ -5,16 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-// ws2812 options
-#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
diff --git a/keyboards/8pack/info.json b/keyboards/8pack/info.json
index 45dec97b3300..0145eef5e3ac 100644
--- a/keyboards/8pack/info.json
+++ b/keyboards/8pack/info.json
@@ -8,9 +8,25 @@
     "pid": "0x2171"
   },
   "backlight": {
+    "driver": "timer",
     "pins": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
     "levels": 8
   },
+  "rgblight": {
+    "led_count": 8,
+    "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": "D2"
   },
diff --git a/keyboards/9key/config.h b/keyboards/9key/config.h
deleted file mode 100644
index bb910a4427d0..000000000000
--- a/keyboards/9key/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 RGBLED_NUM 1    // Number of LEDs
-
-#define TAPPING_TERM 200
diff --git a/keyboards/9key/info.json b/keyboards/9key/info.json
index 1dc9fad41a11..d4061d826145 100644
--- a/keyboards/9key/info.json
+++ b/keyboards/9key/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0007",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "led_count": 1
+  },
   "ws2812": {
     "pin": "F7"
   },
diff --git a/keyboards/a_dux/keymaps/daliusd/keymap.c b/keyboards/a_dux/keymaps/daliusd/keymap.c
index 7dec77b01e45..dcc41a36ee2c 100644
--- a/keyboards/a_dux/keymaps/daliusd/keymap.c
+++ b/keyboards/a_dux/keymaps/daliusd/keymap.c
@@ -126,28 +126,28 @@ const uint32_t unicode_map[] PROGMEM = {
     [LT_CB] = 0x201c, // “
 };
 
-#define K_SNEK      X(SNEK)
-#define K_EURO      X(EURO)
-#define K_LT_A      XP(LT_S_A, LT_L_A)
-#define K_LT_AU     X(LT_L_A)
-#define K_LT_C      XP(LT_S_C, LT_L_C)
-#define K_LT_CU     X(LT_L_C)
-#define K_LT_E1     XP(LT_S_E1, LT_L_E1)
-#define K_LT_E1U    X(LT_L_E1)
-#define K_LT_E2     XP(LT_S_E2, LT_L_E2)
-#define K_LT_E2U    X(LT_L_E2)
-#define K_LT_I      XP(LT_S_I, LT_L_I)
-#define K_LT_IU     X(LT_L_I)
-#define K_LT_S      XP(LT_S_S, LT_L_S)
-#define K_LT_SU     X(LT_L_S)
-#define K_LT_U1     XP(LT_S_U1, LT_L_U1)
-#define K_LT_U1U    X(LT_L_U1)
-#define K_LT_U2     XP(LT_S_U2, LT_L_U2)
-#define K_LT_U2U    X(LT_L_U2)
-#define K_LT_Z      XP(LT_S_Z, LT_L_Z)
-#define K_LT_ZU     X(LT_L_Z)
-#define K_LT_OB     X(LT_OB)
-#define K_LT_CB     X(LT_CB)
+#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] = {
 
diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h
index b5109c291d3f..ca764a9eebee 100644
--- a/keyboards/abacus/config.h
+++ b/keyboards/abacus/config.h
@@ -19,19 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DIP_SWITCH_PINS { D0 }
 
-#    define RGBLED_NUM 17
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== choose animations ==*/
-#    define RGBLIGHT_EFFECT_BREATHING
-#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#    define RGBLIGHT_EFFECT_SNAKE
-#    define RGBLIGHT_EFFECT_KNIGHT
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-
 /* 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/abacus/info.json b/keyboards/abacus/info.json
index c12d7cb23541..2e147829973d 100644
--- a/keyboards/abacus/info.json
+++ b/keyboards/abacus/info.json
@@ -18,6 +18,20 @@
             {"pin_a": "F1", "pin_b": "F0"}
         ]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 17,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "D1"
     },
diff --git a/keyboards/abacus/keymaps/unicodemap/keymap.c b/keyboards/abacus/keymaps/unicodemap/keymap.c
index 0e6ab0d6479b..46e2219f0bd1 100644
--- a/keyboards/abacus/keymaps/unicodemap/keymap.c
+++ b/keyboards/abacus/keymaps/unicodemap/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_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,
-        _______, X(LOVEEYES), X(THINK), X(UPSIDEDOWN), X(NOMOUTH), X(PARTY), X(PEACH), X(HEART), X(EGGPLANT), X(EMOJI100), X(EMOJIB), RGB_HUI,
+        _______, UM(LOVEEYES), UM(THINK), UM(UPSIDEDOWN), UM(NOMOUTH), UM(PARTY), UM(PEACH), UM(HEART), UM(EGGPLANT), UM(EMOJI100), UM(EMOJIB), RGB_HUI,
         KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______
     )
 
diff --git a/keyboards/abatskeyboardclub/nayeon/config.h b/keyboards/abatskeyboardclub/nayeon/config.h
index b42ece99a60a..7fedf4dce12d 100644
--- a/keyboards/abatskeyboardclub/nayeon/config.h
+++ b/keyboards/abatskeyboardclub/nayeon/config.h
@@ -20,5 +20,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* RGB Matrix setup */
 #define RGB_MATRIX_LED_COUNT 2
-#define RGBLED_NUM 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 d7e3718c0b1a..7a3b650ff1d8 100644
--- a/keyboards/abatskeyboardclub/nayeon/info.json
+++ b/keyboards/abatskeyboardclub/nayeon/info.json
@@ -25,7 +25,7 @@
         "driver": "vendor"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "processor": "RP2040",
     "bootloader": "rp2040",
diff --git a/keyboards/abko/ak84bt/info.json b/keyboards/abko/ak84bt/info.json
index 30dd823575d0..4660fb702481 100644
--- a/keyboards/abko/ak84bt/info.json
+++ b/keyboards/abko/ak84bt/info.json
@@ -27,7 +27,7 @@
     },
     "processor": "STM32F103",
     "rgb_matrix": {
-        "driver": "IS31FL3733",
+        "driver": "is31fl3733",
         "layout": [
             {"matrix": [0, 0], "x": 7, "y": 2, "flags": 4},
             {"matrix": [0, 2], "x": 34, "y": 2, "flags": 4},
@@ -126,23 +126,27 @@
         "pid": "0x4321",
         "vid": "0x7654"
     },
+    "layout_aliases": {
+        "LAYOUT_75_ansi": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_75_ansi": {
+        "LAYOUT": {
             "layout": [
                 {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
-                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
-                {"label": "END", "matrix": [0, 15], "x": 16.5, "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": 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": "END", "matrix": [0, 15], "x": 15, "y": 0},
+
                 {"label": "GRV", "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},
@@ -157,7 +161,8 @@
                 {"label": "MINS", "matrix": [1, 11], "x": 11, "y": 1.25},
                 {"label": "EQL", "matrix": [1, 12], "x": 12, "y": 1.25},
                 {"label": "BSPC", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-                {"label": "HOME", "matrix": [1, 14], "x": 16.5, "y": 1.25},
+                {"label": "HOME", "matrix": [1, 14], "x": 15, "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},
@@ -172,7 +177,8 @@
                 {"label": "LBRC", "matrix": [2, 11], "x": 11.5, "y": 2.25},
                 {"label": "RBRC", "matrix": [2, 12], "x": 12.5, "y": 2.25},
                 {"label": "BSLS", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"label": "DEL", "matrix": [2, 14], "x": 16.5, "y": 2.25},
+                {"label": "DEL", "matrix": [2, 14], "x": 15, "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},
@@ -185,8 +191,9 @@
                 {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
                 {"label": "SCLN", "matrix": [3, 10], "x": 10.75, "y": 3.25},
                 {"label": "QUOT", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "ENT", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
-                {"label": "PGUP", "matrix": [3, 14], "x": 16.5, "y": 3.25},
+                {"label": "ENT", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "PGUP", "matrix": [3, 14], "x": 15, "y": 3.25},
+
                 {"label": "LSFT", "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},
@@ -199,18 +206,19 @@
                 {"label": "DOT", "matrix": [4, 10], "x": 10.25, "y": 4.25},
                 {"label": "SLSH", "matrix": [4, 11], "x": 11.25, "y": 4.25},
                 {"label": "RSFT", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "UP", "matrix": [4, 13], "x": 15.25, "y": 4.25},
-                {"label": "PGDN", "matrix": [4, 14], "x": 16.5, "y": 4.25},
+                {"label": "UP", "matrix": [4, 13], "x": 14, "y": 4.25},
+                {"label": "PGDN", "matrix": [4, 14], "x": 15, "y": 4.25},
+
                 {"label": "LCTL", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
                 {"label": "LGUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
                 {"label": "LALT", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
                 {"label": "SPC", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "RALT", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "MO(1)", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "RCTL", "matrix": [5, 11], "x": 13, "y": 5.25, "w": 1.25},
-                {"label": "LEFT", "matrix": [5, 12], "x": 14.25, "y": 5.25},
-                {"label": "DOWN", "matrix": [5, 13], "x": 15.25, "y": 5.25},
-                {"label": "RGHT", "matrix": [5, 14], "x": 16.5, "y": 5.25}
+                {"label": "RALT", "matrix": [5, 9], "x": 10, "y": 5.25},
+                {"label": "MO(1)", "matrix": [5, 10], "x": 11, "y": 5.25},
+                {"label": "RCTL", "matrix": [5, 11], "x": 12, "y": 5.25},
+                {"label": "LEFT", "matrix": [5, 12], "x": 13, "y": 5.25},
+                {"label": "DOWN", "matrix": [5, 13], "x": 14, "y": 5.25},
+                {"label": "RGHT", "matrix": [5, 14], "x": 15, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/abko/ak84bt/keymaps/default/keymap.c b/keyboards/abko/ak84bt/keymaps/default/keymap.c
index 6a57c4422a70..48fab8614b09 100644
--- a/keyboards/abko/ak84bt/keymaps/default/keymap.c
+++ b/keyboards/abko/ak84bt/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum layer_names
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  
-    [_BASE] = LAYOUT_75_ansi(    
+    [_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_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_DEL,
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LSFT,          KC_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(_FnLay), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
     ),
-    [_FnLay] = LAYOUT_75_ansi(
+    [_FnLay] = LAYOUT(
     QK_BOOT,          KC_MY_COMPUTER, KC_WWW_HOME, KC_CALCULATOR, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY,  KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MAIL,          XXXXXXX,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD,
     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h
index c2632e04174f..81349657efa2 100644
--- a/keyboards/abstract/ellipse/rev1/config.h
+++ b/keyboards/abstract/ellipse/rev1/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-   #define RGBLED_NUM 3
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
 /* 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/abstract/ellipse/rev1/info.json b/keyboards/abstract/ellipse/rev1/info.json
index 9dfe255ba221..341b52292654 100644
--- a/keyboards/abstract/ellipse/rev1/info.json
+++ b/keyboards/abstract/ellipse/rev1/info.json
@@ -24,6 +24,12 @@
         "pin": "C6",
         "levels": 15
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 3,
+        "sleep": true
+    },
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h
index 2f3159192ac1..2bcc184a3094 100644
--- a/keyboards/acekeyboard/titan60/config.h
+++ b/keyboards/acekeyboard/titan60/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 6
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/acekeyboard/titan60/info.json b/keyboards/acekeyboard/titan60/info.json
index b384b7bcbf10..8f11e1df0717 100644
--- a/keyboards/acekeyboard/titan60/info.json
+++ b/keyboards/acekeyboard/titan60/info.json
@@ -17,6 +17,24 @@
       "pin": "B7",
       "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "D0"
     },
diff --git a/keyboards/acheron/apollo/87h/delta/info.json b/keyboards/acheron/apollo/87h/delta/info.json
index c2a702781b99..b5b935ab585f 100644
--- a/keyboards/acheron/apollo/87h/delta/info.json
+++ b/keyboards/acheron/apollo/87h/delta/info.json
@@ -8,7 +8,7 @@
         "pin": "B15"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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/delta/rules.mk b/keyboards/acheron/apollo/87h/delta/rules.mk
index ce1d65be0f3a..723724b7aa27 100644
--- a/keyboards/acheron/apollo/87h/delta/rules.mk
+++ b/keyboards/acheron/apollo/87h/delta/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/info.json
index f10a6adb67d7..0a3b28e31f6f 100644
--- a/keyboards/acheron/apollo/87h/gamma/info.json
+++ b/keyboards/acheron/apollo/87h/gamma/info.json
@@ -5,7 +5,7 @@
         "device_version": "0.0.3"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "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/87h/gamma/rules.mk b/keyboards/acheron/apollo/87h/gamma/rules.mk
index 25c83bb136c8..4af646ec021c 100644
--- a/keyboards/acheron/apollo/87h/gamma/rules.mk
+++ b/keyboards/acheron/apollo/87h/gamma/rules.mk
@@ -13,5 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 KEYBOARD_SHARED_EP = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/acheron/apollo/87htsc/info.json b/keyboards/acheron/apollo/87htsc/info.json
index 5a140a7bdceb..de0388176e77 100644
--- a/keyboards/acheron/apollo/87htsc/info.json
+++ b/keyboards/acheron/apollo/87htsc/info.json
@@ -12,7 +12,7 @@
         "pin": "B15"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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/87htsc/rules.mk b/keyboards/acheron/apollo/87htsc/rules.mk
index ce1d65be0f3a..723724b7aa27 100644
--- a/keyboards/acheron/apollo/87htsc/rules.mk
+++ b/keyboards/acheron/apollo/87htsc/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/acheron/apollo/88htsc/info.json b/keyboards/acheron/apollo/88htsc/info.json
index 9fc9210c803d..adb2372e6081 100644
--- a/keyboards/acheron/apollo/88htsc/info.json
+++ b/keyboards/acheron/apollo/88htsc/info.json
@@ -12,7 +12,7 @@
         "pin": "B15"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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/rules.mk b/keyboards/acheron/apollo/88htsc/rules.mk
index ce1d65be0f3a..723724b7aa27 100644
--- a/keyboards/acheron/apollo/88htsc/rules.mk
+++ b/keyboards/acheron/apollo/88htsc/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/acheron/arctic/rules.mk b/keyboards/acheron/arctic/rules.mk
index 0aeca0dd9f35..7f4f202a1b70 100644
--- a/keyboards/acheron/arctic/rules.mk
+++ b/keyboards/acheron/arctic/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/acheron/athena/alpha/alpha.c b/keyboards/acheron/athena/alpha/alpha.c
index 26c00e41aa0d..9e4f82f7ad19 100644
--- a/keyboards/acheron/athena/alpha/alpha.c
+++ b/keyboards/acheron/athena/alpha/alpha.c
@@ -23,10 +23,9 @@ void board_init(void) {
 
 void keyboard_post_init_kb(void){
  // Defining the backlight pin (A6) as an floating (no pullup or pulldown resistor) opendrain output pin
-    palSetLineMode(BACKLIGHT_PIN, PAL_MODE_ALTERNATE(BACKLIGHT_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_OSPEED_HIGHEST | PAL_STM32_PUPDR_FLOATING);
+    palSetLineMode(BACKLIGHT_PIN, PAL_MODE_ALTERNATE(2) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_OSPEED_HIGHEST | PAL_STM32_PUPDR_FLOATING);
 }
 
-#define LED_PIN_ON_STATE 1
 void led_init_ports(void) {
     palSetLineMode(LED_CAPS_LOCK_PIN, PAL_MODE_OUTPUT_OPENDRAIN | PAL_STM32_PUPDR_FLOATING);
 }
diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h
index 1f91766add02..ba5c2dedf2c2 100644
--- a/keyboards/acheron/athena/alpha/config.h
+++ b/keyboards/acheron/athena/alpha/config.h
@@ -22,19 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
-#define BACKLIGHT_PAL_MODE      2
-
-#define RGBLED_NUM 34
-#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 WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json
index e72e8aece466..229fd7a8c88d 100644
--- a/keyboards/acheron/athena/alpha/info.json
+++ b/keyboards/acheron/athena/alpha/info.json
@@ -15,6 +15,21 @@
         "on_state": 0,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 34,
+        "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"
     },
diff --git a/keyboards/acheron/athena/alpha/rules.mk b/keyboards/acheron/athena/alpha/rules.mk
index 3d622c22169a..086e2474baf7 100644
--- a/keyboards/acheron/athena/alpha/rules.mk
+++ b/keyboards/acheron/athena/alpha/rules.mk
@@ -13,5 +13,3 @@ AUDIO_ENABLE = no          # Audio output
 LTO_ENABLE = yes
 ENCODER_ENABLE = no
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h
index 0376a9ac2ca4..30c29fa68623 100644
--- a/keyboards/acheron/athena/beta/config.h
+++ b/keyboards/acheron/athena/beta/config.h
@@ -21,20 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 #define BACKLIGHT_PWM_DRIVER    PWMD3
-#define BACKLIGHT_PWM_CHANNEL   3
-#define BACKLIGHT_PAL_MODE      2
-
-#define RGBLED_NUM 34
-#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
 
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json
index b2ced072a891..0730833b9b8a 100644
--- a/keyboards/acheron/athena/beta/info.json
+++ b/keyboards/acheron/athena/beta/info.json
@@ -14,6 +14,21 @@
         "levels": 20,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 34,
+        "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"
     },
diff --git a/keyboards/acheron/athena/beta/rules.mk b/keyboards/acheron/athena/beta/rules.mk
index 3d622c22169a..086e2474baf7 100644
--- a/keyboards/acheron/athena/beta/rules.mk
+++ b/keyboards/acheron/athena/beta/rules.mk
@@ -13,5 +13,3 @@ AUDIO_ENABLE = no          # Audio output
 LTO_ENABLE = yes
 ENCODER_ENABLE = no
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/acheron/austin/rules.mk b/keyboards/acheron/austin/rules.mk
index 295d6960eed3..a5089d51a5b4 100644
--- a/keyboards/acheron/austin/rules.mk
+++ b/keyboards/acheron/austin/rules.mk
@@ -10,5 +10,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h
index 81093a2838fc..62093e37b230 100644
--- a/keyboards/acheron/elongate/beta/config.h
+++ b/keyboards/acheron/elongate/beta/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 16
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/info.json
index 5f46a2a48c0a..2bbb214bd00a 100644
--- a/keyboards/acheron/elongate/beta/info.json
+++ b/keyboards/acheron/elongate/beta/info.json
@@ -8,6 +8,24 @@
         "pid": "0x454C",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "D7"
     },
diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h
index 2113a65b3a8d..81342ef26dc5 100755
--- a/keyboards/acheron/elongate/delta/config.h
+++ b/keyboards/acheron/elongate/delta/config.h
@@ -21,19 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_CHANNEL 1
 #define BACKLIGHT_PAL_MODE 1
 
-#define RGBLED_NUM 16
-#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_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 5)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/acheron/elongate/delta/delta.c b/keyboards/acheron/elongate/delta/delta.c
index e83516b56674..e621b4495b5b 100755
--- a/keyboards/acheron/elongate/delta/delta.c
+++ b/keyboards/acheron/elongate/delta/delta.c
@@ -16,7 +16,6 @@
 
 #include "quantum.h"
 
-#define LED_PIN_ON_STATE 1
 // Inits all indicator LEDs as push-pull outputs
 void led_init_ports(void) {
     palSetLineMode(LED1_PIN, PAL_MODE_OUTPUT_PUSHPULL);
diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json
index c753810954b3..19991ecb8613 100644
--- a/keyboards/acheron/elongate/delta/info.json
+++ b/keyboards/acheron/elongate/delta/info.json
@@ -20,7 +20,21 @@
         "breathing_period": 3
     },
     "rgblight": {
-        "max_brightness": 200
+        "led_count": 16,
+        "max_brightness": 200,
+        "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": "B15"
diff --git a/keyboards/acheron/elongate/delta/rules.mk b/keyboards/acheron/elongate/delta/rules.mk
old mode 100755
new mode 100644
index f84ab5d6023a..3d5cb57ad507
--- a/keyboards/acheron/elongate/delta/rules.mk
+++ b/keyboards/acheron/elongate/delta/rules.mk
@@ -10,5 +10,3 @@ 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
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/acheron/keebspcb/rules.mk b/keyboards/acheron/keebspcb/rules.mk
index f94f12cb84a9..5356b24d77c4 100644
--- a/keyboards/acheron/keebspcb/rules.mk
+++ b/keyboards/acheron/keebspcb/rules.mk
@@ -10,5 +10,3 @@ 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
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/acheron/lasgweloth/rules.mk b/keyboards/acheron/lasgweloth/rules.mk
index 93f25a13d8d2..5b6b0c929912 100644
--- a/keyboards/acheron/lasgweloth/rules.mk
+++ b/keyboards/acheron/lasgweloth/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h
index 91f51146f0b4..a34ea41cffb2 100644
--- a/keyboards/acheron/shark/alpha/config.h
+++ b/keyboards/acheron/shark/alpha/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define BACKLIGHT_PWM_DRIVER PWMD3
-#define BACKLIGHT_PWM_CHANNEL 3
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h
index 348b284a3fff..d862fd016def 100644
--- a/keyboards/acheron/shark/beta/config.h
+++ b/keyboards/acheron/shark/beta/config.h
@@ -22,19 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
-#define BACKLIGHT_PAL_MODE      2
-
-#define RGBLED_NUM 24
-#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 WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json
index 504e86f4b3ff..5ec24036384e 100644
--- a/keyboards/acheron/shark/beta/info.json
+++ b/keyboards/acheron/shark/beta/info.json
@@ -14,6 +14,21 @@
             {"pin_a": "C15", "pin_b": "C14"}
         ]
     },
+    "rgblight": {
+        "led_count": 24,
+        "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"
     },
diff --git a/keyboards/acheron/shark/beta/rules.mk b/keyboards/acheron/shark/beta/rules.mk
index fd436cc258a3..a398475a3eb5 100644
--- a/keyboards/acheron/shark/beta/rules.mk
+++ b/keyboards/acheron/shark/beta/rules.mk
@@ -15,5 +15,3 @@ ENCODER_ENABLE = yes
 
 EEPROM_DRIVER = i2c
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/acheron/themis/87h/87h.c b/keyboards/acheron/themis/87h/87h.c
new file mode 100644
index 000000000000..dada30ff873f
--- /dev/null
+++ b/keyboards/acheron/themis/87h/87h.c
@@ -0,0 +1,25 @@
+/* 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 "quantum.h"
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if(res) {
+        led_state.caps_lock ? rgblight_setrgb_at(0xAA,0xAA,0xAA,0) : rgblight_setrgb_at(0x00,0x00,0x00,0) ;
+    }
+    return res;
+}
diff --git a/keyboards/acheron/themis/87h/config.h b/keyboards/acheron/themis/87h/config.h
new file mode 100644
index 000000000000..8a1ff4858323
--- /dev/null
+++ b/keyboards/acheron/themis/87h/config.h
@@ -0,0 +1,33 @@
+/*
+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 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
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_DMA_CHANNEL 6
+
+#define WEAR_LEVELING_LOGICAL_SIZE 4096
+#define WEAR_LEVELING_BACKING_SIZE 8192
diff --git a/keyboards/acheron/themis/87h/halconf.h b/keyboards/acheron/themis/87h/halconf.h
new file mode 100644
index 000000000000..485d48ef3067
--- /dev/null
+++ b/keyboards/acheron/themis/87h/halconf.h
@@ -0,0 +1,22 @@
+/* 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
+#define HAL_USE_PAL TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/acheron/themis/87h/info.json b/keyboards/acheron/themis/87h/info.json
new file mode 100644
index 000000000000..ed5d48690d30
--- /dev/null
+++ b/keyboards/acheron/themis/87h/info.json
@@ -0,0 +1,136 @@
+{
+    "keyboard_name": "Themis 87H Rev. Alpha",
+    "usb": {
+        "pid": "0x5448",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "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"]
+    },
+    "features": {
+        "bootmagic": true,
+        "lto":       true,
+        "mousekey":  true,
+        "extrakey":  true,
+        "console":   false,
+        "backlight": false,
+        "rgblight":  true,
+        "audio":     false,
+        "encoder":   false,
+        "nkro":      true
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B15"
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["tkl_ansi"],
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label":"Escape", "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":"Print Screen", "matrix": [6, 14], "x": 15.25, "y": 0},
+                {"label":"Scroll Lock", "matrix": [6, 17], "x": 16.25, "y": 0},
+                {"label":"Pause", "matrix": [6, 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": [7, 14], "x": 15.25, "y": 1.25},
+                {"label":"Home", "matrix": [7, 17], "x": 16.25, "y": 1.25},
+                {"label":"Page Up","matrix": [7, 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": [8, 14], "x": 15.25, "y": 2.25},
+                {"label":"End", "matrix": [8, 17], "x": 16.25, "y": 2.25},
+                {"label":"Page Down", "matrix": [8, 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, 12], "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":"Up",  "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label":"LCtrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label":"Lwin", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label":"LAlt", "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":"RAlt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label":"RWin", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label":"MO(1)", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"label":"RCtrl", "matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"label":"Left", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label":"Down", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label":"Right", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/acheron/themis/87h/keymaps/default/keymap.c b/keyboards/acheron/themis/87h/keymaps/default/keymap.c
new file mode 100755
index 000000000000..4728331f05ff
--- /dev/null
+++ b/keyboards/acheron/themis/87h/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/*
+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
+
+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_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+	),
+   [1] = LAYOUT_tkl_ansi(
+        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, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, 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
+        )
+};
diff --git a/keyboards/acheron/themis/87h/keymaps/via/keymap.c b/keyboards/acheron/themis/87h/keymaps/via/keymap.c
new file mode 100755
index 000000000000..4728331f05ff
--- /dev/null
+++ b/keyboards/acheron/themis/87h/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/*
+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
+
+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_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+	),
+   [1] = LAYOUT_tkl_ansi(
+        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, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, 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
+        )
+};
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/keymaps/via/rules.mk b/keyboards/acheron/themis/87h/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/capsunlocked/cu80/v2_ansi/keymaps/via/rules.mk
rename to keyboards/acheron/themis/87h/keymaps/via/rules.mk
diff --git a/keyboards/acheron/themis/87h/mcuconf.h b/keyboards/acheron/themis/87h/mcuconf.h
new file mode 100644
index 000000000000..3d1d05c307c4
--- /dev/null
+++ b/keyboards/acheron/themis/87h/mcuconf.h
@@ -0,0 +1,25 @@
+/* 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_ADVANCED
+#define STM32_PWM_USE_ADVANCED TRUE
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
diff --git a/keyboards/capsunlocked/cu80/v2_iso/base/rules.mk b/keyboards/acheron/themis/87h/rules.mk
similarity index 100%
rename from keyboards/capsunlocked/cu80/v2_iso/base/rules.mk
rename to keyboards/acheron/themis/87h/rules.mk
diff --git a/keyboards/acheron/themis/87htsc/87htsc.c b/keyboards/acheron/themis/87htsc/87htsc.c
new file mode 100644
index 000000000000..dada30ff873f
--- /dev/null
+++ b/keyboards/acheron/themis/87htsc/87htsc.c
@@ -0,0 +1,25 @@
+/* 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 "quantum.h"
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if(res) {
+        led_state.caps_lock ? rgblight_setrgb_at(0xAA,0xAA,0xAA,0) : rgblight_setrgb_at(0x00,0x00,0x00,0) ;
+    }
+    return res;
+}
diff --git a/keyboards/acheron/themis/87htsc/config.h b/keyboards/acheron/themis/87htsc/config.h
new file mode 100644
index 000000000000..8a1ff4858323
--- /dev/null
+++ b/keyboards/acheron/themis/87htsc/config.h
@@ -0,0 +1,33 @@
+/*
+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 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
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_DMA_CHANNEL 6
+
+#define WEAR_LEVELING_LOGICAL_SIZE 4096
+#define WEAR_LEVELING_BACKING_SIZE 8192
diff --git a/keyboards/acheron/themis/87htsc/halconf.h b/keyboards/acheron/themis/87htsc/halconf.h
new file mode 100644
index 000000000000..485d48ef3067
--- /dev/null
+++ b/keyboards/acheron/themis/87htsc/halconf.h
@@ -0,0 +1,22 @@
+/* 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
+#define HAL_USE_PAL TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/acheron/themis/87htsc/info.json b/keyboards/acheron/themis/87htsc/info.json
new file mode 100644
index 000000000000..854ad5a7d58e
--- /dev/null
+++ b/keyboards/acheron/themis/87htsc/info.json
@@ -0,0 +1,135 @@
+{
+    "keyboard_name": "Themis 87H-T-SC Rev. Alpha",
+    "usb": {
+        "pid": "0x5449",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "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"]
+    },
+    "features": {
+        "bootmagic": true,
+        "lto":       true,
+        "mousekey":  true,
+        "extrakey":  true,
+        "console":   false,
+        "backlight": false,
+        "rgblight":  true,
+        "audio":     false,
+        "encoder":   false,
+        "nkro":      true
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B15"
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["tkl_ansi_tsangan"],
+    "layouts": {
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label":"Escape", "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, 6], "x": 6.5, "y": 0},
+                {"label":"F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label":"F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label":"F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"label":"F9", "matrix": [0, 10], "x": 11, "y": 0},
+                {"label":"F10", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label":"F11", "matrix": [0, 12], "x": 13, "y": 0},
+                {"label":"F12", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label":"Print Screen", "matrix": [6, 14], "x": 15.25, "y": 0},
+                {"label":"Scroll Lock", "matrix": [6, 17], "x": 16.25, "y": 0},
+                {"label":"Pause", "matrix": [6, 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": [7, 14], "x": 15.25, "y": 1.25},
+                {"label":"Home", "matrix": [7, 17], "x": 16.25, "y": 1.25},
+                {"label":"Page Up","matrix": [7, 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": [8, 14], "x": 15.25, "y": 2.25},
+                {"label":"End", "matrix": [8, 17], "x": 16.25, "y": 2.25},
+                {"label":"Page Down", "matrix": [8, 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, 12], "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":"Up",  "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label":"LCtrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label":"Lwin", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label":"LAlt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label":"Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+                {"label":"RAlt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label":"RWin", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label":"RCtrl", "matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label":"Left", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label":"Down", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label":"Right", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/acheron/themis/87htsc/keymaps/default/keymap.c b/keyboards/acheron/themis/87htsc/keymaps/default/keymap.c
new file mode 100755
index 000000000000..7b29220ec8d4
--- /dev/null
+++ b/keyboards/acheron/themis/87htsc/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2023 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/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_tkl_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_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,          KC_LEFT, KC_DOWN, KC_RGHT
+	),
+   [1] = LAYOUT_tkl_ansi_tsangan(
+        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, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, 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
+        )
+};
diff --git a/keyboards/acheron/themis/87htsc/keymaps/via/keymap.c b/keyboards/acheron/themis/87htsc/keymaps/via/keymap.c
new file mode 100755
index 000000000000..7b29220ec8d4
--- /dev/null
+++ b/keyboards/acheron/themis/87htsc/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2023 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/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_tkl_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_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,          KC_LEFT, KC_DOWN, KC_RGHT
+	),
+   [1] = LAYOUT_tkl_ansi_tsangan(
+        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, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, 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
+        )
+};
diff --git a/keyboards/capsunlocked/cu80/v2_iso/keymaps/via/rules.mk b/keyboards/acheron/themis/87htsc/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/capsunlocked/cu80/v2_iso/keymaps/via/rules.mk
rename to keyboards/acheron/themis/87htsc/keymaps/via/rules.mk
diff --git a/keyboards/acheron/themis/87htsc/mcuconf.h b/keyboards/acheron/themis/87htsc/mcuconf.h
new file mode 100644
index 000000000000..3d1d05c307c4
--- /dev/null
+++ b/keyboards/acheron/themis/87htsc/mcuconf.h
@@ -0,0 +1,25 @@
+/* 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_ADVANCED
+#define STM32_PWM_USE_ADVANCED TRUE
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
diff --git a/keyboards/modelh/rules.mk b/keyboards/acheron/themis/87htsc/rules.mk
similarity index 100%
rename from keyboards/modelh/rules.mk
rename to keyboards/acheron/themis/87htsc/rules.mk
diff --git a/keyboards/acheron/themis/88htsc/88htsc.c b/keyboards/acheron/themis/88htsc/88htsc.c
new file mode 100644
index 000000000000..dada30ff873f
--- /dev/null
+++ b/keyboards/acheron/themis/88htsc/88htsc.c
@@ -0,0 +1,25 @@
+/* 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 "quantum.h"
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if(res) {
+        led_state.caps_lock ? rgblight_setrgb_at(0xAA,0xAA,0xAA,0) : rgblight_setrgb_at(0x00,0x00,0x00,0) ;
+    }
+    return res;
+}
diff --git a/keyboards/acheron/themis/88htsc/config.h b/keyboards/acheron/themis/88htsc/config.h
new file mode 100644
index 000000000000..8a1ff4858323
--- /dev/null
+++ b/keyboards/acheron/themis/88htsc/config.h
@@ -0,0 +1,33 @@
+/*
+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 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
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_DMA_CHANNEL 6
+
+#define WEAR_LEVELING_LOGICAL_SIZE 4096
+#define WEAR_LEVELING_BACKING_SIZE 8192
diff --git a/keyboards/acheron/themis/88htsc/halconf.h b/keyboards/acheron/themis/88htsc/halconf.h
new file mode 100644
index 000000000000..485d48ef3067
--- /dev/null
+++ b/keyboards/acheron/themis/88htsc/halconf.h
@@ -0,0 +1,22 @@
+/* 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
+#define HAL_USE_PAL TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/acheron/themis/88htsc/info.json b/keyboards/acheron/themis/88htsc/info.json
new file mode 100644
index 000000000000..cfce0702eb40
--- /dev/null
+++ b/keyboards/acheron/themis/88htsc/info.json
@@ -0,0 +1,137 @@
+{
+    "keyboard_name": "Themis 88H-T-SC Rev. Alpha",
+    "usb": {
+        "pid": "0x5450",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "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"]
+    },
+    "features": {
+        "bootmagic": true,
+        "lto":       true,
+        "mousekey":  true,
+        "extrakey":  true,
+        "console":   false,
+        "backlight": false,
+        "rgblight":  true,
+        "audio":     false,
+        "encoder":   false,
+        "nkro":      true
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "B15"
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["tkl_f13_ansi_tsangan"],
+    "layouts": {
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "layout": [
+                {"label":"Escape", "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": [6, 14], "x": 15.25, "y": 0},
+                {"label":"Scroll Lock", "matrix": [6, 17], "x": 16.25, "y": 0},
+                {"label":"Pause", "matrix": [6, 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": [7, 14], "x": 15.25, "y": 1.25},
+                {"label":"Home", "matrix": [7, 17], "x": 16.25, "y": 1.25},
+                {"label":"Page Up","matrix": [7, 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": [8, 14], "x": 15.25, "y": 2.25},
+                {"label":"End", "matrix": [8, 17], "x": 16.25, "y": 2.25},
+                {"label":"Page Down", "matrix": [8, 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, 12], "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":"Up",  "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label":"LCtrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label":"Lwin", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label":"LAlt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label":"Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+                {"label":"RAlt", "matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"label":"RWin", "matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"label":"RCtrl", "matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label":"Left", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label":"Down", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label":"Right", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/acheron/themis/88htsc/keymaps/default/keymap.c b/keyboards/acheron/themis/88htsc/keymaps/default/keymap.c
new file mode 100755
index 000000000000..725b294b0d65
--- /dev/null
+++ b/keyboards/acheron/themis/88htsc/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2023 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/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = 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_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_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,          KC_LEFT, KC_DOWN, KC_RGHT
+	),
+   [1] = LAYOUT_tkl_f13_ansi_tsangan(
+        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, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, 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
+        )
+};
diff --git a/keyboards/acheron/themis/88htsc/keymaps/via/keymap.c b/keyboards/acheron/themis/88htsc/keymaps/via/keymap.c
new file mode 100755
index 000000000000..725b294b0d65
--- /dev/null
+++ b/keyboards/acheron/themis/88htsc/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2023 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/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = 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_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_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,          KC_LEFT, KC_DOWN, KC_RGHT
+	),
+   [1] = LAYOUT_tkl_f13_ansi_tsangan(
+        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, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, 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
+        )
+};
diff --git a/keyboards/yugo_m/model_m_101/keymaps/via/rules.mk b/keyboards/acheron/themis/88htsc/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/yugo_m/model_m_101/keymaps/via/rules.mk
rename to keyboards/acheron/themis/88htsc/keymaps/via/rules.mk
diff --git a/keyboards/acheron/themis/88htsc/mcuconf.h b/keyboards/acheron/themis/88htsc/mcuconf.h
new file mode 100644
index 000000000000..3d1d05c307c4
--- /dev/null
+++ b/keyboards/acheron/themis/88htsc/mcuconf.h
@@ -0,0 +1,25 @@
+/* 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_ADVANCED
+#define STM32_PWM_USE_ADVANCED TRUE
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
diff --git a/keyboards/acheron/themis/88htsc/rules.mk b/keyboards/acheron/themis/88htsc/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/acheron/themis/info.json b/keyboards/acheron/themis/info.json
new file mode 100644
index 000000000000..4f9d3b61e615
--- /dev/null
+++ b/keyboards/acheron/themis/info.json
@@ -0,0 +1,8 @@
+{
+    "manufacturer": "AcheronProject",
+    "url": "",
+    "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0xAC11"
+    }
+}
diff --git a/keyboards/acheron/themis/readme.md b/keyboards/acheron/themis/readme.md
new file mode 100644
index 000000000000..8c0c7e63e54f
--- /dev/null
+++ b/keyboards/acheron/themis/readme.md
@@ -0,0 +1,23 @@
+# Acheron Themis QMK firmware
+
+![themis](https://i.imgur.com/kwemOsJh.png)
+
+The Themis is Acheron Project's open-source, freely available tenkeyless (TKL) keyboard Printed Circuit Boards (PCB) which features:
+
+- No LED lighting
+- Solderless ("hotswap") MX switches support
+- Fixed layout for each variant
+
+* Keyboard Maintainer: [Gondolindrim](https://github.com/Gondolindrim)
+* Hardware Supported: open-source PCB using the [Joker template](https://acheronproject.com/joker_mcus/joker/). First units were manufactured using STM32F4x1 microcontroller;
+* Hardware Availability: open-source PCBs
+
+In order to flash this PCB, first build the default layout (after setting up your build environment):
+
+    make acheron/themis/<revision>:default
+
+After building or downloading the firmware, put the PCB into DFU mode by holding the reset button for at least five seconds and upload the firmware onto the microcontroller through a utility like `dfu-util` or QMK Toolbox. Alternatively, you can build and flash using:
+
+    make acheron/themis/<revision>: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/ada/ada1800mini/config.h b/keyboards/ada/ada1800mini/config.h
deleted file mode 100644
index 92f08f354ceb..000000000000
--- a/keyboards/ada/ada1800mini/config.h
+++ /dev/null
@@ -1,37 +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
-
-//TODO: implement RGB matrix when I get the hardware
-    #define RGBLED_NUM 100
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/ada/ada1800mini/info.json b/keyboards/ada/ada1800mini/info.json
index 1768a7b55b4a..22cac5ade4dd 100644
--- a/keyboards/ada/ada1800mini/info.json
+++ b/keyboards/ada/ada1800mini/info.json
@@ -12,7 +12,23 @@
         "pin": "F0"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 100,
+        "max_brightness": 200,
+        "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": ["F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B3", "B2", "B1"],
diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h
index 336bd351f1b8..86415b251a05 100644
--- a/keyboards/ada/infinity81/config.h
+++ b/keyboards/ada/infinity81/config.h
@@ -3,22 +3,6 @@
 
 #pragma once
 
-#    define RGBLED_NUM 107
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/ada/infinity81/info.json b/keyboards/ada/infinity81/info.json
index f957a01094c4..f56b6f92d139 100644
--- a/keyboards/ada/infinity81/info.json
+++ b/keyboards/ada/infinity81/info.json
@@ -8,6 +8,24 @@
         "pid": "0x0081",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 107,
+        "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": "D0"
     },
diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h
index 08db87fefe1b..818a8229f580 100644
--- a/keyboards/adafruit/macropad/config.h
+++ b/keyboards/adafruit/macropad/config.h
@@ -55,7 +55,6 @@
 
      /* RGB Defines */
 #    define RGB_MATRIX_LED_COUNT 12
-#    define RGBLED_NUM 12
 
      /* Enable Framebuffer and keypress effects */
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json
index febf1e61f68d..bac0061f3ebe 100644
--- a/keyboards/adafruit/macropad/info.json
+++ b/keyboards/adafruit/macropad/info.json
@@ -14,7 +14,7 @@
         ]
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "bootmagic": {
         "matrix": [1, 2]
diff --git a/keyboards/adkb96/info.json b/keyboards/adkb96/info.json
index 47e08a7ed7d4..aa7e5a6921e9 100644
--- a/keyboards/adkb96/info.json
+++ b/keyboards/adkb96/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "tapping": {
+        "term": 100
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layout_aliases": {
diff --git a/keyboards/adkb96/rev1/config.h b/keyboards/adkb96/rev1/config.h
index 89de3d9a643a..0b8941e77606 100644
--- a/keyboards/adkb96/rev1/config.h
+++ b/keyboards/adkb96/rev1/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 100
-
 /* 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/adm42/config.h b/keyboards/adm42/config.h
index af23da4c6628..b5ba2eb94eaa 100644
--- a/keyboards/adm42/config.h
+++ b/keyboards/adm42/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define TAP_CODE_DELAY 1
-
 #if defined(CONSOLE_ENABLE)
 	#define DEBUG_MATRIX_SCAN_RATE
 #endif
diff --git a/keyboards/adm42/info.json b/keyboards/adm42/info.json
index 0ffebff135ab..b2bdbc4dad0d 100644
--- a/keyboards/adm42/info.json
+++ b/keyboards/adm42/info.json
@@ -13,7 +13,14 @@
         "pin": "B7"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812",
+        "sat_steps": 24
+    },
+    "qmk": {
+        "tap_keycode_delay": 1
+    },
+    "build": {
+        "debounce_type": "sym_eager_pk"
     },
     "matrix_pins": {
         "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7"],
diff --git a/keyboards/adm42/rev4/config.h b/keyboards/adm42/rev4/config.h
index fbf2e300effa..5553b18751cc 100644
--- a/keyboards/adm42/rev4/config.h
+++ b/keyboards/adm42/rev4/config.h
@@ -27,10 +27,6 @@
 #define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 20
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_SAT_STEP 24
-#define RGB_MATRIX_HUE_STEP 8
-#define RGB_MATRIX_VAL_STEP 16
-#define RGB_MATRIX_SPD_STEP 16
 
 #define ENABLE_RGB_MATRIX_BREATHING
 #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
diff --git a/keyboards/adm42/rules.mk b/keyboards/adm42/rules.mk
index 73e4d46c59cf..a2402f19a9b2 100644
--- a/keyboards/adm42/rules.mk
+++ b/keyboards/adm42/rules.mk
@@ -10,7 +10,6 @@ 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
-DEBOUNCE_TYPE = sym_eager_pk
 LTO_ENABLE = yes
 
 DEFAULT_FOLDER = adm42/rev4
diff --git a/keyboards/adpenrose/akemipad/config.h b/keyboards/adpenrose/akemipad/config.h
index 5756903c6645..230453c3a00a 100644
--- a/keyboards/adpenrose/akemipad/config.h
+++ b/keyboards/adpenrose/akemipad/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
 /* Audio functionality */
 #define AUDIO_PIN C6
 #define AUDIO_CLICKY
diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json
index fb70fb00a4f3..0484578571bd 100644
--- a/keyboards/adpenrose/akemipad/info.json
+++ b/keyboards/adpenrose/akemipad/info.json
@@ -11,7 +11,7 @@
         "pin": "F4"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D3", "D2", "F5", "F6", "B2"],
@@ -23,6 +23,9 @@
             {"pin_a": "B1", "pin_b": "B3"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/rules.mk b/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/rules.mk
index d24a189b81d6..d313f3a4f96a 100644
--- a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/rules.mk
+++ b/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/rules.mk
@@ -5,5 +5,4 @@ GRAVE_ESC_ENABLE = no
 MAGIC_ENABLE = no
 ENCODER_MAP_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h
deleted file mode 100644
index 088b40139bfd..000000000000
--- a/keyboards/adpenrose/kintsugi/config.h
+++ /dev/null
@@ -1,36 +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
-
-#define TAP_CODE_DELAY 10
-
-/* Underglow options: */
-#    define RGBLED_NUM 16
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json
index 3daf3326acd7..42cc69ed7fef 100644
--- a/keyboards/adpenrose/kintsugi/info.json
+++ b/keyboards/adpenrose/kintsugi/info.json
@@ -8,6 +8,23 @@
         "pid": "0x0001",
         "device_version": "1.0.0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "F1"
     },
@@ -21,6 +38,9 @@
             {"pin_a": "B7", "pin_b": "D5"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/adpenrose/kintsugi/rules.mk b/keyboards/adpenrose/kintsugi/rules.mk
index 4704a3487dca..864f929c81e5 100644
--- a/keyboards/adpenrose/kintsugi/rules.mk
+++ b/keyboards/adpenrose/kintsugi/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes		    # Encoder functionality
 OLED_ENABLE = yes           # OLED functionality
-OLED_DRIVER = SSD1306
diff --git a/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk b/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk
index 2a1e874d82f0..345c10cdd484 100644
--- a/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk
+++ b/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk
@@ -1,4 +1,4 @@
 VIA_ENABLE = yes
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER += SOLENOID
+HAPTIC_DRIVER = solenoid
 ENCODER_MAP_ENABLE = yes	# Encoder mapping functionality
\ No newline at end of file
diff --git a/keyboards/adpenrose/obi/config.h b/keyboards/adpenrose/obi/config.h
deleted file mode 100644
index 862c0fe1ee53..000000000000
--- a/keyboards/adpenrose/obi/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2022 Arturo Avila (@ADPenrose)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define TAP_CODE_DELAY 10
-
-/* Underglow options: */
-#    define RGBLED_NUM 16
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json
index 00a2572e7a4c..d11e00a50e7b 100644
--- a/keyboards/adpenrose/obi/info.json
+++ b/keyboards/adpenrose/obi/info.json
@@ -7,6 +7,23 @@
         "pid": "0x0002",
         "vid": "0x4450"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "F7"
     },
@@ -20,6 +37,9 @@
             {"pin_a": "F1", "pin_b": "F0"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/adpenrose/shisaku/keymaps/solenoid/rules.mk b/keyboards/adpenrose/shisaku/keymaps/solenoid/rules.mk
index e13f2bd03570..6bec144827bc 100644
--- a/keyboards/adpenrose/shisaku/keymaps/solenoid/rules.mk
+++ b/keyboards/adpenrose/shisaku/keymaps/solenoid/rules.mk
@@ -1,4 +1,4 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER += SOLENOID
\ No newline at end of file
+HAPTIC_DRIVER = solenoid
\ No newline at end of file
diff --git a/keyboards/aeboards/ext65/rev1/keymaps/via/rules.mk b/keyboards/aeboards/ext65/rev1/keymaps/via/rules.mk
index e9a8bec8798b..ab9d5c6ac2f8 100644
--- a/keyboards/aeboards/ext65/rev1/keymaps/via/rules.mk
+++ b/keyboards/aeboards/ext65/rev1/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-# OLED_DRIVER = not a real thing
diff --git a/keyboards/aeboards/ext65/rev2/config.h b/keyboards/aeboards/ext65/rev2/config.h
index 0bc48fb5626f..78d20f300fe9 100644
--- a/keyboards/aeboards/ext65/rev2/config.h
+++ b/keyboards/aeboards/ext65/rev2/config.h
@@ -16,19 +16,6 @@
 
 #pragma once
 
-//RGB Underglow WS2812
-#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 24
-
 //SPI
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/info.json
index bfdcae090e52..d9d0ee62ee1c 100644
--- a/keyboards/aeboards/ext65/rev2/info.json
+++ b/keyboards/aeboards/ext65/rev2/info.json
@@ -12,6 +12,21 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 24,
+        "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"
diff --git a/keyboards/aeboards/ext65/rev2/keymaps/via/rules.mk b/keyboards/aeboards/ext65/rev2/keymaps/via/rules.mk
index e9a8bec8798b..ab9d5c6ac2f8 100644
--- a/keyboards/aeboards/ext65/rev2/keymaps/via/rules.mk
+++ b/keyboards/aeboards/ext65/rev2/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-# OLED_DRIVER = not a real thing
diff --git a/keyboards/aeboards/ext65/rev2/rules.mk b/keyboards/aeboards/ext65/rev2/rules.mk
index d52eea26d194..b9637955ff7b 100644
--- a/keyboards/aeboards/ext65/rev2/rules.mk
+++ b/keyboards/aeboards/ext65/rev2/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SLEEP_LED_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/aeboards/satellite/rev1/rev1.c b/keyboards/aeboards/satellite/rev1/rev1.c
index aafd0e0848da..785fa8af9ff7 100644
--- a/keyboards/aeboards/satellite/rev1/rev1.c
+++ b/keyboards/aeboards/satellite/rev1/rev1.c
@@ -145,30 +145,30 @@ led_config_t g_led_config = { {
 // Custom Driver
 static void init(void) {
     i2c_init();
-    IS31FL3731_init(DRIVER_ADDR_1);
-    IS31FL3731_init(DRIVER_ADDR_2);
+    is31fl3731_init(DRIVER_ADDR_1);
+    is31fl3731_init(DRIVER_ADDR_2);
     for (int index = 0; index < ISSI_DRIVER_TOTAL; index++) {
         bool enabled = !(   ( index == 18+5) || //B5
                             ( index == 36+17) || //C17
                             ( index == 54+13) //D13
                         );
-        IS31FL3731_set_led_control_register(index, enabled, enabled, enabled);
+        is31fl3731_set_led_control_register(index, enabled, enabled, enabled);
     }
-    IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
-    IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1);
+    is31fl3731_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3731_update_led_control_registers(DRIVER_ADDR_2, 1);
 }
 
 static void flush(void) {
-    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
-    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
+    is31fl3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
 }
 
 static void set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
-    IS31FL3731_set_color(index, red, green, blue);
+    is31fl3731_set_color(index, red, green, blue);
 }
 
 static void set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
-    IS31FL3731_set_color_all( red, green, blue );
+    is31fl3731_set_color_all( red, green, blue );
 }
 
 
diff --git a/keyboards/ah/haven65/info.json b/keyboards/ah/haven65/info.json
index 43214e50089c..1cdc337836e0 100644
--- a/keyboards/ah/haven65/info.json
+++ b/keyboards/ah/haven65/info.json
@@ -44,8 +44,14 @@
             "twinkle": true
         }
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker"
+    },
+    "community_layouts": [
+        "65_ansi_blocker"
+    ],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_ansi_blocker": {
             "layout": [
               { "label": "Esc",             "matrix":[0,0],"x": 0, "y": 0 },
               { "label": "1",               "matrix":[0,1],"x": 1, "y": 0 },
diff --git a/keyboards/ah/haven65/keymaps/default/keymap.c b/keyboards/ah/haven65/keymaps/default/keymap.c
index 1d3e67b78bb3..e3c424072d42 100644
--- a/keyboards/ah/haven65/keymaps/default/keymap.c
+++ b/keyboards/ah/haven65/keymaps/default/keymap.c
@@ -4,7 +4,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
+  [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_BACKSPACE,  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_INS,
       KC_CAPS, KC_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,
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  [1] = LAYOUT(
+  [1] = LAYOUT_65_ansi_blocker(
       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,
diff --git a/keyboards/ah/haven65/keymaps/via/keymap.c b/keyboards/ah/haven65/keymaps/via/keymap.c
index c42231995fb1..e4de01e0e8bd 100644
--- a/keyboards/ah/haven65/keymaps/via/keymap.c
+++ b/keyboards/ah/haven65/keymaps/via/keymap.c
@@ -4,7 +4,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
+  [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_BACKSPACE,  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_INS,
       KC_CAPS, KC_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,
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  [1] = LAYOUT(
+  [1] = LAYOUT_65_ansi_blocker(
       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,
diff --git a/keyboards/ah/haven80/hotswap/info.json b/keyboards/ah/haven80/hotswap/info.json
index 4ec292ef9655..b73da1c5f4ce 100644
--- a/keyboards/ah/haven80/hotswap/info.json
+++ b/keyboards/ah/haven80/hotswap/info.json
@@ -9,8 +9,14 @@
         "rows": ["F0", "F1", "F4", "F5", "F6", "B1", "B2", "B3", "D3", "D5", "F7"],
         "cols": ["D0", "D1", "D2", "B0", "D4", "B4", "D6", "D7", "B5"]
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_tkl_f13_ansi_tsangan"
+    },
+    "community_layouts": [
+        "tkl_f13_ansi_tsangan"
+    ],
     "layouts": {
-        "LAYOUT": {
+        "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 },
@@ -21,90 +27,90 @@
               { "label": "F6",              "matrix":[0,6],"x": 6.5, "y": 0 },
               { "label": "F7",              "matrix":[0,7],"x": 7.5, "y": 0 },
               { "label": "F8",              "matrix":[5,8],"x": 8.5, "y": 0 },
-              { "label": "F9",              "matrix":[5,7],"x": 9.5, "y": 0 },
+              { "label": "F9",              "matrix":[5,7],"x": 9.75, "y": 0 },
               { "label": "F10",             "matrix":[5,6],"x": 10.75, "y": 0 },
               { "label": "F11",             "matrix":[5,5],"x": 11.75, "y": 0 },
               { "label": "F12",             "matrix":[5,4],"x": 12.75, "y": 0 },
-              { "label": "F13",             "matrix":[5,3],"x": 13.75, "y": 0 },
+              { "label": "F13",             "matrix":[5,3],"x": 14, "y": 0 },
               { "label": "Prtsc",           "matrix":[5,2],"x": 15.25, "y": 0 },
               { "label": "Scrlk",           "matrix":[5,1],"x": 16.25, "y": 0 },
               { "label": "Pause",           "matrix":[5,0],"x": 17.25, "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":[6,8],"x": 9, "y": 1.5 },
-              { "label": "0",               "matrix":[6,7],"x": 10, "y": 1.5 },
-              { "label": "-",               "matrix":[6,6],"x": 11, "y": 1.5 },
-              { "label": "=",               "matrix":[6,5],"x": 12, "y": 1.5 },
-              { "label": "backspace",       "matrix":[6,4],"x": 13, "y": 1.5, "w": 2 },
-              { "label": "insert",          "matrix":[6,2],"x": 15.25, "y": 1.5 },
-              { "label": "home",            "matrix":[6,1],"x": 16.25, "y": 1.5 },
-              { "label": "pg up",           "matrix":[6,0],"x": 17.25, "y": 1.5 },
+              { "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":[6,8],"x": 9, "y": 1.25 },
+              { "label": "0",               "matrix":[6,7],"x": 10, "y": 1.25 },
+              { "label": "-",               "matrix":[6,6],"x": 11, "y": 1.25 },
+              { "label": "=",               "matrix":[6,5],"x": 12, "y": 1.25 },
+              { "label": "backspace",       "matrix":[6,4],"x": 13, "y": 1.25, "w": 2 },
+              { "label": "insert",          "matrix":[6,2],"x": 15.25, "y": 1.25 },
+              { "label": "home",            "matrix":[6,1],"x": 16.25, "y": 1.25 },
+              { "label": "pg up",           "matrix":[6,0],"x": 17.25, "y": 1.25 },
 
-              { "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":[7,8],"x": 9.5, "y": 2.5 },
-              { "label": "p",               "matrix":[7,7],"x": 10.5, "y": 2.5 },
-              { "label": "{",               "matrix":[7,6],"x": 11.5, "y": 2.5 },
-              { "label": "}",               "matrix":[7,5],"x": 12.5, "y": 2.5 },
-              { "label": "|",               "matrix":[7,4],"x": 13.5, "y": 2.5, "w": 1.5 },
-              { "label": "delete",          "matrix":[7,2],"x": 15.25, "y": 2.5 },
-              { "label": "end",             "matrix":[7,1],"x": 16.25, "y": 2.5 },
-              { "label": "pg dn",           "matrix":[7,0],"x": 17.25, "y": 2.5 },
+              { "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":[7,8],"x": 9.5, "y": 2.25 },
+              { "label": "p",               "matrix":[7,7],"x": 10.5, "y": 2.25 },
+              { "label": "{",               "matrix":[7,6],"x": 11.5, "y": 2.25 },
+              { "label": "}",               "matrix":[7,5],"x": 12.5, "y": 2.25 },
+              { "label": "|",               "matrix":[7,4],"x": 13.5, "y": 2.25, "w": 1.5 },
+              { "label": "delete",          "matrix":[7,2],"x": 15.25, "y": 2.25 },
+              { "label": "end",             "matrix":[7,1],"x": 16.25, "y": 2.25 },
+              { "label": "pg dn",           "matrix":[7,0],"x": 17.25, "y": 2.25 },
 
-              { "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":[8,8],"x": 9.75, "y": 3.5 },
-              { "label": ";",               "matrix":[8,7],"x": 10.75, "y": 3.5 },
-              { "label": "'",               "matrix":[8,6],"x": 11.75, "y": 3.5 },
-              { "label": "enter",           "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 },
+              { "label": "capslock",        "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":[8,8],"x": 9.75, "y": 3.25 },
+              { "label": ";",               "matrix":[8,7],"x": 10.75, "y": 3.25 },
+              { "label": "'",               "matrix":[8,6],"x": 11.75, "y": 3.25 },
+              { "label": "enter",           "matrix":[8,5],"x": 12.75, "y": 3.25, "w": 2.25 },
 
-              { "label": "leftshift",       "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 },
-              { "label": "z",               "matrix":[4,1],"x": 2.25, "y": 4.5 },
-              { "label": "x",               "matrix":[4,2],"x": 3.25, "y": 4.5 },
-              { "label": "c",               "matrix":[4,3],"x": 4.25, "y": 4.5 },
-              { "label": "v",               "matrix":[4,4],"x": 5.25, "y": 4.5 },
-              { "label": "b",               "matrix":[4,5],"x": 6.25, "y": 4.5 },
-              { "label": "n",               "matrix":[4,6],"x": 7.25, "y": 4.5 },
-              { "label": "m",               "matrix":[4,7],"x": 8.25, "y": 4.5 },
-              { "label": ",",               "matrix":[4,8],"x": 9.25, "y": 4.5 },
-              { "label": ".",               "matrix":[9,8],"x": 10.25, "y": 4.5 },
-              { "label": "/",               "matrix":[9,7],"x": 11.25, "y": 4.5 },
-              { "label": "rightshift",      "matrix":[9,6],"x": 12.25, "y": 4.5, "w": 2.75 },
-              { "label": "up",              "matrix":[8,1],"x": 16.25, "y": 4.5 },
+              { "label": "leftshift",       "matrix":[4,0],"x": 0, "y": 4.25, "w": 2.25 },
+              { "label": "z",               "matrix":[4,1],"x": 2.25, "y": 4.25 },
+              { "label": "x",               "matrix":[4,2],"x": 3.25, "y": 4.25 },
+              { "label": "c",               "matrix":[4,3],"x": 4.25, "y": 4.25 },
+              { "label": "v",               "matrix":[4,4],"x": 5.25, "y": 4.25 },
+              { "label": "b",               "matrix":[4,5],"x": 6.25, "y": 4.25 },
+              { "label": "n",               "matrix":[4,6],"x": 7.25, "y": 4.25 },
+              { "label": "m",               "matrix":[4,7],"x": 8.25, "y": 4.25 },
+              { "label": ",",               "matrix":[4,8],"x": 9.25, "y": 4.25 },
+              { "label": ".",               "matrix":[9,8],"x": 10.25, "y": 4.25 },
+              { "label": "/",               "matrix":[9,7],"x": 11.25, "y": 4.25 },
+              { "label": "rightshift",      "matrix":[9,6],"x": 12.25, "y": 4.25, "w": 2.75 },
+              { "label": "up",              "matrix":[8,1],"x": 16.25, "y": 4.25 },
 
-              { "label": "lctrl",           "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 },
-              { "label": "lwin",            "matrix":[10,1],"x": 1.5, "y": 5.5 },
-              { "label": "lalt",            "matrix":[10,2],"x": 2.5, "y": 5.5, "w": 1.5 },
-              { "label": "space",           "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 },
-              { "label": "ralt",            "matrix":[10,5],"x": 11, "y": 5.5, "w": 1.5 },
-              { "label": "rwin",            "matrix":[10,6],"x": 12.5, "y": 5.5, "w": 1 },
-              { "label": "rctrl",           "matrix":[10,7],"x": 13.5, "y": 5.5, "w":1.5},
-              { "label": "left",            "matrix":[9,2],"x": 15.25, "y": 5.5 },
-              { "label": "down",            "matrix":[9,1],"x": 16.25, "y": 5.5 },
-              { "label": "right",           "matrix":[9,0],"x": 17.25, "y": 5.5 }
+              { "label": "lctrl",           "matrix":[10,0],"x": 0, "y": 5.25, "w": 1.5 },
+              { "label": "lwin",            "matrix":[10,1],"x": 1.5, "y": 5.25 },
+              { "label": "lalt",            "matrix":[10,2],"x": 2.5, "y": 5.25, "w": 1.5 },
+              { "label": "space",           "matrix":[10,3],"x": 4, "y": 5.25, "w": 7 },
+              { "label": "ralt",            "matrix":[10,5],"x": 11, "y": 5.25, "w": 1.5 },
+              { "label": "rwin",            "matrix":[10,6],"x": 12.5, "y": 5.25, "w": 1 },
+              { "label": "rctrl",           "matrix":[10,7],"x": 13.5, "y": 5.25, "w":1.5},
+              { "label": "left",            "matrix":[9,2],"x": 15.25, "y": 5.25 },
+              { "label": "down",            "matrix":[9,1],"x": 16.25, "y": 5.25 },
+              { "label": "right",           "matrix":[9,0],"x": 17.25, "y": 5.25 }
            ]
         }
-    },
+    }
 }
diff --git a/keyboards/ah/haven80/keymaps/default/keymap.c b/keyboards/ah/haven80/keymaps/default/keymap.c
index cbcc6bef38e2..401787bcbcb2 100644
--- a/keyboards/ah/haven80/keymaps/default/keymap.c
+++ b/keyboards/ah/haven80/keymaps/default/keymap.c
@@ -4,7 +4,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
+  [0] = 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_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_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,
diff --git a/keyboards/ah/haven80/keymaps/via/keymap.c b/keyboards/ah/haven80/keymaps/via/keymap.c
index 03b98293fcd2..f4d1b6fe92d4 100644
--- a/keyboards/ah/haven80/keymaps/via/keymap.c
+++ b/keyboards/ah/haven80/keymaps/via/keymap.c
@@ -4,7 +4,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
+  [0] = 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_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_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,
diff --git a/keyboards/ah/haven80/solder/info.json b/keyboards/ah/haven80/solder/info.json
index db9eb015de11..775908d24f0e 100644
--- a/keyboards/ah/haven80/solder/info.json
+++ b/keyboards/ah/haven80/solder/info.json
@@ -9,8 +9,17 @@
         "rows": ["F0", "F1", "F4", "F5", "C6", "B1", "B2", "B3", "D3", "D5", "D6"],
         "cols": ["D0", "D1", "D2", "B0", "C7", "B5", "D7", "B4", "B6"]
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_tkl_f13_ansi_tsangan"
+    },
+    "community_layouts": [
+        "tkl_f13_ansi_tsangan",
+        "tkl_f13_ansi_tsangan_split_bs_rshift",
+        "tkl_f13_iso_tsangan",
+        "tkl_f13_iso_tsangan_split_bs_rshift"
+    ],
     "layouts": {
-        "LAYOUT": {
+        "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 },
@@ -21,90 +30,384 @@
               { "label": "F6",              "matrix":[0,6],"x": 6.5, "y": 0 },
               { "label": "F7",              "matrix":[0,7],"x": 7.5, "y": 0 },
               { "label": "F8",              "matrix":[5,8],"x": 8.5, "y": 0 },
-              { "label": "F9",              "matrix":[5,7],"x": 9.5, "y": 0 },
+              { "label": "F9",              "matrix":[5,7],"x": 9.75, "y": 0 },
               { "label": "F10",             "matrix":[5,6],"x": 10.75, "y": 0 },
               { "label": "F11",             "matrix":[5,5],"x": 11.75, "y": 0 },
               { "label": "F12",             "matrix":[5,4],"x": 12.75, "y": 0 },
-              { "label": "F13",             "matrix":[5,3],"x": 13.75, "y": 0 },
+              { "label": "F13",             "matrix":[5,3],"x": 14, "y": 0 },
               { "label": "Prtsc",           "matrix":[5,2],"x": 15.25, "y": 0 },
               { "label": "Scrlk",           "matrix":[5,1],"x": 16.25, "y": 0 },
               { "label": "Pause",           "matrix":[5,0],"x": 17.25, "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":[6,8],"x": 9, "y": 1.5 },
-              { "label": "0",               "matrix":[6,7],"x": 10, "y": 1.5 },
-              { "label": "-",               "matrix":[6,6],"x": 11, "y": 1.5 },
-              { "label": "=",               "matrix":[6,5],"x": 12, "y": 1.5 },
-              { "label": "backspace",       "matrix":[6,4],"x": 13, "y": 1.5, "w": 2 },
-              { "label": "insert",          "matrix":[6,2],"x": 15.25, "y": 1.5 },
-              { "label": "home",            "matrix":[6,1],"x": 16.25, "y": 1.5 },
-              { "label": "pg up",           "matrix":[6,0],"x": 17.25, "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":[7,8],"x": 9.5, "y": 2.5 },
-              { "label": "p",               "matrix":[7,7],"x": 10.5, "y": 2.5 },
-              { "label": "{",               "matrix":[7,6],"x": 11.5, "y": 2.5 },
-              { "label": "}",               "matrix":[7,5],"x": 12.5, "y": 2.5 },
-              { "label": "|",               "matrix":[7,4],"x": 13.5, "y": 2.5, "w": 1.5 },
-              { "label": "delete",          "matrix":[7,2],"x": 15.25, "y": 2.5 },
-              { "label": "end",             "matrix":[7,1],"x": 16.25, "y": 2.5 },
-              { "label": "pg dn",           "matrix":[7,0],"x": 17.25, "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":[8,8],"x": 9.75, "y": 3.5 },
-              { "label": ";",               "matrix":[8,7],"x": 10.75, "y": 3.5 },
-              { "label": "'",               "matrix":[8,6],"x": 11.75, "y": 3.5 },
-              { "label": "enter",           "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 },
-
-              { "label": "leftshift",       "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 },
-              { "label": "z",               "matrix":[4,1],"x": 2.25, "y": 4.5 },
-              { "label": "x",               "matrix":[4,2],"x": 3.25, "y": 4.5 },
-              { "label": "c",               "matrix":[4,3],"x": 4.25, "y": 4.5 },
-              { "label": "v",               "matrix":[4,4],"x": 5.25, "y": 4.5 },
-              { "label": "b",               "matrix":[4,5],"x": 6.25, "y": 4.5 },
-              { "label": "n",               "matrix":[4,6],"x": 7.25, "y": 4.5 },
-              { "label": "m",               "matrix":[4,7],"x": 8.25, "y": 4.5 },
-              { "label": ",",               "matrix":[4,8],"x": 9.25, "y": 4.5 },
-              { "label": ".",               "matrix":[9,8],"x": 10.25, "y": 4.5 },
-              { "label": "/",               "matrix":[9,7],"x": 11.25, "y": 4.5 },
-              { "label": "rightshift",      "matrix":[9,6],"x": 12.25, "y": 4.5, "w": 2.75 },
-              { "label": "up",              "matrix":[8,1],"x": 16.25, "y": 4.5 },
-
-              { "label": "lctrl",           "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 },
-              { "label": "lwin",            "matrix":[10,1],"x": 1.5, "y": 5.5 },
-              { "label": "lalt",            "matrix":[10,2],"x": 2.5, "y": 5.5, "w": 1.5 },
-              { "label": "space",           "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 },
-              { "label": "ralt",            "matrix":[10,5],"x": 11, "y": 5.5, "w": 1.5 },
-              { "label": "rwin",            "matrix":[10,6],"x": 12.5, "y": 5.5, "w": 1 },
-              { "label": "rctrl",           "matrix":[10,7],"x": 13.5, "y": 5.5, "w":1.5},
-              { "label": "left",            "matrix":[9,2],"x": 15.25, "y": 5.5 },
-              { "label": "down",            "matrix":[9,1],"x": 16.25, "y": 5.5 },
-              { "label": "right",           "matrix":[9,0],"x": 17.25, "y": 5.5 }
+              { "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":[6,8],"x": 9, "y": 1.25 },
+              { "label": "0",               "matrix":[6,7],"x": 10, "y": 1.25 },
+              { "label": "-",               "matrix":[6,6],"x": 11, "y": 1.25 },
+              { "label": "=",               "matrix":[6,5],"x": 12, "y": 1.25 },
+              { "label": "backspace",       "matrix":[6,4],"x": 13, "y": 1.25, "w": 2 },
+              { "label": "insert",          "matrix":[6,2],"x": 15.25, "y": 1.25 },
+              { "label": "home",            "matrix":[6,1],"x": 16.25, "y": 1.25 },
+              { "label": "pg up",           "matrix":[6,0],"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":[7,8],"x": 9.5, "y": 2.25 },
+              { "label": "p",               "matrix":[7,7],"x": 10.5, "y": 2.25 },
+              { "label": "{",               "matrix":[7,6],"x": 11.5, "y": 2.25 },
+              { "label": "}",               "matrix":[7,5],"x": 12.5, "y": 2.25 },
+              { "label": "|",               "matrix":[7,4],"x": 13.5, "y": 2.25, "w": 1.5 },
+              { "label": "delete",          "matrix":[7,2],"x": 15.25, "y": 2.25 },
+              { "label": "end",             "matrix":[7,1],"x": 16.25, "y": 2.25 },
+              { "label": "pg dn",           "matrix":[7,0],"x": 17.25, "y": 2.25 },
+
+              { "label": "capslock",        "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":[8,8],"x": 9.75, "y": 3.25 },
+              { "label": ";",               "matrix":[8,7],"x": 10.75, "y": 3.25 },
+              { "label": "'",               "matrix":[8,6],"x": 11.75, "y": 3.25 },
+              { "label": "enter",           "matrix":[8,5],"x": 12.75, "y": 3.25, "w": 2.25 },
+
+              { "label": "leftshift",       "matrix":[4,0],"x": 0, "y": 4.25, "w": 2.25 },
+              { "label": "z",               "matrix":[4,1],"x": 2.25, "y": 4.25 },
+              { "label": "x",               "matrix":[4,2],"x": 3.25, "y": 4.25 },
+              { "label": "c",               "matrix":[4,3],"x": 4.25, "y": 4.25 },
+              { "label": "v",               "matrix":[4,4],"x": 5.25, "y": 4.25 },
+              { "label": "b",               "matrix":[4,5],"x": 6.25, "y": 4.25 },
+              { "label": "n",               "matrix":[4,6],"x": 7.25, "y": 4.25 },
+              { "label": "m",               "matrix":[4,7],"x": 8.25, "y": 4.25 },
+              { "label": ",",               "matrix":[4,8],"x": 9.25, "y": 4.25 },
+              { "label": ".",               "matrix":[9,8],"x": 10.25, "y": 4.25 },
+              { "label": "/",               "matrix":[9,7],"x": 11.25, "y": 4.25 },
+              { "label": "rightshift",      "matrix":[9,6],"x": 12.25, "y": 4.25, "w": 2.75 },
+              { "label": "up",              "matrix":[8,1],"x": 16.25, "y": 4.25 },
+
+              { "label": "lctrl",           "matrix":[10,0],"x": 0, "y": 5.25, "w": 1.5 },
+              { "label": "lwin",            "matrix":[10,1],"x": 1.5, "y": 5.25 },
+              { "label": "lalt",            "matrix":[10,2],"x": 2.5, "y": 5.25, "w": 1.5 },
+              { "label": "space",           "matrix":[10,3],"x": 4, "y": 5.25, "w": 7 },
+              { "label": "ralt",            "matrix":[10,5],"x": 11, "y": 5.25, "w": 1.5 },
+              { "label": "rwin",            "matrix":[10,6],"x": 12.5, "y": 5.25, "w": 1 },
+              { "label": "rctrl",           "matrix":[10,7],"x": 13.5, "y": 5.25, "w":1.5},
+              { "label": "left",            "matrix":[9,2],"x": 15.25, "y": 5.25 },
+              { "label": "down",            "matrix":[9,1],"x": 16.25, "y": 5.25 },
+              { "label": "right",           "matrix":[9,0],"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": [5, 8], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [5, 7], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [5, 6], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [5, 5], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [5, 4], "x": 12.75, "y": 0},
+                {"label": "F13", "matrix": [5, 3], "x": 14, "y": 0},
+                {"label": "Prtsc", "matrix": [5, 2], "x": 15.25, "y": 0},
+                {"label": "Scrlk", "matrix": [5, 1], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [5, 0], "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": [6, 8], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [6, 7], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [6, 6], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [6, 5], "x": 12, "y": 1.25},
+                {"label": "backspace", "matrix": [6, 4], "x": 13, "y": 1.25},
+                {"label": "backspace", "matrix": [6, 3], "x": 14, "y": 1.25},
+                {"label": "insert", "matrix": [6, 2], "x": 15.25, "y": 1.25},
+                {"label": "home", "matrix": [6, 1], "x": 16.25, "y": 1.25},
+                {"label": "pg up", "matrix": [6, 0], "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": [7, 8], "x": 9.5, "y": 2.25},
+                {"label": "p", "matrix": [7, 7], "x": 10.5, "y": 2.25},
+                {"label": "{", "matrix": [7, 6], "x": 11.5, "y": 2.25},
+                {"label": "}", "matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"label": "|", "matrix": [7, 4], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "delete", "matrix": [7, 2], "x": 15.25, "y": 2.25},
+                {"label": "end", "matrix": [7, 1], "x": 16.25, "y": 2.25},
+                {"label": "pg dn", "matrix": [7, 0], "x": 17.25, "y": 2.25},
+
+                {"label": "capslock", "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": [8, 8], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [8, 7], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [8, 6], "x": 11.75, "y": 3.25},
+                {"label": "enter", "matrix": [8, 5], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "leftshift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "x", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "c", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "v", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "b", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "n", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "m", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [9, 8], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [9, 7], "x": 11.25, "y": 4.25},
+                {"label": "rightshift", "matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "rightshift", "matrix": [9, 5], "x": 14, "y": 4.25},
+                {"label": "up", "matrix": [8, 1], "x": 16.25, "y": 4.25},
+
+                {"label": "lctrl", "matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "lwin", "matrix": [10, 1], "x": 1.5, "y": 5.25},
+                {"label": "lalt", "matrix": [10, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "space", "matrix": [10, 3], "x": 4, "y": 5.25, "w": 7},
+                {"label": "ralt", "matrix": [10, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "rwin", "matrix": [10, 6], "x": 12.5, "y": 5.25},
+                {"label": "rctrl", "matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"label": "left", "matrix": [9, 2], "x": 15.25, "y": 5.25},
+                {"label": "down", "matrix": [9, 1], "x": 16.25, "y": 5.25},
+                {"label": "right", "matrix": [9, 0], "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": [5, 8], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [5, 7], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [5, 6], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [5, 5], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [5, 4], "x": 12.75, "y": 0},
+                {"label": "F13", "matrix": [5, 3], "x": 14, "y": 0},
+                {"label": "Prtsc", "matrix": [5, 2], "x": 15.25, "y": 0},
+                {"label": "Scrlk", "matrix": [5, 1], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [5, 0], "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": [6, 8], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [6, 7], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [6, 6], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [6, 5], "x": 12, "y": 1.25},
+                {"label": "backspace", "matrix": [6, 4], "x": 13, "y": 1.25, "w": 2},
+                {"label": "insert", "matrix": [6, 2], "x": 15.25, "y": 1.25},
+                {"label": "home", "matrix": [6, 1], "x": 16.25, "y": 1.25},
+                {"label": "pg up", "matrix": [6, 0], "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": [7, 8], "x": 9.5, "y": 2.25},
+                {"label": "p", "matrix": [7, 7], "x": 10.5, "y": 2.25},
+                {"label": "{", "matrix": [7, 6], "x": 11.5, "y": 2.25},
+                {"label": "}", "matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"label": "delete", "matrix": [7, 2], "x": 15.25, "y": 2.25},
+                {"label": "end", "matrix": [7, 1], "x": 16.25, "y": 2.25},
+                {"label": "pg dn", "matrix": [7, 0], "x": 17.25, "y": 2.25},
+
+                {"label": "capslock", "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": [8, 8], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [8, 7], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [8, 6], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [7, 4], "x": 12.75, "y": 3.25},
+                {"label": "enter", "matrix": [8, 5], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "leftshift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [9, 3], "x": 1.25, "y": 4.25},
+                {"label": "z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "x", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "c", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "v", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "b", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "n", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "m", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [9, 8], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [9, 7], "x": 11.25, "y": 4.25},
+                {"label": "rightshift", "matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"label": "up", "matrix": [8, 1], "x": 16.25, "y": 4.25},
+
+                {"label": "lctrl", "matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "lwin", "matrix": [10, 1], "x": 1.5, "y": 5.25},
+                {"label": "lalt", "matrix": [10, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "space", "matrix": [10, 3], "x": 4, "y": 5.25, "w": 7},
+                {"label": "ralt", "matrix": [10, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "rwin", "matrix": [10, 6], "x": 12.5, "y": 5.25},
+                {"label": "rctrl", "matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"label": "left", "matrix": [9, 2], "x": 15.25, "y": 5.25},
+                {"label": "down", "matrix": [9, 1], "x": 16.25, "y": 5.25},
+                {"label": "right", "matrix": [9, 0], "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": [5, 8], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [5, 7], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [5, 6], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [5, 5], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [5, 4], "x": 12.75, "y": 0},
+                {"label": "F13", "matrix": [5, 3], "x": 14, "y": 0},
+                {"label": "Prtsc", "matrix": [5, 2], "x": 15.25, "y": 0},
+                {"label": "Scrlk", "matrix": [5, 1], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [5, 0], "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": [6, 8], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [6, 7], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [6, 6], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [6, 5], "x": 12, "y": 1.25},
+                {"label": "backspace", "matrix": [6, 4], "x": 13, "y": 1.25},
+                {"label": "backspace", "matrix": [6, 3], "x": 14, "y": 1.25},
+                {"label": "insert", "matrix": [6, 2], "x": 15.25, "y": 1.25},
+                {"label": "home", "matrix": [6, 1], "x": 16.25, "y": 1.25},
+                {"label": "pg up", "matrix": [6, 0], "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": [7, 8], "x": 9.5, "y": 2.25},
+                {"label": "p", "matrix": [7, 7], "x": 10.5, "y": 2.25},
+                {"label": "{", "matrix": [7, 6], "x": 11.5, "y": 2.25},
+                {"label": "}", "matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"label": "delete", "matrix": [7, 2], "x": 15.25, "y": 2.25},
+                {"label": "end", "matrix": [7, 1], "x": 16.25, "y": 2.25},
+                {"label": "pg dn", "matrix": [7, 0], "x": 17.25, "y": 2.25},
+
+                {"label": "capslock", "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": [8, 8], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [8, 7], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [8, 6], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [7, 4], "x": 12.75, "y": 3.25},
+                {"label": "enter", "matrix": [8, 5], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "leftshift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [9, 3], "x": 1.25, "y": 4.25},
+                {"label": "z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"label": "x", "matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"label": "c", "matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"label": "v", "matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"label": "b", "matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"label": "n", "matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"label": "m", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [9, 8], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [9, 7], "x": 11.25, "y": 4.25},
+                {"label": "rightshift", "matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "rightshift", "matrix": [9, 5], "x": 14, "y": 4.25},
+                {"label": "up", "matrix": [8, 1], "x": 16.25, "y": 4.25},
+
+                {"label": "lctrl", "matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "lwin", "matrix": [10, 1], "x": 1.5, "y": 5.25},
+                {"label": "lalt", "matrix": [10, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "space", "matrix": [10, 3], "x": 4, "y": 5.25, "w": 7},
+                {"label": "ralt", "matrix": [10, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "rwin", "matrix": [10, 6], "x": 12.5, "y": 5.25},
+                {"label": "rctrl", "matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"label": "left", "matrix": [9, 2], "x": 15.25, "y": 5.25},
+                {"label": "down", "matrix": [9, 1], "x": 16.25, "y": 5.25},
+                {"label": "right", "matrix": [9, 0], "x": 17.25, "y": 5.25}
+            ]
         }
-    },
+    }
 }
diff --git a/keyboards/ai03/andromeda/rules.mk b/keyboards/ai03/andromeda/rules.mk
index 0aeca0dd9f35..7f4f202a1b70 100644
--- a/keyboards/ai03/andromeda/rules.mk
+++ b/keyboards/ai03/andromeda/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/ai03/duet/config.h b/keyboards/ai03/duet/config.h
new file mode 100644
index 000000000000..9cebd11c6bad
--- /dev/null
+++ b/keyboards/ai03/duet/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 128
diff --git a/keyboards/ai03/duet/info.json b/keyboards/ai03/duet/info.json
new file mode 100644
index 000000000000..1d11c868a37f
--- /dev/null
+++ b/keyboards/ai03/duet/info.json
@@ -0,0 +1,139 @@
+{
+    "manufacturer": "ai03 Design Studio",
+    "keyboard_name": "Duet Switch Tester",
+    "maintainer": "ai03-2725",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP18", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6"],
+        "rows": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5"]
+    },
+    "processor": "RP2040",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0028",
+        "vid": "0xA103"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "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.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+                {"matrix": [0, 14], "x": 15.75, "y": 0},
+                {"matrix": [0, 15], "x": 16.75, "y": 0},
+                {"matrix": [0, 16], "x": 18, "y": 0},
+                {"matrix": [0, 17], "x": 19, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11.25, "y": 1},
+                {"matrix": [1, 11], "x": 12.25, "y": 1},
+                {"matrix": [1, 12], "x": 13.5, "y": 1},
+                {"matrix": [1, 13], "x": 14.5, "y": 1},
+                {"matrix": [1, 14], "x": 15.75, "y": 1},
+                {"matrix": [1, 15], "x": 16.75, "y": 1},
+                {"matrix": [1, 16], "x": 18, "y": 1},
+                {"matrix": [1, 17], "x": 19, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 12], "x": 13.5, "y": 2},
+                {"matrix": [2, 13], "x": 14.5, "y": 2},
+                {"matrix": [2, 14], "x": 15.75, "y": 2},
+                {"matrix": [2, 15], "x": 16.75, "y": 2},
+                {"matrix": [2, 16], "x": 18, "y": 2},
+                {"matrix": [2, 17], "x": 19, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3},
+                {"matrix": [3, 13], "x": 14.5, "y": 3},
+                {"matrix": [3, 14], "x": 15.75, "y": 3},
+                {"matrix": [3, 15], "x": 16.75, "y": 3},
+                {"matrix": [3, 16], "x": 18, "y": 3},
+                {"matrix": [3, 17], "x": 19, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4},
+                {"matrix": [4, 5], "x": 5.5, "y": 4},
+                {"matrix": [4, 6], "x": 6.75, "y": 4},
+                {"matrix": [4, 7], "x": 7.75, "y": 4},
+                {"matrix": [4, 8], "x": 9, "y": 4},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11.25, "y": 4},
+                {"matrix": [4, 11], "x": 12.25, "y": 4},
+                {"matrix": [4, 12], "x": 13.5, "y": 4},
+                {"matrix": [4, 13], "x": 14.5, "y": 4},
+                {"matrix": [4, 14], "x": 15.75, "y": 4},
+                {"matrix": [4, 15], "x": 16.75, "y": 4},
+                {"matrix": [4, 16], "x": 18, "y": 4},
+                {"matrix": [4, 17], "x": 19, "y": 4},
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2.25, "y": 5},
+                {"matrix": [5, 3], "x": 3.25, "y": 5},
+                {"matrix": [5, 4], "x": 4.5, "y": 5},
+                {"matrix": [5, 5], "x": 5.5, "y": 5},
+                {"matrix": [5, 6], "x": 6.75, "y": 5},
+                {"matrix": [5, 7], "x": 7.75, "y": 5},
+                {"matrix": [5, 8], "x": 9, "y": 5},
+                {"matrix": [5, 9], "x": 10, "y": 5},
+                {"matrix": [5, 10], "x": 11.25, "y": 5},
+                {"matrix": [5, 11], "x": 12.25, "y": 5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5},
+                {"matrix": [5, 13], "x": 14.5, "y": 5},
+                {"matrix": [5, 14], "x": 15.75, "y": 5},
+                {"matrix": [5, 15], "x": 16.75, "y": 5},
+                {"matrix": [5, 16], "x": 18, "y": 5},
+                {"matrix": [5, 17], "x": 19, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ai03/duet/keymaps/coordinate/keymap.c b/keyboards/ai03/duet/keymaps/coordinate/keymap.c
new file mode 100644
index 000000000000..821c0295343f
--- /dev/null
+++ b/keyboards/ai03/duet/keymaps/coordinate/keymap.c
@@ -0,0 +1,34 @@
+// 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
new file mode 100644
index 000000000000..de8245875d11
--- /dev/null
+++ b/keyboards/ai03/duet/keymaps/coordinate/readme.md
@@ -0,0 +1,4 @@
+# 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/duet/keymaps/default/keymap.c b/keyboards/ai03/duet/keymaps/default/keymap.c
new file mode 100644
index 000000000000..29f63678a801
--- /dev/null
+++ b/keyboards/ai03/duet/keymaps/default/keymap.c
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+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
+    ),
+};
diff --git a/keyboards/ai03/duet/keymaps/default/readme.md b/keyboards/ai03/duet/keymaps/default/readme.md
new file mode 100644
index 000000000000..fdf727dc96f3
--- /dev/null
+++ b/keyboards/ai03/duet/keymaps/default/readme.md
@@ -0,0 +1,4 @@
+# The default keymap for Duet
+
+Since this is a very irregular keyboard with unique use cases, the keymap should be customized to meet one's needs and to match the requirements of the corresponding display software (if any).  
+By default, all keys send `KC_0` to simply notify the host that an arbitrary key has been pressed.  
diff --git a/keyboards/ai03/duet/readme.md b/keyboards/ai03/duet/readme.md
new file mode 100644
index 000000000000..43c3d6f7c596
--- /dev/null
+++ b/keyboards/ai03/duet/readme.md
@@ -0,0 +1,28 @@
+# Duet Switch Tester
+
+![Cover image](https://i.imgur.com/sFuHJbLh.png)
+
+A switch tester intended for event/storefront use
+
+* Keyboard Maintainer: [ai03](https://github.com/ai03-2725)
+* Hardware Supported: The [Duet PCB](https://github.com/ai03-2725/duet-switch-tester/tree/main/Duet-MainPCB), powered by the RP2040
+* Hardware Availability: [Open-source](https://github.com/ai03-2725/duet-switch-tester)
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ai03/duet:default
+
+Flashing example for this keyboard:
+
+    make ai03/duet: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 the reset button on the back of the PCB while holding the Bootmode switch
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/handwired/jscotto/scotto36/rules.mk b/keyboards/ai03/duet/rules.mk
similarity index 100%
rename from keyboards/handwired/jscotto/scotto36/rules.mk
rename to keyboards/ai03/duet/rules.mk
diff --git a/keyboards/ai03/equinox/rev0/info.json b/keyboards/ai03/equinox/rev0/info.json
index f5dd36556458..396f50c37656 100644
--- a/keyboards/ai03/equinox/rev0/info.json
+++ b/keyboards/ai03/equinox/rev0/info.json
@@ -5,6 +5,7 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "D1",
         "levels": 5,
         "breathing": true
diff --git a/keyboards/ai03/lunar_ii/rules.mk b/keyboards/ai03/lunar_ii/rules.mk
index 1448dc35c3ce..7ad594e1f9f5 100644
--- a/keyboards/ai03/lunar_ii/rules.mk
+++ b/keyboards/ai03/lunar_ii/rules.mk
@@ -12,4 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 HAPTIC_ENABLE = yes         # Enable solenoid support
-HAPTIC_DRIVER += SOLENOID
+HAPTIC_DRIVER = solenoid
diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h
index 2542b9f62f47..50001e978cc4 100644
--- a/keyboards/ai03/polaris/config.h
+++ b/keyboards/ai03/polaris/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 14
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/ai03/polaris/info.json b/keyboards/ai03/polaris/info.json
index af67191ba110..dca6df3dbad8 100644
--- a/keyboards/ai03/polaris/info.json
+++ b/keyboards/ai03/polaris/info.json
@@ -19,7 +19,23 @@
         "breathing": true
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "max_brightness": 200,
+        "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": "D2"
diff --git a/keyboards/ai03/quasar/keymaps/ai03/keymap.c b/keyboards/ai03/quasar/keymaps/ai03/keymap.c
index 4df12732bdb7..c564b8aa388f 100644
--- a/keyboards/ai03/quasar/keymaps/ai03/keymap.c
+++ b/keyboards/ai03/quasar/keymaps/ai03/keymap.c
@@ -33,19 +33,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	_______,          _______,                                     _______,                                     _______,          KC_BSPC,    KC_HOME, KC_PGDN, KC_END   
   )
 };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/ai03/soyuz/keymaps/1U/keymap.c b/keyboards/ai03/soyuz/keymaps/1U/keymap.c
index 1d6f3dfa8c13..792457cf1074 100644
--- a/keyboards/ai03/soyuz/keymaps/1U/keymap.c
+++ b/keyboards/ai03/soyuz/keymaps/1U/keymap.c
@@ -43,15 +43,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
   return true;
 }
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/ai03/vega/rules.mk b/keyboards/ai03/vega/rules.mk
index 0aeca0dd9f35..7f4f202a1b70 100644
--- a/keyboards/ai03/vega/rules.mk
+++ b/keyboards/ai03/vega/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/ai03/voyager60_alps/config.h b/keyboards/ai03/voyager60_alps/config.h
deleted file mode 100644
index a358ce601e2f..000000000000
--- a/keyboards/ai03/voyager60_alps/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2020 <t@ylor.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 RGBLED_NUM 14
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
-/*
- * 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/ai03/voyager60_alps/info.json b/keyboards/ai03/voyager60_alps/info.json
index 00a2a9f4d893..440f061432fe 100644
--- a/keyboards/ai03/voyager60_alps/info.json
+++ b/keyboards/ai03/voyager60_alps/info.json
@@ -8,6 +8,12 @@
         "pid": "0x060A",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "sleep": true
+    },
     "ws2812": {
         "pin": "D2"
     },
diff --git a/keyboards/aidansmithdotdev/fine40/rules.mk b/keyboards/aidansmithdotdev/fine40/rules.mk
index 2e3ef9fb844d..e69de29bb2d1 100644
--- a/keyboards/aidansmithdotdev/fine40/rules.mk
+++ b/keyboards/aidansmithdotdev/fine40/rules.mk
@@ -1 +0,0 @@
-OLED_DRIVER = SSD1306
diff --git a/keyboards/akb/ogrn/info.json b/keyboards/akb/ogrn/info.json
index 42efe55c2a24..780c35374735 100644
--- a/keyboards/akb/ogrn/info.json
+++ b/keyboards/akb/ogrn/info.json
@@ -30,29 +30,62 @@
         "pid": "0x4F4E",
         "vid": "0x414B"
     },
-  "community_layouts": [
-    "numpad_5x4"
-  ],
+    "community_layouts": [
+        "ortho_5x4",
+        "numpad_5x4"
+    ],
     "layouts": {
+        "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}
+            ]
+        },
         "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": [2, 0], "x": 0, "y": 2},
                 {"matrix": [2, 1], "x": 1, "y": 2},
                 {"matrix": [2, 2], "x": 2, "y": 2},
-                {"h": 2, "matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1, "h": 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], "w": 2, "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
                 {"matrix": [4, 2], "x": 2, "y": 4},
-                {"h": 2, "matrix": [3, 3], "x": 3, "y": 3}
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
             ]
         }
     }
diff --git a/keyboards/akb/ogrn/keymaps/default/keymap.c b/keyboards/akb/ogrn/keymaps/default/keymap.c
index 35a275d055f6..f3901ec7fb3b 100644
--- a/keyboards/akb/ogrn/keymaps/default/keymap.c
+++ b/keyboards/akb/ogrn/keymaps/default/keymap.c
@@ -6,7 +6,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /*
      * ┌───┬───┬───┬───┐
-     * │TG1│ / │ * │ - │
+     * │NUM│ / │ * │ - │
      * ├───┼───┼───┼───┤
      * │ 7 │ 8 │ 9 │   │
      * ├───┼───┼───┤ + │
@@ -22,21 +22,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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
+        KC_P0,            KC_PDOT, KC_PENT
     ),
 
     /*
      * ┌───┬───┬───┬───┐
-     * │TG1│ / │ * │ - │
-     * ┌───┬───┬───┐───┤
+     * │NUM│ / │ * │ - │
+     * ├───┼───┼───┼───┤
      * │Hom│ ↑ │PgU│   │
      * ├───┼───┼───┤ + │
      * │ ← │   │ → │   │
-     * ├───┼───┼───┤───┤
+     * ├───┼───┼───┼───┤
      * │End│ ↓ │PgD│   │
      * ├───┴───┼───┤Ent│
      * │Insert │Del│   │
-     * └───────┴───┘───┘
+     * └───────┴───┴───┘
      */
     [1] = LAYOUT_numpad_5x4(
         _______, _______, _______, _______,
diff --git a/keyboards/akb/ogrn/keymaps/via/keymap.c b/keyboards/akb/ogrn/keymaps/via/keymap.c
index 7aec87a623c8..f3901ec7fb3b 100644
--- a/keyboards/akb/ogrn/keymaps/via/keymap.c
+++ b/keyboards/akb/ogrn/keymaps/via/keymap.c
@@ -22,21 +22,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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
+        KC_P0,            KC_PDOT, KC_PENT
     ),
 
     /*
      * ┌───┬───┬───┬───┐
-     * │   │ / │ * │ - │
-     * ┌───┬───┬───┐───┤
+     * │NUM│ / │ * │ - │
+     * ├───┼───┼───┼───┤
      * │Hom│ ↑ │PgU│   │
      * ├───┼───┼───┤ + │
      * │ ← │   │ → │   │
-     * ├───┼───┼───┤───┤
+     * ├───┼───┼───┼───┤
      * │End│ ↓ │PgD│   │
      * ├───┴───┼───┤Ent│
      * │Insert │Del│   │
-     * └───────┴───┘───┘
+     * └───────┴───┴───┘
      */
     [1] = LAYOUT_numpad_5x4(
         _______, _______, _______, _______,
diff --git a/keyboards/akb/ogrn/matrix_diagram.md b/keyboards/akb/ogrn/matrix_diagram.md
new file mode 100644
index 000000000000..03e4f99def9e
--- /dev/null
+++ b/keyboards/akb/ogrn/matrix_diagram.md
@@ -0,0 +1,18 @@
+# Matrix Diagram for Alchemist Keyboards OGRN
+
+```
+        ┌───┬───┬───┬───┐
+        │00 │01 │02 │03 │
+┌───┐   ├───┼───┼───┼───┤   ┌───┐
+│   │   │10 │11 │12 │13 │   │   │
+│10 │   ├───┼───┼───┼───┤   │13 │ 2u Numpad Plus
+│   │   │20 │21 │22 │23 │   │   │
+├───┤   ├───┼───┼───┼───┤   ├───┤
+│   │   │30 │31 │32 │33 │   │   │
+│30 │   ├───┼───┼───┼───┤   │33 │ 2u Numpad Enter
+│   │   │40 │41 │42 │43 │   │   │
+└───┘   └───┴───┴───┴───┘   └───┘
+        ┌───────┬───────┐
+        │41     │42     │
+        └───────┴───────┘
+```
diff --git a/keyboards/akegata_denki/device_one/rules.mk b/keyboards/akegata_denki/device_one/rules.mk
index 6ac6abcf5670..26de1138e5f5 100644
--- a/keyboards/akegata_denki/device_one/rules.mk
+++ b/keyboards/akegata_denki/device_one/rules.mk
@@ -10,5 +10,3 @@ COMMAND_ENABLE = no    			# Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 NO_USB_STARTUP_CHECK = no   # Disable initialization only when usb is plugged in
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/akko/5087/5087.c b/keyboards/akko/5087/5087.c
new file mode 100644
index 000000000000..4d6cf949009e
--- /dev/null
+++ b/keyboards/akko/5087/5087.c
@@ -0,0 +1,190 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You 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"
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       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},
+
+    /*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},
+
+    /*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},
+
+    /*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},
+
+    /*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},
+
+    /*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},
+};
+#endif // RGB_MATRIX_ENABLE
+
+enum __layers { 
+	WIN_B, 
+	WIN_W, 
+	WIN_FN, 
+	MAC_B, 
+	MAC_W, 
+	MAC_FN, 
+};
+
+// clang-format on
+
+void matrix_init_kb(void) {
+    setPinOutput(LED_MAC_OS_PIN); // LDE2 MAC\WIN
+    writePinLow(LED_MAC_OS_PIN);
+    setPinOutput(LED_WIN_LOCK_PIN); // LED3 Win Lock
+    writePinLow(LED_WIN_LOCK_PIN);
+
+    matrix_init_user();
+}
+
+void housekeeping_task_kb(void){
+    writePin(LED_MAC_OS_PIN, (get_highest_layer(default_layer_state) == 3));
+    writePin(LED_WIN_LOCK_PIN, keymap_config.no_gui);
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+    switch (keycode) {
+        case DF(WIN_B):
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(WIN_B);
+            }
+            return false;
+        case DF(MAC_B):
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(MAC_B);
+                keymap_config.no_gui = 0;
+                eeconfig_update_keymap(keymap_config.raw);
+            }
+            return false;
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    } break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                    } break;
+                }
+            }
+            if (!rgb_matrix_is_enabled()) {
+                rgb_matrix_set_flags(LED_FLAG_ALL);
+                rgb_matrix_enable();
+            }
+            return false;
+        default:
+            return true;
+    }
+}
diff --git a/keyboards/akko/5087/config.h b/keyboards/akko/5087/config.h
new file mode 100644
index 000000000000..50a1f224f8b7
--- /dev/null
+++ b/keyboards/akko/5087/config.h
@@ -0,0 +1,52 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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 Indicators */
+#define LED_MAC_OS_PIN C10
+#define LED_WIN_LOCK_PIN C11
+
+/* 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
+
+/* 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
+#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
+
+/* I2C Config for LED Driver */
+#define DRIVER_COUNT 2
+#define DRIVER_ADDR_1 0b1110100
+#define DRIVER_ADDR_2 0b1110111
+#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/halconf.h b/keyboards/akko/5087/halconf.h
new file mode 100644
index 000000000000..55bfe5c97794
--- /dev/null
+++ b/keyboards/akko/5087/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have 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
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/akko/5087/info.json b/keyboards/akko/5087/info.json
new file mode 100644
index 000000000000..43bec927db19
--- /dev/null
+++ b/keyboards/akko/5087/info.json
@@ -0,0 +1,253 @@
+{
+    "keyboard_name": "5087",
+    "manufacturer": "Akko",
+    "url":"https://www.akkogear.com",
+    "maintainer": "jonylee@hfd",
+    "usb": {
+        "vid": "0xFFFE",
+        "pid": "0x000C",
+        "device_version": "1.0.4",
+        "suspend_wakeup_delay": 400,
+        "force_nkro": true
+    },
+    "processor": "WB32FQ95",
+    "bootloader": "wb32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "dynamic_keymap": {
+        "layer_count": 6
+    },
+    "matrix_pins": {
+        "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2", "B10"],
+        "rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
+    },
+    "diode_direction": "ROW2COL",
+    "indicators": {
+        "caps_lock": "A15"
+    }, 
+    "rgb_matrix": {
+        "driver": "ckled2001",
+        "max_brightness": 180,
+        "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,
+            "solid_reactive_cross": true,
+            "multisplash": true
+        },
+        "layout":[
+            { "flags": 4, "matrix": [0, 0],  "x":  0, "y": 0},
+            { "flags": 4, "matrix": [0, 1],  "x": 24, "y": 0},
+            { "flags": 4, "matrix": [0, 2],  "x": 38, "y": 0},
+            { "flags": 4, "matrix": [0, 3],  "x": 52, "y": 0},
+            { "flags": 4, "matrix": [0, 4],  "x": 66, "y": 0},
+            { "flags": 4, "matrix": [0, 5],  "x": 82, "y": 0},
+            { "flags": 4, "matrix": [0, 6],  "x": 96, "y": 0},
+            { "flags": 4, "matrix": [0, 7],  "x":110, "y": 0},
+            { "flags": 4, "matrix": [0, 8],  "x":124, "y": 0},
+            { "flags": 4, "matrix": [0, 9],  "x":140, "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":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": 12},
+            { "flags": 4, "matrix": [1, 1],  "x": 13, "y": 12},
+            { "flags": 4, "matrix": [1, 2],  "x": 26, "y": 12},
+            { "flags": 4, "matrix": [1, 3],  "x": 39, "y": 12},
+            { "flags": 4, "matrix": [1, 4],  "x": 52, "y": 12},
+            { "flags": 4, "matrix": [1, 5],  "x": 65, "y": 12},
+            { "flags": 4, "matrix": [1, 6],  "x": 79, "y": 12},
+            { "flags": 4, "matrix": [1, 7],  "x": 92, "y": 12},
+            { "flags": 4, "matrix": [1, 8],  "x":105, "y": 12},
+            { "flags": 4, "matrix": [1, 9],  "x":118, "y": 12},
+            { "flags": 4, "matrix": [1, 10], "x":131, "y": 12},
+            { "flags": 4, "matrix": [1, 11], "x":144, "y": 12},
+            { "flags": 4, "matrix": [1, 12], "x":158, "y": 12},
+            { "flags": 4, "matrix": [1, 13], "x":171, "y": 12},
+            { "flags": 4, "matrix": [1, 14], "x":184, "y": 12},
+            { "flags": 4, "matrix": [1, 15], "x":197, "y": 12},
+            { "flags": 4, "matrix": [1, 16], "x":210, "y": 12},
+
+            { "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": 38},
+            { "flags": 4, "matrix": [3, 1],  "x": 14, "y": 38},
+            { "flags": 4, "matrix": [3, 2],  "x": 28, "y": 38},
+            { "flags": 4, "matrix": [3, 3],  "x": 42, "y": 38},
+            { "flags": 4, "matrix": [3, 4],  "x": 56, "y": 38},
+            { "flags": 4, "matrix": [3, 5],  "x": 70, "y": 38},
+            { "flags": 4, "matrix": [3, 6],  "x": 84, "y": 38},
+            { "flags": 4, "matrix": [3, 7],  "x": 98, "y": 38},
+            { "flags": 4, "matrix": [3, 8],  "x":112, "y": 38},
+            { "flags": 4, "matrix": [3, 9],  "x":126, "y": 38},
+            { "flags": 4, "matrix": [3, 10], "x":140, "y": 38},
+            { "flags": 4, "matrix": [3, 11], "x":154, "y": 38},
+            { "flags": 4, "matrix": [3, 13], "x":182, "y": 38},
+
+            { "flags": 4, "matrix": [4, 0],  "x":  0, "y": 51},
+            { "flags": 4, "matrix": [4, 1],  "x": 14, "y": 51},
+            { "flags": 4, "matrix": [4, 2],  "x": 28, "y": 51},
+            { "flags": 4, "matrix": [4, 3],  "x": 42, "y": 51},
+            { "flags": 4, "matrix": [4, 4],  "x": 56, "y": 51},
+            { "flags": 4, "matrix": [4, 5],  "x": 70, "y": 51},
+            { "flags": 4, "matrix": [4, 6],  "x": 84, "y": 51},
+            { "flags": 4, "matrix": [4, 7],  "x": 98, "y": 51},
+            { "flags": 4, "matrix": [4, 8],  "x":112, "y": 51},
+            { "flags": 4, "matrix": [4, 9],  "x":126, "y": 51},
+            { "flags": 4, "matrix": [4, 10], "x":140, "y": 51},
+            { "flags": 4, "matrix": [4, 13], "x":154, "y": 51},
+            { "flags": 4, "matrix": [4, 15], "x":182, "y": 51},
+
+            { "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, 5],  "x": 70, "y": 64},
+            { "flags": 4, "matrix": [5, 9],  "x":126, "y": 64},
+            { "flags": 4, "matrix": [5, 10], "x":140, "y": 64},
+            { "flags": 4, "matrix": [5, 11], "x":154, "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}
+
+        ]
+    },
+    "community_layouts": ["tkl_ansi"],
+    "layouts": {
+        "LAYOUT_tkl_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": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0 },
+                { "label": "ScrLk", "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, 13], "x": 13, "y": 1.25, "w": 2 },
+                { "label": "Ins", "matrix": [1, 14], "x": 15.25, "y": 1.25 },
+                { "label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25 },
+                { "label": "PgUp", "matrix": [1, 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": "Del", "matrix": [2, 14], "x": 15.25, "y": 2.25 },
+                { "label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25 },
+                { "label": "PgDn", "matrix": [2, 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, 1], "x": 2.25, "y": 4.25 },
+                { "label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25 },
+                { "label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25 },
+                { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25 },
+                { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25 },
+                { "label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25 },
+                { "label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
+                { "label": "<", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
+                { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
+                { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
+                { "label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75 },
+                { "label": "Up", "matrix": [4, 15], "x": 16.25, "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 },
+                { "label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25 },
+                { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25 },
+                { "label": "Win", "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, 13], "x": 13.75, "y": 5.25, "w": 1.25 },
+                { "label": "Left", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
+                { "label": "Down", "matrix": [5, 15], "x": 16.25, "y": 5.25 },
+                { "label": "Right", "matrix": [5, 16], "x": 17.25, "y": 5.25 }
+
+            ]
+        }
+    }
+}
diff --git a/keyboards/akko/5087/keymaps/default/keymap.c b/keyboards/akko/5087/keymaps/default/keymap.c
new file mode 100644
index 000000000000..07763ccc8916
--- /dev/null
+++ b/keyboards/akko/5087/keymaps/default/keymap.c
@@ -0,0 +1,79 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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_B,
+    WIN_W,
+    WIN_FN,
+    MAC_B,
+    MAC_W,
+    MAC_FN
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [WIN_B] = LAYOUT_tkl_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_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(WIN_FN),       KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_W] = LAYOUT_tkl_ansi( /* Base */
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          KC_W,
+        _______, _______, _______,                   _______,                            _______, _______, MO(WIN_FN),       _______, KC_A,    KC_S,    KC_D),
+
+
+    [WIN_FN] = LAYOUT_tkl_ansi( /* FN */
+        _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______,_______,  _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
+        _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, _______, DF(MAC_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,          RGB_VAI,
+        _______, GU_TOGG, _______,                   _______,                            _______, _______, _______,          _______, RGB_SAD, RGB_VAD, RGB_SAI),
+
+    [MAC_B] = LAYOUT_tkl_ansi( /* Base */
+        KC_ESC,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5,   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_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, KC_RALT, MO(MAC_FN),       KC_RCTL, KC_LEFT, KC_DOWN,   KC_RGHT),
+
+    [MAC_W] = LAYOUT_tkl_ansi( /* Base */
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          KC_W,
+        _______, _______, _______,                   _______,                            _______, _______, MO(MAC_FN),       _______, KC_A,    KC_S,    KC_D),
+    [MAC_FN] = LAYOUT_tkl_ansi( /* FN */
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  _______,  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
+        _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, _______, DF(WIN_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,          RGB_VAI,
+        _______, _______, _______,                   _______,                            _______, _______, _______,          _______, RGB_SAD, RGB_VAD, RGB_SAI)
+};
+// clang-format on
diff --git a/keyboards/akko/5087/keymaps/via/keymap.c b/keyboards/akko/5087/keymaps/via/keymap.c
new file mode 100644
index 000000000000..dd59925fa908
--- /dev/null
+++ b/keyboards/akko/5087/keymaps/via/keymap.c
@@ -0,0 +1,79 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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_B,
+    WIN_W,
+    WIN_FN,
+    MAC_B,
+    MAC_W,
+    MAC_FN,
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [WIN_B] = LAYOUT_tkl_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_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(WIN_FN),       KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_W] = LAYOUT_tkl_ansi( /* Base */
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          KC_W,
+        _______, _______, _______,                   _______,                            _______, _______, MO(WIN_FN),       _______, KC_A,    KC_S,    KC_D),
+
+
+    [WIN_FN] = LAYOUT_tkl_ansi( /* FN */
+        _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______,_______,  _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
+        _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, _______, DF(MAC_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,          RGB_VAI,
+        _______, GU_TOGG, _______,                   _______,                            _______, _______, _______,          _______, RGB_SAD, RGB_VAD, RGB_SAI),
+
+    [MAC_B] = LAYOUT_tkl_ansi( /* Base */
+        KC_ESC,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5,   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_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, KC_RALT, MO(MAC_FN),       KC_RCTL, KC_LEFT, KC_DOWN,   KC_RGHT),
+
+    [MAC_W] = LAYOUT_tkl_ansi( /* Base */
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          KC_W,
+        _______, _______, _______,                   _______,                            _______, _______, MO(MAC_FN),       _______, KC_A,    KC_S,    KC_D),
+    [MAC_FN] = LAYOUT_tkl_ansi( /* FN */
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  _______,  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
+        _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, _______, DF(WIN_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,          RGB_VAI,
+        _______, _______, _______,                   _______,                            _______, _______, _______,          _______, RGB_SAD, RGB_VAD, RGB_SAI)
+};
+// clang-format on
diff --git a/keyboards/akko/5087/keymaps/via/rules.mk b/keyboards/akko/5087/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/akko/5087/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/hfdkb/keyboard_sw/k83/mcuconf.h b/keyboards/akko/5087/mcuconf.h
similarity index 100%
rename from keyboards/hfdkb/keyboard_sw/k83/mcuconf.h
rename to keyboards/akko/5087/mcuconf.h
diff --git a/keyboards/akko/5087/readme.md b/keyboards/akko/5087/readme.md
new file mode 100644
index 000000000000..1d002fbb9f35
--- /dev/null
+++ b/keyboards/akko/5087/readme.md
@@ -0,0 +1,19 @@
+# 5087
+
+A customizable 80% keyboard.
+
+* Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986)
+* Hardware Supported:Akko 5087
+* Hardware Availability: [akko](https://www.akkogear.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make akko/5087:default
+
+Flashing example for this keyboard:
+
+    make akko/5087:default:flash
+    
+**Reset Key**: Hold down the key located at *K000*, which 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).
diff --git a/keyboards/akko/5087/rules.mk b/keyboards/akko/5087/rules.mk
new file mode 100644
index 000000000000..0dc7a3314204
--- /dev/null
+++ b/keyboards/akko/5087/rules.mk
@@ -0,0 +1,3 @@
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = spi_flash
+
diff --git a/keyboards/akko/5108/info.json b/keyboards/akko/5108/info.json
index e9e99be69e3f..7049b20a648c 100644
--- a/keyboards/akko/5108/info.json
+++ b/keyboards/akko/5108/info.json
@@ -31,7 +31,7 @@
         "caps_lock": "C10"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733",
+        "driver": "is31fl3733",
         "max_brightness": 180,
         "animations": {
             "breathing": true,
diff --git a/keyboards/akko/acr87/info.json b/keyboards/akko/acr87/info.json
index bcc6b23cb003..5ff1926d0c50 100644
--- a/keyboards/akko/acr87/info.json
+++ b/keyboards/akko/acr87/info.json
@@ -27,7 +27,7 @@
     },
     "diode_direction": "ROW2COL",
     "rgb_matrix": {
-        "driver": "IS31FL3733",
+        "driver": "is31fl3733",
         "max_brightness": 180,
         "animations": {
             "breathing": true,
diff --git a/keyboards/akko/top40/info.json b/keyboards/akko/top40/info.json
index 8649ecb37596..48252e6c7769 100644
--- a/keyboards/akko/top40/info.json
+++ b/keyboards/akko/top40/info.json
@@ -27,7 +27,7 @@
     },
     "diode_direction": "ROW2COL",
     "rgb_matrix": {
-        "driver": "IS31FL3733",
+        "driver": "is31fl3733",
         "max_brightness": 180,
         "animations": {
             "breathing": true,
diff --git a/keyboards/alas/config.h b/keyboards/alas/config.h
index a4424815608e..6f81ce367b92 100644
--- a/keyboards/alas/config.h
+++ b/keyboards/alas/config.h
@@ -19,7 +19,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Ensure we jump to bootloader if the RESET keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-
-/* Indicator LEDs */
-#define LED_CAPS_LOCK_PIN B6
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/alas/info.json b/keyboards/alas/info.json
index 6c2beff27ebf..5c5e29f5956a 100755
--- a/keyboards/alas/info.json
+++ b/keyboards/alas/info.json
@@ -8,6 +8,10 @@
         "pid": "0x414C",
         "device_version": "0.0.1"
     },
+    "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"]
diff --git a/keyboards/alas/rules.mk b/keyboards/alas/rules.mk
old mode 100755
new mode 100644
index 4b25596ba2b0..916e1bf9bb75
--- a/keyboards/alas/rules.mk
+++ b/keyboards/alas/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/aleblazer/zodiark/config.h b/keyboards/aleblazer/zodiark/config.h
index 900836e4a80c..d765afd355fa 100644
--- a/keyboards/aleblazer/zodiark/config.h
+++ b/keyboards/aleblazer/zodiark/config.h
@@ -18,33 +18,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SELECT_SOFT_SERIAL_SPEED 1
 
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 68
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 34, 34 }
-#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 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
-#define RGB_MATRIX_HUE_STEP 8
-#define RGB_MATRIX_SAT_STEP 8
-#define RGB_MATRIX_VAL_STEP 8
-#define RGB_MATRIX_SPD_STEP 10
 #endif
diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json
index 0052d39844ee..c7c5b9a8a8e0 100644
--- a/keyboards/aleblazer/zodiark/info.json
+++ b/keyboards/aleblazer/zodiark/info.json
@@ -12,10 +12,29 @@
         "pin": "B5"
     },
     "rgblight": {
-        "max_brightness": 170
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 68,
+        "max_brightness": 170,
+        "split_count": [34, 34],
+        "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
+        }
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812",
+        "sat_steps": 8,
+        "val_steps": 8,
+        "speed_steps": 10
     },
     "matrix_pins": {
         "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
diff --git a/keyboards/aleblazer/zodiark/keymaps/via/config.h b/keyboards/aleblazer/zodiark/keymaps/via/config.h
index 2e8732ecc728..135f55b91915 100644
--- a/keyboards/aleblazer/zodiark/keymaps/via/config.h
+++ b/keyboards/aleblazer/zodiark/keymaps/via/config.h
@@ -20,3 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define OLED_DISPLAY_128X64
   #define OLED_TIMEOUT 400000
 #endif
+
+#ifdef RGBLIGHT_ENABLE
+  #undef RGBLIGHT_EFFECT_RGB_TEST
+  #undef RGBLIGHT_EFFECT_ALTERNATING
+#endif
diff --git a/keyboards/aleblazer/zodiark/rules.mk b/keyboards/aleblazer/zodiark/rules.mk
index 3f1afb07c1f5..8fc2f2ff256e 100644
--- a/keyboards/aleblazer/zodiark/rules.mk
+++ b/keyboards/aleblazer/zodiark/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
 ENCODER_ENABLE = yes
 SPLIT_KEYBOARD = yes
 LTO_ENABLE = yes
diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h
index b94b584df0ef..d876570c808e 100644
--- a/keyboards/alf/dc60/config.h
+++ b/keyboards/alf/dc60/config.h
@@ -17,21 +17,6 @@ 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 RGBLED_NUM 20
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* 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/alf/dc60/info.json b/keyboards/alf/dc60/info.json
index 9d304c8de9a9..906b78c10e7e 100644
--- a/keyboards/alf/dc60/info.json
+++ b/keyboards/alf/dc60/info.json
@@ -17,6 +17,23 @@
         "levels": 5,
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "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": "E6"
     },
diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h
index 639c56298b15..b5b661bef2ab 100644
--- a/keyboards/alf/x11/config.h
+++ b/keyboards/alf/x11/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 28
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/alf/x11/info.json b/keyboards/alf/x11/info.json
index bca26ecb0a11..1d1508fc11a9 100644
--- a/keyboards/alf/x11/info.json
+++ b/keyboards/alf/x11/info.json
@@ -17,6 +17,24 @@
     "pin": "B7",
     "breathing": true
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 28,
+    "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": "F7"
   },
diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h
index c982289a0be8..02460e0bedac 100644
--- a/keyboards/alf/x2/config.h
+++ b/keyboards/alf/x2/config.h
@@ -21,18 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 4
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/alf/x2/info.json b/keyboards/alf/x2/info.json
index ea54b093ce50..a7e76061f684 100644
--- a/keyboards/alf/x2/info.json
+++ b/keyboards/alf/x2/info.json
@@ -17,6 +17,23 @@
         "caps_lock": "B2",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 4,
+        "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": "E2"
     },
diff --git a/keyboards/alfredslab/swift65/hotswap/config.h b/keyboards/alfredslab/swift65/hotswap/config.h
deleted file mode 100644
index 793bb4dd1e18..000000000000
--- a/keyboards/alfredslab/swift65/hotswap/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 Steven Phillips (Spooknik)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 22
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations 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
diff --git a/keyboards/alfredslab/swift65/hotswap/info.json b/keyboards/alfredslab/swift65/hotswap/info.json
index d60bd0c85d5d..5be2a3798ceb 100644
--- a/keyboards/alfredslab/swift65/hotswap/info.json
+++ b/keyboards/alfredslab/swift65/hotswap/info.json
@@ -8,6 +8,24 @@
         "pid": "0xD4C4",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 22,
+        "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": "D2"
     },
diff --git a/keyboards/alfredslab/swift65/solder/config.h b/keyboards/alfredslab/swift65/solder/config.h
deleted file mode 100644
index 9ee0233356af..000000000000
--- a/keyboards/alfredslab/swift65/solder/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-/* Copyright 2021 Steven Phillips (Spooknik)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 14
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json
index 129b0436d937..5259316d9d51 100644
--- a/keyboards/alfredslab/swift65/solder/info.json
+++ b/keyboards/alfredslab/swift65/solder/info.json
@@ -9,7 +9,23 @@
         "device_version": "0.0.1"
     },
     "rgblight": {
-        "max_brightness": 100
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "max_brightness": 100,
+        "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": "D2"
diff --git a/keyboards/alpaca/wfeclipse/info.json b/keyboards/alpaca/wfeclipse/info.json
new file mode 100644
index 000000000000..47288bb190d3
--- /dev/null
+++ b/keyboards/alpaca/wfeclipse/info.json
@@ -0,0 +1,210 @@
+{
+    "manufacturer": "Alpaca",
+    "keyboard_name": "WFEclipse",
+    "bootloader": "stm32duino",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["C11", "C10", "A15", "A10", "A9", "A8", "C9", "C8", "C7", "C6", "B1", "B0", "C5", "C4", "A7", "A6"],
+        "rows": ["A0", "A1", "A2", "A3", "A4"]
+    },
+    "processor": "STM32F103",
+    "rgb_matrix": {
+        "animations": {
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "solid_color": true,
+            "solid_reactive_simple": true,
+            "solid_splash": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [4, 15], "x": 198, "y": 54, "flags": 1},
+            {"matrix": [4, 14], "x": 186, "y": 54, "flags": 1},
+            {"matrix": [4, 13], "x": 174, "y": 54, "flags": 1},
+            {"matrix": [4, 12], "x": 150, "y": 54, "flags": 1},
+            {"matrix": [4, 11], "x": 138, "y": 54, "flags": 1},
+            {"matrix": [4, 10], "x": 126, "y": 54, "flags": 1},
+            {"matrix": [4, 6], "x": 51, "y": 54, "flags": 1},
+            {"matrix": [4, 2], "x": 36, "y": 54, "flags": 1},
+            {"matrix": [4, 1], "x": 21, "y": 54, "flags": 1},
+            {"matrix": [4, 0], "x": 6, "y": 54, "flags": 1},
+            {"matrix": [3, 15], "x": 198, "y": 42, "flags": 1},
+            {"matrix": [3, 14], "x": 186, "y": 42, "flags": 1},
+            {"matrix": [3, 13], "x": 153, "y": 42, "flags": 1},
+            {"matrix": [3, 11], "x": 141, "y": 42, "flags": 1},
+            {"matrix": [3, 10], "x": 129, "y": 42, "flags": 1},
+            {"matrix": [3, 9], "x": 117, "y": 42, "flags": 1},
+            {"matrix": [3, 8], "x": 105, "y": 42, "flags": 1},
+            {"matrix": [3, 7], "x": 93, "y": 42, "flags": 1},
+            {"matrix": [3, 6], "x": 81, "y": 42, "flags": 1},
+            {"matrix": [3, 5], "x": 69, "y": 42, "flags": 1},
+            {"matrix": [3, 4], "x": 57, "y": 42, "flags": 1},
+            {"matrix": [3, 3], "x": 45, "y": 42, "flags": 1},
+            {"matrix": [3, 2], "x": 33, "y": 42, "flags": 1},
+            {"matrix": [3, 0], "x": 6, "y": 42, "flags": 1},
+            {"matrix": [2, 15], "x": 198, "y": 30, "flags": 1},
+            {"matrix": [2, 14], "x": 186, "y": 30, "flags": 1},
+            {"matrix": [2, 13], "x": 159, "y": 30, "flags": 1},
+            {"matrix": [2, 11], "x": 147, "y": 30, "flags": 1},
+            {"matrix": [2, 10], "x": 135, "y": 30, "flags": 1},
+            {"matrix": [2, 9], "x": 123, "y": 30, "flags": 1},
+            {"matrix": [2, 8], "x": 111, "y": 30, "flags": 1},
+            {"matrix": [2, 7], "x": 99, "y": 30, "flags": 1},
+            {"matrix": [2, 6], "x": 87, "y": 30, "flags": 1},
+            {"matrix": [2, 5], "x": 75, "y": 30, "flags": 1},
+            {"matrix": [2, 4], "x": 63, "y": 30, "flags": 1},
+            {"matrix": [2, 3], "x": 51, "y": 30, "flags": 1},
+            {"matrix": [2, 2], "x": 39, "y": 30, "flags": 1},
+            {"matrix": [2, 1], "x": 27, "y": 30, "flags": 1},
+            {"matrix": [2, 0], "x": 6, "y": 30, "flags": 1},
+            {"matrix": [1, 15], "x": 198, "y": 18, "flags": 1},
+            {"matrix": [1, 14], "x": 186, "y": 18, "flags": 1},
+            {"matrix": [1, 13], "x": 168, "y": 18, "flags": 1},
+            {"matrix": [1, 12], "x": 156, "y": 18, "flags": 1},
+            {"matrix": [1, 11], "x": 144, "y": 18, "flags": 1},
+            {"matrix": [1, 10], "x": 132, "y": 18, "flags": 1},
+            {"matrix": [1, 9], "x": 120, "y": 18, "flags": 1},
+            {"matrix": [1, 8], "x": 108, "y": 18, "flags": 1},
+            {"matrix": [1, 7], "x": 96, "y": 18, "flags": 1},
+            {"matrix": [1, 6], "x": 84, "y": 18, "flags": 1},
+            {"matrix": [1, 5], "x": 72, "y": 18, "flags": 1},
+            {"matrix": [1, 4], "x": 60, "y": 18, "flags": 1},
+            {"matrix": [1, 3], "x": 48, "y": 18, "flags": 1},
+            {"matrix": [1, 2], "x": 36, "y": 18, "flags": 1},
+            {"matrix": [1, 1], "x": 24, "y": 18, "flags": 1},
+            {"matrix": [1, 0], "x": 6, "y": 18, "flags": 1},
+            {"matrix": [0, 15], "x": 198, "y": 6, "flags": 1},
+            {"matrix": [0, 14], "x": 186, "y": 6, "flags": 1},
+            {"matrix": [0, 13], "x": 162, "y": 6, "flags": 1},
+            {"matrix": [0, 12], "x": 150, "y": 6, "flags": 1},
+            {"matrix": [0, 11], "x": 138, "y": 6, "flags": 1},
+            {"matrix": [0, 10], "x": 126, "y": 6, "flags": 1},
+            {"matrix": [0, 9], "x": 114, "y": 6, "flags": 1},
+            {"matrix": [0, 8], "x": 102, "y": 6, "flags": 1},
+            {"matrix": [0, 7], "x": 90, "y": 6, "flags": 1},
+            {"matrix": [0, 6], "x": 78, "y": 6, "flags": 1},
+            {"matrix": [0, 5], "x": 66, "y": 6, "flags": 1},
+            {"matrix": [0, 4], "x": 54, "y": 6, "flags": 1},
+            {"matrix": [0, 3], "x": 42, "y": 6, "flags": 1},
+            {"matrix": [0, 2], "x": 30, "y": 6, "flags": 1},
+            {"matrix": [0, 1], "x": 18, "y": 6, "flags": 1},
+            {"matrix": [0, 0], "x": 6, "y": 6, "flags": 1},
+            {"x": 125, "y": 1, "flags": 4},
+            {"x": 125, "y": 2, "flags": 4},
+            {"x": 125, "y": 3, "flags": 4},
+            {"x": 125, "y": 4, "flags": 4},
+            {"x": 125, "y": 5, "flags": 4},
+            {"x": 125, "y": 6, "flags": 4},
+            {"x": 125, "y": 7, "flags": 4},
+            {"x": 125, "y": 8, "flags": 4},
+            {"x": 125, "y": 9, "flags": 4},
+            {"x": 125, "y": 10, "flags": 4},
+            {"x": 125, "y": 11, "flags": 4},
+            {"x": 125, "y": 12, "flags": 4}
+        ],
+        "max_brightness": 50
+    },
+    "usb": {
+        "device_version": "1.0.4",
+        "pid": "0x0038",
+        "vid": "0x308F"
+    },
+    "ws2812": {
+        "pin": "B8"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "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": "MINS", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "EQL", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "BSPC", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "DEL", "matrix": [0, 14], "x": 15, "y": 0},
+                {"label": "INS", "matrix": [0, 15], "x": 16, "y": 0},
+                {"label": "TAB", "matrix": [1, 0], "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": "LBRC", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "RBRC", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "BSLS", "matrix": [1, 13], "x": 13.5, "y": 1},
+                {"label": "HOME", "matrix": [1, 14], "x": 15, "y": 1},
+                {"label": "PGUP", "matrix": [1, 15], "x": 16, "y": 1},
+                {"label": "CAPS", "matrix": [2, 0], "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": "SCLN", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "QUOT", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "ENT", "matrix": [2, 13], "x": 12.75, "y": 2},
+                {"label": "END", "matrix": [2, 14], "x": 15, "y": 2},
+                {"label": "PGDN", "matrix": [2, 15], "x": 16, "y": 2},
+                {"label": "LSFT", "matrix": [3, 0], "x": 0, "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": "COMM", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "DOT", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "SLSH", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "RSFT", "matrix": [3, 13], "x": 12.25, "y": 3},
+                {"label": "UP", "matrix": [3, 14], "x": 15, "y": 3},
+                {"label": "MO(1)", "matrix": [3, 15], "x": 16, "y": 3},
+                {"label": "LCTL", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "LGUI", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "LALT", "matrix": [4, 2], "x": 2.5, "y": 4},
+                {"label": "SPC", "matrix": [4, 6], "x": 3.75, "y": 4},
+                {"label": "RALT", "matrix": [4, 10], "x": 10, "y": 4},
+                {"label": "RGUI", "matrix": [4, 11], "x": 11, "y": 4},
+                {"label": "RCTL", "matrix": [4, 12], "x": 12, "y": 4},
+                {"label": "LEFT", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "DOWN", "matrix": [4, 14], "x": 15, "y": 4},
+                {"label": "RGHT", "matrix": [4, 15], "x": 16, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/alpaca/wfeclipse/keymaps/default/keymap.c b/keyboards/alpaca/wfeclipse/keymaps/default/keymap.c
new file mode 100644
index 000000000000..3849b2889c13
--- /dev/null
+++ b/keyboards/alpaca/wfeclipse/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2023 temp4gh
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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 {    
+    WIN_BASE,
+    WIN_FN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [WIN_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_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_BSLS, 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_END , 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(WIN_FN),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+  [WIN_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_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_MPRV, 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_MPLY, KC_TRNS,
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI,          KC_TRNS, KC_MNXT, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            RGB_RMOD,RGB_HUD, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/alpaca/wfeclipse/keymaps/via/keymap.c b/keyboards/alpaca/wfeclipse/keymaps/via/keymap.c
new file mode 100644
index 000000000000..ed0d448fb19b
--- /dev/null
+++ b/keyboards/alpaca/wfeclipse/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2023 temp4gh
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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 {
+    WIN_BASE,
+    WIN_FN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [WIN_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_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_BSLS, 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_END , 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(WIN_FN),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+  [WIN_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_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_MPRV, 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_MPLY, KC_TRNS,
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI,          KC_TRNS, KC_MNXT, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            RGB_RMOD,RGB_HUD, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/mino_plus/keymaps/via/rules.mk b/keyboards/alpaca/wfeclipse/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mino_plus/keymaps/via/rules.mk
rename to keyboards/alpaca/wfeclipse/keymaps/via/rules.mk
diff --git a/keyboards/alpaca/wfeclipse/readme.md b/keyboards/alpaca/wfeclipse/readme.md
new file mode 100644
index 000000000000..55570e1e7ad8
--- /dev/null
+++ b/keyboards/alpaca/wfeclipse/readme.md
@@ -0,0 +1,26 @@
+# Alpaca Keyboards whitefox-eclipse
+
+![Alpaca Keyboards whitefox-eclipse](https://i.imgur.com/VlyDBYGh.jpg)
+
+A customizable 68% keyboard.
+
+- Keyboard Maintainer: [temp4gh](https://github.com/temp4gh)
+- Hardware Supported: whitefox-eclipse PCB
+- Hardware Availability: https://kono.store/collections/all-products-list/products/whitefox-eclipse?variant=43224249991367
+
+Make example for this keyboard (after setting up your build environment):
+
+    make alpaca/wfeclipse:default
+
+Flashing example for this keyboard:
+
+    make alpaca/wfeclipse: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
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/handwired/jscotto/scottostarter/rules.mk b/keyboards/alpaca/wfeclipse/rules.mk
similarity index 100%
rename from keyboards/handwired/jscotto/scottostarter/rules.mk
rename to keyboards/alpaca/wfeclipse/rules.mk
diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h
index b4ab41d42ccc..5f360813239b 100755
--- a/keyboards/alpha/config.h
+++ b/keyboards/alpha/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 5
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/alpha/info.json b/keyboards/alpha/info.json
index 86e4dbefb309..61f7f9d437ce 100644
--- a/keyboards/alpha/info.json
+++ b/keyboards/alpha/info.json
@@ -7,6 +7,23 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 5,
+    "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": "F4"
   },
diff --git a/keyboards/alpine65/config.h b/keyboards/alpine65/config.h
index ac74e24450ea..f608132b5afd 100644
--- a/keyboards/alpine65/config.h
+++ b/keyboards/alpine65/config.h
@@ -22,19 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 68
-#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
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/alpine65/info.json b/keyboards/alpine65/info.json
index e290606d8c05..c0322f72b50f 100644
--- a/keyboards/alpine65/info.json
+++ b/keyboards/alpine65/info.json
@@ -9,7 +9,21 @@
         "device_version": "0.0.1"
     },
     "rgblight": {
-        "max_brightness": 200
+        "led_count": 68,
+        "max_brightness": 200,
+        "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": "B15"
diff --git a/keyboards/alpine65/readme.md b/keyboards/alpine65/readme.md
index 0be4396176f3..6ae9f03e6dcc 100644
--- a/keyboards/alpine65/readme.md
+++ b/keyboards/alpine65/readme.md
@@ -4,7 +4,7 @@
 
 This is the QMK firmware repository for the Alpine65, a 65% hotswap keyboard designed by Bitmap Designs and Gondolindrim.
 
-The Alpine65 has entered GB and sucessfully finalized in november 2020; there is no further way to buy an Alpine65 other than the secondhand market. The IC page for the keyboard can be found [here](https://https://geekhack.org/index.php?topic=106974).
+The Alpine65 has entered GB and sucessfully finalized in november 2020; there is no further way to buy an Alpine65 other than the secondhand market. The IC page for the keyboard can be found [here](https://geekhack.org/index.php?topic=106974).
 
 ## How to compile
 
diff --git a/keyboards/alpine65/rules.mk b/keyboards/alpine65/rules.mk
index 8e1200c9f500..747e719be4a6 100644
--- a/keyboards/alpine65/rules.mk
+++ b/keyboards/alpine65/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 ENCODER_ENABLE = no
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/amag23/config.h b/keyboards/amag23/config.h
index 34e622bfb333..cdad6969cbc8 100644
--- a/keyboards/amag23/config.h
+++ b/keyboards/amag23/config.h
@@ -15,22 +15,6 @@
  */
 #pragma once
 
-#define RGBLED_NUM 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
-
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* 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/amag23/info.json b/keyboards/amag23/info.json
index 9ee25d06d8b7..fd8aa85bbb66 100644
--- a/keyboards/amag23/info.json
+++ b/keyboards/amag23/info.json
@@ -8,6 +8,23 @@
         "pid": "0x2323",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h
index 9ec9dcbbebee..b9449c4714bf 100755
--- a/keyboards/amjkeyboard/amj40/config.h
+++ b/keyboards/amjkeyboard/amj40/config.h
@@ -22,24 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Underlight configuration
- */
-
-#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 4     // Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/amjkeyboard/amj40/info.json b/keyboards/amjkeyboard/amj40/info.json
index a3bbb13785e8..dca520375abd 100644
--- a/keyboards/amjkeyboard/amj40/info.json
+++ b/keyboards/amjkeyboard/amj40/info.json
@@ -17,6 +17,22 @@
         "pin": "B6",
         "levels": 4
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 4,
+        "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": "D3"
     },
diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h
index c94d803db5fe..b9449c4714bf 100644
--- a/keyboards/amjkeyboard/amj60/config.h
+++ b/keyboards/amjkeyboard/amj60/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 8
-#    define RGBLIGHT_HUE_STEP 10
-#    define RGBLIGHT_SAT_STEP 17
-#    define RGBLIGHT_VAL_STEP 17
-//#    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
-
 /* 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/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json
index 236db9bd0831..7c626b5a5f32 100644
--- a/keyboards/amjkeyboard/amj60/info.json
+++ b/keyboards/amjkeyboard/amj60/info.json
@@ -18,6 +18,22 @@
         "levels": 4,
         "breathing": true
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 8,
+        "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": "E2"
     },
diff --git a/keyboards/amjkeyboard/amj66/info.json b/keyboards/amjkeyboard/amj66/info.json
index a28b91d7c60c..07a170a3f6ac 100644
--- a/keyboards/amjkeyboard/amj66/info.json
+++ b/keyboards/amjkeyboard/amj66/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "D4",
         "breathing": true
     },
diff --git a/keyboards/amjkeyboard/amj84/info.json b/keyboards/amjkeyboard/amj84/info.json
index 0b4d614c6eb3..85832229a33a 100644
--- a/keyboards/amjkeyboard/amj84/info.json
+++ b/keyboards/amjkeyboard/amj84/info.json
@@ -23,6 +23,7 @@
     "layout_aliases": {
         "LAYOUT": "LAYOUT_all"
     },
+    "community_layouts": ["75_ansi", "75_iso"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -40,6 +41,7 @@
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [5, 8], "x": 14, "y": 0},
                 {"matrix": [0, 14], "x": 15, "y": 0},
 
                 {"matrix": [1, 0], "x": 0, "y": 1},
@@ -110,7 +112,98 @@
                 {"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, 11], "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}
+            ]
+        },
+        "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": [5, 8], "x": 14, "y": 0},
+                {"matrix": [0, 14], "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, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "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, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "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, 5], "x": 3.75, "y": 5, "w": 6.25},
                 {"matrix": [5, 9], "x": 10, "y": 5},
                 {"matrix": [5, 10], "x": 11, "y": 5},
                 {"matrix": [5, 11], "x": 12, "y": 5},
@@ -211,6 +304,100 @@
                 {"matrix": [5, 14], "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": [5, 8], "x": 14, "y": 0},
+                {"matrix": [0, 14], "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, 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},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"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},
+                {"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": [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, 9], "x": 10, "y": 5},
+                {"matrix": [5, 10], "x": 11, "y": 5},
+                {"matrix": [5, 11], "x": 12, "y": 5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
+            ]
+        },
         "LAYOUT_75_iso_rwkl": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c
index c6a4747a831c..1bc603a79180 100644
--- a/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c
+++ b/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c
@@ -3,51 +3,55 @@
 
 #include QMK_KEYBOARD_H
 
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
     /* Base */
     /* Keymap 0: Default Layer
-     * ,----------------------------------------------------------------.
-     * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Home    |Del|
-     * |------------------------------------------------------------|---|
-     * |`  |  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp  |PgU|
-     * |------------------------------------------------------------|---|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \ |PgD|
-     * |------------------------------------------------------------|---|
-     * |Caps  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return   |Ins|
-     * |------------------------------------------------------------|---|
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift  |Up |Fn0|
-     * |------------------------------------------------------------|---|
-     * |Ctrl|Win |Alt |       Space        |END|Alt |Ctrl|Left |Down|Rig|
-     * `----------------------------------------------------------------'
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│Hm │End│Del│
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bkspc  │PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┼───┤
+     * │Caps  │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │   │Ent │Ins│
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
+     * │Sft │   │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Up │Fn │
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
+     * │Ctrl│GUI │Alt │Space                   │Alt  │Ctrl │Lft│Dwn│Rig│
+     * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
      */
     [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_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_NO,  KC_ENT, KC_INS,
-        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_END, KC_NO,  KC_RALT,KC_RCTL,KC_LEFT,KC_DOWN,KC_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_HOME, KC_END,  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_NO,   KC_ENT,           KC_INS,
+        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
+    ),
+
     /* Keymap 1: Fn Layer
-     * ,-----------------------------------------------------------.
-     * |  `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete |
-     * |-----------------------------------------------------------|
-     * |     |   |Up |   |   |   |Cal|   |Ins|   |Psc|Slk|Pau|     |
-     * |-----------------------------------------------------------|
-     * |      |Lef|Dow|Rig|   |   |   |   |   |   |Hom|PgU|        |
-     * |-----------------------------------------------------------|
-     * |        |   |App|   |   |   |VoD|VoU|Mut|End|PgD|      |   |
-     * |-----------------------------------------------------------|
-     * |    |    |    |                        |    |    |    |    |
-     * `-----------------------------------------------------------'
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
+     * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │     │   │Up │   │   │   │Cal│   │Ins│   │PSc│SLk│Pau│     │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┼───┤
+     * │BBrtg │Lft│Dwn│Rgh│   │   │   │   │   │   │Hm │PgU│   │    │   │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
+     * │BStp│   │   │App│   │   │   │Vl-│Vl+│Mut│End│PgD│      │   │   │
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
+     * │Slp │    │    │                        │     │     │   │   │   │
+     * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
      */
     [1] = LAYOUT_all(
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_UP,  KC_TRNS,KC_TRNS,KC_TRNS,KC_CALC,KC_TRNS,KC_INS, KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,KC_TRNS,
-        BL_BRTG,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_HOME,KC_PGUP,KC_TRNS,KC_TRNS,KC_TRNS,
-        BL_STEP,KC_NO,  KC_TRNS,KC_APP, KC_TRNS,KC_TRNS,KC_TRNS,KC_VOLD,KC_VOLU,KC_MUTE,KC_END, KC_PGDN,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_SLEP,KC_TRNS,KC_TRNS,          KC_TRNS,          KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS)
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,          _______,
+        BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______,          _______,
+        BL_STEP, KC_NO,   _______, KC_APP,  _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, _______,          _______, _______,
+        KC_SLEP, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+    )
 
 };
diff --git a/keyboards/amjkeyboard/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h
index 5060c17f3f30..b16c84d50eb4 100644
--- a/keyboards/amjkeyboard/amj96/config.h
+++ b/keyboards/amjkeyboard/amj96/config.h
@@ -36,22 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#    define RGBLED_NUM 16
-//#    define RGBLIGHT_HUE_STEP 8
-//#    define RGBLIGHT_SAT_STEP 8
-//#    define RGBLIGHT_VAL_STEP 8
-//#    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
-
 /* 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/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/info.json
index 23bfedd721f9..973e6b337598 100644
--- a/keyboards/amjkeyboard/amj96/info.json
+++ b/keyboards/amjkeyboard/amj96/info.json
@@ -8,6 +8,21 @@
         "pid": "0x6074",
         "device_version": "0.0.2"
     },
+    "rgblight": {
+        "led_count": 16,
+        "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": "D3"
     },
diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h
index ecd9f99ed95e..b9449c4714bf 100644
--- a/keyboards/amjkeyboard/amjpad/config.h
+++ b/keyboards/amjkeyboard/amjpad/config.h
@@ -22,25 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Underlight configuration
- */
-
-#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
-#define RGBLIGHT_VAL_STEP 17
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/amjkeyboard/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json
index d5e1b042f40f..fbaa2499d623 100644
--- a/keyboards/amjkeyboard/amjpad/info.json
+++ b/keyboards/amjkeyboard/amjpad/info.json
@@ -17,6 +17,22 @@
     "pin": "B6",
     "levels": 4
   },
+  "rgblight": {
+    "hue_steps": 10,
+    "led_count": 8,
+    "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": "E2"
   },
diff --git a/keyboards/an_achronism/tetromino/info.json b/keyboards/an_achronism/tetromino/info.json
index 6ff31fe1f409..8087c6489c44 100644
--- a/keyboards/an_achronism/tetromino/info.json
+++ b/keyboards/an_achronism/tetromino/info.json
@@ -110,7 +110,7 @@
         "led_count": 70
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
             {"flags": 4, "matrix": [0, 1], "x": 17, "y": 0},
diff --git a/keyboards/anavi/knob1/rules.mk b/keyboards/anavi/knob1/rules.mk
index c3600290d9f1..0e5631b02b3f 100644
--- a/keyboards/anavi/knob1/rules.mk
+++ b/keyboards/anavi/knob1/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306     # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
 
 OPT_DEFS += -DHAL_USE_I2C=TRUE
diff --git a/keyboards/anavi/knobs3/rules.mk b/keyboards/anavi/knobs3/rules.mk
index c3600290d9f1..0e5631b02b3f 100644
--- a/keyboards/anavi/knobs3/rules.mk
+++ b/keyboards/anavi/knobs3/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306     # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
 
 OPT_DEFS += -DHAL_USE_I2C=TRUE
diff --git a/keyboards/anavi/macropad12/info.json b/keyboards/anavi/macropad12/info.json
index a5ed9857cad9..f0f6d6ca60ad 100644
--- a/keyboards/anavi/macropad12/info.json
+++ b/keyboards/anavi/macropad12/info.json
@@ -43,8 +43,11 @@
     "backlight": {
         "pin": "GP26"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x3"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_4x3": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/anavi/macropad12/keymaps/default/keymap.c b/keyboards/anavi/macropad12/keymaps/default/keymap.c
index 054322cb64d0..e74b20d9bad4 100644
--- a/keyboards/anavi/macropad12/keymaps/default/keymap.c
+++ b/keyboards/anavi/macropad12/keymaps/default/keymap.c
@@ -8,7 +8,7 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
+    [_BASE] = LAYOUT_ortho_4x3(
         KC_1, KC_2, KC_3,
         KC_4, KC_5, KC_6,
         KC_7, KC_8, KC_9,
diff --git a/keyboards/anavi/macropad8/config.h b/keyboards/anavi/macropad8/config.h
index cce2b5bc14f9..f7c7b4b44ca9 100644
--- a/keyboards/anavi/macropad8/config.h
+++ b/keyboards/anavi/macropad8/config.h
@@ -17,27 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLIGHT_SLEEP
-
-
-/* ws2812B RGB LED */
-#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 RGBLED_NUM 4
-#    define RGBLIGHT_HUE_STEP 10
-#    define RGBLIGHT_SAT_STEP 17
-#    define RGBLIGHT_VAL_STEP 17
-#endif
-
 #ifdef OLED_ENABLE
 #   define OLED_DISPLAY_128X64
 #   define OLED_TIMEOUT 60000
diff --git a/keyboards/anavi/macropad8/info.json b/keyboards/anavi/macropad8/info.json
index 1fa276d94e60..63f295069d40 100644
--- a/keyboards/anavi/macropad8/info.json
+++ b/keyboards/anavi/macropad8/info.json
@@ -9,9 +9,27 @@
       "device_version": "0.0.1"
   },
   "backlight": {
+    "driver": "timer",
     "pin": "D7",
     "breathing": 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": "F4"
   },
diff --git a/keyboards/anavi/macropad8/rules.mk b/keyboards/anavi/macropad8/rules.mk
index f5e38fc8cbcc..63d200481c72 100644
--- a/keyboards/anavi/macropad8/rules.mk
+++ b/keyboards/anavi/macropad8/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306     # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
diff --git a/keyboards/ano/config.h b/keyboards/ano/config.h
index 296abfa02e63..fff04f05b3cf 100644
--- a/keyboards/ano/config.h
+++ b/keyboards/ano/config.h
@@ -16,8 +16,6 @@
  
  #pragma once
 
-#define TAP_CODE_DELAY 10
-
 /* 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/ano/info.json b/keyboards/ano/info.json
index 146e0cad7fc8..ce88965500b6 100644
--- a/keyboards/ano/info.json
+++ b/keyboards/ano/info.json
@@ -18,6 +18,9 @@
             {"pin_a": "B12", "pin_b": "A14", "resolution": 2}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h
index a30a446491a2..66790ac3d392 100644
--- a/keyboards/aos/tkl/config.h
+++ b/keyboards/aos/tkl/config.h
@@ -20,18 +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 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 88
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/aos/tkl/info.json b/keyboards/aos/tkl/info.json
index 9b4f70a7ef44..165344004bd7 100644
--- a/keyboards/aos/tkl/info.json
+++ b/keyboards/aos/tkl/info.json
@@ -11,7 +11,22 @@
         "pin": "E6"
     },
     "rgblight": {
-        "max_brightness": 50
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 88,
+        "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
+        }
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7", "B6", "B5", "D7", "B4", "D6", "F0", "D1", "C6", "D4"],
diff --git a/keyboards/aplyard/aplx6/rev2/config.h b/keyboards/aplyard/aplx6/rev2/config.h
deleted file mode 100644
index 2724ccf11718..000000000000
--- a/keyboards/aplyard/aplx6/rev2/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2020 April Aplyard <alex.fragiou@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 TAP_CODE_DELAY 50
diff --git a/keyboards/aplyard/aplx6/rev2/info.json b/keyboards/aplyard/aplx6/rev2/info.json
index 2dc54180eb5c..06e0296b684a 100644
--- a/keyboards/aplyard/aplx6/rev2/info.json
+++ b/keyboards/aplyard/aplx6/rev2/info.json
@@ -13,6 +13,9 @@
             {"pin_a": "F5", "pin_b": "F4"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 50
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/aplyard/aplx6/rev2/rules.mk b/keyboards/aplyard/aplx6/rev2/rules.mk
index 90decf0341c7..bb653a97f2b4 100644
--- a/keyboards/aplyard/aplx6/rev2/rules.mk
+++ b/keyboards/aplyard/aplx6/rev2/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes        # Unicode
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable Support for Oled Display
 ENCODER_ENABLE = yes        # Enable Support for Encoder
diff --git a/keyboards/arabica37/keymaps/default/rules.mk b/keyboards/arabica37/keymaps/default/rules.mk
index d34d066ded93..dd68e9d3b090 100644
--- a/keyboards/arabica37/keymaps/default/rules.mk
+++ b/keyboards/arabica37/keymaps/default/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/arabica37/rev1/config.h b/keyboards/arabica37/rev1/config.h
deleted file mode 100644
index 07d567be6540..000000000000
--- a/keyboards/arabica37/rev1/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-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 RGBLED_NUM 50    // Number of LEDs
-#define RGBLED_SPLIT {25, 25}
-/*
- * 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/arabica37/rev1/info.json b/keyboards/arabica37/rev1/info.json
index a543a83fd9ad..14d0c01cb9e3 100644
--- a/keyboards/arabica37/rev1/info.json
+++ b/keyboards/arabica37/rev1/info.json
@@ -16,6 +16,10 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "led_count": 50,
+        "split_count": [25, 25]
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/ares/config.h b/keyboards/ares/config.h
deleted file mode 100644
index ddc21dae3085..000000000000
--- a/keyboards/ares/config.h
+++ /dev/null
@@ -1,32 +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
-
-
-#define RGBLED_NUM 16
-
-#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/ares/info.json b/keyboards/ares/info.json
index 81646cb00c3f..dceb80da0435 100644
--- a/keyboards/ares/info.json
+++ b/keyboards/ares/info.json
@@ -22,6 +22,21 @@
     "bootmagic": {
         "matrix": [4, 0]
     },
+    "rgblight": {
+        "led_count": 16,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk b/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk
index 1af84436ed6b..76e55c05f483 100644
--- a/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk
@@ -1,3 +1,2 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
diff --git a/keyboards/artemis/paragon/hotswap/info.json b/keyboards/artemis/paragon/hotswap/info.json
index d70625c1d6c7..0882579dec13 100644
--- a/keyboards/artemis/paragon/hotswap/info.json
+++ b/keyboards/artemis/paragon/hotswap/info.json
@@ -3,6 +3,11 @@
         "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "E6", "B0", "B3", "B6", "B5", "B4", "D7", "D4", "D6"],
         "rows": ["D2", "D1", "D0", "B2", "B1", "C6"]
     },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "D3", "pin_b": "D5", "resolution": 2 }
+        ]
+    },
     "layouts": {
         "LAYOUT_ansi_rwkl": {
             "layout": [
diff --git a/keyboards/artemis/paragon/info.json b/keyboards/artemis/paragon/info.json
index b18b3b28db2c..63fefe8c55cf 100644
--- a/keyboards/artemis/paragon/info.json
+++ b/keyboards/artemis/paragon/info.json
@@ -18,11 +18,6 @@
     },
     "processor": "atmega32u4",
     "url": "",
-    "encoder": {
-        "rotary": [
-            { "pin_a": "D3", "pin_b": "D5", "resolution": 2 }
-        ]
-    },
     "usb": {
         "device_version": "1.0.0",
         "pid": "0x3449",
diff --git a/keyboards/artemis/paragon/soldered/info.json b/keyboards/artemis/paragon/soldered/info.json
index b531b22f807b..169acb4fb4da 100644
--- a/keyboards/artemis/paragon/soldered/info.json
+++ b/keyboards/artemis/paragon/soldered/info.json
@@ -3,6 +3,11 @@
         "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B0", "B1", "B3", "D0", "D1", "D2", "D3", "D7", "D5"],
         "rows": ["B2", "C7", "C6", "B6", "B5", "B4"]
     },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "D4", "pin_b": "D6", "resolution": 2 }
+        ]
+    },
     "layouts": {
         "LAYOUT_ansi_rwkl": {
             "layout": [
diff --git a/keyboards/ash1800/ash1800.c b/keyboards/ash1800/ash1800.c
deleted file mode 100644
index 520b1503aca7..000000000000
--- a/keyboards/ash1800/ash1800.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 angelbirth
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You 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"
-
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(NUM_LOCK_LED_PIN, !led_state.num_lock);
-        writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock);
-        writePin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock);
-    }
-    return true;
-}
\ No newline at end of file
diff --git a/keyboards/ash1800/config.h b/keyboards/ash1800/config.h
index 2f259d40f67b..75e72d0e22a5 100644
--- a/keyboards/ash1800/config.h
+++ b/keyboards/ash1800/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define NUM_LOCK_LED_PIN E6
-#define CAPS_LOCK_LED_PIN F0
-#define SCROLL_LOCK_LED_PIN F7
-
 /* 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/ash1800/info.json b/keyboards/ash1800/info.json
index e028e09135e1..658e76962d8d 100644
--- a/keyboards/ash1800/info.json
+++ b/keyboards/ash1800/info.json
@@ -7,6 +7,12 @@
         "pid": "0x1800",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "F0",
+        "num_lock": "E6",
+        "scroll_lock": "F7",
+        "on_state": 0
+    },
     "matrix_pins": {
         "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"],
         "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"]
diff --git a/keyboards/ash_xiix/ash_xiix.c b/keyboards/ash_xiix/ash_xiix.c
deleted file mode 100644
index 64be362f93af..000000000000
--- a/keyboards/ash_xiix/ash_xiix.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 sh_xguitar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You 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"
-
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(NUM_LOCK_LED_PIN, led_state.num_lock);
-        writePin(CAPS_LOCK_LED_PIN, led_state.caps_lock);
-        writePin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/ash_xiix/config.h b/keyboards/ash_xiix/config.h
index 8f81c450eb55..08dd2458c880 100644
--- a/keyboards/ash_xiix/config.h
+++ b/keyboards/ash_xiix/config.h
@@ -14,10 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define NUM_LOCK_LED_PIN E6
-#define CAPS_LOCK_LED_PIN F0
-#define SCROLL_LOCK_LED_PIN F7
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/ash_xiix/info.json b/keyboards/ash_xiix/info.json
index 69155f55c10d..d9f996403541 100644
--- a/keyboards/ash_xiix/info.json
+++ b/keyboards/ash_xiix/info.json
@@ -8,6 +8,12 @@
         "pid": "0x14BC",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "F0",
+        "num_lock": "E6",
+        "scroll_lock": "F7",
+        "on_state": 0
+    },
     "matrix_pins": {
         "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"],
         "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"]
diff --git a/keyboards/at_at/660m/rules.mk b/keyboards/at_at/660m/rules.mk
index 0495864be4ce..e984f8dc96e1 100644
--- a/keyboards/at_at/660m/rules.mk
+++ b/keyboards/at_at/660m/rules.mk
@@ -12,5 +12,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 NO_USB_STARTUP_CHECK = yes # Workaround for issue 6369
 
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h
index f30036291724..28a4e88893b9 100644
--- a/keyboards/atlantis/ak81_ve/config.h
+++ b/keyboards/atlantis/ak81_ve/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-#define ENCODERS_CCW_KEY { { 4, 5 } } // Note:  array is { col, row )
-#define ENCODERS_CW_KEY  { { 3, 5 } } // Note:  array is { col, row )
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/atlantis/ak81_ve/info.json b/keyboards/atlantis/ak81_ve/info.json
index 434e10c81f8f..1a2d1eebe1ef 100644
--- a/keyboards/atlantis/ak81_ve/info.json
+++ b/keyboards/atlantis/ak81_ve/info.json
@@ -9,7 +9,7 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "B7", "D3", "D2", "D1", "D0", "B3"],
diff --git a/keyboards/atlantis/ak81_ve/keymaps/via/keymap.c b/keyboards/atlantis/ak81_ve/keymaps/via/keymap.c
index 48ffe1be639f..08001a6f9981 100644
--- a/keyboards/atlantis/ak81_ve/keymaps/via/keymap.c
+++ b/keyboards/atlantis/ak81_ve/keymaps/via/keymap.c
@@ -16,54 +16,47 @@
 
 #include QMK_KEYBOARD_H
 
-#define LAYOUT_via( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008,       K010, K011, K012, K013, K014, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413, K414, \
-	K500, K501, K502, K503, K504,       K506,                   K510, K511, K512, K513, K514  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  KC_NO, K010,  K011,  K012,  K013,  K014 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414 }, \
-	{ K500,  K501,  K502,  K503,  K504, KC_NO, K506,  KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  K513,  K514 } \
-}
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT_via(
-		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_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_VOLU, KC_VOLD, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
-
-	[1] = LAYOUT_via(
-		KC_SYSTEM_SLEEP, 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, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, 
-		_______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, RGB_VAI, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, 
-		_______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, _______, _______, _______, _______, RGB_HUI, RGB_SPD, 
-		_______, _______, _______, RGB_MOD, RGB_RMOD, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI),
-
-	[2] = LAYOUT_via(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
-
-	[3] = LAYOUT_via(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
-
-};
\ No newline at end of file
+	[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_RGHT),
+
+	[1] = LAYOUT(
+		KC_SYSTEM_SLEEP, 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,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI,
+		_______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, RGB_VAI,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD,
+		_______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, _______, _______, _______, _______, RGB_HUI, RGB_SPD,
+		_______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI),
+
+	[2] = LAYOUT(
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+	[3] = LAYOUT(
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______)
+
+};
+
+#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(RGB_RMOD, RGB_MOD) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/atlantis/ak81_ve/keymaps/via/rules.mk b/keyboards/atlantis/ak81_ve/keymaps/via/rules.mk
index f74ca2c2447c..f1adcab005e8 100644
--- a/keyboards/atlantis/ak81_ve/keymaps/via/rules.mk
+++ b/keyboards/atlantis/ak81_ve/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
-
-SRC += encoder_actions.c
\ No newline at end of file
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/atlantis/encoder_actions.c b/keyboards/atlantis/encoder_actions.c
deleted file mode 100644
index 126b665a8e63..000000000000
--- a/keyboards/atlantis/encoder_actions.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- * Copyright 2021 drashna jael're (@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 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 "encoder_actions.h"
-
-#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
-static uint8_t  encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS]    = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS]   = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
-
-void matrix_scan_kb(void) {
-    encoder_action_unregister();
-    matrix_scan_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    encoder_action_register(index, clockwise);
-    // don't return user actions, because they are in the keymap
-    // encoder_update_user(index, clockwise);
-    return true;
-};
-
-#endif
diff --git a/keyboards/atlantis/encoder_actions.h b/keyboards/atlantis/encoder_actions.h
deleted file mode 100644
index 1a7fb72014de..000000000000
--- a/keyboards/atlantis/encoder_actions.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can 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 "quantum.h"
-
-void encoder_action_unregister(void);
-
-void encoder_action_register(uint8_t index, bool clockwise);
diff --git a/keyboards/atlantis/ps17/info.json b/keyboards/atlantis/ps17/info.json
index 1b7ffa778557..5a85dec5b45d 100644
--- a/keyboards/atlantis/ps17/info.json
+++ b/keyboards/atlantis/ps17/info.json
@@ -64,7 +64,7 @@
         }
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "center_point": [126, 126],
         "layout": [
             {"flags": 4, "matrix": [1, 0], "x": 74, "y": 165},
diff --git a/keyboards/atreus/f103/rules.mk b/keyboards/atreus/f103/rules.mk
index 9755a4a3c265..22634018d2f0 100644
--- a/keyboards/atreus/f103/rules.mk
+++ b/keyboards/atreus/f103/rules.mk
@@ -1,4 +1,2 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
 BOOTMAGIC_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/atreus/feather/info.json b/keyboards/atreus/feather/info.json
index 1f70534b7f55..b0d7d5544339 100644
--- a/keyboards/atreus/feather/info.json
+++ b/keyboards/atreus/feather/info.json
@@ -5,5 +5,8 @@
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    }
 }
diff --git a/keyboards/atreus/feather/rules.mk b/keyboards/atreus/feather/rules.mk
index 5e7d24b055bf..c93cad908072 100644
--- a/keyboards/atreus/feather/rules.mk
+++ b/keyboards/atreus/feather/rules.mk
@@ -5,5 +5,4 @@ F_CPU = 8000000
 #   change yes to no to disable
 #
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
 CONSOLE_ENABLE = no
diff --git a/keyboards/atreus/keymaps/ridingqwerty/keymap.c b/keyboards/atreus/keymaps/ridingqwerty/keymap.c
index 1eeb17fd1751..9b0826402ec8 100644
--- a/keyboards/atreus/keymaps/ridingqwerty/keymap.c
+++ b/keyboards/atreus/keymaps/ridingqwerty/keymap.c
@@ -46,7 +46,7 @@
   { K75, K74, K73, K72, K71, K70   }  \
 }
 
-//#define ALPHA XP(UCM_LDEL, UCM_UDEL)
+//#define ALPHA UP(UCM_LDEL, UCM_UDEL)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_atreus_wrapper( /* Qwerty */
diff --git a/keyboards/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h
index 2542b9f62f47..50001e978cc4 100644
--- a/keyboards/atxkb/1894/config.h
+++ b/keyboards/atxkb/1894/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 14
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/atxkb/1894/info.json b/keyboards/atxkb/1894/info.json
index 1f101bd9dedb..aaa6d266436e 100644
--- a/keyboards/atxkb/1894/info.json
+++ b/keyboards/atxkb/1894/info.json
@@ -18,6 +18,24 @@
         "levels": 5,
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "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": "D2"
     },
diff --git a/keyboards/aurora65/config.h b/keyboards/aurora65/config.h
index fad29eeec2c8..ec0853212c93 100644
--- a/keyboards/aurora65/config.h
+++ b/keyboards/aurora65/config.h
@@ -25,18 +25,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM5
 #define WS2812_DMA_CHANNEL 5
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
-
-#define RGBLED_NUM 36
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/aurora65/info.json b/keyboards/aurora65/info.json
index fd03acb5bdce..9311e0f80863 100644
--- a/keyboards/aurora65/info.json
+++ b/keyboards/aurora65/info.json
@@ -8,6 +8,23 @@
         "pid": "0x4136",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 36,
+        "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": "pwm"
diff --git a/keyboards/aurora65/rules.mk b/keyboards/aurora65/rules.mk
index 000ee78e21a2..cc9d7bb3f537 100644
--- a/keyboards/aurora65/rules.mk
+++ b/keyboards/aurora65/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/automata02/alisaie/info.json b/keyboards/automata02/alisaie/info.json
index 6e4c007e00a2..9458843114b8 100644
--- a/keyboards/automata02/alisaie/info.json
+++ b/keyboards/automata02/alisaie/info.json
@@ -36,6 +36,7 @@
                 {"label": "-", "matrix": [0, 11], "x": 12.5, "y": 0},
                 {"label": "=", "matrix": [0, 12], "x": 13.5, "y": 0},
                 {"label": "\\", "matrix": [0, 13], "x": 14.5, "y": 0},
+                {"label": "`", "matrix": [4, 11], "x": 15.5, "y": 0},
 
                 {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
@@ -87,7 +88,6 @@
                 {"label": "Space", "matrix": [4, 3], "x": 4.75, "y": 4, "w": 2.75},
                 {"label": "Space", "matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
                 {"label": "GUI", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
-                {"label": "`", "matrix": [4, 11], "x": 15.5, "y": 0},
                 {"label": "Alt", "matrix": [4, 12], "x": 14, "y": 4},
                 {"label": "Ctrl", "matrix": [4, 13], "x": 15, "y": 4, "w": 1.5}
             ]
diff --git a/keyboards/automata02/alisaie/keymaps/default/keymap.c b/keyboards/automata02/alisaie/keymaps/default/keymap.c
index 4b88bd30b5bc..00bd681aabdd 100644
--- a/keyboards/automata02/alisaie/keymaps/default/keymap.c
+++ b/keyboards/automata02/alisaie/keymaps/default/keymap.c
@@ -19,17 +19,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 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_CAPS, KC_A,    KC_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_LGUI, KC_SPC,  KC_SPC,  KC_RGUI, KC_GRV,                             KC_RALT, KC_RCTL        
+        KC_ESC,  KC_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_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_RGUI,                                     KC_RALT, KC_RCTL
     ),
     [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_PGUP, _______, _______, _______, _______, _______, KC_UP,   _______, KC_MPRV, KC_UP,   KC_MNXT,          _______,
-        	_______, KC_HOME, KC_PGDN, KC_END,  _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, KC_LEFT, KC_RGHT,                   _______,
-        	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN,          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_DEL,  _______,
+        _______, _______, KC_PGUP, _______, _______, _______,          _______, _______, KC_UP,   _______, KC_MPRV, KC_UP,   KC_MNXT, _______,
+        _______, KC_HOME, KC_PGDN, KC_END,  _______, KC_VOLD,          KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, KC_LEFT, KC_RGHT,          _______,
+        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, KC_DOWN, KC_PSCR, _______,
+        _______, _______,                   _______, _______,          _______, _______,                                     _______, _______
     )
 };
diff --git a/keyboards/automata02/alisaie/keymaps/via/keymap.c b/keyboards/automata02/alisaie/keymaps/via/keymap.c
index eee1a8dd387c..3ee2c863e92f 100644
--- a/keyboards/automata02/alisaie/keymaps/via/keymap.c
+++ b/keyboards/automata02/alisaie/keymaps/via/keymap.c
@@ -19,17 +19,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 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_CAPS, KC_A,    KC_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_LGUI, KC_SPC,  KC_SPC,  KC_RGUI, KC_GRV,                             KC_RALT, KC_RCTL        
+        KC_ESC,  KC_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_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_RGUI,                                     KC_RALT, KC_RCTL
     ),
     [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_PGUP, _______, _______, _______, _______, _______, KC_UP,   _______, KC_MPRV, KC_UP,   KC_MNXT,          _______,
-        	_______, KC_HOME, KC_PGDN, KC_END,  _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, KC_LEFT, KC_RGHT,                   _______,
-        	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN,          KC_PSCR, _______,
-        	_______, _______,                   _______, _______, _______, _______, _______,                            _______, _______
+        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_PGUP, _______, _______, _______,          _______, _______, KC_UP,   _______, KC_MPRV, KC_UP,   KC_MNXT, _______,
+        _______, KC_HOME, KC_PGDN, KC_END,  _______, KC_VOLD,          KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, KC_LEFT, KC_RGHT,          _______,
+        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, KC_DOWN, KC_PSCR, _______,
+        _______, _______,                   _______, _______,          _______, _______,                                     _______, _______
     )
 };
diff --git a/keyboards/avalanche/v2/config.h b/keyboards/avalanche/v2/config.h
deleted file mode 100644
index 5d7c1c2047bc..000000000000
--- a/keyboards/avalanche/v2/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define RGBLED_NUM 12
-#define RGBLED_SPLIT { 6, 6 }
-#define RGBLIGHT_SPLIT
diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json
index 92f02721de41..62c284a84542 100644
--- a/keyboards/avalanche/v2/info.json
+++ b/keyboards/avalanche/v2/info.json
@@ -18,6 +18,10 @@
             {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
         ]
     },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6]
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/avalanche/v3/config.h b/keyboards/avalanche/v3/config.h
deleted file mode 100644
index c6042255e3d4..000000000000
--- a/keyboards/avalanche/v3/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2022 Vitaly Volkov (@vlkv)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define RGBLED_NUM 12
-#define RGBLED_SPLIT { 7, 7 }
-#define RGBLIGHT_SPLIT
diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json
index ed507485f5d1..8cf8187df7f4 100644
--- a/keyboards/avalanche/v3/info.json
+++ b/keyboards/avalanche/v3/info.json
@@ -21,6 +21,10 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [7, 7]
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/avalanche/v4/config.h b/keyboards/avalanche/v4/config.h
index 51b7cb7537fb..b88dc205359d 100644
--- a/keyboards/avalanche/v4/config.h
+++ b/keyboards/avalanche/v4/config.h
@@ -3,50 +3,8 @@
 
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-#    define RGBLED_NUM 64
-#    define RGBLED_SPLIT { 32, 32 }
-#    define RGBLIGHT_SPLIT
-#    define RGBLIGHT_HUE_STEP  10    
-#    define RGBLIGHT_SAT_STEP  17    
-#    define RGBLIGHT_VAL_STEP  17    
-
 #    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL+2
 
-#    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
-
-
-// RGB LED Conversion macro from physical array to electric array. This results in better looking animated effects.    
-#    define LED_LAYOUT( \
-      /* LED matrix */ \
-      L01, L02, L03, L04, L05, L06,                        L011, L012, L013, L014, L015, L016, \
-      L11, L12, L13, L14, L15, L16,                        L111, L112, L113, L114, L115, L116, \
- L20, L21, L22, L23, L24, L25, L26,                        L211, L212, L213, L214, L215, L216, L217, \
-      L31, L32, L33, L34, L35, L36, L37, L38,   L39, L310, L311, L312, L313, L314, L315, L316, \
-                     L44, L45, L46, L47, L48,   L49, L410, L411, L412, L413 )\
-  { \
-    /* left half - electrical wiring order */ \
-    L47,L48,L38,L37,L36,L26,L16,L06,L05,L15,L25,L35,L46,L45,L34,L24,L14,L04,L03,L13,L23,L33,L44,L32,L22,L12,L02,L01,L11,L21,L31,L20, \
-    /* right half - electrical wiring order */ \
-    L410,L49,L39,L310,L311,L211,L111,L011,L012,L112,L212,L312,L411,L412,L313,L213,L113,L013,L014,L114,L214,L314,L413,L315,L215,L115,L015,L016,L116,L216,L316,L217 \
-  }
-#    define RGBLIGHT_LED_MAP LED_LAYOUT( \
-    /* animation order. */ \
-      4,  8, 12, 17, 22, 27,                   40, 45, 50, 54, 58, 62, \
-      3,  7, 11, 16, 21, 26,                   39, 44, 49, 53, 57, 61, \
-  0,  2,  6, 10, 15, 20, 25,                   38, 43, 48, 52, 56, 60, 63, \
-      1,  5,  9, 14, 19, 24, 29, 31,   33, 35, 37, 42, 47, 51, 55, 59, \
-                 13, 18, 23, 28, 30,   32, 34, 36, 41, 46 )
-#endif
-
 #ifdef OLED_ENABLE
 #    define OLED_DISPLAY_128X64
 #    define OLED_TIMEOUT 30000
diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json
index 235bb122201e..7bb047466b50 100644
--- a/keyboards/avalanche/v4/info.json
+++ b/keyboards/avalanche/v4/info.json
@@ -25,7 +25,22 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 100
+        "hue_steps": 10,
+        "led_count": 64,
+        "max_brightness": 100,
+        "led_map": [28, 30, 31, 29, 24, 25, 26, 27, 22, 21, 20, 19, 23, 18, 14, 15, 16, 17, 12, 11, 10, 9, 13, 5, 6, 7, 8, 4, 3, 2, 1, 0, 34, 32, 33, 35, 37, 38, 39, 40, 45, 44, 43, 42, 36, 41, 47, 48, 49, 50, 54, 53, 52, 51, 46, 55, 56, 57, 58, 62, 61, 60, 59, 63],
+        "split_count": [32, 32],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/avalanche/v4/rules.mk b/keyboards/avalanche/v4/rules.mk
index da4886f7d77b..513c25d04d91 100644
--- a/keyboards/avalanche/v4/rules.mk
+++ b/keyboards/avalanche/v4/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 SPLIT_KEYBOARD = yes
diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
index 7b3a52862948..35ca2e0fc3cc 100644
--- a/keyboards/aves60/config.h
+++ b/keyboards/aves60/config.h
@@ -3,23 +3,6 @@
 
 #pragma once
 
-#define RGBLED_NUM 9
-//#    define RGBLIGHT_HUE_STEP 8
-//#    define RGBLIGHT_SAT_STEP 8
-//#    define RGBLIGHT_VAL_STEP 8
-//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== or choose animations ==*/
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
 /* 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/aves60/info.json b/keyboards/aves60/info.json
index eaa74b4fbb63..111fcab3bdc2 100644
--- a/keyboards/aves60/info.json
+++ b/keyboards/aves60/info.json
@@ -16,6 +16,21 @@
     "bootmagic": {
         "matrix": [4, 6]
     },
+    "rgblight": {
+        "led_count": 9,
+        "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": "D5"
     },
diff --git a/keyboards/aves65/config.h b/keyboards/aves65/config.h
index 05d7e7fb166f..95af0f8e733b 100644
--- a/keyboards/aves65/config.h
+++ b/keyboards/aves65/config.h
@@ -21,17 +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 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 9
diff --git a/keyboards/aves65/info.json b/keyboards/aves65/info.json
index 38e619a0aa63..44299f80c50c 100644
--- a/keyboards/aves65/info.json
+++ b/keyboards/aves65/info.json
@@ -17,6 +17,21 @@
         "esc_input": "D4",
         "esc_output": "D0"
     },
+    "rgblight": {
+        "led_count": 9,
+        "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": "B0"
     },
diff --git a/keyboards/axolstudio/yeti/hotswap/info.json b/keyboards/axolstudio/yeti/hotswap/info.json
index 732e9075cded..9b782c88c908 100644
--- a/keyboards/axolstudio/yeti/hotswap/info.json
+++ b/keyboards/axolstudio/yeti/hotswap/info.json
@@ -9,7 +9,7 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "IS31FL3733"
+    "driver": "is31fl3733"
   },
   "matrix_pins": {
     "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
diff --git a/keyboards/baion_808/rules.mk b/keyboards/baion_808/rules.mk
old mode 100755
new mode 100644
index 5d2ff6287791..11c4a00e5a5f
--- a/keyboards/baion_808/rules.mk
+++ b/keyboards/baion_808/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/bajjak/config.h b/keyboards/bajjak/config.h
index 614d7a781365..72d296bca4b9 100644
--- a/keyboards/bajjak/config.h
+++ b/keyboards/bajjak/config.h
@@ -43,10 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY 0
 
-#define TAPPING_TOGGLE  1
-
-#define TAPPING_TERM    200
-
 /* 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/bajjak/info.json b/keyboards/bajjak/info.json
index a280cb9ed8d5..bf090bb7d63c 100644
--- a/keyboards/bajjak/info.json
+++ b/keyboards/bajjak/info.json
@@ -10,6 +10,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "halfkay",
+    "tapping": {
+        "toggle": 1
+    },
+    "build": {
+        "debounce_type": "sym_eager_pr"
+    },
     "layouts": {
         "LAYOUT_6x7": {
             "layout": [
diff --git a/keyboards/bajjak/rules.mk b/keyboards/bajjak/rules.mk
index 9a93aea27fe4..13148ecb0489 100644
--- a/keyboards/bajjak/rules.mk
+++ b/keyboards/bajjak/rules.mk
@@ -24,8 +24,6 @@ SWAP_HANDS_ENABLE = yes     # Allow swapping hands of keyboard
 BACKLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
 
-DEBOUNCE_TYPE = sym_eager_pr
-
 # project specific files
 SRC += matrix.c 
 QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h
index 91a4eb0ae800..df0ebb0fdc43 100644
--- a/keyboards/bandominedoni/config.h
+++ b/keyboards/bandominedoni/config.h
@@ -137,5 +137,3 @@
 // Initial velocity value (avoid using 127 since it is used as a special number in some sound sources.)
 #   define MIDI_INITIAL_VELOCITY 117
 #endif  //  MIDI_ENABLE
-
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/bandominedoni/info.json b/keyboards/bandominedoni/info.json
index c4dfe46d74b4..aa5b2f9a2f2f 100644
--- a/keyboards/bandominedoni/info.json
+++ b/keyboards/bandominedoni/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D1", "E6", "F7", "B1", "B3", "B2", "D0"],
@@ -26,6 +26,9 @@
             }
         }
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/barleycorn_smd/config.h b/keyboards/barleycorn_smd/config.h
index 167c3b5c87c4..06c67798c010 100644
--- a/keyboards/barleycorn_smd/config.h
+++ b/keyboards/barleycorn_smd/config.h
@@ -38,19 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, D5, D5, D5, D5, D5, D5, D5, D5, D5, D5 }
 #define PORT_EXPANDER_ADDRESS 0x20
 
-#define RGBLED_NUM 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_LED_MAP { 0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 5 }
-
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/barleycorn_smd/info.json b/keyboards/barleycorn_smd/info.json
index 0f759e5f4d53..b4aef08b62da 100644
--- a/keyboards/barleycorn_smd/info.json
+++ b/keyboards/barleycorn_smd/info.json
@@ -12,6 +12,22 @@
         "caps_lock": "B2",
         "num_lock": "B3"
     },
+    "rgblight": {
+        "led_count": 15,
+        "led_map": [0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 5],
+        "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": "E6"
     },
diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h
index 996e538ae3b3..8a0c1946c16f 100644
--- a/keyboards/basekeys/slice/rev1_rgb/config.h
+++ b/keyboards/basekeys/slice/rev1_rgb/config.h
@@ -26,23 +26,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* RGB LED */
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 69    // Number of LEDs. backlight x69
-#define RGBLED_SPLIT { 34, 35 }
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-#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
-
 #define OLED_FONT_H "keyboards/basekeys/slice/slice_font.c"
diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/info.json
index 38a6e8398a9b..faec5a995330 100644
--- a/keyboards/basekeys/slice/rev1_rgb/info.json
+++ b/keyboards/basekeys/slice/rev1_rgb/info.json
@@ -20,7 +20,22 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 120
+        "hue_steps": 10,
+        "led_count": 69,
+        "max_brightness": 120,
+        "split_count": [34, 35],
+        "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": "caterina",
diff --git a/keyboards/basekeys/slice/rev1_rgb/rules.mk b/keyboards/basekeys/slice/rev1_rgb/rules.mk
index e9d1e52c1664..1e24ec177f92 100644
--- a/keyboards/basekeys/slice/rev1_rgb/rules.mk
+++ b/keyboards/basekeys/slice/rev1_rgb/rules.mk
@@ -12,6 +12,5 @@ COMMAND_ENABLE = no        # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306     # Disable OLED driver.
 
 LTO_ENABLE = yes
diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
index 85ae15513e55..341f6f03e0f6 100644
--- a/keyboards/basekeys/trifecta/config.h
+++ b/keyboards/basekeys/trifecta/config.h
@@ -18,24 +18,6 @@
 
 #define RGB_MATRIX_LED_COUNT 80
 
-/* RGB LED */
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 80    // Number of LEDs. backlight x69
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-#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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
@@ -53,10 +35,6 @@
 #   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. */
diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json
index 3cc2c19f8b9f..338eb1ae9006 100644
--- a/keyboards/basekeys/trifecta/info.json
+++ b/keyboards/basekeys/trifecta/info.json
@@ -27,7 +27,26 @@
         "pin": "E6"
     },
     "rgblight": {
-        "max_brightness": 128
+        "hue_steps": 10,
+        "led_count": 80,
+        "max_brightness": 128,
+        "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
+        }
+    },
+    "rgb_matrix": {
+        "sat_steps": 8,
+        "val_steps": 8,
+        "speed_steps": 10
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/basketweave/config.h b/keyboards/basketweave/config.h
index 36054e7bb6fb..ebf85963191c 100644
--- a/keyboards/basketweave/config.h
+++ b/keyboards/basketweave/config.h
@@ -20,5 +20,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/info.json
index 8f9be9b4062e..705ef675ba83 100644
--- a/keyboards/basketweave/info.json
+++ b/keyboards/basketweave/info.json
@@ -19,6 +19,9 @@
             {"pin_a": "D7", "pin_b": "C0"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "layouts": {
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
index 3fc4587f36b7..89e181b8f93d 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
@@ -4,12 +4,15 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "ws2812": {
         "pin": "A1",
         "driver": "pwm"
     },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
     "matrix_pins": {
         "cols": ["B1", "B10", "B3", "B4", "B5"],
         "rows": ["A2", "B8", "A8", "B9"]
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
index c48862af2c90..9cc216bb71fb 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
@@ -25,5 +25,3 @@ KEYBOARD_SHARED_EP = yes
 
 EEPROM_DRIVER = spi
 SERIAL_DRIVER = usart
-
-DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
index 80a68aea5ded..bbb0fd66ba22 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
@@ -7,7 +7,7 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["C7", "F0", "D7", "E6", "B4"],
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
index ee2692fa062b..4b69b244fbe5 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
@@ -7,7 +7,7 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F5", "B6", "D7", "E6", "B4"],
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
index 3feffac0abbc..2c0faa956756 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"],
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
index c80cd648c368..0a88daf352d6 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"],
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
index 7fd33fdc4deb..c119df524c31 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
@@ -4,12 +4,15 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "ws2812": {
         "pin": "D3",
         "driver": "pwm"
     },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
     "matrix_pins": {
         "cols": ["F5", "B6", "D7", "E6", "B4"],
         "rows": ["F7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
index f10636573e74..4436426f3033 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
@@ -26,5 +26,3 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart
-
-DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
index a02c176d5ecf..5ac7a1cdca00 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
@@ -4,12 +4,15 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "ws2812": {
         "pin": "A1",
         "driver": "pwm"
     },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
     "matrix_pins": {
         "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
         "rows": ["A2", "B8", "A8", "B9"]
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
index c48862af2c90..9cc216bb71fb 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
@@ -25,5 +25,3 @@ KEYBOARD_SHARED_EP = yes
 
 EEPROM_DRIVER = spi
 SERIAL_DRIVER = usart
-
-DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
index 8fba6b33cd5f..69c8bd6fb4fd 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
@@ -7,7 +7,7 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D5", "C7", "F0", "D7", "E6", "B4"],
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
index 7822fbc36d6c..67ada55640e1 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
@@ -7,7 +7,7 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
index f4b25121ef1c..9b44b3f336c4 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
index 8e9b413329b6..d1ac62e1abe8 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
index e67aa0d64083..85b66277cf20 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
@@ -4,12 +4,15 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "ws2812": {
         "pin": "D3",
         "driver": "pwm"
     },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
     "matrix_pins": {
         "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
         "rows": ["F7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
index f10636573e74..4436426f3033 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
@@ -26,5 +26,3 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart
-
-DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
index c6bff84bf5c1..b9fb103496c8 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
@@ -4,12 +4,15 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "ws2812": {
         "pin": "A1",
         "driver": "pwm"
     },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
     "matrix_pins": {
         "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
         "rows": ["B15", "A2", "B8", "A8", "B9"]
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
index 8ac0939d0137..1cfe4724b427 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
@@ -25,5 +25,3 @@ KEYBOARD_SHARED_EP = yes
 
 EEPROM_DRIVER = spi
 SERIAL_DRIVER = usart
-
-DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
index 36f341e0e7b8..161d36f45d4d 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
@@ -7,7 +7,7 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D5", "C7", "F0", "D7", "E6", "B4"],
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
index 3043400b7b6d..2ee88c4f9e4f 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
@@ -7,7 +7,7 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
index e6b47c984e6f..961a0b1420d1 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
index 7814c4197670..28a1dee31f41 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
index 723f8ae5b133..cfae56715f1b 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
@@ -4,12 +4,15 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "ws2812": {
         "pin": "D3",
         "driver": "pwm"
     },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
     "matrix_pins": {
         "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
         "rows": ["F4", "F7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
index f10636573e74..4436426f3033 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
@@ -26,5 +26,3 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart
-
-DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h
index c5fa0dc192b1..8604597ff8ab 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/config.h
@@ -41,16 +41,11 @@
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
 
-/* RGB settings. */
-#define RGBLED_NUM 36
-#define RGBLED_SPLIT \
-    { 18, 18 }
-
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    define RGB_MATRIX_LED_COUNT 36
+#    define RGB_MATRIX_SPLIT { 18, 18 }
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json
index 57ea2c16dff2..4ab43d6a8e84 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_3/info.json
@@ -5,7 +5,7 @@
         "pid": "0x1835"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["GP8", "GP9", "GP7", "GP6", "GP28"],
@@ -15,6 +15,9 @@
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "rgblight": {
+        "split_count": [18, 18]
+    },
     "ws2812": {
         "pin": "GP0",
         "driver": "vendor"
diff --git a/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c b/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c
new file mode 100644
index 000000000000..c80ccbc8eb83
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c
@@ -0,0 +1,59 @@
+/**
+ * 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
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You 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 SWAP_HANDS_ENABLE
+const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+    /* Left hand, matrix positions */
+    {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}},
+    {{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6}},
+    {{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7}},
+    {{0, 8}, {1, 8}, {2, 8}, {3, 8}, {4, 8}, {5, 8}},
+    {{0, 9}, {1, 9}, {2, 9}, {3, 9}, {4, 9}, {5, 9}},
+    /* Right hand, matrix positions */
+    {{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}},
+    {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}},
+    {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2}},
+    {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}},
+    {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}}
+};
+
+#    ifdef ENCODER_MAP_ENABLE
+const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {1, 0};
+#    endif
+#endif
+
+#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_DOWN : KC_MS_WH_UP);
+            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
diff --git a/keyboards/bastardkb/dilemma/4x6_4/config.h b/keyboards/bastardkb/dilemma/4x6_4/config.h
new file mode 100644
index 000000000000..9c76cb76f9e0
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/4x6_4/config.h
@@ -0,0 +1,54 @@
+/**
+ * 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/>.
+ */
+
+#pragma once
+
+/* Handedness. */
+#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
+#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 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
diff --git a/keyboards/bastardkb/dilemma/4x6_4/halconf.h b/keyboards/bastardkb/dilemma/4x6_4/halconf.h
new file mode 100644
index 000000000000..57d15376d63a
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/4x6_4/halconf.h
@@ -0,0 +1,22 @@
+/**
+ * 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
+
+#define HAL_USE_SPI TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/dilemma/4x6_4/info.json b/keyboards/bastardkb/dilemma/4x6_4/info.json
new file mode 100644
index 000000000000..ba07a7fccf28
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/4x6_4/info.json
@@ -0,0 +1,266 @@
+{
+    "keyboard_name": "Dilemma Max",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x1837"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "board": "GENERIC_RP_RP2040",
+    "matrix_pins": {
+        "cols": ["GP14", "GP8", "GP9", "GP7", "GP6", "GP28"],
+        "rows": ["GP15", "GP4", "GP5", "GP27", "GP26"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP1",
+        "bootmagic": {
+            "matrix": [5, 0]
+        }
+    },
+    "encoder": {
+        "enabled" : true,
+        "rotary" : [
+            {"pin_a": "GP25", "pin_b": "GP24"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "caps_word": true,
+        "tri_layer": true
+    },
+    "ws2812": {
+        "pin": "GP10",
+        "driver": "vendor"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "split_count": [52, 52],
+        "max_brightness": 176,
+        "center_point": [112, 28],
+        "animations": {
+            "solid_color": true,
+            "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": [
+            {"x": 81, "y": 4, "flags": 2},
+            {"x": 65, "y": 2, "flags": 2},
+            {"x": 40, "y": 0, "flags": 2},
+            {"x": 29, "y": 9, "flags": 2},
+            {"x": 16, "y": 9, "flags": 2},
+            {"x": 0, "y": 16, "flags": 2},
+            {"x": 0, "y": 29, "flags": 2},
+            {"x": 0, "y": 40, "flags": 2},
+            {"x": 5, "y": 50, "flags": 2},
+            {"x": 17, "y": 49, "flags": 2},
+            {"x": 28, "y": 44, "flags": 2},
+            {"x": 40, "y": 43, "flags": 2},
+            {"x": 49, "y": 51, "flags": 2},
+            {"x": 62, "y": 53, "flags": 2},
+            {"x": 73, "y": 56, "flags": 2},
+            {"x": 85, "y": 59, "flags": 2},
+            {"x": 100, "y": 64, "flags": 2},
+            {"x": 106, "y": 55, "flags": 2},
+            {"x": 107, "y": 45, "flags": 2},
+            {"x": 91, "y": 51, "flags": 2},
+            {"x": 94, "y": 40, "flags": 2},
+            {"x": 108, "y": 33, "flags": 2},
+            {"x": 106, "y": 25, "flags": 2},
+            {"x": 108, "y": 16, "flags": 2},
+
+            {"matrix": [0, 5], "x": 75, "y": 10, "flags": 4},
+            {"matrix": [0, 4], "x": 62, "y": 9, "flags": 4},
+            {"matrix": [0, 3], "x": 49, "y": 6, "flags": 4},
+            {"matrix": [0, 2], "x": 35, "y": 10, "flags": 4},
+            {"matrix": [0, 1], "x": 22, "y": 16, "flags": 4},
+            {"matrix": [0, 0], "x": 9, "y": 16, "flags": 1},
+            {"matrix": [1, 0], "x": 9, "y": 27, "flags": 1},
+            {"matrix": [1, 1], "x": 22, "y": 27, "flags": 4},
+            {"matrix": [1, 2], "x": 35, "y": 20, "flags": 4},
+            {"matrix": [1, 3], "x": 49, "y": 17, "flags": 4},
+            {"matrix": [1, 4], "x": 62, "y": 19, "flags": 4},
+            {"matrix": [1, 5], "x": 75, "y": 21, "flags": 4},
+            {"matrix": [2, 5], "x": 75, "y": 31, "flags": 4},
+            {"matrix": [2, 4], "x": 62, "y": 30, "flags": 4},
+            {"matrix": [2, 3], "x": 49, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 35, "y": 31, "flags": 4},
+            {"matrix": [2, 1], "x": 22, "y": 37, "flags": 4},
+            {"matrix": [2, 0], "x": 9, "y": 37, "flags": 1},
+            {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
+            {"matrix": [3, 1], "x": 22, "y": 48, "flags": 4},
+            {"matrix": [3, 2], "x": 35, "y": 41, "flags": 4},
+            {"matrix": [3, 3], "x": 49, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 62, "y": 40, "flags": 4},
+            {"matrix": [3, 5], "x": 75, "y": 42, "flags": 4},
+            {"matrix": [4, 3], "x": 54, "y": 51, "flags": 4},
+            {"matrix": [4, 1], "x": 68, "y": 53, "flags": 4},
+            {"matrix": [4, 2], "x": 81, "y": 57, "flags": 4},
+            {"matrix": [4, 4], "x": 92, "y": 64, "flags": 4},
+
+            {"x": 143, "y": 4, "flags": 2},
+            {"x": 159, "y": 2, "flags": 2},
+            {"x": 184, "y": 0, "flags": 2},
+            {"x": 195, "y": 9, "flags": 2},
+            {"x": 208, "y": 9, "flags": 2},
+            {"x": 224, "y": 16, "flags": 2},
+            {"x": 224, "y": 29, "flags": 2},
+            {"x": 224, "y": 40, "flags": 2},
+            {"x": 219, "y": 50, "flags": 2},
+            {"x": 207, "y": 49, "flags": 2},
+            {"x": 196, "y": 44, "flags": 2},
+            {"x": 184, "y": 43, "flags": 2},
+            {"x": 176, "y": 51, "flags": 2},
+            {"x": 162, "y": 53, "flags": 2},
+            {"x": 151, "y": 56, "flags": 2},
+            {"x": 139, "y": 59, "flags": 2},
+            {"x": 124, "y": 64, "flags": 2},
+            {"x": 118, "y": 55, "flags": 2},
+            {"x": 117, "y": 45, "flags": 2},
+            {"x": 133, "y": 51, "flags": 2},
+            {"x": 130, "y": 40, "flags": 2},
+            {"x": 116, "y": 33, "flags": 2},
+            {"x": 118, "y": 25, "flags": 2},
+            {"x": 116, "y": 16, "flags": 2},
+
+            {"matrix": [5, 5], "x": 149, "y": 10, "flags": 4},
+            {"matrix": [5, 4], "x": 162, "y": 9, "flags": 4},
+            {"matrix": [5, 3], "x": 175, "y": 6, "flags": 4},
+            {"matrix": [5, 2], "x": 189, "y": 10, "flags": 4},
+            {"matrix": [5, 1], "x": 202, "y": 16, "flags": 4},
+            {"matrix": [5, 0], "x": 215, "y": 16, "flags": 1},
+            {"matrix": [6, 0], "x": 215, "y": 27, "flags": 1},
+            {"matrix": [6, 1], "x": 202, "y": 27, "flags": 4},
+            {"matrix": [6, 2], "x": 189, "y": 20, "flags": 4},
+            {"matrix": [6, 3], "x": 175, "y": 17, "flags": 4},
+            {"matrix": [6, 4], "x": 162, "y": 19, "flags": 4},
+            {"matrix": [6, 5], "x": 149, "y": 21, "flags": 4},
+            {"matrix": [7, 5], "x": 149, "y": 31, "flags": 4},
+            {"matrix": [7, 4], "x": 162, "y": 30, "flags": 4},
+            {"matrix": [7, 3], "x": 175, "y": 27, "flags": 4},
+            {"matrix": [7, 2], "x": 189, "y": 31, "flags": 4},
+            {"matrix": [7, 1], "x": 202, "y": 37, "flags": 4},
+            {"matrix": [7, 0], "x": 215, "y": 37, "flags": 1},
+            {"matrix": [8, 0], "x": 215, "y": 48, "flags": 1},
+            {"matrix": [8, 1], "x": 202, "y": 48, "flags": 4},
+            {"matrix": [8, 2], "x": 189, "y": 41, "flags": 4},
+            {"matrix": [8, 3], "x": 175, "y": 38, "flags": 4},
+            {"matrix": [8, 4], "x": 162, "y": 40, "flags": 4},
+            {"matrix": [8, 5], "x": 149, "y": 42, "flags": 4},
+            {"matrix": [9, 4], "x": 170, "y": 51, "flags": 4},
+            {"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}
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"L00", "matrix": [0, 0], "x":0, "y":0},
+                {"label":"L01", "matrix": [0, 1], "x":1, "y":0},
+                {"label":"L02", "matrix": [0, 2], "x":2, "y":0},
+                {"label":"L03", "matrix": [0, 3], "x":3, "y":0},
+                {"label":"L04", "matrix": [0, 4], "x":4, "y":0},
+                {"label":"L05", "matrix": [0, 5], "x":5, "y":0},
+                {"label":"R05", "matrix": [5, 5], "x":8, "y":0},
+                {"label":"R04", "matrix": [5, 4], "x":9, "y":0},
+                {"label":"R03", "matrix": [5, 3], "x":10, "y":0},
+                {"label":"R02", "matrix": [5, 2], "x":11, "y":0},
+                {"label":"R01", "matrix": [5, 1], "x":12, "y":0},
+                {"label":"R00", "matrix": [5, 0], "x":13, "y":0},
+                {"label":"L10", "matrix": [1, 0], "x":0, "y":1},
+                {"label":"L11", "matrix": [1, 1], "x":1, "y":1},
+                {"label":"L12", "matrix": [1, 2], "x":2, "y":1},
+                {"label":"L13", "matrix": [1, 3], "x":3, "y":1},
+                {"label":"L14", "matrix": [1, 4], "x":4, "y":1},
+                {"label":"L15", "matrix": [1, 5], "x":5, "y":1},
+                {"label":"R15", "matrix": [6, 5], "x":8, "y":1},
+                {"label":"R14", "matrix": [6, 4], "x":9, "y":1},
+                {"label":"R13", "matrix": [6, 3], "x":10, "y":1},
+                {"label":"R12", "matrix": [6, 2], "x":11, "y":1},
+                {"label":"R11", "matrix": [6, 1], "x":12, "y":1},
+                {"label":"R10", "matrix": [6, 0], "x":13, "y":1},
+                {"label":"L20", "matrix": [2, 0], "x":0, "y":2},
+                {"label":"L21", "matrix": [2, 1], "x":1, "y":2},
+                {"label":"L22", "matrix": [2, 2], "x":2, "y":2},
+                {"label":"L23", "matrix": [2, 3], "x":3, "y":2},
+                {"label":"L24", "matrix": [2, 4], "x":4, "y":2},
+                {"label":"L25", "matrix": [2, 5], "x":5, "y":2},
+                {"label":"R25", "matrix": [7, 5], "x":8, "y":2},
+                {"label":"R24", "matrix": [7, 4], "x":9, "y":2},
+                {"label":"R23", "matrix": [7, 3], "x":10, "y":2},
+                {"label":"R22", "matrix": [7, 2], "x":11, "y":2},
+                {"label":"R21", "matrix": [7, 1], "x":12, "y":2},
+                {"label":"R20", "matrix": [7, 0], "x":13, "y":2},
+                {"label":"L30", "matrix": [3, 0], "x":0, "y":3},
+                {"label":"L31", "matrix": [3, 1], "x":1, "y":3},
+                {"label":"L32", "matrix": [3, 2], "x":2, "y":3},
+                {"label":"L33", "matrix": [3, 3], "x":3, "y":3},
+                {"label":"L34", "matrix": [3, 4], "x":4, "y":3},
+                {"label":"L35", "matrix": [3, 5], "x":5, "y":3},
+                {"label":"R35", "matrix": [8, 5], "x":8, "y":3},
+                {"label":"R34", "matrix": [8, 4], "x":9, "y":3},
+                {"label":"R33", "matrix": [8, 3], "x":10, "y":3},
+                {"label":"R32", "matrix": [8, 2], "x":11, "y":3},
+                {"label":"R31", "matrix": [8, 1], "x":12, "y":3},
+                {"label":"R30", "matrix": [8, 0], "x":13, "y":3},
+                {"label":"L43", "matrix": [4, 3], "x":2.5, "y":4},
+                {"label":"L41", "matrix": [4, 1], "x":3.5, "y":4},
+                {"label":"L42", "matrix": [4, 2], "x":4.5, "y":4},
+                {"label":"L44", "matrix": [4, 4], "x":5.5, "y":4},
+                {"label":"R44", "matrix": [9, 4], "x":7.5, "y":4},
+                {"label":"R42", "matrix": [9, 2], "x":8.5, "y":4},
+                {"label":"R41", "matrix": [9, 1], "x":9.5, "y":4},
+                {"label":"R43", "matrix": [9, 3], "x":10.5, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bastardkb/dilemma/4x6_4/keymaps/default/keymap.c b/keyboards/bastardkb/dilemma/4x6_4/keymaps/default/keymap.c
new file mode 100644
index 000000000000..2e5564f5e931
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/4x6_4/keymaps/default/keymap.c
@@ -0,0 +1,73 @@
+/**
+ * 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/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum dilemma_keymap_layers {
+    LAYER_BASE = 0,
+    LAYER_LOWER,
+    LAYER_RAISE,
+};
+
+#define LOWER MO(LAYER_LOWER)
+#define RAISE MO(LAYER_RAISE)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [LAYER_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_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_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_LALT,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                         KC_LALT, KC_BSPC,  KC_SPC,   LOWER,      RAISE,  KC_ENT,  KC_DEL, KC_LGUI
+  //                    ╰───────────────────────────────────╯ ╰───────────────────────────────────╯
+  ),
+
+  [LAYER_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_UNDS,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_LBRC,   KC_P7,   KC_P8,   KC_P9, KC_RBRC, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       RGB_TOG, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    KC_PPLS,   KC_P4,   KC_P5,   KC_P6, KC_PMNS, KC_PEQL,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+      RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX,  EE_CLR, QK_BOOT,    KC_PAST,   KC_P1,   KC_P2,   KC_P3, KC_PSLS, KC_PDOT,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                         XXXXXXX, XXXXXXX, XXXXXXX, _______,    _______, _______, _______, _______
+  //                    ╰───────────────────────────────────╯ ╰───────────────────────────────────╯
+  ),
+
+  [LAYER_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_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_MPLY, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, KC_MUTE,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_MPRV, KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,    QK_BOOT,  EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                         _______, _______, _______, _______,    _______, XXXXXXX, XXXXXXX, XXXXXXX
+  //                    ╰───────────────────────────────────╯ ╰───────────────────────────────────╯
+  ),
+};
+// clang-format on
diff --git a/keyboards/bastardkb/dilemma/4x6_4/keymaps/default/readme.md b/keyboards/bastardkb/dilemma/4x6_4/keymaps/default/readme.md
new file mode 100644
index 000000000000..2005c2fec91c
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/4x6_4/keymaps/default/readme.md
@@ -0,0 +1,2 @@
+# Dilemma Max (4x6+4) default keymap
+
diff --git a/keyboards/bastardkb/dilemma/4x6_4/keymaps/via/config.h b/keyboards/bastardkb/dilemma/4x6_4/keymaps/via/config.h
new file mode 100644
index 000000000000..24322f990440
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/4x6_4/keymaps/via/config.h
@@ -0,0 +1,20 @@
+/**
+ * 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
diff --git a/keyboards/bastardkb/dilemma/4x6_4/keymaps/via/keymap.c b/keyboards/bastardkb/dilemma/4x6_4/keymaps/via/keymap.c
new file mode 100644
index 000000000000..68602b272227
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/4x6_4/keymaps/via/keymap.c
@@ -0,0 +1,132 @@
+/**
+ * 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/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum dilemma_keymap_layers {
+    LAYER_BASE = 0,
+    LAYER_LOWER,
+    LAYER_RAISE,
+    LAYER_POINTER,
+};
+
+// Automatically enable sniping-mode on the pointer layer.
+// #define DILEMMA_AUTO_SNIPING_ON_LAYER LAYER_POINTER
+
+#define LOWER MO(LAYER_LOWER)
+#define RAISE MO(LAYER_RAISE)
+#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
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [LAYER_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_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,    PT_Z,    KC_X,    KC_C,    KC_V,    KC_B,       KC_N,    KC_M, KC_COMM,  KC_DOT, PT_SLSH, KC_LALT,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                         KC_LALT, KC_BSPC,  KC_SPC,   LOWER,      RAISE,  KC_ENT, KC_DEL,  KC_MUTE
+  //                    ╰───────────────────────────────────╯ ╰───────────────────────────────────╯
+  ),
+
+  [LAYER_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_UNDS,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_LBRC,   KC_P7,   KC_P8,   KC_P9, KC_RBRC, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       RGB_TOG, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    KC_PPLS,   KC_P4,   KC_P5,   KC_P6, KC_PMNS, KC_PEQL,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+      RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_PAST,   KC_P1,   KC_P2,   KC_P3, KC_PSLS, KC_PDOT,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                         XXXXXXX, XXXXXXX, XXXXXXX, _______,    XXXXXXX, _______, XXXXXXX, XXXXXXX
+  //                    ╰───────────────────────────────────╯ ╰───────────────────────────────────╯
+  ),
+
+  [LAYER_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_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_MPLY, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, KC_MUTE,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_MPRV, KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                         XXXXXXX, _______, _______, XXXXXXX,    _______, XXXXXXX, XXXXXXX, XXXXXXX
+  //                    ╰───────────────────────────────────╯ ╰───────────────────────────────────╯
+  ),
+
+  [LAYER_POINTER] = LAYOUT(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DPI_MOD, S_D_MOD,    S_D_MOD, DPI_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       XXXXXXX, _______, DRGSCRL, SNIPING, EE_CLR,  QK_BOOT,    QK_BOOT, EE_CLR,  SNIPING, DRGSCRL, _______, XXXXXXX,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                         XXXXXXX, KC_BTN2, KC_BTN1, KC_BTN3,    KC_BTN3, KC_BTN1, KC_BTN2, 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_ENABLEE
+
+#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
+
+#ifdef ENCODER_MAP_ENABLE
+// clang-format off
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [LAYER_BASE]       = {ENCODER_CCW_CW(KC_WH_U, KC_WH_D), ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
+    [LAYER_LOWER]      = {ENCODER_CCW_CW(KC_UP, KC_DOWN), ENCODER_CCW_CW(KC_LEFT, KC_RGHT)},
+    [LAYER_RAISE]      = {ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
+    [LAYER_POINTER]    = {ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI)},
+};
+// clang-format on
+#endif // ENCODER_MAP_ENABLE
+
+void shutdown_user(void) {
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_sethsv_noeeprom(HSV_RED);
+    rgb_matrix_update_pwm_buffers();
+#endif // RGB_MATRIX_ENABLE
+}
diff --git a/keyboards/bastardkb/dilemma/4x6_4/keymaps/via/readme.md b/keyboards/bastardkb/dilemma/4x6_4/keymaps/via/readme.md
new file mode 100644
index 000000000000..f3636c8a40e3
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/4x6_4/keymaps/via/readme.md
@@ -0,0 +1,47 @@
+# Dilemma Max `via` keymap
+
+The Dilemma Max `via` keymap is based on the original [Dactyl Manuform](../../../../../handwired/dactyl_manuform) default keymap, with 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
+```
diff --git a/keyboards/bastardkb/dilemma/4x6_4/keymaps/via/rules.mk b/keyboards/bastardkb/dilemma/4x6_4/keymaps/via/rules.mk
new file mode 100644
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/4x6_4/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/bastardkb/dilemma/4x6_4/mcuconf.h b/keyboards/bastardkb/dilemma/4x6_4/mcuconf.h
new file mode 100644
index 000000000000..52b726a56d5f
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/4x6_4/mcuconf.h
@@ -0,0 +1,23 @@
+/**
+ * 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
+
+#include_next <mcuconf.h>
+
+#undef RP_SPI_USE_SPI0
+#define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/dilemma/4x6_4/readme.md b/keyboards/bastardkb/dilemma/4x6_4/readme.md
new file mode 100644
index 000000000000..30dd2a99f1de
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/4x6_4/readme.md
@@ -0,0 +1,5 @@
+# Dilemma Max (4x6+4)
+
+This keyboard is an upsized version of the [3x5+3 Dilemma](../3x5_3/).
+
+The Dilemma Max is available at [bastardkb.com](https://bastardkb.com).
diff --git a/keyboards/bastardkb/dilemma/4x6_4/rules.mk b/keyboards/bastardkb/dilemma/4x6_4/rules.mk
new file mode 100644
index 000000000000..4923c2c84a50
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/4x6_4/rules.mk
@@ -0,0 +1,4 @@
+SERIAL_DRIVER = vendor
+
+POINTING_DEVICE_ENABLE = yes
+POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
diff --git a/keyboards/bastardkb/dilemma/readme.md b/keyboards/bastardkb/dilemma/readme.md
index ac3c818bd6f1..876400ae52ac 100644
--- a/keyboards/bastardkb/dilemma/readme.md
+++ b/keyboards/bastardkb/dilemma/readme.md
@@ -1,16 +1,21 @@
 # Dilemma
 
-A very small keyboard made for ergonomic enthusiasts.
+A family of split keyboards with embedded RP2040 controllers, support for Cirque GlidePoint circle trackpads, and SPI + I2C breakouts for other peripherals
 
 -   Keyboard Maintainer: [Bastard Keyboards](https://github.com/Bastardkb/)
--   Hardware Supported: RP2040-based controller (_eg._ Splinky, Elite-c, ...)
+-   Hardware Supported: [Bastardkb Dilemma](https://github.com/Bastardkb/Dilemma)
 -   Hardware Availability: [Bastardkb.com](https://bastardkb.com/)
 
-A pre-assembled version (with embedded controller) is also available.
+A DIY version of the 3x5_2 PCB with promicro compatible footprint is also available.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bastardkb/dilemma/3x5_2/splinky:default
-    make bastardkb/dilemma/3x5_2/assembled:default
+    make bastardkb/dilemma/3x5_3:default
+    make bastardkb/dilemma/4x6_4:default
+
+Flashing example for this keyboard:
+
+    make bastardkb/dilemma/3x5_3:default:flash
+    make bastardkb/dilemma/4x6_4:default:flash
 
 See the [keyboard build instructions](http://docs.bastardkb.com/)
diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json
index 8b6531710413..24fb8bc701bd 100644
--- a/keyboards/bastardkb/scylla/blackpill/info.json
+++ b/keyboards/bastardkb/scylla/blackpill/info.json
@@ -4,12 +4,15 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "ws2812": {
         "pin": "A1",
         "driver": "pwm"
     },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
     "matrix_pins": {
         "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
         "rows": ["B15", "A2", "B8", "A8", "B9"]
diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk
index 88d65fbb906f..8c0e9b589186 100644
--- a/keyboards/bastardkb/scylla/blackpill/rules.mk
+++ b/keyboards/bastardkb/scylla/blackpill/rules.mk
@@ -23,5 +23,3 @@ KEYBOARD_SHARED_EP = yes
 
 EEPROM_DRIVER = spi
 SERIAL_DRIVER = usart
-
-DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h
index 0ad3ecd17bcc..33c62549a10d 100644
--- a/keyboards/bastardkb/scylla/config.h
+++ b/keyboards/bastardkb/scylla/config.h
@@ -18,16 +18,11 @@
 
 #pragma once
 
-/* RGB settings. */
-#define RGBLED_NUM 58
-#define RGBLED_SPLIT \
-    { 29, 29 }
-
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    define RGB_MATRIX_LED_COUNT 58
+#    define RGB_MATRIX_SPLIT { 29, 29 }
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json
index 682b2dc6dbda..24a0262beebe 100644
--- a/keyboards/bastardkb/scylla/info.json
+++ b/keyboards/bastardkb/scylla/info.json
@@ -3,6 +3,10 @@
     "usb": {
         "pid": "0x1829"
     },
+    "rgblight": {
+        "led_count": 58,
+        "split_count": [29, 29]
+    },
     "layouts": {
         "LAYOUT_split_4x6_5": {
             "layout": [
diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/info.json
index ffac558bbc7a..3984c69f2faa 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v1/elitec/info.json
@@ -7,7 +7,7 @@
         "pin": "D2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json
index 1a8643b27df7..f9069afd911b 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v2/elitec/info.json
@@ -7,7 +7,7 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
index 8ba2d4d19ab8..0c7dc406b074 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
index c0cd88672b7c..377fd4424ac1 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json
index 2c66f255541f..d463418cf19c 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/info.json
+++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json
@@ -4,12 +4,15 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "ws2812": {
         "pin": "D3",
         "driver": "pwm"
     },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
     "matrix_pins": {
         "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
         "rows": ["F4", "F7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
index c42b71866e90..8dda103d07a7 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
@@ -21,5 +21,3 @@ RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 SPLIT_KEYBOARD = yes
 
 SERIAL_DRIVER = usart
-
-DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json
index 2bec7f198118..1d256392819f 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/info.json
+++ b/keyboards/bastardkb/skeletyl/blackpill/info.json
@@ -4,12 +4,15 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "ws2812": {
         "pin": "A1",
         "driver": "pwm"
     },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
     "matrix_pins": {
         "cols": ["B1", "B10", "B3", "B4", "B5"],
         "rows": ["A2", "B8", "A8", "B9"]
diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
index 88d65fbb906f..8c0e9b589186 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk
+++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
@@ -23,5 +23,3 @@ KEYBOARD_SHARED_EP = yes
 
 EEPROM_DRIVER = spi
 SERIAL_DRIVER = usart
-
-DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
index 3e282f0f15ee..a7f9c9438762 100644
--- a/keyboards/bastardkb/skeletyl/config.h
+++ b/keyboards/bastardkb/skeletyl/config.h
@@ -18,16 +18,11 @@
 
 #pragma once
 
-/* RGB settings. */
-#define RGBLED_NUM 36
-#define RGBLED_SPLIT \
-    { 18, 18 }
-
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    define RGB_MATRIX_LED_COUNT 36
+#    define RGB_MATRIX_SPLIT { 18, 18 }
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json
index b325ca719686..b4bb9ea78e5c 100644
--- a/keyboards/bastardkb/skeletyl/info.json
+++ b/keyboards/bastardkb/skeletyl/info.json
@@ -3,6 +3,10 @@
     "usb": {
         "pid": "0x1830"
     },
+    "rgblight": {
+        "led_count": 36,
+        "split_count": [18, 18]
+    },
     "community_layouts": ["split_3x5_3"],
     "layouts": {
         "LAYOUT_split_3x5_3": {
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
index f81bca976eef..f3eb68587d09 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
@@ -7,7 +7,7 @@
         "pin": "D2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["E6", "C6", "B1", "B3", "B2"],
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
index 2c43204acead..5e5ccd25458c 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
@@ -7,7 +7,7 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F5", "B6", "D7", "E6", "B4"],
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
index 023c4d553e6e..e9c2b3459233 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"],
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
index 56a00a3c3dc1..a47464720c0f 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"],
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
index cc4bcf887f9e..b44d64a47aae 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
@@ -4,12 +4,15 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "ws2812": {
         "pin": "D3",
         "driver": "pwm"
     },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
     "matrix_pins": {
         "cols": ["F5", "B6", "D7", "E6", "B4"],
         "rows": ["F7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
index c42b71866e90..8dda103d07a7 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
@@ -21,5 +21,3 @@ RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 SPLIT_KEYBOARD = yes
 
 SERIAL_DRIVER = usart
-
-DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/tbk/config.h b/keyboards/bastardkb/tbk/config.h
index 40a9b2cbeb84..8515cac5ef06 100644
--- a/keyboards/bastardkb/tbk/config.h
+++ b/keyboards/bastardkb/tbk/config.h
@@ -17,18 +17,4 @@
 
 #pragma once
 
-#define RGBLED_NUM 38
-#define RGBLED_SPLIT { 19, 19 }
-#define RGBLIGHT_SPLIT
-#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 MASTER_RIGHT
diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json
index 7da2d56ad538..3afca1e792e9 100644
--- a/keyboards/bastardkb/tbk/info.json
+++ b/keyboards/bastardkb/tbk/info.json
@@ -5,6 +5,22 @@
         "device_version": "0.0.1",
         "pid": "0x1828"
     },
+    "rgblight": {
+        "led_count": 38,
+        "split_count": [19, 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
+        }
+    },
     "ws2812": {
         "pin": "D2"
     },
diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json
index 30a1b0ac9437..dcdce8f63b5b 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/info.json
+++ b/keyboards/bastardkb/tbkmini/blackpill/info.json
@@ -4,12 +4,15 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "ws2812": {
         "pin": "A1",
         "driver": "pwm"
     },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
     "matrix_pins": {
         "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
         "rows": ["A2", "B8", "A8", "B9"]
diff --git a/keyboards/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk
index 88d65fbb906f..8c0e9b589186 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk
+++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk
@@ -23,5 +23,3 @@ KEYBOARD_SHARED_EP = yes
 
 EEPROM_DRIVER = spi
 SERIAL_DRIVER = usart
-
-DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h
index 06c6e3ada400..ea18f4349e7b 100644
--- a/keyboards/bastardkb/tbkmini/config.h
+++ b/keyboards/bastardkb/tbkmini/config.h
@@ -18,16 +18,11 @@
 
 #pragma once
 
-/* RGB settings. */
-#define RGBLED_NUM 42
-#define RGBLED_SPLIT \
-    { 21, 21 }
-
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    define RGB_MATRIX_LED_COUNT 42
+#    define RGB_MATRIX_SPLIT { 21, 21 }
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json
index 94c357cd3b56..ec0433d38733 100644
--- a/keyboards/bastardkb/tbkmini/info.json
+++ b/keyboards/bastardkb/tbkmini/info.json
@@ -3,6 +3,10 @@
     "usb": {
         "pid": "0x1828"
     },
+    "rgblight": {
+        "led_count": 42,
+        "split_count": [21, 21]
+    },
     "community_layouts": ["split_3x6_3"],
     "layouts": {
         "LAYOUT_split_3x6_3": {
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
index a5a90811ec8d..f246ce0e7cee 100644
--- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
@@ -7,7 +7,7 @@
         "pin": "D2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
index 28c30f9ab7bb..07bf99658b1f 100644
--- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
@@ -7,7 +7,7 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
index 1dc6607f3d0d..3bcae1df6079 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
index 2c96b46c2add..e7f01c359dcf 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
index ae8a3c4d88af..a75db584e798 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
@@ -4,12 +4,15 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "ws2812": {
         "pin": "D3",
         "driver": "pwm"
     },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
     "matrix_pins": {
         "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
         "rows": ["F7", "C6", "D4", "B5"]
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
index c42b71866e90..8dda103d07a7 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
@@ -21,5 +21,3 @@ RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 SPLIT_KEYBOARD = yes
 
 SERIAL_DRIVER = usart
-
-DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bbrfkr/dynamis/config.h b/keyboards/bbrfkr/dynamis/config.h
index 4cad8086cd3c..98088d31c4a2 100644
--- a/keyboards/bbrfkr/dynamis/config.h
+++ b/keyboards/bbrfkr/dynamis/config.h
@@ -16,18 +16,5 @@
 
 #pragma once
 
-/* rgb num */
-#define RGBLED_NUM 10
-#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 PMW33XX_CS_PIN SPI_SS_PIN
 #define POINTING_DEVICE_INVERT_Y
diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/info.json
index c9f403a04551..6d1ae830ebe9 100644
--- a/keyboards/bbrfkr/dynamis/info.json
+++ b/keyboards/bbrfkr/dynamis/info.json
@@ -18,6 +18,21 @@
             {"pin_a": "B7", "pin_b": "E6"}
         ]
     },
+    "rgblight": {
+        "led_count": 10,
+        "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": "D3"
     },
diff --git a/keyboards/bear_face/info.json b/keyboards/bear_face/info.json
index 0c3e6148033c..e0df316093d5 100644
--- a/keyboards/bear_face/info.json
+++ b/keyboards/bear_face/info.json
@@ -15,6 +15,7 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "F7"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/beekeeb/piantor_pro/config.h b/keyboards/beekeeb/piantor_pro/config.h
new file mode 100644
index 000000000000..4f0be6dbbea0
--- /dev/null
+++ b/keyboards/beekeeb/piantor_pro/config.h
@@ -0,0 +1,17 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP0
+#define SERIAL_USART_RX_PIN GP1
+#define SERIAL_USART_PIN_SWAP
+
+#define USB_VBUS_PIN GP19
+
+#define SPLIT_HAND_PIN GP17
+#define SPLIT_HAND_PIN_LOW_IS_LEFT
diff --git a/keyboards/beekeeb/piantor_pro/info.json b/keyboards/beekeeb/piantor_pro/info.json
new file mode 100644
index 000000000000..c85247550e21
--- /dev/null
+++ b/keyboards/beekeeb/piantor_pro/info.json
@@ -0,0 +1,78 @@
+{
+    "manufacturer": "beekeeb",
+    "keyboard_name": "piantor_pro",
+    "maintainer": "beekeeb",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP11", "GP12", "GP13", "GP14", "GP15", "GP16"],
+        "rows": ["GP7", "GP8", "GP9", "GP10"]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0002",
+        "vid": "0xBEEB"
+    },
+    "split": {
+        "enabled": true
+    },
+    "community_layouts": [ "split_3x6_3" ],
+    "layouts": {
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"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": [4, 5], "x": 8, "y": 0.25},
+                {"matrix": [4, 4], "x": 9, "y": 0.125},
+                {"matrix": [4, 3], "x": 10, "y": 0},
+                {"matrix": [4, 2], "x": 11, "y": 0.125},
+                {"matrix": [4, 1], "x": 12, "y": 0.25},
+                {"matrix": [4, 0], "x": 13, "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.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": [5, 5], "x": 8, "y": 1.25},
+                {"matrix": [5, 4], "x": 9, "y": 1.125},
+                {"matrix": [5, 3], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1.125},
+                {"matrix": [5, 1], "x": 12, "y": 1.25},
+                {"matrix": [5, 0], "x": 13, "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.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": [6, 5], "x": 8, "y": 2.25},
+                {"matrix": [6, 4], "x": 9, "y": 2.125},
+                {"matrix": [6, 3], "x": 10, "y": 2},
+                {"matrix": [6, 2], "x": 11, "y": 2.125},
+                {"matrix": [6, 1], "x": 12, "y": 2.25},
+                {"matrix": [6, 0], "x": 13, "y": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.75},
+                {"matrix": [7, 5], "x": 7.5, "y": 3.75},
+                {"matrix": [7, 4], "x": 8.5, "y": 3.5},
+                {"matrix": [7, 3], "x": 9.5, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/beekeeb/piantor_pro/keymaps/default/keymap.c b/keyboards/beekeeb/piantor_pro/keymaps/default/keymap.c
new file mode 100644
index 000000000000..ed09dd7d069f
--- /dev/null
+++ b/keyboards/beekeeb/piantor_pro/keymaps/default/keymap.c
@@ -0,0 +1,55 @@
+// 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_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_SPC,     KC_ENT,   MO(2), KC_RALT
+                                      //`--------------------------'  `--------------------------'
+
+  ),
+
+    [1] = 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_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_LGUI, _______,  KC_SPC,     KC_ENT,   MO(3), KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+    [2] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB, 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_LBRC, KC_RBRC, KC_BSLS,  KC_GRV,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI,   MO(3),  KC_SPC,     KC_ENT, _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+    [3] = 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,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  )
+};
diff --git a/keyboards/beekeeb/piantor_pro/readme.md b/keyboards/beekeeb/piantor_pro/readme.md
new file mode 100644
index 000000000000..08012e43dff2
--- /dev/null
+++ b/keyboards/beekeeb/piantor_pro/readme.md
@@ -0,0 +1,20 @@
+# Piantor Pro
+
+![Piantor Pro](https://i.imgur.com/UPRI64ch.jpg)
+
+A 42 key hotswappable keyboard with RP2040.
+
+* Keyboard Maintainer: [beekeeb](https://github.com/beekeeb)
+* Hardware Availability: [beekeeb.shop](https://beekeeb.shop)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make beekeeb/piantor_pro: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
+
+To enter the bootloader mode, disconnect the keyboard from the computer. While holding the BOOT button, connect the keyboard to the computer.
+
+Run `make beekeeb/piantor_pro:default:flash` or copy the compiled uf2 firmware to the USB mass storage device.
diff --git a/keyboards/beekeeb/piantor_pro/rules.mk b/keyboards/beekeeb/piantor_pro/rules.mk
new file mode 100644
index 000000000000..161ec22b16e2
--- /dev/null
+++ b/keyboards/beekeeb/piantor_pro/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
diff --git a/keyboards/bemeier/bmek/config.h b/keyboards/bemeier/bmek/config.h
index 6c147e6368ce..455345409626 100755
--- a/keyboards/bemeier/bmek/config.h
+++ b/keyboards/bemeier/bmek/config.h
@@ -18,15 +18,3 @@
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 5
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 20 
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_MODE_STATIC_GRADIENT
-
-#define RGBLED_NUM 6
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-//#define RETRO_TAPPING
-#define TAPPING_TERM 175
diff --git a/keyboards/bemeier/bmek/rev1/info.json b/keyboards/bemeier/bmek/rev1/info.json
index c50cae166e27..70873aa52741 100644
--- a/keyboards/bemeier/bmek/rev1/info.json
+++ b/keyboards/bemeier/bmek/rev1/info.json
@@ -2,6 +2,18 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true
+        }
+    },
+    "tapping": {
+        "term": 175
+    },
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/bemeier/bmek/rev2/info.json b/keyboards/bemeier/bmek/rev2/info.json
index 1ac54f5c79d6..f1440afaf24f 100644
--- a/keyboards/bemeier/bmek/rev2/info.json
+++ b/keyboards/bemeier/bmek/rev2/info.json
@@ -2,6 +2,18 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true
+        }
+    },
+    "tapping": {
+        "term": 175
+    },
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/bemeier/bmek/rev3/info.json b/keyboards/bemeier/bmek/rev3/info.json
index c951ca8e43bb..ac0faf870634 100644
--- a/keyboards/bemeier/bmek/rev3/info.json
+++ b/keyboards/bemeier/bmek/rev3/info.json
@@ -2,6 +2,18 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true
+        }
+    },
+    "tapping": {
+        "term": 175
+    },
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/bfake/config.h b/keyboards/bfake/config.h
deleted file mode 100644
index ddc21dae3085..000000000000
--- a/keyboards/bfake/config.h
+++ /dev/null
@@ -1,32 +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
-
-
-#define RGBLED_NUM 16
-
-#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/bfake/info.json b/keyboards/bfake/info.json
index 374e3377929f..3aae216047fd 100644
--- a/keyboards/bfake/info.json
+++ b/keyboards/bfake/info.json
@@ -16,6 +16,21 @@
   "backlight": {
     "pin": "D4"
   },
+  "rgblight": {
+    "led_count": 16,
+    "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": {
     "driver": "i2c"
   },
diff --git a/keyboards/biacco42/ergo42/rev1/config.h b/keyboards/biacco42/ergo42/rev1/config.h
index 8f990eb8ed0c..179b11724307 100644
--- a/keyboards/biacco42/ergo42/rev1/config.h
+++ b/keyboards/biacco42/ergo42/rev1/config.h
@@ -24,9 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12    // Number of LEDs
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/biacco42/ergo42/rev1/info.json b/keyboards/biacco42/ergo42/rev1/info.json
index 96ecd7010e1c..67f27ad61298 100644
--- a/keyboards/biacco42/ergo42/rev1/info.json
+++ b/keyboards/biacco42/ergo42/rev1/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0042",
     "device_version": "1.0.0"
   },
+  "rgblight": {
+    "led_count": 12
+  },
   "ws2812": {
     "pin": "D3"
   },
diff --git a/keyboards/binepad/bn006/info.json b/keyboards/binepad/bn006/info.json
index 2c2aecbf82cc..756b82e330a7 100755
--- a/keyboards/binepad/bn006/info.json
+++ b/keyboards/binepad/bn006/info.json
@@ -28,7 +28,7 @@
         "pin": "B15"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
             {"flags": 4, "matrix": [0, 1], "x": 112, "y": 0},
diff --git a/keyboards/binepad/bnr1/v2/rules.mk b/keyboards/binepad/bnr1/v2/rules.mk
old mode 100755
new mode 100644
index a9a826d49ff6..77b90d035df4
--- a/keyboards/binepad/bnr1/v2/rules.mk
+++ b/keyboards/binepad/bnr1/v2/rules.mk
@@ -3,5 +3,3 @@
 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
diff --git a/keyboards/binepad/pixie/config.h b/keyboards/binepad/pixie/config.h
new file mode 100644
index 000000000000..00d5ddf0355f
--- /dev/null
+++ b/keyboards/binepad/pixie/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 binepad (@binepad)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define ENCODER_DEFAULT_POS 0x3  // enable 1:1 resolution
diff --git a/keyboards/binepad/pixie/info.json b/keyboards/binepad/pixie/info.json
new file mode 100644
index 000000000000..7d9d2ceb9ad9
--- /dev/null
+++ b/keyboards/binepad/pixie/info.json
@@ -0,0 +1,49 @@
+{
+    "manufacturer": "binepad",
+    "keyboard_name": "PIXIE",
+    "url": "http://binepad.com",
+    "maintainer": "binepad",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "usb": {
+        "vid": "0x4249",
+        "pid": "0x5078",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["GP19", "GP4"],
+        "rows": ["GP28", "GP5"]
+    },
+    "encoder": {
+        "rotary": [
+            {
+                "pin_a": "GP18",
+                "pin_b": "GP17"
+            },
+            {
+                "pin_a": "GP20",
+                "pin_b": "GP21"
+            }
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1.25, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1.25, "y": 1.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/binepad/pixie/keymaps/default/keymap.c b/keyboards/binepad/pixie/keymaps/default/keymap.c
new file mode 100644
index 000000000000..b49c4db6de3a
--- /dev/null
+++ b/keyboards/binepad/pixie/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+// 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_MPLY,
+        KC_MPRV, KC_MNXT
+    )
+};
+
+#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_WH_U, KC_WH_D)
+    }
+};
+
+#endif
diff --git a/keyboards/binepad/pixie/keymaps/default/rules.mk b/keyboards/binepad/pixie/keymaps/default/rules.mk
new file mode 100644
index 000000000000..34789bf1728c
--- /dev/null
+++ b/keyboards/binepad/pixie/keymaps/default/rules.mk
@@ -0,0 +1,2 @@
+
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/binepad/pixie/keymaps/via/keymap.c b/keyboards/binepad/pixie/keymaps/via/keymap.c
new file mode 100644
index 000000000000..b49c4db6de3a
--- /dev/null
+++ b/keyboards/binepad/pixie/keymaps/via/keymap.c
@@ -0,0 +1,22 @@
+// 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_MPLY,
+        KC_MPRV, KC_MNXT
+    )
+};
+
+#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_WH_U, KC_WH_D)
+    }
+};
+
+#endif
diff --git a/keyboards/binepad/pixie/keymaps/via/rules.mk b/keyboards/binepad/pixie/keymaps/via/rules.mk
new file mode 100644
index 000000000000..82b46f5873fc
--- /dev/null
+++ b/keyboards/binepad/pixie/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/binepad/pixie/readme.md b/keyboards/binepad/pixie/readme.md
new file mode 100644
index 000000000000..98287ab97bf3
--- /dev/null
+++ b/keyboards/binepad/pixie/readme.md
@@ -0,0 +1,27 @@
+# BINEPAD PIXIE
+
+![BINEPAD PIXIE](https://i.imgur.com/OnQnkdUh.jpeg)
+
+*A 2x2 macropad with 2x rotary encoders*
+
+* Keyboard Maintainer: [binepad](https://github.com/binepad)
+* Hardware Supported: BINPAD PIXIE
+* Hardware Availability: [binepad.com](https://www.binepad.com/pixie)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make binepad/pixie:default
+
+Flashing example for this keyboard:
+
+    make binepad/pixie: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 (010) in the matrix (the bottom left key) 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` if it is available
diff --git a/keyboards/handwired/jscotto/scotto40/rules.mk b/keyboards/binepad/pixie/rules.mk
similarity index 100%
rename from keyboards/handwired/jscotto/scotto40/rules.mk
rename to keyboards/binepad/pixie/rules.mk
diff --git a/keyboards/bioi/f60/config.h b/keyboards/bioi/f60/config.h
index b06dcb251a75..39b9e8b47aca 100644
--- a/keyboards/bioi/f60/config.h
+++ b/keyboards/bioi/f60/config.h
@@ -17,18 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 5
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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 WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
diff --git a/keyboards/bioi/f60/info.json b/keyboards/bioi/f60/info.json
index 591181304347..6223ba7b5792 100644
--- a/keyboards/bioi/f60/info.json
+++ b/keyboards/bioi/f60/info.json
@@ -18,6 +18,23 @@
         "levels": 8,
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 5,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "B1"
     },
diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h
index d1039d089681..976841be799f 100644
--- a/keyboards/bioi/g60/config.h
+++ b/keyboards/bioi/g60/config.h
@@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB Underglow */
-#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 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* 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/bioi/g60/info.json b/keyboards/bioi/g60/info.json
index 10a92de946b4..a96d1acce57a 100644
--- a/keyboards/bioi/g60/info.json
+++ b/keyboards/bioi/g60/info.json
@@ -17,9 +17,29 @@
         "pin": "B7",
         "levels": 12
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "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": "B1"
     },
+    "bluetooth": {
+        "driver": "custom"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "layouts": {
diff --git a/keyboards/bioi/g60/rules.mk b/keyboards/bioi/g60/rules.mk
index a22a56ecec3f..2b955ce793ba 100644
--- a/keyboards/bioi/g60/rules.mk
+++ b/keyboards/bioi/g60/rules.mk
@@ -15,7 +15,6 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes            # Reduce firmware size
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = custom
 
 VIA_ENABLE = yes            # VIA support should be enabled here due to the main() loop will be compiled first.
 
diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h
index 24ced1fc0a21..0b4ce9a09075 100644
--- a/keyboards/bioi/g60ble/config.h
+++ b/keyboards/bioi/g60ble/config.h
@@ -1,21 +1,5 @@
 #pragma once
 
-/* RGB Underglow */
-#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 36
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* 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/bioi/g60ble/info.json b/keyboards/bioi/g60ble/info.json
index 2b835f7c4828..1699f7275e09 100644
--- a/keyboards/bioi/g60ble/info.json
+++ b/keyboards/bioi/g60ble/info.json
@@ -17,9 +17,29 @@
         "pin": "B7",
         "levels": 8
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 36,
+        "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": "B1"
     },
+    "bluetooth": {
+        "driver": "custom"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"],
diff --git a/keyboards/bioi/g60ble/rules.mk b/keyboards/bioi/g60ble/rules.mk
index d1edb6882dac..31cc2c22b691 100644
--- a/keyboards/bioi/g60ble/rules.mk
+++ b/keyboards/bioi/g60ble/rules.mk
@@ -15,7 +15,6 @@ LTO_ENABLE = yes
 
 # these lines are all for bluetooth
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = custom
 SRC += usart.c ble.c
 OPT_DEFS += -DUART_RX1_BUFFER_SIZE=16 -DUART_TX1_BUFFER_SIZE=16
 OPT_DEFS += -DUSART1_ENABLED
diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h
index 93ab008b66a9..2e78cc2a3e15 100644
--- a/keyboards/bioi/morgan65/config.h
+++ b/keyboards/bioi/morgan65/config.h
@@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB Underglow */
-#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 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* 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/bioi/morgan65/info.json b/keyboards/bioi/morgan65/info.json
index c3fced4f783e..6cf66b843ac7 100644
--- a/keyboards/bioi/morgan65/info.json
+++ b/keyboards/bioi/morgan65/info.json
@@ -17,9 +17,29 @@
       "pin": "B6",
       "levels": 12
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "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": "B1"
     },
+    "bluetooth": {
+        "driver": "custom"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": [
diff --git a/keyboards/bioi/morgan65/rules.mk b/keyboards/bioi/morgan65/rules.mk
index a22a56ecec3f..2b955ce793ba 100644
--- a/keyboards/bioi/morgan65/rules.mk
+++ b/keyboards/bioi/morgan65/rules.mk
@@ -15,7 +15,6 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes            # Reduce firmware size
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = custom
 
 VIA_ENABLE = yes            # VIA support should be enabled here due to the main() loop will be compiled first.
 
diff --git a/keyboards/bioi/s65/config.h b/keyboards/bioi/s65/config.h
index 13f5533c9f6d..8134bd96cfa3 100644
--- a/keyboards/bioi/s65/config.h
+++ b/keyboards/bioi/s65/config.h
@@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB Underglow */
-#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
-
 /* 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/bioi/s65/info.json b/keyboards/bioi/s65/info.json
index a3a783b61ff8..a2d63ae3f97f 100644
--- a/keyboards/bioi/s65/info.json
+++ b/keyboards/bioi/s65/info.json
@@ -17,6 +17,23 @@
         "pin": "B6",
         "levels": 12
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "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": "D3"
     },
diff --git a/keyboards/black_hellebore/info.json b/keyboards/black_hellebore/info.json
index 649bc63f238e..bc70e3eb984c 100644
--- a/keyboards/black_hellebore/info.json
+++ b/keyboards/black_hellebore/info.json
@@ -29,7 +29,7 @@
         "vid": "0x3141"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 0], "x": 7, "y": 5},
             {"flags": 4, "matrix": [0, 1], "x": 22, "y": 5},
diff --git a/keyboards/blackplum/config.h b/keyboards/blackplum/config.h
index ec4300c811da..5f360813239b 100644
--- a/keyboards/blackplum/config.h
+++ b/keyboards/blackplum/config.h
@@ -5,21 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-
-/* ws2812 RGB LED */
-#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    // Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/blackplum/info.json b/keyboards/blackplum/info.json
index bc9786c09a60..ba93091bcc66 100644
--- a/keyboards/blackplum/info.json
+++ b/keyboards/blackplum/info.json
@@ -8,6 +8,25 @@
         "pid": "0x4250",
         "device_version": "10.0.1"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "saturation_steps": 10,
+        "brightness_steps": 10,
+        "led_count": 16,
+        "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": "C7"
     },
diff --git a/keyboards/blockboy/ac980mini/config.h b/keyboards/blockboy/ac980mini/config.h
index 57ba70ec1105..b98cb7964fdb 100644
--- a/keyboards/blockboy/ac980mini/config.h
+++ b/keyboards/blockboy/ac980mini/config.h
@@ -6,7 +6,6 @@
 // RGB configuration
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT  81
-#    define RGBLED_NUM 81
 
 #ifdef RGB_MATRIX_ENABLE
 //#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
@@ -16,10 +15,6 @@
 // #   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
 
 /* 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. */
diff --git a/keyboards/blockboy/ac980mini/info.json b/keyboards/blockboy/ac980mini/info.json
index c7541768246c..36d6fe5ba9e6 100644
--- a/keyboards/blockboy/ac980mini/info.json
+++ b/keyboards/blockboy/ac980mini/info.json
@@ -19,7 +19,10 @@
         "pin": "B7"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812",
+        "sat_steps": 8,
+        "val_steps": 8,
+        "speed_steps": 10
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/blockey/config.h b/keyboards/blockey/config.h
index 9b796dcece81..a93b381c85b3 100644
--- a/keyboards/blockey/config.h
+++ b/keyboards/blockey/config.h
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 4
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-
-#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
-
 /* 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/blockey/info.json b/keyboards/blockey/info.json
index 044d1e9e1a48..2ed60f6e69ae 100644
--- a/keyboards/blockey/info.json
+++ b/keyboards/blockey/info.json
@@ -8,6 +8,22 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "hue_steps": 10,
+    "led_count": 4,
+    "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": "B1"
   },
diff --git a/keyboards/blockey/keymaps/eucalyn/keymap.c b/keyboards/blockey/keymaps/eucalyn/keymap.c
index 3a6d1fecd12b..20ab8ed11754 100644
--- a/keyboards/blockey/keymaps/eucalyn/keymap.c
+++ b/keyboards/blockey/keymaps/eucalyn/keymap.c
@@ -37,19 +37,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
 };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/blu/vimclutch/info.json b/keyboards/blu/vimclutch/info.json
index bb9586b61f84..cbee78735cfb 100644
--- a/keyboards/blu/vimclutch/info.json
+++ b/keyboards/blu/vimclutch/info.json
@@ -11,8 +11,9 @@
     "development_board": "promicro",
     "diode_direction": "ROW2COL",
     "matrix_pins": {
-        "cols": ["B3", "B2", "B6"],
-        "rows": ["B5"]
+        "direct": [
+            ["B3", "B2", "B6"]
+        ]
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/blu/vimclutch/readme.md b/keyboards/blu/vimclutch/readme.md
index bbc6b9826066..94ebc183332b 100644
--- a/keyboards/blu/vimclutch/readme.md
+++ b/keyboards/blu/vimclutch/readme.md
@@ -19,8 +19,6 @@ Here are some included keymaps and their modes to get you started:
 * vc_i: the same as default but using `i` instead of `a`
 * vim_ai: vim clutch only, selectable between `a` and `i`
 
-Also includes a mode for single-keypress in case of "push to talk clutch"
-
 Make example for this keyboard after setting up your development environment:
 
     make blu/vimclutch:default
@@ -34,3 +32,7 @@ Flashing example for this keyboard:
 Reset button on the reverse side of the enclosure for initializing flashing.
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Hardware Revision Compatibility
+This keyboard as-it-is in the QMK repository at the is only designed to work with Revision B (and possibly beyond!)
+
diff --git a/keyboards/bluebell/swoop/config.h b/keyboards/bluebell/swoop/config.h
index c34ab85ecfd6..48d63003252a 100644
--- a/keyboards/bluebell/swoop/config.h
+++ b/keyboards/bluebell/swoop/config.h
@@ -22,17 +22,3 @@
   #define OLED_DISPLAY_128X32
   #define OLED_TIMEOUT 30000
 #endif
-
-// RGB underglow and per key
-  #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-  #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-  #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-  #define RGBLIGHT_EFFECT_BREATHING
-  #define RGBLED_NUM 36
-  #define RGBLED_SPLIT \
-        { 18, 18 }
-  #define RGBLIGHT_SPLIT
-  #define RGBLIGHT_HUE_STEP 10
-  #define RGBLIGHT_SAT_STEP 17
-  #define RGBLIGHT_VAL_STEP 17
-  #define RGBLIGHT_SLEEP
diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/info.json
index e319754f7854..52c859c1540d 100644
--- a/keyboards/bluebell/swoop/info.json
+++ b/keyboards/bluebell/swoop/info.json
@@ -12,7 +12,17 @@
     "pin": "D3"
   },
   "rgblight": {
-    "max_brightness": 150
+    "hue_steps": 10,
+    "led_count": 36,
+    "max_brightness": 150,
+    "sleep": true,
+    "split_count": [18, 18],
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "static_gradient": true
+    }
   },
   "matrix_pins": {
     "cols": ["B1", "F7", "F6", "F5", "F4"],
diff --git a/keyboards/bluebell/swoop/keymaps/kyek/rules.mk b/keyboards/bluebell/swoop/keymaps/kyek/rules.mk
index 6b5678dd27c2..fb46c2589d34 100644
--- a/keyboards/bluebell/swoop/keymaps/kyek/rules.mk
+++ b/keyboards/bluebell/swoop/keymaps/kyek/rules.mk
@@ -6,7 +6,6 @@ LTO_ENABLE = no
 EXTRAKEY_ENABLE = no
 
 # ENCODER_ENABLE = no
-# OLED_DRIVER_ENABLE = no
 # WPM_ENABLE = no
 
 # Enable keyboard underlight functionality
diff --git a/keyboards/boardrun/bizarre/config.h b/keyboards/boardrun/bizarre/config.h
index a367b59dd311..1b4e5a6d87e6 100644
--- a/keyboards/boardrun/bizarre/config.h
+++ b/keyboards/boardrun/bizarre/config.h
@@ -35,19 +35,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
-
-// ws2812 options
-#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 // 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)
diff --git a/keyboards/boardrun/bizarre/info.json b/keyboards/boardrun/bizarre/info.json
index 8c6253965be2..428ca3bac60b 100644
--- a/keyboards/boardrun/bizarre/info.json
+++ b/keyboards/boardrun/bizarre/info.json
@@ -9,6 +9,24 @@
         "pid": "0x5339",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 25,
+        "brightness_steps": 12,
+        "led_count": 15,
+        "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"
     },
diff --git a/keyboards/boardrun/classic/config.h b/keyboards/boardrun/classic/config.h
index a1d1a3a54411..1b4e5a6d87e6 100644
--- a/keyboards/boardrun/classic/config.h
+++ b/keyboards/boardrun/classic/config.h
@@ -35,19 +35,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
-
-// ws2812 options
-#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 // 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)
diff --git a/keyboards/boardrun/classic/info.json b/keyboards/boardrun/classic/info.json
index 8259afcdcc95..4518961b4ae3 100644
--- a/keyboards/boardrun/classic/info.json
+++ b/keyboards/boardrun/classic/info.json
@@ -9,6 +9,24 @@
         "pid": "0x5338",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 25,
+        "brightness_steps": 12,
+        "led_count": 14,
+        "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"
     },
diff --git a/keyboards/boardsource/beiwagon/info.json b/keyboards/boardsource/beiwagon/info.json
index 08fcffc024fb..b02c52886782 100644
--- a/keyboards/boardsource/beiwagon/info.json
+++ b/keyboards/boardsource/beiwagon/info.json
@@ -25,7 +25,7 @@
     "vid": "0x4273"
   },
   "rgb_matrix": {
-    "driver": "WS2812",
+    "driver": "ws2812",
     "layout": [
       {"flags": 2, "x": 16, "y": 38},
       {"flags": 2, "x": 16, "y": 113},
diff --git a/keyboards/boardsource/equals/48/config.h b/keyboards/boardsource/equals/48/config.h
new file mode 100644
index 000000000000..952fa269c6e7
--- /dev/null
+++ b/keyboards/boardsource/equals/48/config.h
@@ -0,0 +1,23 @@
+// 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
+
+#define AUDIO_INIT_DELAY
+
+// SPI Configuration
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN GP26
+#define SPI_MOSI_PIN GP27
+
+// Display Configuration
+#define OLED_CS_PIN GP25
+#define OLED_DC_PIN GP20
+#define OLED_RST_PIN GP28
diff --git a/keyboards/boardsource/equals/48/halconf.h b/keyboards/boardsource/equals/48/halconf.h
new file mode 100644
index 000000000000..ec1c061eeca5
--- /dev/null
+++ b/keyboards/boardsource/equals/48/halconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Cole Smith (@boardsource)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_I2C TRUE
+#define HAL_USE_PWM TRUE
+#define HAL_USE_SPI TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/boardsource/equals/48/info.json b/keyboards/boardsource/equals/48/info.json
new file mode 100644
index 000000000000..63561f4c5979
--- /dev/null
+++ b/keyboards/boardsource/equals/48/info.json
@@ -0,0 +1,180 @@
+{
+    "keyboard_name": "Equals 48",
+    "bootloader": "rp2040",
+    "processor": "RP2040",
+    "features": {
+        "audio":true
+    },
+    "matrix_pins": {
+        "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"],
+        "rows": ["GP12", "GP13", "GP16", "GP17"]
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "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 },
+            { "flags": 2, "x": 112, "y": 17 },
+            { "flags": 2, "x": 50, "y": 17 },
+            { "flags": 2, "x": 4, "y": 17 },
+            { "flags": 2, "x": 4, "y": 56 },
+            { "flags": 2, "x": 50, "y": 56 },
+            { "flags": 2, "x": 112, "y": 56 },
+            { "flags": 2, "x": 172, "y": 56 },
+            { "flags": 2, "x": 220, "y": 56 },
+            { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
+            { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 },
+            { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 },
+            { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 },
+            { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 },
+            { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 },
+            { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 },
+            { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 },
+            { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 },
+            { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 },
+            { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 },
+            { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 },
+            { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 },
+            { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 },
+            { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 },
+            { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 },
+            { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 },
+            { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 },
+            { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 },
+            { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 },
+            { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 },
+            { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 },
+            { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 },
+            { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 },
+            { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 },
+            { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 },
+            { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 },
+            { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 },
+            { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 },
+            { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 },
+            { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 },
+            { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 },
+            { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 },
+            { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 },
+            { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 },
+            { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 },
+            { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 },
+            { "flags": 1, "matrix": [3, 1], "x": 20, "y": 64 },
+            { "flags": 1, "matrix": [3, 2], "x": 40, "y": 64 },
+            { "flags": 1, "matrix": [3, 3], "x": 61, "y": 64 },
+            { "flags": 1, "matrix": [3, 4], "x": 81, "y": 64 },
+            { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 },
+            { "flags": 1, "matrix": [3, 6], "x": 122, "y": 64 },
+            { "flags": 1, "matrix": [3, 7], "x": 142, "y": 64 },
+            { "flags": 1, "matrix": [3, 8], "x": 162, "y": 64 },
+            { "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 }
+        ]
+    },
+    "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": [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 },
+                { "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 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/boardsource/equals/48/keymaps/default/keymap.c b/keyboards/boardsource/equals/48/keymaps/default/keymap.c
new file mode 100644
index 000000000000..92d83bb0e892
--- /dev/null
+++ b/keyboards/boardsource/equals/48/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+// Copyright 2022 @boardsource
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _MAIN,
+    _RAISE,
+    _LOWER
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_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_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+    ),
+    [_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_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, _______,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    ),
+    [_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_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    )
+};
diff --git a/keyboards/boardsource/equals/48/keymaps/via/keymap.c b/keyboards/boardsource/equals/48/keymaps/via/keymap.c
new file mode 100644
index 000000000000..3c3427d12255
--- /dev/null
+++ b/keyboards/boardsource/equals/48/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+// Copyright 2022 @boardsource
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _MAIN,
+    _RAISE,
+    _LOWER
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_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_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+    ),
+    [_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_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, _______,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    ),
+    [_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_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
+
+};
diff --git a/keyboards/boardsource/equals/48/keymaps/via/rules.mk b/keyboards/boardsource/equals/48/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/boardsource/equals/48/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/boardsource/equals/48/mcuconf.h b/keyboards/boardsource/equals/48/mcuconf.h
new file mode 100644
index 000000000000..e38c802c071a
--- /dev/null
+++ b/keyboards/boardsource/equals/48/mcuconf.h
@@ -0,0 +1,11 @@
+// Copyright 2023 Cole Smith (@boardsource)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_PWM_USE_PWM6
+#define RP_PWM_USE_PWM6 TRUE
+
+#undef RP_SPI_USE_SPI1
+#define RP_SPI_USE_SPI1 TRUE
diff --git a/keyboards/boardsource/equals/48/rules.mk b/keyboards/boardsource/equals/48/rules.mk
new file mode 100644
index 000000000000..4192b0c2e54d
--- /dev/null
+++ b/keyboards/boardsource/equals/48/rules.mk
@@ -0,0 +1,3 @@
+AUDIO_DRIVER = pwm_hardware
+QUANTUM_PAINTER_ENABLE = yes
+QUANTUM_PAINTER_DRIVERS += st7735_spi
diff --git a/keyboards/boardsource/equals/60/config.h b/keyboards/boardsource/equals/60/config.h
new file mode 100644
index 000000000000..ee4bc6b1e850
--- /dev/null
+++ b/keyboards/boardsource/equals/60/config.h
@@ -0,0 +1,23 @@
+// 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
+
+#define AUDIO_INIT_DELAY
+
+// SPI Configuration
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN GP26
+#define SPI_MOSI_PIN GP27
+
+// Display Configuration
+#define OLED_CS_PIN GP25
+#define OLED_DC_PIN GP20
+#define OLED_RST_PIN GP28
diff --git a/keyboards/boardsource/equals/60/halconf.h b/keyboards/boardsource/equals/60/halconf.h
new file mode 100644
index 000000000000..ec1c061eeca5
--- /dev/null
+++ b/keyboards/boardsource/equals/60/halconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Cole Smith (@boardsource)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_I2C TRUE
+#define HAL_USE_PWM TRUE
+#define HAL_USE_SPI TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/boardsource/equals/60/info.json b/keyboards/boardsource/equals/60/info.json
new file mode 100644
index 000000000000..355e434b4e5d
--- /dev/null
+++ b/keyboards/boardsource/equals/60/info.json
@@ -0,0 +1,203 @@
+{
+    "keyboard_name": "Equals 60",
+    "bootloader": "rp2040",
+    "processor": "RP2040",
+    "features": {
+        "audio":true
+    },
+    "matrix_pins": {
+        "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"],
+        "rows": ["GP12", "GP13", "GP16", "GP17", "GP18"]
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "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 },
+            { "flags": 2, "x": 112, "y": 17 },
+            { "flags": 2, "x": 50, "y": 17 },
+            { "flags": 2, "x": 4, "y": 17 },
+            { "flags": 2, "x": 4, "y": 56 },
+            { "flags": 2, "x": 50, "y": 56 },
+            { "flags": 2, "x": 112, "y": 56 },
+            { "flags": 2, "x": 172, "y": 56 },
+            { "flags": 2, "x": 220, "y": 56 },
+            { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
+            { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 },
+            { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 },
+            { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 },
+            { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 },
+            { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 },
+            { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 },
+            { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 },
+            { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 },
+            { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 },
+            { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 },
+            { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 },
+            { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 },
+            { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 },
+            { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 },
+            { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 },
+            { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 },
+            { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 },
+            { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 },
+            { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 },
+            { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 },
+            { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 },
+            { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 },
+            { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 },
+            { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 },
+            { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 },
+            { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 },
+            { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 },
+            { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 },
+            { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 },
+            { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 },
+            { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 },
+            { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 },
+            { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 },
+            { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 },
+            { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 },
+            { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 },
+            { "flags": 4, "matrix": [3, 1], "x": 20, "y": 64 },
+            { "flags": 4, "matrix": [3, 2], "x": 40, "y": 64 },
+            { "flags": 4, "matrix": [3, 3], "x": 61, "y": 64 },
+            { "flags": 4, "matrix": [3, 4], "x": 81, "y": 64 },
+            { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 },
+            { "flags": 4, "matrix": [3, 6], "x": 122, "y": 64 },
+            { "flags": 4, "matrix": [3, 7], "x": 142, "y": 64 },
+            { "flags": 4, "matrix": [3, 8], "x": 162, "y": 64 },
+            { "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 },
+            { "flags": 1, "matrix": [4, 0], "x": 0, "y": 86 },
+            { "flags": 1, "matrix": [4, 1], "x": 20, "y": 86 },
+            { "flags": 1, "matrix": [4, 2], "x": 40, "y": 86 },
+            { "flags": 1, "matrix": [4, 3], "x": 61, "y": 86 },
+            { "flags": 1, "matrix": [4, 4], "x": 81, "y": 86 },
+            { "flags": 4, "matrix": [4, 5], "x": 111, "y": 86 },
+            { "flags": 1, "matrix": [4, 7], "x": 142, "y": 86 },
+            { "flags": 1, "matrix": [4, 8], "x": 162, "y": 86 },
+            { "flags": 1, "matrix": [4, 9], "x": 183, "y": 86 },
+            { "flags": 1, "matrix": [4, 10], "x": 203, "y": 86 },
+            { "flags": 1, "matrix": [4, 11], "x": 224, "y": 86 }
+        ]
+    },
+    "community_layouts": ["ortho_5x12"],
+    "layouts": {
+        "LAYOUT_ortho_5x12": {
+            "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 },
+                { "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": [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, 6], "x": 6, "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/boardsource/equals/60/keymaps/default/keymap.c b/keyboards/boardsource/equals/60/keymaps/default/keymap.c
new file mode 100644
index 000000000000..48e26a409474
--- /dev/null
+++ b/keyboards/boardsource/equals/60/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+// Copyright 2023 Cole Smith (@boardsource)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _MAIN,
+    _RAISE,
+    _LOWER
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_MAIN] = 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_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_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_RGHT, RGB_MOD, RGB_TOG
+    ),
+    [_RAISE] = LAYOUT_ortho_5x12(
+        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,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    ),
+    [_LOWER] = LAYOUT_ortho_5x12(
+        KC_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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    )
+};
diff --git a/keyboards/boardsource/equals/60/keymaps/via/keymap.c b/keyboards/boardsource/equals/60/keymaps/via/keymap.c
new file mode 100644
index 000000000000..54528b8f600e
--- /dev/null
+++ b/keyboards/boardsource/equals/60/keymaps/via/keymap.c
@@ -0,0 +1,36 @@
+// Copyright 2023 Cole Smith (@boardsource)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _MAIN,
+    _RAISE,
+    _LOWER
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_MAIN] = 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_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_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+    ),
+    [_RAISE] = LAYOUT_ortho_5x12(
+        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,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    ),
+    [_LOWER] = LAYOUT_ortho_5x12(
+        KC_ESC, 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, _______, KC_UP, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    )
+};
diff --git a/keyboards/boardsource/equals/60/keymaps/via/rules.mk b/keyboards/boardsource/equals/60/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/boardsource/equals/60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/boardsource/equals/60/mcuconf.h b/keyboards/boardsource/equals/60/mcuconf.h
new file mode 100644
index 000000000000..e38c802c071a
--- /dev/null
+++ b/keyboards/boardsource/equals/60/mcuconf.h
@@ -0,0 +1,11 @@
+// Copyright 2023 Cole Smith (@boardsource)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_PWM_USE_PWM6
+#define RP_PWM_USE_PWM6 TRUE
+
+#undef RP_SPI_USE_SPI1
+#define RP_SPI_USE_SPI1 TRUE
diff --git a/keyboards/boardsource/equals/60/rules.mk b/keyboards/boardsource/equals/60/rules.mk
new file mode 100644
index 000000000000..4192b0c2e54d
--- /dev/null
+++ b/keyboards/boardsource/equals/60/rules.mk
@@ -0,0 +1,3 @@
+AUDIO_DRIVER = pwm_hardware
+QUANTUM_PAINTER_ENABLE = yes
+QUANTUM_PAINTER_DRIVERS += st7735_spi
diff --git a/keyboards/boardsource/equals/avr/config.h b/keyboards/boardsource/equals/avr/config.h
new file mode 100644
index 000000000000..68754cbe528d
--- /dev/null
+++ b/keyboards/boardsource/equals/avr/config.h
@@ -0,0 +1,4 @@
+// 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
new file mode 100644
index 000000000000..bbade34e6383
--- /dev/null
+++ b/keyboards/boardsource/equals/avr/info.json
@@ -0,0 +1,202 @@
+{
+    "keyboard_name": "Equals kit",
+
+    "build": {
+        "lto": true
+      },
+      "development_board": "promicro",
+    "matrix_pins": {
+        "cols": ["F4","F5","F6","F7","B1","B3","B2","B6","B5","B4","E6","D7"],
+        "rows": ["D3","D2","D1","D0","D4"]
+    },
+    "ws2812": {
+        "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 },
+            { "flags": 2, "x": 112, "y": 17 },
+            { "flags": 2, "x": 50, "y": 17 },
+            { "flags": 2, "x": 4, "y": 17 },
+            { "flags": 2, "x": 4, "y": 56 },
+            { "flags": 2, "x": 50, "y": 56 },
+            { "flags": 2, "x": 112, "y": 56 },
+            { "flags": 2, "x": 172, "y": 56 },
+            { "flags": 2, "x": 220, "y": 56 },
+            { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
+            { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 },
+            { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 },
+            { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 },
+            { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 },
+            { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 },
+            { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 },
+            { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 },
+            { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 },
+            { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 },
+            { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 },
+            { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 },
+            { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 },
+            { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 },
+            { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 },
+            { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 },
+            { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 },
+            { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 },
+            { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 },
+            { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 },
+            { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 },
+            { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 },
+            { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 },
+            { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 },
+            { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 },
+            { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 },
+            { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 },
+            { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 },
+            { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 },
+            { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 },
+            { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 },
+            { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 },
+            { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 },
+            { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 },
+            { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 },
+            { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 },
+            { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 },
+            { "flags": 4, "matrix": [3, 1], "x": 20, "y": 64 },
+            { "flags": 4, "matrix": [3, 2], "x": 40, "y": 64 },
+            { "flags": 4, "matrix": [3, 3], "x": 61, "y": 64 },
+            { "flags": 4, "matrix": [3, 4], "x": 81, "y": 64 },
+            { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 },
+            { "flags": 4, "matrix": [3, 6], "x": 122, "y": 64 },
+            { "flags": 4, "matrix": [3, 7], "x": 142, "y": 64 },
+            { "flags": 4, "matrix": [3, 8], "x": 162, "y": 64 },
+            { "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 },
+            { "flags": 1, "matrix": [4, 0], "x": 0, "y": 86 },
+            { "flags": 1, "matrix": [4, 1], "x": 20, "y": 86 },
+            { "flags": 1, "matrix": [4, 2], "x": 40, "y": 86 },
+            { "flags": 1, "matrix": [4, 3], "x": 61, "y": 86 },
+            { "flags": 1, "matrix": [4, 4], "x": 81, "y": 86 },
+            { "flags": 4, "matrix": [4, 5], "x": 111, "y": 86 },
+            { "flags": 1, "matrix": [4, 7], "x": 142, "y": 86 },
+            { "flags": 1, "matrix": [4, 8], "x": 162, "y": 86 },
+            { "flags": 1, "matrix": [4, 9], "x": 183, "y": 86 },
+            { "flags": 1, "matrix": [4, 10], "x": 203, "y": 86 },
+            { "flags": 1, "matrix": [4, 11], "x": 224, "y": 86 }
+        ]
+    },
+    "community_layouts": ["ortho_5x12"],
+    "layouts": {
+        "LAYOUT_ortho_5x12": {
+            "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 },
+                { "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": [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, 6], "x": 6, "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/boardsource/equals/avr/keymaps/default/keymap.c b/keyboards/boardsource/equals/avr/keymaps/default/keymap.c
new file mode 100644
index 000000000000..99a049214b14
--- /dev/null
+++ b/keyboards/boardsource/equals/avr/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+// Copyright 2023 Cole Smith (@boardsource)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _MAIN,
+    _RAISE,
+    _LOWER
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_MAIN] = 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_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_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, CK_TOGG, RGB_MOD, RGB_TOG
+    ),
+    [_RAISE] = LAYOUT_ortho_5x12(
+        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,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    ),
+    [_LOWER] = LAYOUT_ortho_5x12(
+        KC_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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    )
+};
diff --git a/keyboards/boardsource/equals/avr/keymaps/via/keymap.c b/keyboards/boardsource/equals/avr/keymaps/via/keymap.c
new file mode 100644
index 000000000000..54528b8f600e
--- /dev/null
+++ b/keyboards/boardsource/equals/avr/keymaps/via/keymap.c
@@ -0,0 +1,36 @@
+// Copyright 2023 Cole Smith (@boardsource)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _MAIN,
+    _RAISE,
+    _LOWER
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_MAIN] = 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_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_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+    ),
+    [_RAISE] = LAYOUT_ortho_5x12(
+        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,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    ),
+    [_LOWER] = LAYOUT_ortho_5x12(
+        KC_ESC, 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, _______, KC_UP, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    )
+};
diff --git a/keyboards/boardsource/equals/avr/keymaps/via/rules.mk b/keyboards/boardsource/equals/avr/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/boardsource/equals/avr/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/boardsource/equals/equals.c b/keyboards/boardsource/equals/equals.c
new file mode 100644
index 000000000000..8eb933e70d21
--- /dev/null
+++ b/keyboards/boardsource/equals/equals.c
@@ -0,0 +1,18 @@
+// 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
+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();
+}
+#endif //QUANTUM_PAINTER_ENABLE
diff --git a/keyboards/boardsource/equals/graphics/thintel15.qff.c b/keyboards/boardsource/equals/graphics/thintel15.qff.c
new file mode 100644
index 000000000000..c361ad5346eb
--- /dev/null
+++ b/keyboards/boardsource/equals/graphics/thintel15.qff.c
@@ -0,0 +1,69 @@
+// Copyright 2023 Cole Smith (@boardsource)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include <qp.h>
+
+// clang-format off
+const uint8_t font_thintel15[966] = {
+    0x00, 0xFF, 0x14, 0x00, 0x00, 0x51, 0x46, 0x46, 0x01, 0xC6, 0x03, 0x00, 0x00, 0x39, 0xFC, 0xFF,
+    0xFF, 0x0B, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01, 0xFE, 0x1D, 0x01, 0x00, 0x02, 0x00,
+    0x00, 0xC2, 0x00, 0x00, 0x84, 0x01, 0x00, 0x06, 0x03, 0x00, 0x46, 0x05, 0x00, 0x88, 0x07, 0x00,
+    0x46, 0x0A, 0x00, 0x82, 0x0C, 0x00, 0x43, 0x0D, 0x00, 0x83, 0x0E, 0x00, 0xC4, 0x0F, 0x00, 0x46,
+    0x11, 0x00, 0x83, 0x13, 0x00, 0xC5, 0x14, 0x00, 0x82, 0x16, 0x00, 0x44, 0x17, 0x00, 0xC5, 0x18,
+    0x00, 0x84, 0x1A, 0x00, 0x05, 0x1C, 0x00, 0xC5, 0x1D, 0x00, 0x85, 0x1F, 0x00, 0x45, 0x21, 0x00,
+    0x05, 0x23, 0x00, 0xC5, 0x24, 0x00, 0x85, 0x26, 0x00, 0x45, 0x28, 0x00, 0x02, 0x2A, 0x00, 0xC3,
+    0x2A, 0x00, 0x05, 0x2C, 0x00, 0xC5, 0x2D, 0x00, 0x85, 0x2F, 0x00, 0x45, 0x31, 0x00, 0x08, 0x33,
+    0x00, 0xC5, 0x35, 0x00, 0x85, 0x37, 0x00, 0x45, 0x39, 0x00, 0x05, 0x3B, 0x00, 0xC4, 0x3C, 0x00,
+    0x44, 0x3E, 0x00, 0xC5, 0x3F, 0x00, 0x85, 0x41, 0x00, 0x44, 0x43, 0x00, 0xC5, 0x44, 0x00, 0x85,
+    0x46, 0x00, 0x44, 0x48, 0x00, 0xC6, 0x49, 0x00, 0x06, 0x4C, 0x00, 0x45, 0x4E, 0x00, 0x05, 0x50,
+    0x00, 0xC5, 0x51, 0x00, 0x85, 0x53, 0x00, 0x45, 0x55, 0x00, 0x06, 0x57, 0x00, 0x45, 0x59, 0x00,
+    0x06, 0x5B, 0x00, 0x46, 0x5D, 0x00, 0x86, 0x5F, 0x00, 0xC6, 0x61, 0x00, 0x06, 0x64, 0x00, 0x44,
+    0x66, 0x00, 0xC4, 0x67, 0x00, 0x44, 0x69, 0x00, 0xC6, 0x6A, 0x00, 0x05, 0x6D, 0x00, 0xC3, 0x6E,
+    0x00, 0x05, 0x70, 0x00, 0xC5, 0x71, 0x00, 0x84, 0x73, 0x00, 0x05, 0x75, 0x00, 0xC5, 0x76, 0x00,
+    0x84, 0x78, 0x00, 0x05, 0x7A, 0x00, 0xC5, 0x7B, 0x00, 0x82, 0x7D, 0x00, 0x43, 0x7E, 0x00, 0x85,
+    0x7F, 0x00, 0x42, 0x81, 0x00, 0x06, 0x82, 0x00, 0x45, 0x84, 0x00, 0x05, 0x86, 0x00, 0xC5, 0x87,
+    0x00, 0x85, 0x89, 0x00, 0x44, 0x8B, 0x00, 0xC5, 0x8C, 0x00, 0x83, 0x8E, 0x00, 0xC5, 0x8F, 0x00,
+    0x86, 0x91, 0x00, 0xC6, 0x93, 0x00, 0x06, 0x96, 0x00, 0x45, 0x98, 0x00, 0x04, 0x9A, 0x00, 0x85,
+    0x9B, 0x00, 0x42, 0x9D, 0x00, 0x05, 0x9E, 0x00, 0xC5, 0x9F, 0x00, 0x04, 0xFB, 0x86, 0x02, 0x00,
+    0x00, 0x00, 0x00, 0x54, 0x45, 0x00, 0x50, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0xFD, 0xD2,
+    0xAF, 0x28, 0x00, 0x00, 0x00, 0x84, 0x53, 0x15, 0x0E, 0x55, 0x39, 0x04, 0x00, 0x00, 0x00, 0x00,
+    0x12, 0x15, 0x0A, 0x28, 0x54, 0x24, 0x00, 0x00, 0x00, 0x80, 0x50, 0x14, 0x52, 0x95, 0x58, 0x00,
+    0x00, 0x00, 0x14, 0x00, 0x00, 0x4A, 0x92, 0x24, 0x02, 0x00, 0x91, 0x24, 0x49, 0x01, 0x00, 0x20,
+    0x27, 0x05, 0x00, 0x00, 0x00, 0x00, 0x40, 0x10, 0x1F, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x60, 0x0A, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x40, 0x24, 0x22,
+    0x11, 0x00, 0x00, 0xC0, 0xA4, 0x94, 0x52, 0x32, 0x00, 0x00, 0x20, 0x23, 0x22, 0x72, 0x00, 0x00,
+    0xC0, 0x24, 0x44, 0x44, 0x78, 0x00, 0x00, 0xC0, 0x24, 0x44, 0x50, 0x32, 0x00, 0x00, 0x80, 0x29,
+    0x95, 0x1E, 0x42, 0x00, 0x00, 0xE0, 0x85, 0x83, 0x50, 0x32, 0x00, 0x00, 0xC0, 0xA4, 0x70, 0x52,
+    0x32, 0x00, 0x00, 0xE0, 0x21, 0x42, 0x84, 0x10, 0x00, 0x00, 0xC0, 0xA4, 0x64, 0x52, 0x32, 0x00,
+    0x00, 0xC0, 0xA4, 0xE4, 0x50, 0x32, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x30, 0x60, 0x0A, 0x00,
+    0x00, 0x11, 0x11, 0x04, 0x41, 0x00, 0x00, 0x00, 0x80, 0x07, 0x1E, 0x00, 0x00, 0x00, 0x20, 0x08,
+    0x82, 0x88, 0x08, 0x00, 0x00, 0xC0, 0x24, 0x64, 0x04, 0x10, 0x00, 0x00, 0x00, 0x1C, 0x22, 0x59,
+    0x55, 0x2D, 0x02, 0x1C, 0x00, 0x00, 0x00, 0xC0, 0xA4, 0xF4, 0x52, 0x4A, 0x00, 0x00, 0xE0, 0xA4,
+    0x74, 0x52, 0x3A, 0x00, 0x00, 0xC0, 0xA4, 0x10, 0x42, 0x32, 0x00, 0x00, 0xE0, 0xA4, 0x94, 0x52,
+    0x3A, 0x00, 0x00, 0x70, 0x11, 0x17, 0x71, 0x00, 0x00, 0x70, 0x11, 0x17, 0x11, 0x00, 0x00, 0xC0,
+    0xA4, 0xD0, 0x52, 0x32, 0x00, 0x00, 0x20, 0xA5, 0xF4, 0x52, 0x4A, 0x00, 0x00, 0x70, 0x22, 0x22,
+    0x72, 0x00, 0x00, 0xC0, 0x21, 0x84, 0x50, 0x32, 0x00, 0x00, 0x20, 0xA5, 0x32, 0x4A, 0x4A, 0x00,
+    0x00, 0x10, 0x11, 0x11, 0x71, 0x00, 0x00, 0x40, 0xB4, 0x55, 0x51, 0x14, 0x45, 0x00, 0x00, 0x00,
+    0x40, 0x34, 0x55, 0x59, 0x14, 0x45, 0x00, 0x00, 0x00, 0xC0, 0xA4, 0x94, 0x52, 0x32, 0x00, 0x00,
+    0xE0, 0xA4, 0x74, 0x42, 0x08, 0x00, 0x00, 0xC0, 0xA4, 0x94, 0x52, 0x51, 0x00, 0x00, 0xE0, 0xA4,
+    0x74, 0x52, 0x4A, 0x00, 0x00, 0xC0, 0xA4, 0x60, 0x50, 0x32, 0x00, 0x00, 0xC0, 0x47, 0x10, 0x04,
+    0x41, 0x10, 0x00, 0x00, 0x00, 0x20, 0xA5, 0x94, 0x52, 0x32, 0x00, 0x00, 0x40, 0x14, 0x45, 0x51,
+    0xA4, 0x10, 0x00, 0x00, 0x00, 0x40, 0x14, 0x45, 0x51, 0xB5, 0x45, 0x00, 0x00, 0x00, 0x40, 0x14,
+    0x29, 0x84, 0x12, 0x45, 0x00, 0x00, 0x00, 0x40, 0x14, 0x45, 0x0E, 0x41, 0x10, 0x00, 0x00, 0x00,
+    0xC0, 0x07, 0x21, 0x84, 0x10, 0x7C, 0x00, 0x00, 0x00, 0x17, 0x11, 0x11, 0x11, 0x07, 0x00, 0x10,
+    0x21, 0x22, 0x44, 0x00, 0x00, 0x47, 0x44, 0x44, 0x44, 0x07, 0x00, 0x84, 0x12, 0x01, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x93, 0x5C, 0x72, 0x00, 0x00, 0x20, 0x84, 0x93, 0x52, 0x3A, 0x00, 0x00, 0x00, 0x60,
+    0x11, 0x61, 0x00, 0x00, 0x00, 0x21, 0x97, 0x52, 0x72, 0x00, 0x00, 0x00, 0x00, 0x93, 0x5E, 0x70,
+    0x00, 0x00, 0x60, 0x11, 0x13, 0x11, 0x00, 0x00, 0x00, 0x00, 0x97, 0x52, 0x72, 0x28, 0x19, 0x20,
+    0x84, 0x93, 0x52, 0x4A, 0x00, 0x00, 0x10, 0x55, 0x00, 0x80, 0x20, 0x49, 0x0A, 0x00, 0x20, 0x84,
+    0x94, 0x4E, 0x4A, 0x00, 0x00, 0x54, 0x55, 0x00, 0x00, 0x00, 0x2C, 0x55, 0x55, 0x55, 0x00, 0x00,
+    0x00, 0x00, 0x80, 0x93, 0x52, 0x4A, 0x00, 0x00, 0x00, 0x00, 0x93, 0x52, 0x32, 0x00, 0x00, 0x00,
+    0x80, 0x93, 0x52, 0x3A, 0x21, 0x00, 0x00, 0x00, 0x97, 0x52, 0x72, 0x08, 0x01, 0x00, 0x50, 0x13,
+    0x11, 0x00, 0x00, 0x00, 0x00, 0x17, 0x0C, 0x3A, 0x00, 0x00, 0x48, 0x96, 0x44, 0x00, 0x00, 0x00,
+    0x80, 0x94, 0x52, 0x72, 0x00, 0x00, 0x00, 0x00, 0x44, 0x51, 0xA4, 0x10, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x44, 0x51, 0x54, 0x6D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x0A, 0xA1, 0x44, 0x00, 0x00,
+    0x00, 0x00, 0x80, 0x94, 0x52, 0x72, 0x28, 0x19, 0x00, 0x70, 0x24, 0x71, 0x00, 0x00, 0x4C, 0x08,
+    0x11, 0x84, 0x10, 0x0C, 0x00, 0x55, 0x55, 0x01, 0x83, 0x10, 0x82, 0x08, 0x21, 0x03, 0x00, 0x00,
+    0x00, 0xB0, 0x1A, 0x00, 0x00, 0x00,
+};
+// clang-format on
diff --git a/keyboards/boardsource/equals/info.json b/keyboards/boardsource/equals/info.json
new file mode 100644
index 000000000000..bed8ec2640c5
--- /dev/null
+++ b/keyboards/boardsource/equals/info.json
@@ -0,0 +1,21 @@
+{
+    "manufacturer": "Boardsource",
+    "maintainer": "Boardsource",
+    "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"
+    }
+
+}
diff --git a/keyboards/boardsource/equals/readme.md b/keyboards/boardsource/equals/readme.md
new file mode 100644
index 000000000000..9c5d48f5c297
--- /dev/null
+++ b/keyboards/boardsource/equals/readme.md
@@ -0,0 +1,33 @@
+# equals
+
+![equals](https://i.imgur.com/c3adFqsh.jpeg)
+
+* Keyboard Maintainer: [Cole Smith](https://github.com/boardsource)
+* Hardware Supported: Equals PCB w/ RP2040
+* Hardware Availability: [boardsource](https://boardsource.xyz)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make boardsource/equals/48:default
+    make boardsource/equals/60:default
+    make boardsource/equals/avr:default
+    
+Flashing example for this keyboard:
+
+    make boardsource/equals/48:default:flash
+    make boardsource/equals/60:default:flash
+    make boardsource/equals/avr:default:flash
+    
+Compile `avr` firmware if your PCB uses a drop-in microcontroller like Pro Micro.
+
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/boardsource/equals/ui.c b/keyboards/boardsource/equals/ui.c
new file mode 100644
index 000000000000..f953fc4c8896
--- /dev/null
+++ b/keyboards/boardsource/equals/ui.c
@@ -0,0 +1,40 @@
+// 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/rules.mk b/keyboards/boardsource/holiday/spooky/keymaps/rip_mx/rules.mk
index d34d066ded93..dd68e9d3b090 100644
--- a/keyboards/boardsource/holiday/spooky/keymaps/rip_mx/rules.mk
+++ b/keyboards/boardsource/holiday/spooky/keymaps/rip_mx/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/rules.mk b/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/rules.mk
index d34d066ded93..dd68e9d3b090 100644
--- a/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/rules.mk
+++ b/keyboards/boardsource/holiday/spooky/keymaps/rip_my_wallet/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/boardsource/lulu/info.json b/keyboards/boardsource/lulu/info.json
index 8272c1630084..f0eb661d7b9a 100644
--- a/keyboards/boardsource/lulu/info.json
+++ b/keyboards/boardsource/lulu/info.json
@@ -22,7 +22,7 @@
     "enabled": true
   },
   "rgb_matrix": {
-    "driver": "WS2812",
+    "driver": "ws2812",
     "split_count": [35, 35],
     "max_brightness": 150,
     "animations": {
diff --git a/keyboards/boardsource/lulu/lulu.c b/keyboards/boardsource/lulu/lulu.c
index be6d565a329c..8d011268c4b1 100644
--- a/keyboards/boardsource/lulu/lulu.c
+++ b/keyboards/boardsource/lulu/lulu.c
@@ -1,6 +1,6 @@
 // Copyright 2022 Cole Smith <cole@boadsource.xyz>
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include "encoder.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/boardsource/microdox/v2/info.json b/keyboards/boardsource/microdox/v2/info.json
index 8d68b964c16a..dccecb4980eb 100644
--- a/keyboards/boardsource/microdox/v2/info.json
+++ b/keyboards/boardsource/microdox/v2/info.json
@@ -35,7 +35,7 @@
     }
   },
   "rgb_matrix": {
-    "driver": "WS2812",
+    "driver": "ws2812",
     "layout": [
       {"flags": 2, "x": 12, "y": 11},
       {"flags": 2, "x": 86, "y": 11},
diff --git a/keyboards/boardsource/technik_o/config.h b/keyboards/boardsource/technik_o/config.h
index 1148c13ebc63..4d7d053cfbc4 100644
--- a/keyboards/boardsource/technik_o/config.h
+++ b/keyboards/boardsource/technik_o/config.h
@@ -41,12 +41,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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 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 79ade753b1d3..91840eeb4fc1 100644
--- a/keyboards/boardsource/technik_o/info.json
+++ b/keyboards/boardsource/technik_o/info.json
@@ -26,7 +26,7 @@
     "vid": "0x4273"
   },
   "rgb_matrix": {
-    "driver": "WS2812",
+    "driver": "ws2812",
     "layout": [
       {"flags": 2, "x": 220, "y": 17},
       {"flags": 2, "x": 172, "y": 17},
diff --git a/keyboards/boardsource/technik_s/config.h b/keyboards/boardsource/technik_s/config.h
index fe6518356e51..b01542d77b72 100644
--- a/keyboards/boardsource/technik_s/config.h
+++ b/keyboards/boardsource/technik_s/config.h
@@ -41,12 +41,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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 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 7c6086db7492..0c8b101b20e3 100644
--- a/keyboards/boardsource/technik_s/info.json
+++ b/keyboards/boardsource/technik_s/info.json
@@ -26,7 +26,7 @@
     "vid": "0x4273"
   },
   "rgb_matrix": {
-    "driver": "WS2812",
+    "driver": "ws2812",
     "layout": [
       {"flags": 2, "x": 220, "y": 17},
       {"flags": 2, "x": 172, "y": 17},
diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json
index be130dc94dfa..c574f7ab66fc 100644
--- a/keyboards/boardsource/the_mark/info.json
+++ b/keyboards/boardsource/the_mark/info.json
@@ -43,7 +43,7 @@
     "pin": "C6"
   },
   "rgb_matrix": {
-    "driver": "WS2812",
+    "driver": "ws2812",
     "layout": [
       {"flags": 2, "x": 224, "y": 42},
       {"flags": 2, "x": 224, "y": 21},
diff --git a/keyboards/boardsource/unicorne/info.json b/keyboards/boardsource/unicorne/info.json
index fe46ec13a697..aeeb34812537 100644
--- a/keyboards/boardsource/unicorne/info.json
+++ b/keyboards/boardsource/unicorne/info.json
@@ -51,7 +51,7 @@
         },
         "max_brightness": 150,
         "split_count": [27, 27],
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"x": 85, "y": 16, "flags": 2},
             {"x": 50, "y": 13, "flags": 2},
diff --git a/keyboards/boardsource/unicorne/unicorne.c b/keyboards/boardsource/unicorne/unicorne.c
index 0c443722e027..22cd1e4a37d8 100644
--- a/keyboards/boardsource/unicorne/unicorne.c
+++ b/keyboards/boardsource/unicorne/unicorne.c
@@ -20,13 +20,13 @@ bool oled_task_kb(void) {
                 oled_write_raw(layer_zero, sizeof(layer_zero));
                 break;
             case 1:
-                oled_write_raw(layer_zero, sizeof(layer_zero));
+                oled_write_raw(layer_one, sizeof(layer_one));
                 break;
             case 2:
-                oled_write_raw(layer_zero, sizeof(layer_zero));
+                oled_write_raw(layer_two, sizeof(layer_two));
                 break;
             case 3:
-                oled_write_raw(layer_zero, sizeof(layer_zero));
+                oled_write_raw(layer_three, sizeof(layer_three));
                 break;
         }
     } else {
diff --git a/keyboards/boardwalk/config.h b/keyboards/boardwalk/config.h
index a1d1a3a54411..1b4e5a6d87e6 100644
--- a/keyboards/boardwalk/config.h
+++ b/keyboards/boardwalk/config.h
@@ -35,19 +35,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
-
-// ws2812 options
-#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 // 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)
diff --git a/keyboards/boardwalk/info.json b/keyboards/boardwalk/info.json
index 8a04fc121ee3..82b8fb23e402 100644
--- a/keyboards/boardwalk/info.json
+++ b/keyboards/boardwalk/info.json
@@ -8,6 +8,24 @@
         "pid": "0x5337",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 25,
+        "brightness_steps": 12,
+        "led_count": 14,
+        "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"
     },
diff --git a/keyboards/bolsa/bolsalice/config.h b/keyboards/bolsa/bolsalice/config.h
deleted file mode 100644
index ad199d65786e..000000000000
--- a/keyboards/bolsa/bolsalice/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2022 CMM.Studio 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/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 8
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/bolsa/bolsalice/info.json b/keyboards/bolsa/bolsalice/info.json
index 25ef2f617bc6..51e342b10b35 100644
--- a/keyboards/bolsa/bolsalice/info.json
+++ b/keyboards/bolsa/bolsalice/info.json
@@ -6,6 +6,23 @@
         "vid": "0x4253",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "B1"
     },
diff --git a/keyboards/bolsa/damapad/rules.mk b/keyboards/bolsa/damapad/rules.mk
index 395f25f859ec..9c75f75d52d3 100644
--- a/keyboards/bolsa/damapad/rules.mk
+++ b/keyboards/bolsa/damapad/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/boston/config.h b/keyboards/boston/config.h
index 1dcbcdb5b870..483c57940c34 100644
--- a/keyboards/boston/config.h
+++ b/keyboards/boston/config.h
@@ -25,25 +25,11 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Define RGBLED */
-#define RGBLED_NUM 1
-#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
 
 //The 3D-printed version of Boston uses APA106 LEDs, which are reversed
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
 
-#define TAP_CODE_DELAY 15
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/boston/info.json b/keyboards/boston/info.json
index 76d6cb41abf8..39c5a7c160dc 100644
--- a/keyboards/boston/info.json
+++ b/keyboards/boston/info.json
@@ -18,11 +18,29 @@
             {"pin_a": "C13", "pin_b": "F1", "resolution": 2}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 15
+    },
     "backlight": {
         "pin": "A6",
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "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
+        }
+    },
     "ws2812": {
         "pin": "A5"
     },
diff --git a/keyboards/boston/rules.mk b/keyboards/boston/rules.mk
index 176d6b7982e9..80d17a2dfd14 100644
--- a/keyboards/boston/rules.mk
+++ b/keyboards/boston/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 AUDIO_ENABLE = no          # Audio output
 ENCODER_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/boston_meetup/2019/config.h b/keyboards/boston_meetup/2019/config.h
index d609409cb56b..7d53f90b150d 100644
--- a/keyboards/boston_meetup/2019/config.h
+++ b/keyboards/boston_meetup/2019/config.h
@@ -38,66 +38,54 @@
 
 /* Haptic Driver initialization settings
  * Feedback Control Settings */
-#define FB_ERM_LRA 1 /* For ERM:0 or LRA:1*/
-#define FB_BRAKEFACTOR 6 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
-#define FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
+#define DRV2605L_FB_ERM_LRA 1 /* For ERM:0 or LRA:1*/
+#define DRV2605L_FB_BRAKEFACTOR 6 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
+#define DRV2605L_FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
 
 /* default 3V ERM vibration motor voltage and library*/
-#if FB_ERM_LRA == 0
-#define RATED_VOLTAGE 3
-#define V_RMS 2.3
-#define V_PEAK 3.30
+#if DRV2605L_FB_ERM_LRA == 0
+#define DRV2605L_RATED_VOLTAGE 3
+#define DRV2605L_V_RMS 2.3
+#define DRV2605L_V_PEAK 3.30
 /* Library Selection */
-#define LIB_SELECTION 4 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
+#define DRV2605L_LIBRARY 4 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
 
 /* default 2V LRA voltage and library */
-#elif FB_ERM_LRA == 1
-#define RATED_VOLTAGE 2
-#define V_RMS 2.0
-#define V_PEAK 2.85
-#define F_LRA 200
+#elif DRV2605L_FB_ERM_LRA == 1
+#define DRV2605L_RATED_VOLTAGE 2
+#define DRV2605L_V_RMS 2.0
+#define DRV2605L_V_PEAK 2.85
+#define DRV2605L_F_LRA 200
 /* Library Selection */
-#define LIB_SELECTION 6 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
+#define DRV2605L_LIBRARY 6 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
 
 #endif
 
 /* Control 1 register settings */
-#define DRIVE_TIME 25
-#define AC_COUPLE 0
-#define STARTUP_BOOST 1
+#define DRV2605L_DRIVE_TIME 25
+#define DRV2605L_AC_COUPLE 0
+#define DRV2605L_STARTUP_BOOST 1
 
 /* Control 2 Settings */
-#define BIDIR_INPUT 1
-#define BRAKE_STAB 1 /* Loopgain is reduced when braking is almost complete to improve stability */
-#define SAMPLE_TIME 3
-#define BLANKING_TIME 1
-#define IDISS_TIME 1
+#define DRV2605L_BIDIR_INPUT 1
+#define DRV2605L_BRAKE_STAB 1 /* Loopgain is reduced when braking is almost complete to improve stability */
+#define DRV2605L_SAMPLE_TIME 3
+#define DRV2605L_BLANKING_TIME 1
+#define DRV2605L_IDISS_TIME 1
 
 /* Control 3 settings */
-#define NG_THRESH 2
-#define ERM_OPEN_LOOP 1
-#define SUPPLY_COMP_DIS 0
-#define DATA_FORMAT_RTO 0
-#define LRA_DRIVE_MODE 0
-#define N_PWM_ANALOG 0
-#define LRA_OPEN_LOOP 0
+#define DRV2605L_NG_THRESH 2
+#define DRV2605L_ERM_OPEN_LOOP 1
+#define DRV2605L_SUPPLY_COMP_DIS 0
+#define DRV2605L_DATA_FORMAT_RTO 0
+#define DRV2605L_LRA_DRIVE_MODE 0
+#define DRV2605L_N_PWM_ANALOG 0
+#define DRV2605L_LRA_OPEN_LOOP 0
 /* Control 4 settings */
-#define ZC_DET_TIME 0
-#define AUTO_CAL_TIME 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 10
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define DRV2605L_ZC_DET_TIME 0
+#define DRV2605L_AUTO_CAL_TIME 3
+
+#define RGB_MATRIX_LED_COUNT 10
 
 #define RGB_MATRIX_KEYPRESSES
 
diff --git a/keyboards/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/info.json
index d50e92e17c9f..981d4de7c8db 100644
--- a/keyboards/boston_meetup/2019/info.json
+++ b/keyboards/boston_meetup/2019/info.json
@@ -3,7 +3,7 @@
         "device_version": "20.1.9"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["A7", "A8", "B2", "B10"],
@@ -15,6 +15,21 @@
             {"pin_a": "B13", "pin_b": "B14"}
         ]
     },
+    "rgblight": {
+        "led_count": 10,
+        "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": "B5"
     },
diff --git a/keyboards/boston_meetup/2019/rules.mk b/keyboards/boston_meetup/2019/rules.mk
index b2f1131ffd46..f5ef6ba5a265 100644
--- a/keyboards/boston_meetup/2019/rules.mk
+++ b/keyboards/boston_meetup/2019/rules.mk
@@ -12,6 +12,5 @@ AUDIO_ENABLE = yes          # Audio output
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = no
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = DRV2605L
+HAPTIC_DRIVER = drv2605l
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/box75/rules.mk b/keyboards/box75/rules.mk
index 93f25a13d8d2..5b6b0c929912 100644
--- a/keyboards/box75/rules.mk
+++ b/keyboards/box75/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/bpiphany/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h
index 2dae864ddb2e..5f360813239b 100644
--- a/keyboards/bpiphany/four_banger/config.h
+++ b/keyboards/bpiphany/four_banger/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 1
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/bpiphany/four_banger/info.json b/keyboards/bpiphany/four_banger/info.json
index ce9b4a7ec5f4..e267922ab88f 100644
--- a/keyboards/bpiphany/four_banger/info.json
+++ b/keyboards/bpiphany/four_banger/info.json
@@ -8,6 +8,23 @@
         "pid": "0x2004",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/bpiphany/hid_liber/config.h b/keyboards/bpiphany/hid_liber/config.h
index f567c3e12a1d..2e41e1f7005d 100755
--- a/keyboards/bpiphany/hid_liber/config.h
+++ b/keyboards/bpiphany/hid_liber/config.h
@@ -23,7 +23,6 @@
 #define MATRIX_COLS 8
 
 // HID Liberation Device uses custom matrix code to accomodate a 74HC238 3 to 8 decoder on pins B1, B2 and B3.
-//#define DIODE_DIRECTION
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c b/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
index c0439912ffae..f0c75284f740 100644
--- a/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
+++ b/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
@@ -3,8 +3,6 @@
 
 #define MEDAPP LT(MEDIA, KC_APP)
 
-uint8_t current_layer_global = 255;
-
 enum layers {
     DEFAULT,
     PROG1,
@@ -87,25 +85,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          _______,_______,_______,               LT(MISC, KC_SPC),                        _______,_______,_______,_______,   _______,_______,_______,  _______,_______),
 };
 
-void matrix_scan_user(void) {
-    uint8_t layer;
-    layer = get_highest_layer(layer_state);
-
-    if (current_layer_global != layer) {
-        current_layer_global = layer;
-
-        // unset CAPSLOCK and SCROLL LOCK LEDs
-        led_set(host_keyboard_leds() & ~(1<<USB_LED_CAPS_LOCK));
-        led_set(host_keyboard_leds() & ~(1<<USB_LED_SCROLL_LOCK));
-        // set SCROLL LOCK LED when the mouse layer is active, CAPS LOCK when PROG layer is active
-        if (layer == MOUSE1 || layer == MOUSE2) {
-          led_set(host_keyboard_leds() | (1<<USB_LED_SCROLL_LOCK));
-        } else if (layer == PROG1 || layer == PROG2) {
-          led_set(host_keyboard_leds() | (1<<USB_LED_CAPS_LOCK));
-        }
-    }
-}
-
 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) {
diff --git a/keyboards/bredworks/wyvern_hs/info.json b/keyboards/bredworks/wyvern_hs/info.json
new file mode 100644
index 000000000000..63e85496ae0d
--- /dev/null
+++ b/keyboards/bredworks/wyvern_hs/info.json
@@ -0,0 +1,308 @@
+{
+    "manufacturer": "Bred Works",
+    "keyboard_name": "Wyvern HS",
+    "maintainer": "DeskDaily",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B2", "B1", "B0", "F7", "D5", "D3", "D2", "D1", "D0", "E6", "F0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B7", "F1", "F6", "F5", "F4"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://bredworks.com/products/wyvern-hotswap-pcb",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0001",
+        "vid": "0x0571"
+    },
+    "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.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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+                {"matrix": [0, 19], "x": 19.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": 4.25, "y": 1, "w": 1.5},
+                {"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},
+                {"matrix": [1, 16], "x": 16.75, "y": 1},
+                {"matrix": [1, 17], "x": 17.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 19], "x": 19.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.25, "y": 2, "w": 1.75},
+                {"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},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+                {"matrix": [2, 16], "x": 17, "y": 2, "w": 2.25},
+                {"matrix": [2, 19], "x": 19.75, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "h": 2},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2},
+                {"matrix": [3, 4], "x": 4.25, "y": 3, "w": 1.25},
+                {"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},
+                {"matrix": [3, 15], "x": 15.5, "y": 3},
+                {"matrix": [3, 16], "x": 16.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 19], "x": 19.75, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 8, "y": 4, "w": 2.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [0, 18], "x": 18.25, "y": 0}
+            ]
+        },
+        "LAYOUT_mirrored_numpad": {
+            "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.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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+                {"matrix": [0, 19], "x": 19.75, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "h": 2},
+                {"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.25, "y": 1, "w": 1.5},
+                {"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},
+                {"matrix": [1, 16], "x": 16.75, "y": 1},
+                {"matrix": [1, 17], "x": 17.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 19], "x": 19.75, "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, 4], "x": 4.25, "y": 2, "w": 1.75},
+                {"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},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+                {"matrix": [2, 16], "x": 17, "y": 2, "w": 2.25},
+                {"matrix": [2, 19], "x": 19.75, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "h": 2},
+                {"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.25, "y": 3, "w": 1.25},
+                {"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},
+                {"matrix": [3, 15], "x": 15.5, "y": 3},
+                {"matrix": [3, 16], "x": 16.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 19], "x": 19.75, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4, "w": 2},
+                {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 8, "y": 4, "w": 2.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [0, 18], "x": 18.25, "y": 0}
+            ]
+        },
+        "LAYOUT_regular_numpad": {
+            "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.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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+                {"matrix": [0, 19], "x": 19.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, "h": 2},
+                {"matrix": [1, 4], "x": 4.25, "y": 1, "w": 1.5},
+                {"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},
+                {"matrix": [1, 16], "x": 16.75, "y": 1},
+                {"matrix": [1, 17], "x": 17.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 19], "x": 19.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, 4], "x": 4.25, "y": 2, "w": 1.75},
+                {"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},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+                {"matrix": [2, 16], "x": 17, "y": 2, "w": 2.25},
+                {"matrix": [2, 19], "x": 19.75, "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": [3, 4], "x": 4.25, "y": 3, "w": 1.25},
+                {"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},
+                {"matrix": [3, 15], "x": 15.5, "y": 3},
+                {"matrix": [3, 16], "x": 16.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 19], "x": 19.75, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [4, 1], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 8, "y": 4, "w": 2.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [0, 18], "x": 18.25, "y": 0}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/bredworks/wyvern_hs/keymaps/default/keymap.c b/keyboards/bredworks/wyvern_hs/keymaps/default/keymap.c
new file mode 100644
index 000000000000..3d0e06721524
--- /dev/null
+++ b/keyboards/bredworks/wyvern_hs/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* 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_mirrored_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_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_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_ENT,  KC_P1,   KC_P2,   KC_P3,   	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_DEL,  KC_P0,   				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_mirrored_numpad(
+        _______, _______, _______, _______, 	QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+				 _______, _______, _______, 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+				 _______, _______, 				_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
\ No newline at end of file
diff --git a/keyboards/bredworks/wyvern_hs/keymaps/regular_numpad/keymap.c b/keyboards/bredworks/wyvern_hs/keymaps/regular_numpad/keymap.c
new file mode 100644
index 000000000000..78037bac14ab
--- /dev/null
+++ b/keyboards/bredworks/wyvern_hs/keymaps/regular_numpad/keymap.c
@@ -0,0 +1,33 @@
+/* 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/bredworks/wyvern_hs/keymaps/via/keymap.c b/keyboards/bredworks/wyvern_hs/keymaps/via/keymap.c
new file mode 100644
index 000000000000..0b73184e01e0
--- /dev/null
+++ b/keyboards/bredworks/wyvern_hs/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+/* 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_all(
+        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_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_PGUP,
+        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_PGDN,
+        KC_ENT,  KC_P1,   KC_P2,   KC_P3,   	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_DEL,  KC_P0,   						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_all(
+        _______, _______, _______, _______, 	QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, 						_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
\ No newline at end of file
diff --git a/keyboards/bredworks/wyvern_hs/keymaps/via/rules.mk b/keyboards/bredworks/wyvern_hs/keymaps/via/rules.mk
new file mode 100644
index 000000000000..36b7ba9cbc98
--- /dev/null
+++ b/keyboards/bredworks/wyvern_hs/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/bredworks/wyvern_hs/readme.md b/keyboards/bredworks/wyvern_hs/readme.md
new file mode 100644
index 000000000000..0d0ed4e099e5
--- /dev/null
+++ b/keyboards/bredworks/wyvern_hs/readme.md
@@ -0,0 +1,23 @@
+# Bredworks Wyvern HS
+
+* Keyboard Maintainer: [DeskDaily](https://github.com/DeskDaily)
+* Hardware Supported: Atmega32u4
+* Hardware Availability: [BredWorks](https://bredworks.com/products/wyvern-hotswap-pcb)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make bredworks/wyvern_hs:default
+	
+Flashing example for this keyboard:
+
+    make bredworks/wyvern_hs:default:flash
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the upper left key/esc) 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
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/jscotto/scotto9/rules.mk b/keyboards/bredworks/wyvern_hs/rules.mk
similarity index 100%
rename from keyboards/handwired/jscotto/scotto9/rules.mk
rename to keyboards/bredworks/wyvern_hs/rules.mk
diff --git a/keyboards/bt66tech/bt66tech60/config.h b/keyboards/bt66tech/bt66tech60/config.h
index 687baec50945..45693628a6f2 100644
--- a/keyboards/bt66tech/bt66tech60/config.h
+++ b/keyboards/bt66tech/bt66tech60/config.h
@@ -25,17 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 9
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 5
 /*
diff --git a/keyboards/bt66tech/bt66tech60/info.json b/keyboards/bt66tech/bt66tech60/info.json
index e4a2d5b1d6c3..adb45b95f31e 100644
--- a/keyboards/bt66tech/bt66tech60/info.json
+++ b/keyboards/bt66tech/bt66tech60/info.json
@@ -19,6 +19,21 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 9,
+        "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"
diff --git a/keyboards/bt66tech/bt66tech60/rules.mk b/keyboards/bt66tech/bt66tech60/rules.mk
index bfd3bcd1b497..0f238804a19f 100644
--- a/keyboards/bt66tech/bt66tech60/rules.mk
+++ b/keyboards/bt66tech/bt66tech60/rules.mk
@@ -14,5 +14,3 @@ SLEEP_LED_ENABLE = yes
 
 DEFAULT_FOLDER = bt66tech/bt66tech60
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/bubble75/hotswap/config.h b/keyboards/bubble75/hotswap/config.h
index df83257ebd9e..7ecadd007624 100644
--- a/keyboards/bubble75/hotswap/config.h
+++ b/keyboards/bubble75/hotswap/config.h
@@ -24,11 +24,7 @@
 
 /* WS2812 RGB */
 #ifdef RGB_MATRIX_ENABLE
-#define RGBLED_NUM 81
 #define RGB_MATRIX_LED_COUNT 81
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LAYERS
 //#define RGBLIGHT_LAYER_BLINK
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/bubble75/hotswap/info.json b/keyboards/bubble75/hotswap/info.json
index a12e4ca7944e..c9757847b035 100644
--- a/keyboards/bubble75/hotswap/info.json
+++ b/keyboards/bubble75/hotswap/info.json
@@ -13,7 +13,7 @@
         "pin": "B7"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "E6", "F0", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
diff --git a/keyboards/budgy/info.json b/keyboards/budgy/info.json
index 7310fa5a55a9..5903daa68d08 100644
--- a/keyboards/budgy/info.json
+++ b/keyboards/budgy/info.json
@@ -38,6 +38,7 @@
             }
         }
     },
+    "community_layouts": ["split_3x5_2"],
     "layouts": {
         "LAYOUT_split_3x5_2": {
             "layout": [
diff --git a/keyboards/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h
index 17e3e9a48171..5b25baa8c4b6 100644
--- a/keyboards/buildakb/potato65/config.h
+++ b/keyboards/buildakb/potato65/config.h
@@ -37,19 +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 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 RGBLIGHT_SLEEP
diff --git a/keyboards/buildakb/potato65/info.json b/keyboards/buildakb/potato65/info.json
index effaf6cbcaee..7fee44a1cea9 100644
--- a/keyboards/buildakb/potato65/info.json
+++ b/keyboards/buildakb/potato65/info.json
@@ -12,7 +12,23 @@
         "pin": "B1"
     },
     "rgblight": {
-        "max_brightness": 240
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "max_brightness": 240,
+        "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": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h
index d0bdbb2258b3..d60fc7af0191 100644
--- a/keyboards/buildakb/potato65hs/config.h
+++ b/keyboards/buildakb/potato65hs/config.h
@@ -22,19 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 16
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP
diff --git a/keyboards/buildakb/potato65hs/info.json b/keyboards/buildakb/potato65hs/info.json
index fa3b5d2bfebf..2b6a22179eb6 100644
--- a/keyboards/buildakb/potato65hs/info.json
+++ b/keyboards/buildakb/potato65hs/info.json
@@ -12,7 +12,23 @@
         "pin": "D5"
     },
     "rgblight": {
-        "max_brightness": 240
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "max_brightness": 240,
+        "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": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"],
diff --git a/keyboards/buildakb/potato65s/config.h b/keyboards/buildakb/potato65s/config.h
index 3b512642a269..d60fc7af0191 100644
--- a/keyboards/buildakb/potato65s/config.h
+++ b/keyboards/buildakb/potato65s/config.h
@@ -22,19 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 16
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP
diff --git a/keyboards/buildakb/potato65s/info.json b/keyboards/buildakb/potato65s/info.json
index d4efe4aac66c..fcd6cbf56f15 100644
--- a/keyboards/buildakb/potato65s/info.json
+++ b/keyboards/buildakb/potato65s/info.json
@@ -12,7 +12,23 @@
         "pin": "D5"
     },
     "rgblight": {
-        "max_brightness": 240
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "max_brightness": 240,
+        "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": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"],
diff --git a/keyboards/buzzard/keymaps/crehmann/config.h b/keyboards/buzzard/keymaps/crehmann/config.h
index 181396ad26f8..446ae01d3468 100644
--- a/keyboards/buzzard/keymaps/crehmann/config.h
+++ b/keyboards/buzzard/keymaps/crehmann/config.h
@@ -25,8 +25,8 @@
 #define NO_HAPTIC_PUNCTUATION
 #define NO_HAPTIC_NAV 
 #define NO_HAPTIC_NUMERIC
-#define DRV_GREETING       alert_750ms
-#define DRV_MODE_DEFAULT   sharp_tick1
+#define DRV2605L_GREETING       DRV2605L_EFFECT_750_MS_ALERT_100
+#define DRV2605L_DEFAULT_MODE   DRV2605L_EFFECT_SHARP_TICK_1_100
 #endif
 
 #ifdef PS2_MOUSE_ENABLE
diff --git a/keyboards/buzzard/keymaps/crehmann/features/haptic_utils.c b/keyboards/buzzard/keymaps/crehmann/features/haptic_utils.c
index 37fa2902c5cc..941d559f4290 100644
--- a/keyboards/buzzard/keymaps/crehmann/features/haptic_utils.c
+++ b/keyboards/buzzard/keymaps/crehmann/features/haptic_utils.c
@@ -4,7 +4,7 @@
 #include "haptic_utils.h"
 
 #ifdef HAPTIC_ENABLE
-#include "drivers/haptic/DRV2605L.h"
+#include "drivers/haptic/drv2605l.h"
 #endif
 
 #ifdef HAPTIC_ENABLE
@@ -23,19 +23,19 @@ void process_layer_pulse(layer_state_t state) {
 #ifdef HAPTIC_ENABLE
     switch (get_highest_layer(state)) {
         case 1:
-            DRV_pulse(soft_bump);
+            drv2605l_pulse(DRV2605L_EFFECT_SOFT_BUMP_100);
             break;
         case 2:
-            DRV_pulse(sh_dblsharp_tick);
+            drv2605l_pulse(DRV2605L_EFFECT_SHORT_DOUBLE_SHARP_TICK_1_100);
             break;
         case 3:
-            DRV_pulse(lg_dblclick_str);
+            drv2605l_pulse(DRV2605L_EFFECT_LONG_DOUBLE_SHARP_CLICK_STRONG_1_100);
             break;
         case 4:
-            DRV_pulse(soft_bump);
+            drv2605l_pulse(DRV2605L_EFFECT_SOFT_BUMP_100);
             break;
         case 5:
-            DRV_pulse(pulsing_sharp);
+            drv2605l_pulse(DRV2605L_EFFECT_PULSING_SHARP_1_100);
             break;
     }
 #endif
diff --git a/keyboards/buzzard/keymaps/crehmann/rules.mk b/keyboards/buzzard/keymaps/crehmann/rules.mk
index 484e7d84a6bf..98a83af54975 100644
--- a/keyboards/buzzard/keymaps/crehmann/rules.mk
+++ b/keyboards/buzzard/keymaps/crehmann/rules.mk
@@ -3,7 +3,7 @@ SRC += features/haptic_utils.c
 OLED_ENABLE = yes		
 
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = DRV2605L
+HAPTIC_DRIVER = drv2605l
 
 PS2_MOUSE_ENABLE = yes	
 MOUSEKEY_ENABLE = yes
diff --git a/keyboards/buzzard/keymaps/default/config.h b/keyboards/buzzard/keymaps/default/config.h
index 2a42e17d0cc2..0a2776afd15d 100644
--- a/keyboards/buzzard/keymaps/default/config.h
+++ b/keyboards/buzzard/keymaps/default/config.h
@@ -25,8 +25,8 @@
 #define NO_HAPTIC_PUNCTUATION
 #define NO_HAPTIC_NAV 
 #define NO_HAPTIC_NUMERIC
-#define DRV_GREETING       alert_750ms
-#define DRV_MODE_DEFAULT   sharp_tick1
+#define DRV2605L_GREETING       DRV2605L_EFFECT_750_MS_ALERT_100
+#define DRV2605L_DEFAULT_MODE   DRV2605L_EFFECT_SHARP_TICK_1_100
 #endif
 
 
diff --git a/keyboards/buzzard/keymaps/default/rules.mk b/keyboards/buzzard/keymaps/default/rules.mk
index e8124aebb9e0..46728f380337 100644
--- a/keyboards/buzzard/keymaps/default/rules.mk
+++ b/keyboards/buzzard/keymaps/default/rules.mk
@@ -1,7 +1,7 @@
 OLED_ENABLE = yes				# uncomment if you are using an OLED display
 
 #HAPTIC_ENABLE = yes			# uncomment only on the master side if you are using a Pimoroni haptic buzz
-#HAPTIC_DRIVER = DRV2605L		# uncomment only on the master side if you are using a Pimoroni haptic buzz
+#HAPTIC_DRIVER = drv2605l		# uncomment only on the master side if you are using a Pimoroni haptic buzz
 
 #PS2_MOUSE_ENABLE = yes			# uncomment only on the master side if you are usin a TrackPoint
 MOUSEKEY_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/buzzard/rev1/rev1.c b/keyboards/buzzard/rev1/rev1.c
index c6cdc66187b8..03c3269a7e45 100644
--- a/keyboards/buzzard/rev1/rev1.c
+++ b/keyboards/buzzard/rev1/rev1.c
@@ -3,7 +3,7 @@
 #include "quantum.h"
 
 #ifdef HAPTIC_ENABLE
-#include "drivers/haptic/DRV2605L.h"
+#include "drivers/haptic/drv2605l.h"
 #endif
 
 #ifdef SWAP_HANDS_ENABLE
@@ -100,27 +100,27 @@ __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
     switch (get_highest_layer(state)) {
         case 1:
 #ifdef HAPTIC_ENABLE
-            DRV_pulse(soft_bump);
+            drv2605l_pulse(DRV2605L_EFFECT_SOFT_BUMP_100);
 #endif
             break;
         case 2:
 #ifdef HAPTIC_ENABLE
-            DRV_pulse(sh_dblsharp_tick);
+            drv2605l_pulse(DRV2605L_EFFECT_SHORT_DOUBLE_SHARP_TICK_1_100);
 #endif
             break;
         case 3:
 #ifdef HAPTIC_ENABLE
-            DRV_pulse(lg_dblclick_str);
+            drv2605l_pulse(DRV2605L_EFFECT_LONG_DOUBLE_SHARP_CLICK_STRONG_1_100);
 #endif
             break;
         case 4:
 #ifdef HAPTIC_ENABLE
-            DRV_pulse(soft_bump);
+            drv2605l_pulse(DRV2605L_EFFECT_SOFT_BUMP_100);
 #endif
             break;
         case 5:
 #ifdef HAPTIC_ENABLE
-            DRV_pulse(pulsing_sharp);
+            drv2605l_pulse(DRV2605L_EFFECT_PULSING_SHARP_1_100);
 #endif
             break;
     }
diff --git a/keyboards/buzzard/rev1/rules.mk b/keyboards/buzzard/rev1/rules.mk
index 13c63d5b1763..2beb545ece1f 100644
--- a/keyboards/buzzard/rev1/rules.mk
+++ b/keyboards/buzzard/rev1/rules.mk
@@ -1,4 +1,2 @@
-OLED_DRIVER = SSD1306
-
 PS2_ENABLE = yes
 PS2_DRIVER = interrupt
diff --git a/keyboards/cablecardesigns/cypher/rev6/config.h b/keyboards/cablecardesigns/cypher/rev6/config.h
index 5a697f880536..791ecc268772 100644
--- a/keyboards/cablecardesigns/cypher/rev6/config.h
+++ b/keyboards/cablecardesigns/cypher/rev6/config.h
@@ -6,19 +6,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-   #define RGBLED_NUM 3
-   #define RGBLIGHT_HUE_STEP 12
-   #define RGBLIGHT_SAT_STEP 25
-   #define RGBLIGHT_VAL_STEP 12
-   #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
diff --git a/keyboards/cablecardesigns/cypher/rev6/info.json b/keyboards/cablecardesigns/cypher/rev6/info.json
index 5974c492a1f3..9bc6e26814b0 100644
--- a/keyboards/cablecardesigns/cypher/rev6/info.json
+++ b/keyboards/cablecardesigns/cypher/rev6/info.json
@@ -14,10 +14,30 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+      "driver": "timer",
       "pin": "D0",
       "levels": 5,
       "breathing": true
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 25,
+        "brightness_steps": 12,
+        "led_count": 3,
+        "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": "D5"
     },
diff --git a/keyboards/cablecardesigns/phoenix/rules.mk b/keyboards/cablecardesigns/phoenix/rules.mk
old mode 100755
new mode 100644
index 7ce6edcba902..6dd24d8e0683
--- a/keyboards/cablecardesigns/phoenix/rules.mk
+++ b/keyboards/cablecardesigns/phoenix/rules.mk
@@ -1,7 +1,3 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/info.json
index 1d3b2d693bc5..7f19520ac341 100644
--- a/keyboards/canary/canary60rgb/info.json
+++ b/keyboards/canary/canary60rgb/info.json
@@ -8,11 +8,29 @@
         "pid": "0x0621",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "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": "B6"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h
index c269ae517246..e8d0808384fc 100644
--- a/keyboards/canary/canary60rgb/v1/config.h
+++ b/keyboards/canary/canary60rgb/v1/config.h
@@ -15,22 +15,6 @@
  */
  #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 RGBLED_NUM 20
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/cannonkeys/adelie/config.h b/keyboards/cannonkeys/adelie/config.h
index 4333289e824c..9027c44df535 100644
--- a/keyboards/cannonkeys/adelie/config.h
+++ b/keyboards/cannonkeys/adelie/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 3
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/cannonkeys/adelie/info.json b/keyboards/cannonkeys/adelie/info.json
index 717bf3f3f8b5..798c59969261 100644
--- a/keyboards/cannonkeys/adelie/info.json
+++ b/keyboards/cannonkeys/adelie/info.json
@@ -8,6 +8,24 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 3,
+        "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": "F0"
     },
diff --git a/keyboards/cannonkeys/aella/rules.mk b/keyboards/cannonkeys/aella/rules.mk
index f56120695ac0..480e8661799b 100644
--- a/keyboards/cannonkeys/aella/rules.mk
+++ b/keyboards/cannonkeys/aella/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/an_c/config.h b/keyboards/cannonkeys/an_c/config.h
index aced1f333cce..bea77ceac299 100644
--- a/keyboards/cannonkeys/an_c/config.h
+++ b/keyboards/cannonkeys/an_c/config.h
@@ -26,17 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 14
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/info.json
index d3b73e31092f..9de1ff5fff62 100644
--- a/keyboards/cannonkeys/an_c/info.json
+++ b/keyboards/cannonkeys/an_c/info.json
@@ -18,6 +18,21 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 14,
+        "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"
diff --git a/keyboards/cannonkeys/an_c/rules.mk b/keyboards/cannonkeys/an_c/rules.mk
index b7ab91a33934..8d3de1b8b236 100644
--- a/keyboards/cannonkeys/an_c/rules.mk
+++ b/keyboards/cannonkeys/an_c/rules.mk
@@ -13,5 +13,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/atlas/config.h b/keyboards/cannonkeys/atlas/config.h
index 1296ad8dcc70..e8d571f7a9dc 100644
--- a/keyboards/cannonkeys/atlas/config.h
+++ b/keyboards/cannonkeys/atlas/config.h
@@ -22,20 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 WS2812_SPI SPID2
-#define RGBLED_NUM 22
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
 #define WS2812_SPI_SCK_PIN B13
diff --git a/keyboards/cannonkeys/atlas/info.json b/keyboards/cannonkeys/atlas/info.json
index 6fc7724b2b2d..8173ec6a8fa2 100644
--- a/keyboards/cannonkeys/atlas/info.json
+++ b/keyboards/cannonkeys/atlas/info.json
@@ -8,6 +8,21 @@
         "pid": "0xA7A5",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+      "led_count": 22,
+      "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"
diff --git a/keyboards/cannonkeys/atlas_alps/config.h b/keyboards/cannonkeys/atlas_alps/config.h
index 7e6ce9cdb952..876e59daa074 100644
--- a/keyboards/cannonkeys/atlas_alps/config.h
+++ b/keyboards/cannonkeys/atlas_alps/config.h
@@ -21,20 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-
-// ws2812 options
-#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 36
-#define RGBLIGHT_HUE_STEP 12
-#define RGBLIGHT_SAT_STEP 12
-#define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/cannonkeys/atlas_alps/info.json b/keyboards/cannonkeys/atlas_alps/info.json
index ee584b24d247..7166206f051d 100644
--- a/keyboards/cannonkeys/atlas_alps/info.json
+++ b/keyboards/cannonkeys/atlas_alps/info.json
@@ -12,7 +12,23 @@
         "pin": "D4"
     },
     "rgblight": {
-        "max_brightness": 230
+        "hue_steps": 12,
+        "saturation_steps": 12,
+        "brightness_steps": 12,
+        "led_count": 36,
+        "max_brightness": 230,
+        "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": ["B6", "C6", "D2", "E6", "C7", "B3", "F7", "F6", "F5", "F4", "F1", "F0"],
diff --git a/keyboards/cannonkeys/bakeneko60_iso_hs/rules.mk b/keyboards/cannonkeys/bakeneko60_iso_hs/rules.mk
index 2a5031cd3205..6dd24d8e0683 100644
--- a/keyboards/cannonkeys/bakeneko60_iso_hs/rules.mk
+++ b/keyboards/cannonkeys/bakeneko60_iso_hs/rules.mk
@@ -1,5 +1,3 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/bakeneko65_iso_hs/rules.mk b/keyboards/cannonkeys/bakeneko65_iso_hs/rules.mk
index 2a5031cd3205..6dd24d8e0683 100644
--- a/keyboards/cannonkeys/bakeneko65_iso_hs/rules.mk
+++ b/keyboards/cannonkeys/bakeneko65_iso_hs/rules.mk
@@ -1,5 +1,3 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/balance/config.h b/keyboards/cannonkeys/balance/config.h
index f9c629dad823..0f2582901b1b 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 TAP_CODE_DELAY 25
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 
 /*
diff --git a/keyboards/cannonkeys/balance/info.json b/keyboards/cannonkeys/balance/info.json
index 8be2cee0c58a..9565795169cb 100644
--- a/keyboards/cannonkeys/balance/info.json
+++ b/keyboards/cannonkeys/balance/info.json
@@ -18,6 +18,9 @@
             {"pin_a": "B5", "pin_b": "B6", "resolution": 2}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 25
+    },
     "indicators": {
         "caps_lock": "B12",
         "num_lock": "B14",
diff --git a/keyboards/cannonkeys/balance/rules.mk b/keyboards/cannonkeys/balance/rules.mk
index aa1b707d431f..5afdd3772f5c 100644
--- a/keyboards/cannonkeys/balance/rules.mk
+++ b/keyboards/cannonkeys/balance/rules.mk
@@ -15,5 +15,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/bastion60/info.json b/keyboards/cannonkeys/bastion60/info.json
index b6ecc9c3b3fa..07443b50b780 100644
--- a/keyboards/cannonkeys/bastion60/info.json
+++ b/keyboards/cannonkeys/bastion60/info.json
@@ -49,7 +49,16 @@
         "driver": "vendor",
         "pin": "GP7"
     },
-    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso_tsangan"],
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan"
+    ],
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
@@ -183,7 +192,7 @@
                 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
-        "LAYOUT_60_iso_tsangan": {
+        "LAYOUT_60_ansi_tsangan": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -199,6 +208,284 @@
                 {"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_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},
@@ -212,7 +499,76 @@
                 {"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},
@@ -226,6 +582,7 @@
                 {"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},
@@ -248,6 +605,77 @@
                 {"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_all": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/cannonkeys/bastion60/matrix_diagram.md b/keyboards/cannonkeys/bastion60/matrix_diagram.md
new file mode 100644
index 000000000000..fe29d0eea91b
--- /dev/null
+++ b/keyboards/cannonkeys/bastion60/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for CannonKeys Bastion60
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2C │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      ┌─────┐
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤   ┌──┴┐2D  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │   │1D │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+│40  │41  │42  │46                      │4A  │4B  │4C  │4D  │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+┌────────┐                                       ┌──────────┐
+│30      │ 2.25u LShift             2.75u RShift │3C        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40   │41 │42   │46                         │4B   │4C │4D   │ Tsangan/WKL/HHKB
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```
diff --git a/keyboards/cannonkeys/bastion65/info.json b/keyboards/cannonkeys/bastion65/info.json
index 83b4f1081775..dd7dd4516eb4 100644
--- a/keyboards/cannonkeys/bastion65/info.json
+++ b/keyboards/cannonkeys/bastion65/info.json
@@ -49,8 +49,21 @@
         "driver": "vendor",
         "pin": "GP7"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "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": {
+        "LAYOUT_all": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -124,6 +137,610 @@
                 {"matrix": [4, 13], "x": 14, "y": 4},
                 {"matrix": [4, 14], "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, 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, 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": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "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, 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_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, 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_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, 12], "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, 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_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, 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, 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": [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, "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.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_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": [2, 12], "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, 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": [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, "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.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_iso_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, 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": [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, "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, 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_65_iso_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, 12], "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, 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": [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, "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, 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/cannonkeys/bastion65/keymaps/default/keymap.c b/keyboards/cannonkeys/bastion65/keymaps/default/keymap.c
index 6ee4a5f71edd..111633864cf3 100644
--- a/keyboards/cannonkeys/bastion65/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/bastion65/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
+  [_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_DEL, KC_HOME,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS, KC_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,
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                                          KC_RALT, MO(_FN1), KC_LEFT, KC_DOWN, KC_RIGHT
   ),
 
-  [_FN1] = LAYOUT(
+  [_FN1] = LAYOUT_all(
     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, _______, _______,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
diff --git a/keyboards/cannonkeys/bastion65/keymaps/via/keymap.c b/keyboards/cannonkeys/bastion65/keymaps/via/keymap.c
index 4ce1aebed34b..66b6c1c1f72e 100644
--- a/keyboards/cannonkeys/bastion65/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/bastion65/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
+  [_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_DEL, KC_HOME,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS, KC_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,
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                                          KC_RALT, MO(_FN1), KC_LEFT, KC_DOWN, KC_RIGHT
   ),
 
-  [_FN1] = LAYOUT(
+  [_FN1] = LAYOUT_all(
     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, _______, _______,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
diff --git a/keyboards/cannonkeys/bastion65/matrix_diagram.md b/keyboards/cannonkeys/bastion65/matrix_diagram.md
new file mode 100644
index 000000000000..12d7734d5a07
--- /dev/null
+++ b/keyboards/cannonkeys/bastion65/matrix_diagram.md
@@ -0,0 +1,27 @@
+# Matrix Diagram for CannonKeys Bastion65
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2C │0E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      ┌─────┐
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2D  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │   │1D │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
+├────┴┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
+│40   │41 │42   │45         │46 │49         │4B   │ │4C │4D │4E │
+└─────┴───┴─────┴───────────┴───┴───────────┴─────┘ └───┴───┴───┘
+┌────────┐
+│30      │ 2.25u LShift
+└────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┐
+│40   │41 │42   │46                         │4B   │ Blocker Tsangan
+└─────┴───┴─────┴───────────────────────────┴─────┘
+┌────┬────┬────┬────────────────────────┬────┬────┐
+│40  │41  │42  │46                      │4A  │4B  │ Blocker
+└────┴────┴────┴────────────────────────┴────┴────┘
+```
diff --git a/keyboards/cannonkeys/bastion75/info.json b/keyboards/cannonkeys/bastion75/info.json
index 64243257aec4..276cc03c5140 100644
--- a/keyboards/cannonkeys/bastion75/info.json
+++ b/keyboards/cannonkeys/bastion75/info.json
@@ -49,8 +49,11 @@
             "rainbow_swirl": true
         }
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 { "matrix": [0, 0], "x": 0, "y": 0 },
                 { "matrix": [0, 1], "x": 1.5, "y": 0 },
@@ -138,6 +141,730 @@
                 { "matrix": [5, 13], "x": 14, "y": 5.25 },
                 { "matrix": [5, 14], "x": 15, "y": 5.25 }
             ]
+        },
+        "LAYOUT_ansi_blocker": {
+            "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, 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, "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, "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, "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, "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, "y": 4.25},
+                {"matrix": [4, 14], "x": 15, "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.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.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}
+            ]
+        },
+        "LAYOUT_ansi_blocker_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, 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, "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": [3, 12], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15, "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, "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, "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, "y": 4.25},
+                {"matrix": [4, 14], "x": 15, "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.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.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}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan": {
+            "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, 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, "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, "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, "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, "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, "y": 4.25},
+                {"matrix": [4, 14], "x": 15, "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": 13, "y": 5.25},
+                {"matrix": [5, 13], "x": 14, "y": 5.25},
+                {"matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan_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, 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, "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": [3, 12], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15, "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, "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, "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, "y": 4.25},
+                {"matrix": [4, 14], "x": 15, "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": 13, "y": 5.25},
+                {"matrix": [5, 13], "x": 14, "y": 5.25},
+                {"matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_iso_blocker": {
+            "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, 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, "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, "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, 14], "x": 15, "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": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "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, 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, 14], "x": 15, "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.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.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}
+            ]
+        },
+        "LAYOUT_iso_blocker_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, 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, "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": [3, 12], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15, "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, 14], "x": 15, "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": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "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, 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, 14], "x": 15, "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.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.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}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan": {
+            "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, 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, "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, "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, 14], "x": 15, "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": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "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, 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, 14], "x": 15, "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": 13, "y": 5.25},
+                {"matrix": [5, 13], "x": 14, "y": 5.25},
+                {"matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan_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, 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, "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": [3, 12], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15, "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, 14], "x": 15, "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": [2, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "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, 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, 14], "x": 15, "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": 13, "y": 5.25},
+                {"matrix": [5, 13], "x": 14, "y": 5.25},
+                {"matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/cannonkeys/bastion75/keymaps/default/keymap.c b/keyboards/cannonkeys/bastion75/keymaps/default/keymap.c
index 9b3d00ade259..b0da09f0b8dc 100644
--- a/keyboards/cannonkeys/bastion75/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/bastion75/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
+  [_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_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_DEL, KC_HOME,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS, KC_END,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                                          KC_RALT, MO(_FN1), KC_LEFT, KC_DOWN, KC_RIGHT
   ),
 
-  [_FN1] = LAYOUT(
+  [_FN1] = LAYOUT_all(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     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, _______, _______,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cannonkeys/bastion75/keymaps/via/keymap.c b/keyboards/cannonkeys/bastion75/keymaps/via/keymap.c
index a4c9bf120c43..493fea3c9a68 100644
--- a/keyboards/cannonkeys/bastion75/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/bastion75/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
+  [_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_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_DEL, KC_HOME,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS, KC_END,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                                          KC_RALT, MO(_FN1), KC_LEFT, KC_DOWN, KC_RIGHT
   ),
 
-  [_FN1] = LAYOUT(
+  [_FN1] = LAYOUT_all(
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     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, _______, _______,
     RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cannonkeys/bastion75/matrix_diagram.md b/keyboards/cannonkeys/bastion75/matrix_diagram.md
new file mode 100644
index 000000000000..756c26c3b388
--- /dev/null
+++ b/keyboards/cannonkeys/bastion75/matrix_diagram.md
@@ -0,0 +1,27 @@
+# Matrix Diagram for CannonKeys Bastion75
+
+```
+┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┐
+│00 │ │01 │02 │03 │04 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │
+└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │3C │1E │    │1D     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │2E │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐3D  │ ISO Enter
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │3E │   │2D │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+│40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │4E │
+├────┴┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
+│50   │51 │52   │55         │56 │59         │5B   │ │5C │5D │5E │
+└─────┴───┴─────┴───────────┴───┴───────────┴─────┘ └───┴───┴───┘
+┌────────┐
+│40      │ 2.25u LShift
+└────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┐
+│50   │51 │52   │56                         │5B   │ Blocker Tsangan
+└─────┴───┴─────┴───────────────────────────┴─────┘
+┌────┬────┬────┬────────────────────────┬────┬────┐
+│50  │51  │52  │56                      │5A  │5B  │ Blocker
+└────┴────┴────┴────────────────────────┴────┴────┘
+```
diff --git a/keyboards/cannonkeys/bastiontkl/info.json b/keyboards/cannonkeys/bastiontkl/info.json
index d06f134fec3c..72733b3d8fe8 100644
--- a/keyboards/cannonkeys/bastiontkl/info.json
+++ b/keyboards/cannonkeys/bastiontkl/info.json
@@ -28,7 +28,24 @@
         "pid": "0x0023",
         "vid": "0xCA04"
     },
-    "community_layouts": ["tkl_ansi", "tkl_iso", "tkl_f13_ansi_tsangan_split_bs_rshift"],
+    "community_layouts": [
+        "tkl_ansi",
+        "tkl_ansi_split_bs_rshift",
+        "tkl_ansi_tsangan",
+        "tkl_ansi_tsangan_split_bs_rshift",
+        "tkl_f13_ansi",
+        "tkl_f13_ansi_split_bs_rshift",
+        "tkl_f13_ansi_tsangan",
+        "tkl_f13_ansi_tsangan_split_bs_rshift",
+        "tkl_iso",
+        "tkl_iso_split_bs_rshift",
+        "tkl_iso_tsangan",
+        "tkl_iso_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": [
@@ -216,25 +233,25 @@
                 {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
-        "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
             "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, 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.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, 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},
@@ -253,6 +270,7 @@
                 {"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},
@@ -270,6 +288,7 @@
                 {"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},
@@ -283,6 +302,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": [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},
@@ -297,6 +317,103 @@
                 {"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, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "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": [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": [2, 13], "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},
@@ -309,7 +426,7 @@
                 {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
-        "LAYOUT_tkl_iso": {
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 2], "x": 2, "y": 0},
@@ -327,6 +444,105 @@
                 {"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": [3, 12], "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], "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.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, 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_f13_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.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},
@@ -344,6 +560,7 @@
                 {"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},
@@ -357,10 +574,11 @@
                 {"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, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 13], "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},
@@ -373,9 +591,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": [2, 13], "x": 12.75, "y": 3.25},
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.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},
@@ -388,6 +606,7 @@
                 {"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},
@@ -400,6 +619,1073 @@
                 {"matrix": [5, 15], "x": 16.25, "y": 5.25},
                 {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
+        },
+        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
+            "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": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 12], "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], "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.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, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "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_f13_ansi_tsangan": {
+            "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": [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": [2, 13], "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_f13_ansi_tsangan_split_bs_rshift": {
+            "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": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 12], "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], "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.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, 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_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": [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": [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": [2, 13], "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, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "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": [3, 12], "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], "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, 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": [2, 13], "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, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "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": [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": [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": [2, 13], "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, 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_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": [3, 12], "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], "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, 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": [2, 13], "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, 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_f13_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.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": [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": [2, 13], "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, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "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_f13_iso_split_bs_rshift": {
+            "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": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 12], "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], "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, 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": [2, 13], "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, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "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_f13_iso_tsangan": {
+            "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": [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": [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": [2, 13], "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, 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_f13_iso_tsangan_split_bs_rshift": {
+            "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": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [3, 12], "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], "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, 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": [2, 13], "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, 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}
+            ]
         }
     }
 }
diff --git a/keyboards/cannonkeys/bastiontkl/matrix_diagram.md b/keyboards/cannonkeys/bastiontkl/matrix_diagram.md
new file mode 100644
index 000000000000..6b3e3f60dd0c
--- /dev/null
+++ b/keyboards/cannonkeys/bastiontkl/matrix_diagram.md
@@ -0,0 +1,27 @@
+# Matrix Diagram for CannonKeys BastionTKL
+
+```
+┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+│00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │0G │ F12 Row
+└───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+│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 │3C ││1E │1F │1G │    │1D     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤    └─┬─────┤
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘   ┌──┴┐3D  │ ISO Enter
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │                │2D │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐       └───┴────┘
+│40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │    │4F │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+│50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+┌────────┐                                       ┌──────────┐
+│40      │ 2.25u LShift             2.75u RShift │4C        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│50   │51 │52   │56                         │5B   │5C │5D   │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```
diff --git a/keyboards/cannonkeys/brutalv2_60/config.h b/keyboards/cannonkeys/brutalv2_60/config.h
new file mode 100644
index 000000000000..8b8e7f9aa557
--- /dev/null
+++ b/keyboards/cannonkeys/brutalv2_60/config.h
@@ -0,0 +1,10 @@
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
+
diff --git a/keyboards/cannonkeys/brutalv2_60/info.json b/keyboards/cannonkeys/brutalv2_60/info.json
new file mode 100644
index 000000000000..3ee5f0d576b9
--- /dev/null
+++ b/keyboards/cannonkeys/brutalv2_60/info.json
@@ -0,0 +1,700 @@
+{
+    "manufacturer": "CannonKeys",
+    "keyboard_name": "Brutal V2 60",
+    "maintainer": "awkannan",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "GP12",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["GP3", "GP2", "GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18"],
+        "rows": ["GP4", "GP5", "GP13", "GP14", "GP10"]
+    },
+    "processor": "RP2040",
+    "url": "https://cannonkeys.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x000B",
+        "vid": "0xCA04"
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan"
+    ],
+    "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.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": {
+            "layout": [
+                {"label": "Esc", "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"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": "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": "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, 13], "x": 12.25, "y": 3, "w": 2.75},
+                {"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},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "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": "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": "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": "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": "Fn", "matrix": [3, 13], "x": 14, "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},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"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": "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": "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, 13], "x": 12.25, "y": 3, "w": 2.75},
+                {"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},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "Esc", "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": "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": "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": "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": "Fn", "matrix": [3, 13], "x": 14, "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},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label": "Esc", "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": "|", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [2, 12], "x": 14, "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": "Bspc", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Ctrl", "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": "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": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Win", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Win", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label": "Esc", "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"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": "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": "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, 13], "x": 12.25, "y": 3, "w": 2.75},
+                {"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},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "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": "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": "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": "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": "Fn", "matrix": [3, 13], "x": 14, "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},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"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": "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": "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, 13], "x": 12.25, "y": 3, "w": 2.75},
+                {"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},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "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": "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": "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": "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": "Fn", "matrix": [3, 13], "x": 14, "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},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cannonkeys/brutalv2_60/keymaps/default/keymap.c b/keyboards/cannonkeys/brutalv2_60/keymaps/default/keymap.c
new file mode 100644
index 000000000000..4678bab52a5a
--- /dev/null
+++ b/keyboards/cannonkeys/brutalv2_60/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _BASE,
+    _FN1,
+    _FN2,
+};
+
+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_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_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  MO(_FN2),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                            KC_RALT, KC_RGUI, MO(_FN1), KC_RCTL
+  ),
+
+  [_FN1] = 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_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,                            _______,                            _______, _______, _______, QK_BOOT
+  ),
+
+  [_FN2] = 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_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,                            _______,                            _______, _______, DB_TOGG, QK_BOOT
+  )
+};
diff --git a/keyboards/cannonkeys/brutalv2_60/keymaps/via/keymap.c b/keyboards/cannonkeys/brutalv2_60/keymaps/via/keymap.c
new file mode 100644
index 000000000000..4678bab52a5a
--- /dev/null
+++ b/keyboards/cannonkeys/brutalv2_60/keymaps/via/keymap.c
@@ -0,0 +1,36 @@
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _BASE,
+    _FN1,
+    _FN2,
+};
+
+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_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_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  MO(_FN2),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                            KC_RALT, KC_RGUI, MO(_FN1), KC_RCTL
+  ),
+
+  [_FN1] = 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_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,                            _______,                            _______, _______, _______, QK_BOOT
+  ),
+
+  [_FN2] = 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_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,                            _______,                            _______, _______, DB_TOGG, QK_BOOT
+  )
+};
diff --git a/keyboards/cannonkeys/brutalv2_60/keymaps/via/rules.mk b/keyboards/cannonkeys/brutalv2_60/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/cannonkeys/brutalv2_60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cannonkeys/brutalv2_60/readme.md b/keyboards/cannonkeys/brutalv2_60/readme.md
new file mode 100644
index 000000000000..8c08e3a30aa6
--- /dev/null
+++ b/keyboards/cannonkeys/brutalv2_60/readme.md
@@ -0,0 +1,24 @@
+# Brutal v2 60
+
+Brutal v2 60 Keyboard
+
+Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)  
+Hardware Supported: RP2040 
+ 
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/brutalv2_60:default
+    
+Flashing example for this keyboard:
+
+    make cannonkeys/brutalv2_60: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**: Hold the "BOOTMODE" button on the back of the PCB and briefly press 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/cannonkeys/brutalv2_60/rules.mk b/keyboards/cannonkeys/brutalv2_60/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/cannonkeys/brutalv2_60/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/cannonkeys/brutalv2_65/rules.mk b/keyboards/cannonkeys/brutalv2_65/rules.mk
index f56120695ac0..480e8661799b 100644
--- a/keyboards/cannonkeys/brutalv2_65/rules.mk
+++ b/keyboards/cannonkeys/brutalv2_65/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/chimera65/rules.mk b/keyboards/cannonkeys/chimera65/rules.mk
index 09c801a8491c..9bdf6b80937f 100644
--- a/keyboards/cannonkeys/chimera65/rules.mk
+++ b/keyboards/cannonkeys/chimera65/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = no
 
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/chimera65_hs/rules.mk b/keyboards/cannonkeys/chimera65_hs/rules.mk
index 2a5031cd3205..6dd24d8e0683 100644
--- a/keyboards/cannonkeys/chimera65_hs/rules.mk
+++ b/keyboards/cannonkeys/chimera65_hs/rules.mk
@@ -1,5 +1,3 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/cloudline/config.h b/keyboards/cannonkeys/cloudline/config.h
index a3fc30fc3d66..cff0a03945e2 100644
--- a/keyboards/cannonkeys/cloudline/config.h
+++ b/keyboards/cannonkeys/cloudline/config.h
@@ -12,25 +12,11 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 20
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
 #define WS2812_SPI_SCK_PIN B13
 
-
-#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
-
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/info.json
index 37fc5470f969..d1bbce929a19 100644
--- a/keyboards/cannonkeys/cloudline/info.json
+++ b/keyboards/cannonkeys/cloudline/info.json
@@ -8,6 +8,21 @@
         "pid": "0x000A",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 20,
+        "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"
diff --git a/keyboards/cannonkeys/cloudline/rules.mk b/keyboards/cannonkeys/cloudline/rules.mk
index 42e73a46504d..86794ca0f702 100644
--- a/keyboards/cannonkeys/cloudline/rules.mk
+++ b/keyboards/cannonkeys/cloudline/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/crin/rules.mk b/keyboards/cannonkeys/crin/rules.mk
index e58c51143553..a5906b6a90f8 100644
--- a/keyboards/cannonkeys/crin/rules.mk
+++ b/keyboards/cannonkeys/crin/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/db60/config.h b/keyboards/cannonkeys/db60/config.h
index 20f73d95a2fc..bea77ceac299 100644
--- a/keyboards/cannonkeys/db60/config.h
+++ b/keyboards/cannonkeys/db60/config.h
@@ -26,18 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 WS2812_SPI SPID2
-#define RGBLED_NUM 20
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
 #define WS2812_SPI_SCK_PIN B13
diff --git a/keyboards/cannonkeys/db60/info.json b/keyboards/cannonkeys/db60/info.json
index 99a4425752b6..112ebaddde7e 100644
--- a/keyboards/cannonkeys/db60/info.json
+++ b/keyboards/cannonkeys/db60/info.json
@@ -16,6 +16,21 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 20,
+        "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"
diff --git a/keyboards/cannonkeys/db60/rules.mk b/keyboards/cannonkeys/db60/rules.mk
index 9a57c69c7e90..023b329ad223 100644
--- a/keyboards/cannonkeys/db60/rules.mk
+++ b/keyboards/cannonkeys/db60/rules.mk
@@ -15,5 +15,3 @@ RGBLIGHT_ENABLE = yes
 
 DEFAULT_FOLDER = cannonkeys/db60/rev2
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/devastatingtkl/config.h b/keyboards/cannonkeys/devastatingtkl/config.h
index 947648f59e75..bea77ceac299 100644
--- a/keyboards/cannonkeys/devastatingtkl/config.h
+++ b/keyboards/cannonkeys/devastatingtkl/config.h
@@ -26,17 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 20
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/info.json
index 13a1a2ef48a7..a3b269f1cfef 100644
--- a/keyboards/cannonkeys/devastatingtkl/info.json
+++ b/keyboards/cannonkeys/devastatingtkl/info.json
@@ -18,6 +18,21 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 20,
+        "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"
diff --git a/keyboards/cannonkeys/devastatingtkl/rules.mk b/keyboards/cannonkeys/devastatingtkl/rules.mk
index b7ab91a33934..8d3de1b8b236 100644
--- a/keyboards/cannonkeys/devastatingtkl/rules.mk
+++ b/keyboards/cannonkeys/devastatingtkl/rules.mk
@@ -13,5 +13,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/gentoo/rules.mk b/keyboards/cannonkeys/gentoo/rules.mk
index f56120695ac0..480e8661799b 100644
--- a/keyboards/cannonkeys/gentoo/rules.mk
+++ b/keyboards/cannonkeys/gentoo/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/gentoo_hs/rules.mk b/keyboards/cannonkeys/gentoo_hs/rules.mk
index 5b983f1f260b..4ee7a29916aa 100644
--- a/keyboards/cannonkeys/gentoo_hs/rules.mk
+++ b/keyboards/cannonkeys/gentoo_hs/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/hoodrowg/config.h b/keyboards/cannonkeys/hoodrowg/config.h
index 043ee2908a24..3b78decb2778 100644
--- a/keyboards/cannonkeys/hoodrowg/config.h
+++ b/keyboards/cannonkeys/hoodrowg/config.h
@@ -17,18 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 16
-#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
-
 /* 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/cannonkeys/hoodrowg/info.json b/keyboards/cannonkeys/hoodrowg/info.json
index 0ad5b9fbf635..1c1fbf59647c 100644
--- a/keyboards/cannonkeys/hoodrowg/info.json
+++ b/keyboards/cannonkeys/hoodrowg/info.json
@@ -17,6 +17,21 @@
         "caps_lock": "B6",
         "scroll_lock": "B2"
     },
+    "rgblight": {
+        "led_count": 16,
+        "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": "D1"
     },
diff --git a/keyboards/cannonkeys/instant60/config.h b/keyboards/cannonkeys/instant60/config.h
index aced1f333cce..bea77ceac299 100644
--- a/keyboards/cannonkeys/instant60/config.h
+++ b/keyboards/cannonkeys/instant60/config.h
@@ -26,17 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 14
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/info.json
index 31aeca1e8d78..355ae99f0c90 100644
--- a/keyboards/cannonkeys/instant60/info.json
+++ b/keyboards/cannonkeys/instant60/info.json
@@ -18,6 +18,21 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 14,
+        "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"
diff --git a/keyboards/cannonkeys/instant60/rules.mk b/keyboards/cannonkeys/instant60/rules.mk
index b7ab91a33934..8d3de1b8b236 100644
--- a/keyboards/cannonkeys/instant60/rules.mk
+++ b/keyboards/cannonkeys/instant60/rules.mk
@@ -13,5 +13,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/instant65/config.h b/keyboards/cannonkeys/instant65/config.h
index 65ffa50103be..0adcfdfa9289 100644
--- a/keyboards/cannonkeys/instant65/config.h
+++ b/keyboards/cannonkeys/instant65/config.h
@@ -26,17 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 20
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/info.json
index 23b667cf6ccf..3c447a4bd3e2 100644
--- a/keyboards/cannonkeys/instant65/info.json
+++ b/keyboards/cannonkeys/instant65/info.json
@@ -18,6 +18,21 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 20,
+        "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"
diff --git a/keyboards/cannonkeys/instant65/rules.mk b/keyboards/cannonkeys/instant65/rules.mk
index 42e73a46504d..86794ca0f702 100644
--- a/keyboards/cannonkeys/instant65/rules.mk
+++ b/keyboards/cannonkeys/instant65/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/iron165/rules.mk b/keyboards/cannonkeys/iron165/rules.mk
index 09c801a8491c..9bdf6b80937f 100644
--- a/keyboards/cannonkeys/iron165/rules.mk
+++ b/keyboards/cannonkeys/iron165/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = no
 
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/is0gr/info.json b/keyboards/cannonkeys/is0gr/info.json
new file mode 100644
index 000000000000..49aaaddd5254
--- /dev/null
+++ b/keyboards/cannonkeys/is0gr/info.json
@@ -0,0 +1,32 @@
+{
+    "manufacturer": "CannonKeys",
+    "keyboard_name": "is0GR",
+    "maintainer": "awkannan",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B3"],
+        "rows": ["A15"]
+    },
+    "processor": "STM32F072",
+    "url": "https://cannonkeys.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0028",
+        "vid": "0xCA04"
+    },
+    "community_layouts": ["ortho_1x1"],
+    "layouts": {
+        "LAYOUT_ortho_1x1": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.25, "y": 0, "w": 1.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c b/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c
new file mode 100644
index 000000000000..49f0cdb4916d
--- /dev/null
+++ b/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c
@@ -0,0 +1,10 @@
+// Copyright 2023 Andrew Kannan
+// 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_ENT
+  ),
+};
diff --git a/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c b/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c
new file mode 100644
index 000000000000..10451984f063
--- /dev/null
+++ b/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c
@@ -0,0 +1,11 @@
+// Copyright 2023 Andrew Kannan
+// 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_ENT
+  ),
+};
+
diff --git a/keyboards/cannonkeys/is0gr/keymaps/via/rules.mk b/keyboards/cannonkeys/is0gr/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/cannonkeys/is0gr/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cannonkeys/is0gr/readme.md b/keyboards/cannonkeys/is0gr/readme.md
new file mode 100644
index 000000000000..f6fb2b8f61ee
--- /dev/null
+++ b/keyboards/cannonkeys/is0gr/readme.md
@@ -0,0 +1,24 @@
+# Alchemist Keyboards is0GR
+
+is0GR Keyboard
+
+Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)  
+Hardware Supported: STM32F072CBT6 or equivalent  
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/is0gr:default
+
+Flashing example for this keyboard:
+
+    make cannonkeys/is0gr: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 (on this board - it's the only key) and plug in the keyboard
+* **Physical reset button**: Bridge the two pads labeled "RESET" on the top of the PCB using some tweezers, and hold the tweezers there until the board enters the bootloader mode
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available (it isn't by default)
diff --git a/keyboards/cannonkeys/is0gr/rules.mk b/keyboards/cannonkeys/is0gr/rules.mk
new file mode 100644
index 000000000000..0ab54aaaf718
--- /dev/null
+++ b/keyboards/cannonkeys/is0gr/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/cannonkeys/leviatan/rules.mk b/keyboards/cannonkeys/leviatan/rules.mk
index 2a5031cd3205..6dd24d8e0683 100644
--- a/keyboards/cannonkeys/leviatan/rules.mk
+++ b/keyboards/cannonkeys/leviatan/rules.mk
@@ -1,5 +1,3 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/malicious_ergo/config.h b/keyboards/cannonkeys/malicious_ergo/config.h
index 2c1baa101d0f..70d39892fdea 100644
--- a/keyboards/cannonkeys/malicious_ergo/config.h
+++ b/keyboards/cannonkeys/malicious_ergo/config.h
@@ -28,17 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 14
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json
index 3b54ee75b642..d5941f5f969a 100644
--- a/keyboards/cannonkeys/malicious_ergo/info.json
+++ b/keyboards/cannonkeys/malicious_ergo/info.json
@@ -18,6 +18,21 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 14,
+        "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"
diff --git a/keyboards/cannonkeys/malicious_ergo/rules.mk b/keyboards/cannonkeys/malicious_ergo/rules.mk
index 42e73a46504d..86794ca0f702 100644
--- a/keyboards/cannonkeys/malicious_ergo/rules.mk
+++ b/keyboards/cannonkeys/malicious_ergo/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/meetuppad2023/info.json b/keyboards/cannonkeys/meetuppad2023/info.json
new file mode 100644
index 000000000000..e55d4361d84e
--- /dev/null
+++ b/keyboards/cannonkeys/meetuppad2023/info.json
@@ -0,0 +1,40 @@
+{
+    "manufacturer": "CannonKeys",
+    "keyboard_name": "Meetup Pad 2023",
+    "maintainer": "awkannan",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B0"],
+        "rows": ["B1", "A7"]
+    },
+    "processor": "STM32F072",
+    "url": "https://cannonkeys.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x2023",
+        "vid": "0xCA04"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 0, "y": 2},
+                {"matrix": [0, 2], "x": 1, "y": 2},
+                {"matrix": [1, 3], "x": 0, "y": 3},
+                {"matrix": [0, 3], "x": 1, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cannonkeys/meetuppad2023/keymaps/default/keymap.c b/keyboards/cannonkeys/meetuppad2023/keymaps/default/keymap.c
new file mode 100644
index 000000000000..790839f831e0
--- /dev/null
+++ b/keyboards/cannonkeys/meetuppad2023/keymaps/default/keymap.c
@@ -0,0 +1,20 @@
+// Copyright 2023 Andrew Kannan
+// 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, MO(1)
+  ),
+
+  [1] = LAYOUT(
+    QK_BOOT, KC_8,
+    KC_9, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS
+  )
+};
diff --git a/keyboards/cannonkeys/meetuppad2023/keymaps/via/keymap.c b/keyboards/cannonkeys/meetuppad2023/keymaps/via/keymap.c
new file mode 100644
index 000000000000..8039eb260ea9
--- /dev/null
+++ b/keyboards/cannonkeys/meetuppad2023/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes {
+    MYMACRO = QK_KB_0,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    MYMACRO, KC_1,
+    KC_2, KC_3,
+    KC_4, KC_5,
+    KC_6, MO(1)
+  ),
+
+  [1] = LAYOUT(
+    QK_BOOT, KC_7,
+    KC_8, KC_9,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS
+  )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+    case MYMACRO:
+        if (record->event.pressed) {
+            SEND_STRING("I went to the CannonKeys 2023 meetup and all I got was this macropad");
+        }
+        break;
+    }
+    return true;
+};
diff --git a/keyboards/cannonkeys/meetuppad2023/keymaps/via/rules.mk b/keyboards/cannonkeys/meetuppad2023/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/cannonkeys/meetuppad2023/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cannonkeys/meetuppad2023/readme.md b/keyboards/cannonkeys/meetuppad2023/readme.md
new file mode 100644
index 000000000000..73312c1b6976
--- /dev/null
+++ b/keyboards/cannonkeys/meetuppad2023/readme.md
@@ -0,0 +1,18 @@
+# CannonKeys Meetup Pad 2023
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: STM32F072CBT6
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/meetuppad2023:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top right on this board) and plug in the keyboard
+* **Physical reset button**: Swap the boot switch on the back of the PCB to "1" and hit the reset button
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cannonkeys/meetuppad2023/rules.mk b/keyboards/cannonkeys/meetuppad2023/rules.mk
new file mode 100644
index 000000000000..0ab54aaaf718
--- /dev/null
+++ b/keyboards/cannonkeys/meetuppad2023/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/cannonkeys/obliterated75/config.h b/keyboards/cannonkeys/obliterated75/config.h
index 65ffa50103be..0adcfdfa9289 100644
--- a/keyboards/cannonkeys/obliterated75/config.h
+++ b/keyboards/cannonkeys/obliterated75/config.h
@@ -26,17 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 20
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/info.json
index 678ca4457a00..d831eb1aca5c 100644
--- a/keyboards/cannonkeys/obliterated75/info.json
+++ b/keyboards/cannonkeys/obliterated75/info.json
@@ -18,6 +18,21 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 20,
+        "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"
diff --git a/keyboards/cannonkeys/obliterated75/rules.mk b/keyboards/cannonkeys/obliterated75/rules.mk
index 42e73a46504d..86794ca0f702 100644
--- a/keyboards/cannonkeys/obliterated75/rules.mk
+++ b/keyboards/cannonkeys/obliterated75/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/onyx/rules.mk b/keyboards/cannonkeys/onyx/rules.mk
index e58c51143553..a5906b6a90f8 100644
--- a/keyboards/cannonkeys/onyx/rules.mk
+++ b/keyboards/cannonkeys/onyx/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/ortho48/config.h b/keyboards/cannonkeys/ortho48/config.h
index eaf33bbfa069..703975ab861b 100644
--- a/keyboards/cannonkeys/ortho48/config.h
+++ b/keyboards/cannonkeys/ortho48/config.h
@@ -25,17 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 9
 #define WS2812_SPI SPID2
 
 /*
diff --git a/keyboards/cannonkeys/ortho48/info.json b/keyboards/cannonkeys/ortho48/info.json
index dd4879b5beb5..c995210ba4e2 100644
--- a/keyboards/cannonkeys/ortho48/info.json
+++ b/keyboards/cannonkeys/ortho48/info.json
@@ -18,6 +18,21 @@
     "levels": 6,
     "breathing": true
   },
+  "rgblight": {
+    "led_count": 9,
+    "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"
diff --git a/keyboards/cannonkeys/ortho48/rules.mk b/keyboards/cannonkeys/ortho48/rules.mk
index 57a302eec3ae..7b6ddd5ad364 100644
--- a/keyboards/cannonkeys/ortho48/rules.mk
+++ b/keyboards/cannonkeys/ortho48/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 SLEEP_LED_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/ortho60/config.h b/keyboards/cannonkeys/ortho60/config.h
index c8c8c93e51ef..703975ab861b 100644
--- a/keyboards/cannonkeys/ortho60/config.h
+++ b/keyboards/cannonkeys/ortho60/config.h
@@ -25,18 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 16
 #define WS2812_SPI SPID2
 
 /*
diff --git a/keyboards/cannonkeys/ortho60/info.json b/keyboards/cannonkeys/ortho60/info.json
index 3b672f4f6d7d..18fcbc828bea 100644
--- a/keyboards/cannonkeys/ortho60/info.json
+++ b/keyboards/cannonkeys/ortho60/info.json
@@ -18,6 +18,21 @@
     "levels": 6,
     "breathing": true
   },
+  "rgblight": {
+    "led_count": 16,
+    "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"
diff --git a/keyboards/cannonkeys/ortho60/rules.mk b/keyboards/cannonkeys/ortho60/rules.mk
index 57a302eec3ae..7b6ddd5ad364 100644
--- a/keyboards/cannonkeys/ortho60/rules.mk
+++ b/keyboards/cannonkeys/ortho60/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 SLEEP_LED_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/ortho75/config.h b/keyboards/cannonkeys/ortho75/config.h
index c8c8c93e51ef..703975ab861b 100644
--- a/keyboards/cannonkeys/ortho75/config.h
+++ b/keyboards/cannonkeys/ortho75/config.h
@@ -25,18 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 16
 #define WS2812_SPI SPID2
 
 /*
diff --git a/keyboards/cannonkeys/ortho75/info.json b/keyboards/cannonkeys/ortho75/info.json
index dd2b78b99898..1f9fa9408657 100644
--- a/keyboards/cannonkeys/ortho75/info.json
+++ b/keyboards/cannonkeys/ortho75/info.json
@@ -23,6 +23,21 @@
     "levels": 6,
     "breathing": true
   },
+  "rgblight": {
+    "led_count": 16,
+    "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"
diff --git a/keyboards/cannonkeys/ortho75/rules.mk b/keyboards/cannonkeys/ortho75/rules.mk
index 240787506287..5a1f61bac055 100644
--- a/keyboards/cannonkeys/ortho75/rules.mk
+++ b/keyboards/cannonkeys/ortho75/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = yes
 SLEEP_LED_ENABLE = yes
 ENCODER_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/practice60/config.h b/keyboards/cannonkeys/practice60/config.h
index c766c83f65af..703975ab861b 100644
--- a/keyboards/cannonkeys/practice60/config.h
+++ b/keyboards/cannonkeys/practice60/config.h
@@ -25,18 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 9
 #define WS2812_SPI SPID2
 
 /*
diff --git a/keyboards/cannonkeys/practice60/info.json b/keyboards/cannonkeys/practice60/info.json
index a1313242fa6b..ae57bfbf06f3 100644
--- a/keyboards/cannonkeys/practice60/info.json
+++ b/keyboards/cannonkeys/practice60/info.json
@@ -18,6 +18,21 @@
     "levels": 6,
     "breathing": true
   },
+  "rgblight": {
+    "led_count": 9,
+    "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"
diff --git a/keyboards/cannonkeys/practice60/rules.mk b/keyboards/cannonkeys/practice60/rules.mk
index 01c330aeb6fb..544fe68a8867 100644
--- a/keyboards/cannonkeys/practice60/rules.mk
+++ b/keyboards/cannonkeys/practice60/rules.mk
@@ -14,5 +14,3 @@ SLEEP_LED_ENABLE = yes
 DEFAULT_FOLDER = cannonkeys/practice60
 
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/practice65/config.h b/keyboards/cannonkeys/practice65/config.h
index 0163604ead91..703975ab861b 100644
--- a/keyboards/cannonkeys/practice65/config.h
+++ b/keyboards/cannonkeys/practice65/config.h
@@ -25,18 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 20
 #define WS2812_SPI SPID2
 
 /*
diff --git a/keyboards/cannonkeys/practice65/info.json b/keyboards/cannonkeys/practice65/info.json
index 28841b48a680..f86951bf5c9f 100644
--- a/keyboards/cannonkeys/practice65/info.json
+++ b/keyboards/cannonkeys/practice65/info.json
@@ -18,6 +18,21 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 20,
+        "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"
diff --git a/keyboards/cannonkeys/practice65/rules.mk b/keyboards/cannonkeys/practice65/rules.mk
index 57a302eec3ae..7b6ddd5ad364 100644
--- a/keyboards/cannonkeys/practice65/rules.mk
+++ b/keyboards/cannonkeys/practice65/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 SLEEP_LED_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/rekt1800/rules.mk b/keyboards/cannonkeys/rekt1800/rules.mk
index 32e7be7370a7..01d0c0ade113 100644
--- a/keyboards/cannonkeys/rekt1800/rules.mk
+++ b/keyboards/cannonkeys/rekt1800/rules.mk
@@ -13,5 +13,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = no
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/ripple/rules.mk b/keyboards/cannonkeys/ripple/rules.mk
index 2a5031cd3205..6dd24d8e0683 100644
--- a/keyboards/cannonkeys/ripple/rules.mk
+++ b/keyboards/cannonkeys/ripple/rules.mk
@@ -1,5 +1,3 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/ripple_hs/rules.mk b/keyboards/cannonkeys/ripple_hs/rules.mk
index 2a5031cd3205..6dd24d8e0683 100644
--- a/keyboards/cannonkeys/ripple_hs/rules.mk
+++ b/keyboards/cannonkeys/ripple_hs/rules.mk
@@ -1,5 +1,3 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/sagittarius/config.h b/keyboards/cannonkeys/sagittarius/config.h
index 29c78c239829..b48d66fd787b 100644
--- a/keyboards/cannonkeys/sagittarius/config.h
+++ b/keyboards/cannonkeys/sagittarius/config.h
@@ -26,18 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 8
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/info.json
index 0980cb42751e..d9236b390564 100644
--- a/keyboards/cannonkeys/sagittarius/info.json
+++ b/keyboards/cannonkeys/sagittarius/info.json
@@ -18,6 +18,21 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 8,
+        "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"
diff --git a/keyboards/cannonkeys/sagittarius/rules.mk b/keyboards/cannonkeys/sagittarius/rules.mk
index 42e73a46504d..86794ca0f702 100644
--- a/keyboards/cannonkeys/sagittarius/rules.mk
+++ b/keyboards/cannonkeys/sagittarius/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/satisfaction75/rules.mk b/keyboards/cannonkeys/satisfaction75/rules.mk
index 9f6480ee0e42..8cee2da595e3 100644
--- a/keyboards/cannonkeys/satisfaction75/rules.mk
+++ b/keyboards/cannonkeys/satisfaction75/rules.mk
@@ -16,10 +16,6 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 #BACKLIGHT_ENABLE = yes
 
 DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
-
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
index ce870c49af60..29fb6e761915 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.c
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
@@ -243,22 +243,22 @@ void via_custom_value_command(uint8_t *data, uint8_t length) {
 
 
 void read_host_led_state(void) {
-  uint8_t leds = host_keyboard_leds();
-  if (leds & (1 << USB_LED_NUM_LOCK))    {
+  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 (leds & (1 << USB_LED_CAPS_LOCK))   {
+  if (led_state.caps_lock)   {
     if (led_capslock == false){
     led_capslock = true;}
     } else {
     if (led_capslock == true){
     led_capslock = false;}
     }
-  if (leds & (1 << USB_LED_SCROLL_LOCK)) {
+  if (led_state.scroll_lock) {
     if (led_scrolllock == false){
     led_scrolllock = true;}
     } else {
diff --git a/keyboards/cannonkeys/savage65/config.h b/keyboards/cannonkeys/savage65/config.h
index 6aac0aefb441..0adcfdfa9289 100644
--- a/keyboards/cannonkeys/savage65/config.h
+++ b/keyboards/cannonkeys/savage65/config.h
@@ -26,18 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 20
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/savage65/info.json b/keyboards/cannonkeys/savage65/info.json
index 540327c6b8d6..0c2409713b97 100644
--- a/keyboards/cannonkeys/savage65/info.json
+++ b/keyboards/cannonkeys/savage65/info.json
@@ -18,6 +18,21 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 20,
+        "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"
diff --git a/keyboards/cannonkeys/savage65/rules.mk b/keyboards/cannonkeys/savage65/rules.mk
index b7ab91a33934..8d3de1b8b236 100644
--- a/keyboards/cannonkeys/savage65/rules.mk
+++ b/keyboards/cannonkeys/savage65/rules.mk
@@ -13,5 +13,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/tmov2/config.h b/keyboards/cannonkeys/tmov2/config.h
index d344ffaee68b..bea77ceac299 100644
--- a/keyboards/cannonkeys/tmov2/config.h
+++ b/keyboards/cannonkeys/tmov2/config.h
@@ -26,18 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 22
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/info.json
index 4d5d564e668e..ed834c73cd9e 100644
--- a/keyboards/cannonkeys/tmov2/info.json
+++ b/keyboards/cannonkeys/tmov2/info.json
@@ -18,6 +18,21 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 22,
+        "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"
diff --git a/keyboards/cannonkeys/tmov2/rules.mk b/keyboards/cannonkeys/tmov2/rules.mk
index b7ab91a33934..8d3de1b8b236 100644
--- a/keyboards/cannonkeys/tmov2/rules.mk
+++ b/keyboards/cannonkeys/tmov2/rules.mk
@@ -13,5 +13,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/tsukuyomi/config.h b/keyboards/cannonkeys/tsukuyomi/config.h
index 6aac0aefb441..0adcfdfa9289 100644
--- a/keyboards/cannonkeys/tsukuyomi/config.h
+++ b/keyboards/cannonkeys/tsukuyomi/config.h
@@ -26,18 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 20
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/info.json
index e370e1acc0e6..3542bca1f6b4 100644
--- a/keyboards/cannonkeys/tsukuyomi/info.json
+++ b/keyboards/cannonkeys/tsukuyomi/info.json
@@ -18,6 +18,21 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 20,
+        "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"
diff --git a/keyboards/cannonkeys/tsukuyomi/rules.mk b/keyboards/cannonkeys/tsukuyomi/rules.mk
index 42e73a46504d..86794ca0f702 100644
--- a/keyboards/cannonkeys/tsukuyomi/rules.mk
+++ b/keyboards/cannonkeys/tsukuyomi/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/vicious40/rules.mk b/keyboards/cannonkeys/vicious40/rules.mk
index df232017195b..9d14eaf9aa09 100644
--- a/keyboards/cannonkeys/vicious40/rules.mk
+++ b/keyboards/cannonkeys/vicious40/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/capsunlocked/cu24/config.h b/keyboards/capsunlocked/cu24/config.h
index 1d8a04fe70c2..8ec34286fc31 100644
--- a/keyboards/capsunlocked/cu24/config.h
+++ b/keyboards/capsunlocked/cu24/config.h
@@ -16,19 +16,6 @@
 
 #pragma once
 
-/* RGB Glow */
-#define RGBLED_NUM 5     // 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
-
 /* 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/capsunlocked/cu24/info.json b/keyboards/capsunlocked/cu24/info.json
index c7d6660f132c..f5d56e383ed3 100644
--- a/keyboards/capsunlocked/cu24/info.json
+++ b/keyboards/capsunlocked/cu24/info.json
@@ -18,6 +18,21 @@
         "levels": 5,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 5,
+        "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": "F4"
     },
diff --git a/keyboards/capsunlocked/cu7/config.h b/keyboards/capsunlocked/cu7/config.h
index 8883514e5d21..b7767c19ec4d 100644
--- a/keyboards/capsunlocked/cu7/config.h
+++ b/keyboards/capsunlocked/cu7/config.h
@@ -20,20 +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 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_BREATHING
-#define RGBLED_NUM 6
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/capsunlocked/cu7/info.json b/keyboards/capsunlocked/cu7/info.json
index 61182fcb5384..06deeacd6920 100644
--- a/keyboards/capsunlocked/cu7/info.json
+++ b/keyboards/capsunlocked/cu7/info.json
@@ -12,7 +12,21 @@
         "pin": "F1"
     },
     "rgblight": {
-        "max_brightness": 50
+        "hue_steps": 10,
+        "led_count": 6,
+        "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
+        }
     },
     "matrix_pins": {
         "cols": ["F5", "F7", "F4"],
diff --git a/keyboards/capsunlocked/cu75/config.h b/keyboards/capsunlocked/cu75/config.h
index 67f1f43c44bd..b8cd9eeebbc3 100644
--- a/keyboards/capsunlocked/cu75/config.h
+++ b/keyboards/capsunlocked/cu75/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 24     // 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
-
 #define BACKLIGHT_PWM_MAP {8, 16, 40, 55, 70, 128, 200, 255}
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/capsunlocked/cu75/info.json b/keyboards/capsunlocked/cu75/info.json
index 3ea17a46e1cd..24aed787ef9b 100644
--- a/keyboards/capsunlocked/cu75/info.json
+++ b/keyboards/capsunlocked/cu75/info.json
@@ -17,6 +17,23 @@
     "driver": "custom",
     "levels": 8
   },
+  "rgblight": {
+    "driver": "custom",
+    "hue_steps": 10,
+    "led_count": 24,
+    "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": "C7"
   },
diff --git a/keyboards/capsunlocked/cu75/keymaps/default/rules.mk b/keyboards/capsunlocked/cu75/keymaps/default/rules.mk
index bbd4c8c9fdc2..483baa799377 100644
--- a/keyboards/capsunlocked/cu75/keymaps/default/rules.mk
+++ b/keyboards/capsunlocked/cu75/keymaps/default/rules.mk
@@ -7,34 +7,7 @@ NKRO_ENABLE = yes
 BACKLIGHT_ENABLE = yes           # Disable keyboard backlight functionality
 AUDIO_ENABLE = no               # Audio output
 RGBLIGHT_ENABLE = yes          	# Disable RGB underlight
-RGBLIGHT_CUSTOM_DRIVER = yes    # RGB code is implemented in lefkeyboards, not WS2812
 SLEEP_LED_ENABLE = yes
 
 ISSI_ENABLE = yes               # If the I2C pullup resistors aren't install this must be disabled
 WATCHDOG_ENABLE = no           # Resets keyboard if matrix_scan isn't run every 250ms
-
-
-ifeq ($(strip $(ISSI_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DISSI_ENABLE
-endif
-
-ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
-endif
-
-
-# # Set the LFK78 hardware version. This is defined in rules.mk, but can be overidden here if desired
-# #
-# # RevB - first public release, uses atmega32u4, has audio, ISSI matrix split between RGB and backlight
-# # RevC/D - at90usb1286, no audio, ISSI device 0 is backlight, 4 is RGB
-# #
-# # Set to B, C or D
-# LFK_REV = D
-
-# ifeq ($(LFK_REV), B)
-# 	MCU = atmega32u4
-# else
-# 	MCU = at90usb1286
-# endif
-# OPT_DEFS += -DLFK_REV_$(LFK_REV)
-# OPT_DEFS += -DUSB_PRODUCT=\"LFK_Rev$(LFK_REV)\"
diff --git a/keyboards/capsunlocked/cu75/keymaps/iso/rules.mk b/keyboards/capsunlocked/cu75/keymaps/iso/rules.mk
index be27fed69c1b..005811360586 100644
--- a/keyboards/capsunlocked/cu75/keymaps/iso/rules.mk
+++ b/keyboards/capsunlocked/cu75/keymaps/iso/rules.mk
@@ -7,34 +7,7 @@ NKRO_ENABLE = yes
 # BACKLIGHT_ENABLE = no           # Disable keyboard backlight functionality
 AUDIO_ENABLE = no               # Audio output
 RGBLIGHT_ENABLE = no          	# Disable RGB underlight
-RGBLIGHT_CUSTOM_DRIVER = yes    # RGB code is implemented in lefkeyboards, not WS2812
 SLEEP_LED_ENABLE = yes
 
 ISSI_ENABLE = no               # If the I2C pullup resistors aren't install this must be disabled
 WATCHDOG_ENABLE = yes           # Resets keyboard if matrix_scan isn't run every 250ms
-
-
-ifeq ($(strip $(ISSI_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DISSI_ENABLE
-endif
-
-ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
-endif
-
-
-# # Set the LFK78 hardware version. This is defined in rules.mk, but can be overidden here if desired
-# #
-# # RevB - first public release, uses atmega32u4, has audio, ISSI matrix split between RGB and backlight
-# # RevC/D - at90usb1286, no audio, ISSI device 0 is backlight, 4 is RGB
-# #
-# # Set to B, C or D
-# LFK_REV = D
-
-# ifeq ($(LFK_REV), B)
-# 	MCU = atmega32u4
-# else
-# 	MCU = at90usb1286
-# endif
-# OPT_DEFS += -DLFK_REV_$(LFK_REV)
-# OPT_DEFS += -DUSB_PRODUCT=\"LFK_Rev$(LFK_REV)\"
diff --git a/keyboards/capsunlocked/cu75/post_rules.mk b/keyboards/capsunlocked/cu75/post_rules.mk
new file mode 100644
index 000000000000..a5d974666438
--- /dev/null
+++ b/keyboards/capsunlocked/cu75/post_rules.mk
@@ -0,0 +1,23 @@
+ifeq ($(strip $(ISSI_ENABLE)), yes)
+    OPT_DEFS += -DISSI_ENABLE
+endif
+
+ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
+    OPT_DEFS += -DWATCHDOG_ENABLE
+endif
+
+# # Set the LFK78 hardware version. This is defined in rules.mk, but can be overidden here if desired
+# #
+# # RevB - first public release, uses atmega32u4, has audio, ISSI matrix split between RGB and backlight
+# # RevC/D - at90usb1286, no audio, ISSI device 0 is backlight, 4 is RGB
+# #
+# # Set to B, C or D
+# LFK_REV = D
+
+# ifeq ($(LFK_REV), B)
+# 	MCU = atmega32u4
+# else
+# 	MCU = at90usb1286
+# endif
+# OPT_DEFS += -DLFK_REV_$(LFK_REV)
+# OPT_DEFS += -DUSB_PRODUCT=\"LFK_Rev$(LFK_REV)\"
diff --git a/keyboards/capsunlocked/cu80/v2/ansi/ansi.c b/keyboards/capsunlocked/cu80/v2/ansi/ansi.c
new file mode 100644
index 000000000000..996738815331
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2/ansi/ansi.c
@@ -0,0 +1,20 @@
+// Copyright 2021 CapsUnlocked
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+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},
+    {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}
+  }, {
+    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, 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, 8, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, 4, 4, 1, 1, 1, 1, 4, 1, 1, 1
+  }
+};
+#endif
diff --git a/keyboards/capsunlocked/cu80/v2/ansi/config.h b/keyboards/capsunlocked/cu80/v2/ansi/config.h
new file mode 100644
index 000000000000..638c9a820ffe
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2/ansi/config.h
@@ -0,0 +1,8 @@
+// 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_ansi/base/info.json b/keyboards/capsunlocked/cu80/v2/ansi/info.json
similarity index 100%
rename from keyboards/capsunlocked/cu80/v2_ansi/base/info.json
rename to keyboards/capsunlocked/cu80/v2/ansi/info.json
diff --git a/keyboards/capsunlocked/cu80/v2/ansi/keymaps/default/keymap.c b/keyboards/capsunlocked/cu80/v2/ansi/keymaps/default/keymap.c
new file mode 100644
index 000000000000..5e13e10d1539
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2/ansi/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/*
+Copyright 2021 CapsUnlocked
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along 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, MO(1),   KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+  [1] = LAYOUT_tkl_ansi(
+    QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_M_P, RGB_M_B, RGB_M_R,
+
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______,                   RGB_SPD,
+    _______, _______, _______,                   _______,                            _______, _______, _______, _______,          RGB_RMOD,RGB_TOG, RGB_MOD
+  )
+};
diff --git a/keyboards/capsunlocked/cu80/v2/ansi/keymaps/via/keymap.c b/keyboards/capsunlocked/cu80/v2/ansi/keymaps/via/keymap.c
new file mode 100644
index 000000000000..aeef5a125595
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2/ansi/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2021 CapsUnlocked
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along 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, MO(1),   KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+  [1] = LAYOUT_tkl_ansi(
+    QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_M_P, RGB_M_B, RGB_M_R,
+
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______,                   RGB_SPD,
+    _______, _______, _______,                   _______,                            _______, _______, _______, _______,          RGB_RMOD,RGB_TOG, RGB_MOD
+  )
+};
diff --git a/keyboards/capsunlocked/cu80/v2/ansi/keymaps/via/rules.mk b/keyboards/capsunlocked/cu80/v2/ansi/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2/ansi/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/capsunlocked/cu80/v2/ansi/rules.mk b/keyboards/capsunlocked/cu80/v2/ansi/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2/ansi/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/capsunlocked/cu80/v2/info.json b/keyboards/capsunlocked/cu80/v2/info.json
new file mode 100644
index 000000000000..c21572be66f9
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2/info.json
@@ -0,0 +1,265 @@
+{
+    "manufacturer": "CapsUnlocked",
+    "maintainer": "rys / maz0r",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "build": {
+      "lto": true
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7", "B6", "B5", "D7", "B4", "D6", "F0", "D1", "C6", "D4"],
+        "rows": ["D3", "D2", "B7", "F1", "C7", "D5"]
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "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
+        }
+    },
+    "url": "https://caps-unlocked.com/cu80-round-2/",
+    "usb": {
+        "device_version": "0.0.1",
+        "vid": "0x4355",
+        "no_startup_check": true
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "community_layouts": ["tkl_ansi", "tkl_iso"],
+    "layouts": {
+        "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.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.25, "y": 1.5},
+                {"matrix": [1, 16], "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": [2, 16], "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, 15], "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, 5], "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, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "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.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.25, "y": 1.5},
+                {"matrix": [1, 16], "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, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"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, 15], "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, 5], "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, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/capsunlocked/cu80/v2/iso/config.h b/keyboards/capsunlocked/cu80/v2/iso/config.h
new file mode 100644
index 000000000000..28086d619540
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2/iso/config.h
@@ -0,0 +1,8 @@
+// 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/info.json b/keyboards/capsunlocked/cu80/v2/iso/info.json
new file mode 100644
index 000000000000..33d49db64abc
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2/iso/info.json
@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "CU80 v2 ISO",
+    "usb": {
+        "pid": "0x0083"
+    }
+}
diff --git a/keyboards/capsunlocked/cu80/v2/iso/iso.c b/keyboards/capsunlocked/cu80/v2/iso/iso.c
new file mode 100644
index 000000000000..cdc588160ec5
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2/iso/iso.c
@@ -0,0 +1,20 @@
+// Copyright 2021 CapsUnlocked
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+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},
+    {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}
+  }, {
+    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, 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, 8, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, 4, 4, 1, 1, 1, 1, 4, 1, 1, 1
+  }
+};
+#endif
diff --git a/keyboards/capsunlocked/cu80/v2/iso/keymaps/default/keymap.c b/keyboards/capsunlocked/cu80/v2/iso/keymaps/default/keymap.c
new file mode 100644
index 000000000000..cf5886f457c5
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2/iso/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/*
+Copyright 2021 CapsUnlocked
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along 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(
+    KC_ESC,  KC_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_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+  [1] = LAYOUT_tkl_iso(
+    QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_M_P, RGB_M_B, RGB_M_R,
+
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_HUD, RGB_SAD, RGB_VAD,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______,          _______,
+    _______, _______, _______,                   _______,                            _______, _______, _______, _______,          RGB_RMOD,RGB_TOG, RGB_MOD
+  )
+};
diff --git a/keyboards/capsunlocked/cu80/v2/iso/keymaps/via/keymap.c b/keyboards/capsunlocked/cu80/v2/iso/keymaps/via/keymap.c
new file mode 100644
index 000000000000..947a0bd97a41
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2/iso/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2021 CapsUnlocked
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along 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(
+    KC_ESC,  KC_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_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+  [1] = LAYOUT_tkl_iso(
+    QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_M_P, RGB_M_B, RGB_M_R,
+
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_HUD, RGB_SAD, RGB_VAD,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______,          _______,
+    _______, _______, _______,                   _______,                            _______, _______, _______, _______,          RGB_RMOD,RGB_TOG, RGB_MOD
+  )
+};
diff --git a/keyboards/capsunlocked/cu80/v2/iso/keymaps/via/rules.mk b/keyboards/capsunlocked/cu80/v2/iso/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2/iso/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/capsunlocked/cu80/v2/iso/rules.mk b/keyboards/capsunlocked/cu80/v2/iso/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2/iso/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/capsunlocked/cu80/v2/v2.c b/keyboards/capsunlocked/cu80/v2/v2.c
new file mode 100644
index 000000000000..e450082ba236
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2/v2.c
@@ -0,0 +1,23 @@
+// Copyright 2021 CapsUnlocked
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "quantum.h"
+
+void matrix_init_kb(void) {
+    setPinOutput(E6);
+    matrix_init_user();
+}
+
+#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(62, 255, 255, 255);
+    }
+    if (host_keyboard_led_state().scroll_lock) {
+        rgb_matrix_set_color(14, 255, 255, 255);
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/config.h b/keyboards/capsunlocked/cu80/v2_ansi/config.h
deleted file mode 100644
index 3199b57da4a0..000000000000
--- a/keyboards/capsunlocked/cu80/v2_ansi/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2021 CapsUnlocked
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* Define RGB */
-#define RGB_MATRIX_LED_COUNT 87
-#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/capsunlocked/cu80/v2_ansi/info.json b/keyboards/capsunlocked/cu80/v2_ansi/info.json
deleted file mode 100644
index c9d4b8892636..000000000000
--- a/keyboards/capsunlocked/cu80/v2_ansi/info.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-  "manufacturer": "CapsUnlocked",
-  "maintainer": "rys / maz0r",
-  "bootloader": "atmel-dfu",
-  "diode_direction": "COL2ROW",
-  "features": {
-    "audio": false,
-    "backlight": false,
-    "bluetooth": false,
-    "bootmagic": true,
-    "command": false,
-    "console": false,
-    "extrakey": true,
-    "mousekey": false,
-    "nkro": true,
-    "rgblight": true,
-    "sleep_led": false,
-    "unicode": false
-  },
-  "matrix_pins": {
-    "cols": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7", "B6", "B5", "D7", "B4", "D6", "F0", "D1", "C6", "D4"],
-    "rows": ["D3", "D2", "B7", "F1", "C7", "D5"]
-  },
-  "processor": "atmega32u4",
-  "rgblight": {
-    "animations": {
-      "alternating": false,
-      "breathing": false,
-      "christmas": false,
-      "knight": false,
-      "rainbow_mood": false,
-      "rainbow_swirl": false,
-      "rgb_test": false,
-      "snake": false,
-      "static_gradient": false,
-      "twinkle": false
-    },
-    "brightness_steps": 8,
-    "hue_steps": 8,
-    "led_count": 87,
-    "max_brightness": 50,
-    "saturation_steps": 8
-  },
-  "ws2812": {
-    "pin": "E6"
-  },
-  "url": "https://caps-unlocked.com/cu80-round-2/",
-  "usb": {
-    "device_version": "0.0.1",
-    "vid": "0x4355"
-  },
-  "community_layouts": ["tkl_ansi"],
-  "layouts": {
-    "LAYOUT_tkl_ansi": {
-      "c_macro": true,
-      "filename": "keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.h",
-      "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.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.25, "y": 1.5},
-        {"matrix": [1, 16], "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": [2, 16], "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, 15], "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, 5], "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, 15], "x": 16.25, "y": 5.5},
-        {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-      ]
-    }
-  }
-}
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/keymaps/default/keymap.c b/keyboards/capsunlocked/cu80/v2_ansi/keymaps/default/keymap.c
deleted file mode 100644
index ee81be6561f0..000000000000
--- a/keyboards/capsunlocked/cu80/v2_ansi/keymaps/default/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2021 CapsUnlocked
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along 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, MO(1),   KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  [1] = LAYOUT_tkl_ansi(
-    QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_M_P, RGB_M_B, RGB_M_R,
-
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______,                   RGB_SPD,
-    _______, _______, _______,                   _______,                            _______, _______, _______, _______,          RGB_RMOD,RGB_TOG, RGB_MOD
-  ),
-};
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/keymaps/default/readme.md b/keyboards/capsunlocked/cu80/v2_ansi/keymaps/default/readme.md
deleted file mode 100644
index 717c2c283a47..000000000000
--- a/keyboards/capsunlocked/cu80/v2_ansi/keymaps/default/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# The default ANSI keymap for the CU80
-
-This CU80 is keymap is for the fixed ANSI variant with fully populated bottom row.
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/keymaps/via/keymap.c b/keyboards/capsunlocked/cu80/v2_ansi/keymaps/via/keymap.c
deleted file mode 100644
index 5ee09fadace2..000000000000
--- a/keyboards/capsunlocked/cu80/v2_ansi/keymaps/via/keymap.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2021 CapsUnlocked
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along 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, MO(1),   KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  [1] = LAYOUT_tkl_ansi(
-    QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_M_P, RGB_M_B, RGB_M_R,
-
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______,                   RGB_SPD,
-    _______, _______, _______,                   _______,                            _______, _______, _______, _______,          RGB_RMOD,RGB_TOG, RGB_MOD
-  ),
-  [2] = LAYOUT_tkl_ansi(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   _______,
-    _______, _______, _______,                   _______,                            _______, _______, _______, _______,          _______, _______, _______
-  ),
-  [3] = LAYOUT_tkl_ansi(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   _______,
-    _______, _______, _______,                   _______,                            _______, _______, _______, _______,          _______, _______, _______
-  ),
-};
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/readme.md b/keyboards/capsunlocked/cu80/v2_ansi/readme.md
deleted file mode 100644
index 4768917fc8ce..000000000000
--- a/keyboards/capsunlocked/cu80/v2_ansi/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# CU80 v2 ANSI
-
-The CU80 v2 ANSI is the PCB for round 2 of the CU80 TKL keyboard, with fixed layout ANSI and VIA support.
-
-To place the keyboard into bootloader mode in order to flash it, hold the ESC key while plugging the board in, or use the reset button on the back of the PCB.
-
-* Keyboard maintainer: [rys](https://github.com/rys) & [maz0r](https://github.com/maz0r)
-* Hardware supported: [CU80 v2 ANSI](https://imgur.com/gOWpJqe)
-* Hardware availability: [CapsUnlocked](https://caps-unlocked.com/cu80-round-2/)
-
-Make and flash example for this keyboard (after setting up your build environment):
-
-    make capsunlocked/cu80/v2_ansi:default:flash
-    make capsunlocked/cu80/v2_ansi/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).
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/rgb/config.h b/keyboards/capsunlocked/cu80/v2_ansi/rgb/config.h
deleted file mode 100644
index 48a12c0cdcf2..000000000000
--- a/keyboards/capsunlocked/cu80/v2_ansi/rgb/config.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Copyright 2021 CapsUnlocked
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should 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 RGB matrix */
-#define CU80_RGB
-
-/* moved to RGB specific */
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-// 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
-
-/* RGB firmware override */
-#undef RGBLIGHT_HUE_STEP
-#undef RGBLIGHT_SAT_STEP
-#undef RGBLIGHT_VAL_STEP
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json b/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json
deleted file mode 100644
index 45b4b9c8cd38..000000000000
--- a/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "keyboard_name": "CU80 v2 ANSI RGB",
-  "features": {
-    "rgblight": false
-  },
-  "rgb_matrix": {
-    "driver": "WS2812"
-  },
-  "usb": {
-    "pid": "0x0082"
-  }
-}
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/rgb/readme.md b/keyboards/capsunlocked/cu80/v2_ansi/rgb/readme.md
deleted file mode 100644
index 0919483592de..000000000000
--- a/keyboards/capsunlocked/cu80/v2_ansi/rgb/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# CU80 v2 ANSI RGB
-
-Overrides
\ No newline at end of file
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/rgb/rules.mk b/keyboards/capsunlocked/cu80/v2_ansi/rgb/rules.mk
deleted file mode 100644
index 9470477f49e2..000000000000
--- a/keyboards/capsunlocked/cu80/v2_ansi/rgb/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGB_MATRIX_ENABLE = yes     # Enable RGB matrix
-
-LTO_ENABLE = yes
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/rules.mk b/keyboards/capsunlocked/cu80/v2_ansi/rules.mk
deleted file mode 100644
index e96dd72928ac..000000000000
--- a/keyboards/capsunlocked/cu80/v2_ansi/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-NO_USB_STARTUP_CHECK = yes  # resolve possible sleep issue
-
-DEFAULT_FOLDER = capsunlocked/cu80/v2_ansi/base
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.c b/keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.c
deleted file mode 100644
index f014479ef8ad..000000000000
--- a/keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-Copyright 2021 CapsUnlocked
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You 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 CU80_RGB
-
-void matrix_init_kb(void) {
-    setPinOutput(E6);
-    matrix_init_user();
-}
-
-/* Set LED 62 (Caps Lock) and LED 14 (Scroll Lock) when key active */
-bool rgb_matrix_indicators_kb(void) {
-    if (!rgb_matrix_indicators_user()) {
-        return false;
-    }
-    if (host_keyboard_led_state().caps_lock) {
-        rgb_matrix_set_color(62, 255, 255, 255);
-    }
-    if (host_keyboard_led_state().scroll_lock) {
-        rgb_matrix_set_color(14, 255, 255, 255);
-    }
-    return true;
-}
-
-/* Leds on the CU80 go ltr > rtl > ltr > rlt > Ltr > rtl */
-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}, {86, 85, 84, NO_LED, NO_LED, 83, NO_LED, NO_LED, NO_LED, 82, 81, 80, 79, 78, NO_LED, 77, 76}
-
-                             },
-                             /*board layout accounting for led directions */
-                             {{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}
-
-                             },
-                             /* marks scroll and caps as function modifiers for led effects */
-                             {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, 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, 8, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, 4, 4, 1, 1, 1, 1, 4, 1, 1, 1}};
-#endif
diff --git a/keyboards/capsunlocked/cu80/v2_iso/base/info.json b/keyboards/capsunlocked/cu80/v2_iso/base/info.json
deleted file mode 100644
index 636e6e227619..000000000000
--- a/keyboards/capsunlocked/cu80/v2_iso/base/info.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "keyboard_name": "CU80 v2 ISO",
-    "usb": {
-        "pid": "0x0080"
-    }
-}
diff --git a/keyboards/capsunlocked/cu80/v2_iso/config.h b/keyboards/capsunlocked/cu80/v2_iso/config.h
deleted file mode 100644
index 167bf871f1c3..000000000000
--- a/keyboards/capsunlocked/cu80/v2_iso/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2021 CapsUnlocked
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* Define RGB */
-#define RGB_MATRIX_LED_COUNT 88
-#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/capsunlocked/cu80/v2_iso/info.json b/keyboards/capsunlocked/cu80/v2_iso/info.json
deleted file mode 100644
index b7225214ba98..000000000000
--- a/keyboards/capsunlocked/cu80/v2_iso/info.json
+++ /dev/null
@@ -1,162 +0,0 @@
-{
-  "manufacturer": "CapsUnlocked",
-  "maintainer": "rys / maz0r",
-  "bootloader": "atmel-dfu",
-  "diode_direction": "COL2ROW",
-  "features": {
-    "audio": false,
-    "backlight": false,
-    "bluetooth": false,
-    "bootmagic": true,
-    "command": false,
-    "console": false,
-    "extrakey": true,
-    "mousekey": false,
-    "nkro": true,
-    "rgblight": true,
-    "sleep_led": false,
-    "unicode": false
-  },
-  "matrix_pins": {
-    "cols": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7", "B6", "B5", "D7", "B4", "D6", "F0", "D1", "C6", "D4"],
-    "rows": ["D3", "D2", "B7", "F1", "C7", "D5"]
-  },
-  "processor": "atmega32u4",
-  "rgblight": {
-    "animations": {
-      "alternating": false,
-      "breathing": false,
-      "christmas": false,
-      "knight": false,
-      "rainbow_mood": false,
-      "rainbow_swirl": false,
-      "rgb_test": false,
-      "snake": false,
-      "static_gradient": false,
-      "twinkle": false
-    },
-    "brightness_steps": 8,
-    "hue_steps": 8,
-    "led_count": 88,
-    "max_brightness": 50,
-    "saturation_steps": 8
-  },
-  "ws2812": {
-    "pin": "E6"
-  },
-  "url": "https://caps-unlocked.com/cu80-round-2/",
-  "usb": {
-    "device_version": "0.0.1",
-    "vid": "0x4355"
-  },
-  "community_layouts": ["tkl_iso"],
-  "layouts": {
-    "LAYOUT_tkl_iso": {
-      "c_macro": true,
-      "filename": "keyboards/capsunlocked/cu80/v2_iso/v2_iso.h",
-      "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.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.25, "y": 1.5},
-        {"matrix": [1, 16], "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, 14], "x": 15.25, "y": 2.5},
-        {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-        {"matrix": [2, 16], "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},
-        {"matrix": [2, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-        {"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, 15], "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, 5], "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, 15], "x": 16.25, "y": 5.5},
-        {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-      ]
-    }
-  }
-}
diff --git a/keyboards/capsunlocked/cu80/v2_iso/keymaps/default/keymap.c b/keyboards/capsunlocked/cu80/v2_iso/keymaps/default/keymap.c
deleted file mode 100644
index d42f3533a45d..000000000000
--- a/keyboards/capsunlocked/cu80/v2_iso/keymaps/default/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2021 CapsUnlocked
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along 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(
-    KC_ESC,  KC_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_DEL,  KC_END,  KC_PGDN,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  [1] = LAYOUT_tkl_iso(
-    QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_M_P, RGB_M_B, RGB_M_R,
-
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_HUD, RGB_SAD, RGB_VAD,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______,          _______,
-    _______, _______, _______,                   _______,                            _______, _______, _______, _______,          RGB_RMOD,RGB_TOG, RGB_MOD
-  ),
-};
diff --git a/keyboards/capsunlocked/cu80/v2_iso/keymaps/default/readme.md b/keyboards/capsunlocked/cu80/v2_iso/keymaps/default/readme.md
deleted file mode 100644
index bf55002afea9..000000000000
--- a/keyboards/capsunlocked/cu80/v2_iso/keymaps/default/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# The default ISO keymap for the CU80
-
-This CU80 is keymap is for the fixed ISO variant with fully populated bottom row.
diff --git a/keyboards/capsunlocked/cu80/v2_iso/keymaps/via/keymap.c b/keyboards/capsunlocked/cu80/v2_iso/keymaps/via/keymap.c
deleted file mode 100644
index a72f451b3f99..000000000000
--- a/keyboards/capsunlocked/cu80/v2_iso/keymaps/via/keymap.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2021 CapsUnlocked
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along 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(
-    KC_ESC,  KC_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_DEL,  KC_END,  KC_PGDN,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  [1] = LAYOUT_tkl_iso(
-    QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_M_P, RGB_M_B, RGB_M_R,
-
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_HUD, RGB_SAD, RGB_VAD,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______,          _______,
-    _______, _______, _______,                   _______,                            _______, _______, _______, _______,          RGB_RMOD,RGB_TOG, RGB_MOD
-  ),
-  [2] = LAYOUT_tkl_iso(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-    _______, _______, _______,                   _______,                            _______, _______, _______, _______,          _______, _______, _______
-  ),
-  [3] = LAYOUT_tkl_iso(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-    _______, _______, _______,                   _______,                            _______, _______, _______, _______,          _______, _______, _______
-  ),
-};
diff --git a/keyboards/capsunlocked/cu80/v2_iso/readme.md b/keyboards/capsunlocked/cu80/v2_iso/readme.md
deleted file mode 100644
index cf8c5fc6fa9a..000000000000
--- a/keyboards/capsunlocked/cu80/v2_iso/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# CU80 v2 ISO
-
-The CU80 v2 ISO is the PCB for round 2 of the CU80 TKL keyboard, with fixed layout ISO and VIA support.
-
-To place the keyboard into bootloader mode in order to flash it, hold the ESC key while plugging the board in, or use the reset button on the back of the PCB.
-
-* Keyboard maintainer: [rys](https://github.com/rys) & [maz0r](https://github.com/maz0r)
-* Hardware supported: [CU80 v2 ISO](https://imgur.com/yMZMt6j)
-* Hardware availability: [CapsUnlocked](https://caps-unlocked.com/cu80-round-2/)
-
-Make and flash example for this keyboard (after setting up your build environment):
-
-    make capsunlocked/cu80/v2_iso:default:flash
-    make capsunlocked/cu80/v2_iso/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).
diff --git a/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h b/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h
deleted file mode 100644
index db6ab832b417..000000000000
--- a/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Copyright 2021 CapsUnlocked
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should 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 RGB matrix */
-#define CU80_RGB
-
-/* moved to RGB specific */
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-// 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
-
-/* RGB firmware override */
-#undef RGBLIGHT_HUE_STEP
-#undef RGBLIGHT_SAT_STEP
-#undef RGBLIGHT_VAL_STEP
diff --git a/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json b/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json
deleted file mode 100644
index 4f08f6116a74..000000000000
--- a/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "keyboard_name": "CU80 v2 ISO RGB",
-  "features": {
-    "rgblight": false
-  },
-  "rgb_matrix": {
-    "driver": "WS2812"
-  },
-  "usb": {
-    "pid": "0x0083"
-  }
-}
diff --git a/keyboards/capsunlocked/cu80/v2_iso/rgb/readme.md b/keyboards/capsunlocked/cu80/v2_iso/rgb/readme.md
deleted file mode 100644
index c53bf7407848..000000000000
--- a/keyboards/capsunlocked/cu80/v2_iso/rgb/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# CU80 v2 ISO RGB
-
-Overrides
\ No newline at end of file
diff --git a/keyboards/capsunlocked/cu80/v2_iso/rgb/rules.mk b/keyboards/capsunlocked/cu80/v2_iso/rgb/rules.mk
deleted file mode 100644
index 9470477f49e2..000000000000
--- a/keyboards/capsunlocked/cu80/v2_iso/rgb/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGB_MATRIX_ENABLE = yes     # Enable RGB matrix
-
-LTO_ENABLE = yes
diff --git a/keyboards/capsunlocked/cu80/v2_iso/rules.mk b/keyboards/capsunlocked/cu80/v2_iso/rules.mk
deleted file mode 100644
index c0feb353070f..000000000000
--- a/keyboards/capsunlocked/cu80/v2_iso/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-NO_USB_STARTUP_CHECK = yes  # resolve possible sleep issue
-
-DEFAULT_FOLDER = capsunlocked/cu80/v2_iso/base
diff --git a/keyboards/capsunlocked/cu80/v2_iso/v2_iso.c b/keyboards/capsunlocked/cu80/v2_iso/v2_iso.c
deleted file mode 100644
index acb1d835aa0c..000000000000
--- a/keyboards/capsunlocked/cu80/v2_iso/v2_iso.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright 2021 CapsUnlocked
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You 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 CU80_RGB
-
-void matrix_init_kb(void) {
-    setPinOutput(E6);
-    matrix_init_user();
-}
-
-/* Set LED 62 (Caps Lock) and LED 14 (Scroll Lock) when key active */
-bool rgb_matrix_indicators_kb(void) {
-    if (!rgb_matrix_indicators_user()) {
-        return false;
-    }
-    if (host_keyboard_led_state().caps_lock) {
-        rgb_matrix_set_color(62, 255, 255, 255);
-    }
-    if (host_keyboard_led_state().scroll_lock) {
-        rgb_matrix_set_color(14, 255, 255, 255);
-    }
-    return true;
-}
-
-/* Leds on the CU80 go ltr > rtl > ltr > rlt > Ltr > rtl */
-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}, {87, 86, 85, NO_LED, NO_LED, 84, NO_LED, NO_LED, NO_LED, 83, 82, 81, 80, 79, NO_LED, 78, 77}},
-                             /*board layout accounting for led directions */
-                             {{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}},
-                             /* marks scroll and caps as function modifiers for led effects */
-                             {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, 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, 8, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, 4, 4, 1, 1, 1, 1, 4, 1, 1, 1}};
-#endif
diff --git a/keyboards/carbo65/rules.mk b/keyboards/carbo65/rules.mk
index d6ed15acc729..d3ca7b060e17 100644
--- a/keyboards/carbo65/rules.mk
+++ b/keyboards/carbo65/rules.mk
@@ -1,7 +1,3 @@
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/catch22/config.h b/keyboards/catch22/config.h
index 98e0780698c6..fb1ac6044dec 100644
--- a/keyboards/catch22/config.h
+++ b/keyboards/catch22/config.h
@@ -20,17 +20,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define IS_COMMAND() ( \
     false \
 )
-
-#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 RGBLED_NUM 6
-#endif
diff --git a/keyboards/catch22/info.json b/keyboards/catch22/info.json
index 6ffd3117afc2..baaee6ca98f8 100644
--- a/keyboards/catch22/info.json
+++ b/keyboards/catch22/info.json
@@ -6,6 +6,21 @@
         "pid": "0xCA22",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 6,
+        "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": "F6"
     },
diff --git a/keyboards/centromere/info.json b/keyboards/centromere/info.json
index 5f9b57d97a18..280ab8bd7e42 100644
--- a/keyboards/centromere/info.json
+++ b/keyboards/centromere/info.json
@@ -10,7 +10,7 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
-    "community_layouts": ["split_3x5_3" "split_3x6_3"],
+    "community_layouts": ["split_3x5_3", "split_3x6_3"],
     "layout_aliases": {
         "LAYOUT": "LAYOUT_split_3x6_3"
     },
diff --git a/keyboards/cest73/tkm/info.json b/keyboards/cest73/tkm/info.json
index 028e028159d1..6447189b936f 100644
--- a/keyboards/cest73/tkm/info.json
+++ b/keyboards/cest73/tkm/info.json
@@ -15,6 +15,7 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "E6"
     },
     "indicators": {
diff --git a/keyboards/chalice/config.h b/keyboards/chalice/config.h
index 6bbd5af9bf95..f53b6e90992b 100644
--- a/keyboards/chalice/config.h
+++ b/keyboards/chalice/config.h
@@ -17,21 +17,6 @@
 
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-    #define RGBLED_NUM 14
-    #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
-#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/chalice/info.json b/keyboards/chalice/info.json
index 6b447c1fe643..8e6a6f2ed63f 100644
--- a/keyboards/chalice/info.json
+++ b/keyboards/chalice/info.json
@@ -8,6 +8,22 @@
         "pid": "0x000C",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 14,
+        "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": "D3"
     },
diff --git a/keyboards/charue/sunsetter/rules.mk b/keyboards/charue/sunsetter/rules.mk
index 0aeca0dd9f35..7f4f202a1b70 100644
--- a/keyboards/charue/sunsetter/rules.mk
+++ b/keyboards/charue/sunsetter/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/charue/sunsetter_r2/config.h b/keyboards/charue/sunsetter_r2/config.h
index 4ef27597b396..bb09fb145c76 100644
--- a/keyboards/charue/sunsetter_r2/config.h
+++ b/keyboards/charue/sunsetter_r2/config.h
@@ -3,19 +3,6 @@
 
 #pragma once
 
-/* RGB */
-#    define RGBLED_NUM 10
-#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
-
 /* 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/charue/sunsetter_r2/info.json b/keyboards/charue/sunsetter_r2/info.json
index 502609402f9a..9bbc6a7f94db 100644
--- a/keyboards/charue/sunsetter_r2/info.json
+++ b/keyboards/charue/sunsetter_r2/info.json
@@ -8,6 +8,21 @@
         "pid": "0x5335",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 10,
+        "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": "E6"
     },
diff --git a/keyboards/checkerboards/axon40/config.h b/keyboards/checkerboards/axon40/config.h
index 530fa064135b..21d76ea1ac7c 100644
--- a/keyboards/checkerboards/axon40/config.h
+++ b/keyboards/checkerboards/axon40/config.h
@@ -21,18 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 29
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/checkerboards/axon40/info.json b/keyboards/checkerboards/axon40/info.json
index 6b47a8f679d8..f9097042808f 100644
--- a/keyboards/checkerboards/axon40/info.json
+++ b/keyboards/checkerboards/axon40/info.json
@@ -8,6 +8,23 @@
         "pid": "0x1119",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 29,
+        "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": "D7"
     },
diff --git a/keyboards/checkerboards/candybar_ortho/config.h b/keyboards/checkerboards/candybar_ortho/config.h
index 0033db5d2bd9..e9b1b6d10521 100644
--- a/keyboards/checkerboards/candybar_ortho/config.h
+++ b/keyboards/checkerboards/candybar_ortho/config.h
@@ -21,18 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 18
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/checkerboards/candybar_ortho/info.json b/keyboards/checkerboards/candybar_ortho/info.json
index 3369eee53d44..c91f0d924d63 100644
--- a/keyboards/checkerboards/candybar_ortho/info.json
+++ b/keyboards/checkerboards/candybar_ortho/info.json
@@ -8,6 +8,23 @@
         "pid": "0x3215",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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"
     },
diff --git a/keyboards/checkerboards/nop60/config.h b/keyboards/checkerboards/nop60/config.h
index 3c52543d2536..9b8adff3ecfb 100644
--- a/keyboards/checkerboards/nop60/config.h
+++ b/keyboards/checkerboards/nop60/config.h
@@ -17,24 +17,6 @@ Copyright 2021 Nathan Spears
 
 #pragma once
 
-#define BACKLIGHT_PWM_DRIVER    PWMD3
-
-// ws2812 options
-#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 // number of LEDs
-#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
-#define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
-#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/checkerboards/nop60/info.json b/keyboards/checkerboards/nop60/info.json
index 9f44cfd41fe3..f59c70ac29c2 100644
--- a/keyboards/checkerboards/nop60/info.json
+++ b/keyboards/checkerboards/nop60/info.json
@@ -14,10 +14,29 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "D1",
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 12,
+        "brightness_steps": 12,
+        "led_count": 14,
+        "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": "D2"
     },
diff --git a/keyboards/checkerboards/plexus75/config.h b/keyboards/checkerboards/plexus75/config.h
index 50aa6985248b..c71a85e7db89 100644
--- a/keyboards/checkerboards/plexus75/config.h
+++ b/keyboards/checkerboards/plexus75/config.h
@@ -36,19 +36,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
-
-// ws2812 options
-#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 // 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)
diff --git a/keyboards/checkerboards/plexus75/info.json b/keyboards/checkerboards/plexus75/info.json
index 30d8df7edbcc..943262b885cb 100644
--- a/keyboards/checkerboards/plexus75/info.json
+++ b/keyboards/checkerboards/plexus75/info.json
@@ -8,6 +8,24 @@
         "pid": "0x5338",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 25,
+        "brightness_steps": 12,
+        "led_count": 14,
+        "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": "D3"
     },
diff --git a/keyboards/checkerboards/plexus75_he/config.h b/keyboards/checkerboards/plexus75_he/config.h
index bfa587838356..21d76ea1ac7c 100644
--- a/keyboards/checkerboards/plexus75_he/config.h
+++ b/keyboards/checkerboards/plexus75_he/config.h
@@ -21,19 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-// ws2812 options
-#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 18 // number of LEDs
-#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
-#define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
-#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/checkerboards/plexus75_he/info.json b/keyboards/checkerboards/plexus75_he/info.json
index fc1dfc9fd5f8..d9817cbbe13d 100644
--- a/keyboards/checkerboards/plexus75_he/info.json
+++ b/keyboards/checkerboards/plexus75_he/info.json
@@ -8,6 +8,24 @@
         "pid": "0x5339",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 12,
+        "brightness_steps": 12,
+        "led_count": 18,
+        "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": "D4"
     },
diff --git a/keyboards/checkerboards/pursuit40/config.h b/keyboards/checkerboards/pursuit40/config.h
index 6fe6785edb05..4552a7509283 100644
--- a/keyboards/checkerboards/pursuit40/config.h
+++ b/keyboards/checkerboards/pursuit40/config.h
@@ -37,19 +37,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-// ws2812 options
-#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 12 // units to step when in/decresing saturation
-#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/checkerboards/pursuit40/info.json b/keyboards/checkerboards/pursuit40/info.json
index 0f4394b87fa7..f7a0be79e33c 100644
--- a/keyboards/checkerboards/pursuit40/info.json
+++ b/keyboards/checkerboards/pursuit40/info.json
@@ -8,6 +8,24 @@
         "pid": "0x1620",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 12,
+        "brightness_steps": 12,
+        "led_count": 12,
+        "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": "F0"
     },
diff --git a/keyboards/checkerboards/quark/config.h b/keyboards/checkerboards/quark/config.h
index efa8f93d3ebf..876e59daa074 100644
--- a/keyboards/checkerboards/quark/config.h
+++ b/keyboards/checkerboards/quark/config.h
@@ -21,19 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-// ws2812 options
-#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 // number of LEDs
-#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
-#define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
-#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/checkerboards/quark/info.json b/keyboards/checkerboards/quark/info.json
index 262cd6e60cc9..ca8446034840 100644
--- a/keyboards/checkerboards/quark/info.json
+++ b/keyboards/checkerboards/quark/info.json
@@ -8,6 +8,24 @@
         "pid": "0x5340",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 12,
+        "brightness_steps": 12,
+        "led_count": 14,
+        "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": "D0"
     },
diff --git a/keyboards/checkerboards/quark_lp/config.h b/keyboards/checkerboards/quark_lp/config.h
index 75345075e758..ca124775d72e 100644
--- a/keyboards/checkerboards/quark_lp/config.h
+++ b/keyboards/checkerboards/quark_lp/config.h
@@ -22,17 +22,11 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define TAPPING_TOGGLE 2
-
 #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.
-#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:
diff --git a/keyboards/checkerboards/quark_lp/info.json b/keyboards/checkerboards/quark_lp/info.json
index 264bddad1292..9712b63a3890 100644
--- a/keyboards/checkerboards/quark_lp/info.json
+++ b/keyboards/checkerboards/quark_lp/info.json
@@ -12,7 +12,10 @@
         "pin": "C2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812",
+        "sat_steps": 8,
+        "val_steps": 8,
+        "speed_steps": 10
     },
     "matrix_pins": {
         "cols": ["B6", "B5", "B4", "B3", "B0", "D6", "D5", "D4", "D3", "D2", "D1", "D0"],
@@ -21,6 +24,9 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
+    "tapping": {
+        "toggle": 2
+    },
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
diff --git a/keyboards/checkerboards/quark_plus/config.h b/keyboards/checkerboards/quark_plus/config.h
index 4136faaa7ae6..07fe2e4c7b8a 100644
--- a/keyboards/checkerboards/quark_plus/config.h
+++ b/keyboards/checkerboards/quark_plus/config.h
@@ -21,19 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-// ws2812 options
-#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 // number of LEDs
-#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
-#define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
-#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/checkerboards/quark_plus/info.json b/keyboards/checkerboards/quark_plus/info.json
index 0d47ec2ec471..dc5bc478ca40 100644
--- a/keyboards/checkerboards/quark_plus/info.json
+++ b/keyboards/checkerboards/quark_plus/info.json
@@ -8,6 +8,24 @@
         "pid": "0x5344",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 12,
+        "brightness_steps": 12,
+        "led_count": 14,
+        "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": "C5"
     },
@@ -25,6 +43,7 @@
       ]
     },
     "backlight": {
+      "driver": "timer",
       "pin": "C4",
       "levels": 6,
       "breathing": true
diff --git a/keyboards/checkerboards/quark_squared/config.h b/keyboards/checkerboards/quark_squared/config.h
index 514ce68f3f08..21d76ea1ac7c 100644
--- a/keyboards/checkerboards/quark_squared/config.h
+++ b/keyboards/checkerboards/quark_squared/config.h
@@ -21,19 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-// ws2812 options
-#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 // number of LEDs
-#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
-#define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
-#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/info.json
index bd6233b20868..a47253d5b4a4 100644
--- a/keyboards/checkerboards/quark_squared/info.json
+++ b/keyboards/checkerboards/quark_squared/info.json
@@ -8,6 +8,24 @@
         "pid": "0x5342",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 12,
+        "brightness_steps": 12,
+        "led_count": 14,
+        "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": "D0"
     },
diff --git a/keyboards/checkerboards/snop60/config.h b/keyboards/checkerboards/snop60/config.h
index d11757cc15e9..e335720fd1e9 100644
--- a/keyboards/checkerboards/snop60/config.h
+++ b/keyboards/checkerboards/snop60/config.h
@@ -17,22 +17,6 @@ Copyright 2022 Nathan Spears
 
 #pragma once
 
-// ws2812 options
-#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 // number of LEDs
-#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
-#define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
-#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/checkerboards/snop60/info.json b/keyboards/checkerboards/snop60/info.json
index 94d40e6645b5..f88186faddc3 100644
--- a/keyboards/checkerboards/snop60/info.json
+++ b/keyboards/checkerboards/snop60/info.json
@@ -19,10 +19,29 @@
         ]
     },
     "backlight": {
+        "driver": "timer",
         "pin": "D1",
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 12,
+        "brightness_steps": 12,
+        "led_count": 14,
+        "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": "B1"
     },
diff --git a/keyboards/checkerboards/ud40_ortho_alt/config.h b/keyboards/checkerboards/ud40_ortho_alt/config.h
index 788fbe39a991..21d76ea1ac7c 100644
--- a/keyboards/checkerboards/ud40_ortho_alt/config.h
+++ b/keyboards/checkerboards/ud40_ortho_alt/config.h
@@ -21,19 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-// ws2812 options
-#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 12 // units to step when in/decresing saturation
-#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/checkerboards/ud40_ortho_alt/info.json b/keyboards/checkerboards/ud40_ortho_alt/info.json
index 7d49bdb5b457..c47c2c4c6bfe 100644
--- a/keyboards/checkerboards/ud40_ortho_alt/info.json
+++ b/keyboards/checkerboards/ud40_ortho_alt/info.json
@@ -8,6 +8,24 @@
         "pid": "0x7030",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 12,
+        "brightness_steps": 12,
+        "led_count": 12,
+        "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": "D4"
     },
diff --git a/keyboards/cherrybstudio/cb1800/config.h b/keyboards/cherrybstudio/cb1800/config.h
deleted file mode 100644
index 21aeb17d77d2..000000000000
--- a/keyboards/cherrybstudio/cb1800/config.h
+++ /dev/null
@@ -1,29 +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 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/cherrybstudio/cb1800/info.json b/keyboards/cherrybstudio/cb1800/info.json
index 1b2fadd2a9c0..e6819d40ee3a 100644
--- a/keyboards/cherrybstudio/cb1800/info.json
+++ b/keyboards/cherrybstudio/cb1800/info.json
@@ -19,6 +19,23 @@
         "scroll_lock": "F7",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "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": "E6"
     },
diff --git a/keyboards/cherrybstudio/cb65/config.h b/keyboards/cherrybstudio/cb65/config.h
deleted file mode 100644
index e463e1d6c703..000000000000
--- a/keyboards/cherrybstudio/cb65/config.h
+++ /dev/null
@@ -1,30 +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
-
-/* RGB Lighting */
-#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 24
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json
index 37038b214fd2..841dae6103db 100644
--- a/keyboards/cherrybstudio/cb65/info.json
+++ b/keyboards/cherrybstudio/cb65/info.json
@@ -18,6 +18,23 @@
         "scroll_lock": "F4",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 24,
+        "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": "F0"
     },
diff --git a/keyboards/cherrybstudio/cb87/config.h b/keyboards/cherrybstudio/cb87/config.h
deleted file mode 100644
index ddb9102d3652..000000000000
--- a/keyboards/cherrybstudio/cb87/config.h
+++ /dev/null
@@ -1,29 +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 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 22 /* 16 Bottom 6 top*/
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/cherrybstudio/cb87/info.json b/keyboards/cherrybstudio/cb87/info.json
index ac32d5f8eabc..228cc030bbec 100644
--- a/keyboards/cherrybstudio/cb87/info.json
+++ b/keyboards/cherrybstudio/cb87/info.json
@@ -16,6 +16,23 @@
     "backlight": {
         "pin": "B6"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 22,
+        "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": "E6"
     },
diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json
index 93eed315241b..eefa7e73f0a7 100644
--- a/keyboards/cherrybstudio/cb87rgb/info.json
+++ b/keyboards/cherrybstudio/cb87rgb/info.json
@@ -12,7 +12,7 @@
         "pin": "E6"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "F5", "C6", "C7", "F7"],
diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h
deleted file mode 100644
index 4c66b113e7bf..000000000000
--- a/keyboards/cherrybstudio/cb87v2/config.h
+++ /dev/null
@@ -1,29 +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 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 24
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json
index 8c35532c321b..1023cac5d186 100644
--- a/keyboards/cherrybstudio/cb87v2/info.json
+++ b/keyboards/cherrybstudio/cb87v2/info.json
@@ -21,6 +21,23 @@
         "scroll_lock": "F4",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 24,
+        "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": "E6"
     },
diff --git a/keyboards/cheshire/curiosity/config.h b/keyboards/cheshire/curiosity/config.h
index 71b01464378e..2687b628f58e 100644
--- a/keyboards/cheshire/curiosity/config.h
+++ b/keyboards/cheshire/curiosity/config.h
@@ -17,19 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 14
-
-#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
-
 /* 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/cheshire/curiosity/info.json b/keyboards/cheshire/curiosity/info.json
index fa8180e5af1a..678305ae3292 100644
--- a/keyboards/cheshire/curiosity/info.json
+++ b/keyboards/cheshire/curiosity/info.json
@@ -7,6 +7,21 @@
         "pid": "0x0FAD",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 14,
+        "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"
     },
diff --git a/keyboards/chlx/str_merro60/config.h b/keyboards/chlx/str_merro60/config.h
index 62b31cf95bf4..763f2a4d5cc2 100644
--- a/keyboards/chlx/str_merro60/config.h
+++ b/keyboards/chlx/str_merro60/config.h
@@ -17,23 +17,7 @@ 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_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5
-#   define RGBLED_NUM 12
-#   define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }
-#   define RGBLIGHT_HUE_STEP 8
-#   define RGBLIGHT_SAT_STEP 8
-#   define RGBLIGHT_VAL_STEP 8
-#   define RGBLIGHT_SLEEP
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/chlx/str_merro60/info.json b/keyboards/chlx/str_merro60/info.json
index add2f077fee9..89fdd4baa123 100644
--- a/keyboards/chlx/str_merro60/info.json
+++ b/keyboards/chlx/str_merro60/info.json
@@ -8,6 +8,24 @@
         "pid": "0x0602",
         "device_version": "1.0.0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "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": "D3"
     },
diff --git a/keyboards/chosfox/cf81/info.json b/keyboards/chosfox/cf81/info.json
index 8b09d5daf614..827347f41e3b 100644
--- a/keyboards/chosfox/cf81/info.json
+++ b/keyboards/chosfox/cf81/info.json
@@ -35,7 +35,7 @@
         ]
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733",
+        "driver": "is31fl3733",
         "animations": {
             "breathing": true,
             "cycle_all": true,
@@ -252,7 +252,7 @@
                 { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
                 { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
                 { "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 },
-                { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
+                { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.5 },
 
                 { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
                 { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
@@ -261,9 +261,9 @@
                 { "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, 13], "x": 13.25, "y": 5.25 },
-                { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25 },
-                { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25 }
+                { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.5 },
+                { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.5 },
+                { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.5 }
             ]
         }
     }
diff --git a/keyboards/chosfox/cf81/keymaps/default/keymap.c b/keyboards/chosfox/cf81/keymaps/default/keymap.c
index 753bdebc0a49..030ef2e2c141 100644
--- a/keyboards/chosfox/cf81/keymaps/default/keymap.c
+++ b/keyboards/chosfox/cf81/keymaps/default/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
     [WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
     [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
diff --git a/keyboards/chosfox/cf81/keymaps/via/keymap.c b/keyboards/chosfox/cf81/keymaps/via/keymap.c
index 753bdebc0a49..030ef2e2c141 100644
--- a/keyboards/chosfox/cf81/keymaps/via/keymap.c
+++ b/keyboards/chosfox/cf81/keymaps/via/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
     [WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
     [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
diff --git a/keyboards/chromatonemini/info.json b/keyboards/chromatonemini/info.json
index e6f433313393..3dd10d7381ca 100644
--- a/keyboards/chromatonemini/info.json
+++ b/keyboards/chromatonemini/info.json
@@ -21,7 +21,7 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "diode_direction": "COL2ROW",
     "matrix_pins": {
diff --git a/keyboards/churrosoft/deck8/rgb/info.json b/keyboards/churrosoft/deck8/rgb/info.json
index 43f273be58c9..546c17ca13d2 100644
--- a/keyboards/churrosoft/deck8/rgb/info.json
+++ b/keyboards/churrosoft/deck8/rgb/info.json
@@ -11,7 +11,7 @@
     "rgb_matrix": true
   },
   "rgb_matrix": {
-    "driver": "WS2812",
+    "driver": "ws2812",
     "max_brightness": 200,
     "layout": [
       {"flags": 4, "matrix": [0, 0], "x":  45, "y": 21},
diff --git a/keyboards/cipulot/ec_prox/jis/info.json b/keyboards/cipulot/ec_prox/jis/info.json
index 840496790968..6016004b1ba3 100644
--- a/keyboards/cipulot/ec_prox/jis/info.json
+++ b/keyboards/cipulot/ec_prox/jis/info.json
@@ -52,75 +52,79 @@
     "layouts": {
         "LAYOUT_jp": {
             "layout": [
-                {"label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0},
-                {"label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0},
-                {"label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0},
-                {"label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0},
-                {"label": "0,4", "matrix": [0, 4], "x": 4.0, "y": 0.0},
-                {"label": "0,5", "matrix": [0, 5], "x": 5.0, "y": 0.0},
-                {"label": "0,6", "matrix": [0, 6], "x": 6.0, "y": 0.0},
-                {"label": "0,7", "matrix": [0, 7], "x": 7.0, "y": 0.0},
-                {"label": "0,8", "matrix": [0, 8], "x": 8.0, "y": 0.0},
-                {"label": "0,9", "matrix": [0, 9], "x": 9.0, "y": 0.0},
-                {"label": "0,10", "matrix": [0, 10], "x": 10.0, "y": 0.0},
-                {"label": "0,11", "matrix": [0, 11], "x": 11.0, "y": 0.0},
-                {"label": "0,12", "matrix": [0, 12], "x": 12.0, "y": 0.0},
-                {"label": "0,13", "matrix": [0, 13], "x": 13.0, "y": 0.0},
-                {"label": "1,13", "matrix": [1, 13], "x": 14.0, "y": 0.0},
-                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0},
-                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1.0},
-                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1.0},
-                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1.0},
-                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1.0},
-                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1.0},
-                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1.0},
-                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1.0},
-                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1.0},
-                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1.0},
-                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1.0},
-                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1.0},
-                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1.0},
-                {"h": 2, "label": "2,13", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1.0},
-                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0},
-                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2.0},
-                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2.0},
-                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2.0},
-                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2.0},
-                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2.0},
-                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2.0},
-                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2.0},
-                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2.0},
-                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2.0},
-                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2.0},
-                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2.0},
-                {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2.0},
-                {"label": "3,0", "matrix": [3, 0], "w": 2, "x": 0.0, "y": 3.0},
-                {"label": "3,1", "matrix": [3, 1], "x": 2.0, "y": 3.0},
-                {"label": "3,2", "matrix": [3, 2], "x": 3.0, "y": 3.0},
-                {"label": "3,3", "matrix": [3, 3], "x": 4.0, "y": 3.0},
-                {"label": "3,4", "matrix": [3, 4], "x": 5.0, "y": 3.0},
-                {"label": "3,5", "matrix": [3, 5], "x": 6.0, "y": 3.0},
-                {"label": "3,6", "matrix": [3, 6], "x": 7.0, "y": 3.0},
-                {"label": "3,7", "matrix": [3, 7], "x": 8.0, "y": 3.0},
-                {"label": "3,8", "matrix": [3, 8], "x": 9.0, "y": 3.0},
-                {"label": "3,9", "matrix": [3, 9], "x": 10.0, "y": 3.0},
-                {"label": "3,10", "matrix": [3, 10], "x": 11.0, "y": 3.0},
-                {"label": "3,11", "matrix": [3, 11], "x": 12.0, "y": 3.0},
-                {"label": "3,12", "matrix": [3, 12], "x": 13.0, "y": 3.0},
-                {"label": "3,13", "matrix": [3, 13], "x": 14.0, "y": 3.0},
-                {"label": "4,0", "matrix": [4, 0], "x": 0.0, "y": 4.0},
-                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.0},
-                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.0},
-                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.0},
-                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.0},
-                {"label": "4,5", "matrix": [4, 5], "w": 2.5, "x": 5.25, "y": 4.0},
-                {"label": "4,7", "matrix": [4, 7], "x": 7.75, "y": 4.0},
-                {"label": "4,8", "matrix": [4, 8], "x": 8.75, "y": 4.0},
-                {"label": "4,9", "matrix": [4, 9], "x": 9.75, "y": 4.0},
-                {"label": "4,10", "matrix": [4, 10], "x": 10.75, "y": 4.0},
-                {"label": "4,11", "matrix": [4, 11], "x": 12.0, "y": 4.0},
-                {"label": "4,12", "matrix": [4, 12], "x": 13.0, "y": 4.0},
-                {"label": "4,13", "matrix": [4, 13], "x": 14.0, "y": 4.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},
+                {"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}
             ]
         }
     }
diff --git a/keyboards/cipulot/ec_prox/jis/keymaps/default/keymap.c b/keyboards/cipulot/ec_prox/jis/keymaps/default/keymap.c
index 979319a62209..2a64063a0bc3 100644
--- a/keyboards/cipulot/ec_prox/jis/keymaps/default/keymap.c
+++ b/keyboards/cipulot/ec_prox/jis/keymaps/default/keymap.c
@@ -21,14 +21,14 @@
 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, _______, _______, _______,
diff --git a/keyboards/cipulot/ec_prox/jis/keymaps/via/keymap.c b/keyboards/cipulot/ec_prox/jis/keymaps/via/keymap.c
index cc9382531d20..2a64063a0bc3 100644
--- a/keyboards/cipulot/ec_prox/jis/keymaps/via/keymap.c
+++ b/keyboards/cipulot/ec_prox/jis/keymaps/via/keymap.c
@@ -21,31 +21,31 @@
 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_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),
+        KC_ESC,  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_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_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(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______, _______, _______)
     // clang-format on
 };
diff --git a/keyboards/cipulot/ec_theca/info.json b/keyboards/cipulot/ec_theca/info.json
index 8aa2933892f1..a80a92a7f5d2 100644
--- a/keyboards/cipulot/ec_theca/info.json
+++ b/keyboards/cipulot/ec_theca/info.json
@@ -23,98 +23,15 @@
         },
         "vid": "0x6369"
     },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_tkl_ansi",
+        "LAYOUT_tkl_ansi_tsangan_wkl": "LAYOUT_tkl_ansi_wkl"
+    },
+    "community_layouts": [
+        "tkl_ansi",
+        "tkl_ansi_tsangan"
+    ],
     "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 },
-                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 },
-                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 },
-                { "label": "1,13", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 },
-                { "label": "1,14", "matrix": [1, 14], "x": 15.25, "y": 1.25 },
-                { "label": "1,15", "matrix": [1, 15], "x": 16.25, "y": 1.25 },
-                { "label": "2,15", "matrix": [2, 15], "x": 17.25, "y": 1.25 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
-                { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
-                { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
-                { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
-                { "label": "2,4", "matrix": [2, 4], "x": 4.5, "y": 2.25 },
-                { "label": "2,5", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
-                { "label": "2,6", "matrix": [2, 6], "x": 6.5, "y": 2.25 },
-                { "label": "2,7", "matrix": [2, 7], "x": 7.5, "y": 2.25 },
-                { "label": "2,8", "matrix": [2, 8], "x": 8.5, "y": 2.25 },
-                { "label": "2,9", "matrix": [2, 9], "x": 9.5, "y": 2.25 },
-                { "label": "2,10", "matrix": [2, 10], "x": 10.5, "y": 2.25 },
-                { "label": "2,11", "matrix": [2, 11], "x": 11.5, "y": 2.25 },
-                { "label": "2,12", "matrix": [2, 12], "x": 12.5, "y": 2.25 },
-                { "label": "2,13", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 },
-                { "label": "2,14", "matrix": [2, 14], "x": 15.25, "y": 2.25 },
-                { "label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 2.25 },
-                { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 },
-                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
-                { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
-                { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
-                { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
-                { "label": "3,4", "matrix": [3, 4], "x": 4.75, "y": 3.25 },
-                { "label": "3,5", "matrix": [3, 5], "x": 5.75, "y": 3.25 },
-                { "label": "3,6", "matrix": [3, 6], "x": 6.75, "y": 3.25 },
-                { "label": "3,7", "matrix": [3, 7], "x": 7.75, "y": 3.25 },
-                { "label": "3,8", "matrix": [3, 8], "x": 8.75, "y": 3.25 },
-                { "label": "3,9", "matrix": [3, 9], "x": 9.75, "y": 3.25 },
-                { "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
-                { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
-                { "label": "3,13", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
-                { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
-                { "label": "4,1", "matrix": [4, 1], "x": 2.25, "y": 4.25 },
-                { "label": "4,2", "matrix": [4, 2], "x": 3.25, "y": 4.25 },
-                { "label": "4,3", "matrix": [4, 3], "x": 4.25, "y": 4.25 },
-                { "label": "4,4", "matrix": [4, 4], "x": 5.25, "y": 4.25 },
-                { "label": "4,5", "matrix": [4, 5], "x": 6.25, "y": 4.25 },
-                { "label": "4,6", "matrix": [4, 6], "x": 7.25, "y": 4.25 },
-                { "label": "4,7", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
-                { "label": "4,8", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
-                { "label": "4,9", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
-                { "label": "4,10", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
-                { "label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
-                { "label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4.25 },
-                { "label": "5,0", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
-                { "label": "5,1", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
-                { "label": "5,2", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
-                { "label": "5,5", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 5.25 },
-                { "label": "5,10", "matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25 },
-                { "label": "5,11", "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
-                { "label": "5,12", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 },
-                { "label": "5,13", "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 5.25 },
-                { "label": "5,14", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
-                { "label": "5,15", "matrix": [5, 15], "x": 16.25, "y": 5.25 },
-                { "label": "4,15", "matrix": [4, 15], "x": 17.25, "y": 5.25 }
-            ]
-        },
         "LAYOUT_tkl_ansi": {
             "layout": [
                 { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
@@ -296,7 +213,7 @@
                 { "label": "4,15", "matrix": [4, 15], "x": 17.25, "y": 5.25 }
             ]
         },
-        "LAYOUT_tkl_ansi_tsangan_wkl": {
+        "LAYOUT_tkl_ansi_wkl": {
             "layout": [
                 { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
                 { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
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 f5b25db22813..56548302ddc3 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
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
-    [0] = LAYOUT_tkl_ansi_tsangan_wkl(
+    [0] = LAYOUT_tkl_ansi_wkl(
     KC_ESC,   KC_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,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LSFT,  KC_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,            KC_RCTL,               KC_LEFT,  KC_DOWN,  KC_RIGHT),
 
-    [1] = LAYOUT_tkl_ansi_tsangan_wkl(
+    [1] = LAYOUT_tkl_ansi_wkl(
     QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
diff --git a/keyboards/cipulot/kallos/config.h b/keyboards/cipulot/kallos/config.h
index bb51142311f8..dfe6b13b0668 100644
--- a/keyboards/cipulot/kallos/config.h
+++ b/keyboards/cipulot/kallos/config.h
@@ -17,19 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Lightbar pin and LED count definitions*/
-#define RGBLED_NUM 13
-#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
-
 /* 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/cipulot/kallos/info.json b/keyboards/cipulot/kallos/info.json
index f9fd74acfe2b..b2f265c13fd7 100644
--- a/keyboards/cipulot/kallos/info.json
+++ b/keyboards/cipulot/kallos/info.json
@@ -8,6 +8,21 @@
         "pid": "0x6B7A",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 13,
+        "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": "D0"
     },
diff --git a/keyboards/citrus/erdnuss65/rules.mk b/keyboards/citrus/erdnuss65/rules.mk
index 80b5a0b8f5a5..e69de29bb2d1 100644
--- a/keyboards/citrus/erdnuss65/rules.mk
+++ b/keyboards/citrus/erdnuss65/rules.mk
@@ -1,2 +0,0 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
\ No newline at end of file
diff --git a/keyboards/ck60i/config.h b/keyboards/ck60i/config.h
index 07c7421d2551..7506922b008e 100644
--- a/keyboards/ck60i/config.h
+++ b/keyboards/ck60i/config.h
@@ -26,19 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 16
-#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
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/ck60i/info.json b/keyboards/ck60i/info.json
index 38ae378ef4ca..d35eac99200e 100644
--- a/keyboards/ck60i/info.json
+++ b/keyboards/ck60i/info.json
@@ -24,7 +24,21 @@
         "breathing": true
     },
     "rgblight": {
-        "max_brightness": 200
+        "led_count": 16,
+        "max_brightness": 200,
+        "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": "B15"
diff --git a/keyboards/ck60i/rules.mk b/keyboards/ck60i/rules.mk
index e505cf44b4f6..3ec023e5e842 100644
--- a/keyboards/ck60i/rules.mk
+++ b/keyboards/ck60i/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 ENCODER_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/ckeys/washington/keymaps/default/keymap.c b/keyboards/ckeys/washington/keymaps/default/keymap.c
index 9ce0181fe423..8e1eb0e2728c 100644
--- a/keyboards/ckeys/washington/keymaps/default/keymap.c
+++ b/keyboards/ckeys/washington/keymaps/default/keymap.c
@@ -75,10 +75,10 @@ bool oled_task_user(void) {
   }
 
   // Host Keyboard LED Status
-  uint8_t usb_led = host_keyboard_leds();
-  oled_write_P(IS_LED_ON(usb_led, USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR("       "), false);
-  oled_write_P(IS_LED_ON(usb_led, USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR("       "), false);
-  oled_write_P(IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR("       "), false);
+  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/ckeys/washington/rules.mk b/keyboards/ckeys/washington/rules.mk
index 87154d95c9af..c6c08dda5950 100644
--- a/keyboards/ckeys/washington/rules.mk
+++ b/keyboards/ckeys/washington/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable support for encoders
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable support for OLED displays
diff --git a/keyboards/clickety_split/leeloo/info.json b/keyboards/clickety_split/leeloo/info.json
index 78794cbddb8f..a2510f9f7f25 100644
--- a/keyboards/clickety_split/leeloo/info.json
+++ b/keyboards/clickety_split/leeloo/info.json
@@ -28,6 +28,9 @@
       }
     }
   },
+  "tapping": {
+    "term": 100
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/clickety_split/leeloo/rev1/config.h b/keyboards/clickety_split/leeloo/rev1/config.h
deleted file mode 100644
index 96c6b71d3743..000000000000
--- a/keyboards/clickety_split/leeloo/rev1/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2022 Clickety Split Ltd.
- *                https://clicketysplit.ca
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have 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 */
-#define TAPPING_TERM 100
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
diff --git a/keyboards/clueboard/66_hotswap/gen1/info.json b/keyboards/clueboard/66_hotswap/gen1/info.json
index 360f2e0e042b..81a23f7d87a4 100644
--- a/keyboards/clueboard/66_hotswap/gen1/info.json
+++ b/keyboards/clueboard/66_hotswap/gen1/info.json
@@ -17,7 +17,7 @@
     "nkro": true
   },
   "led_matrix": {
-    "driver": "IS31FL3731"
+    "driver": "is31fl3731"
   },
   "matrix_pins": {
     "cols": ["B10", "B2", "B1", "B0", "A7", "B4", "B3", "B7"],
@@ -28,7 +28,7 @@
     "pid": "0x2391",
     "vid": "0xC1ED"
   },
-  "community_layouts": [],
+  "community_layouts": ["66_ansi"],
   "layout_aliases": {
     "LAYOUT": "LAYOUT_all"
   },
diff --git a/keyboards/cmm_studio/fuji65/config.h b/keyboards/cmm_studio/fuji65/config.h
deleted file mode 100644
index 2460cac2cb73..000000000000
--- a/keyboards/cmm_studio/fuji65/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 CMM.Studio 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/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 8
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/fuji65/info.json b/keyboards/cmm_studio/fuji65/info.json
index cf5a137b34b0..860608042f68 100644
--- a/keyboards/cmm_studio/fuji65/info.json
+++ b/keyboards/cmm_studio/fuji65/info.json
@@ -8,6 +8,23 @@
         "pid": "0x364D",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/coarse/cordillera/rules.mk b/keyboards/coarse/cordillera/rules.mk
index 6e8451b10cd5..d6cd9d5f0dab 100644
--- a/keyboards/coarse/cordillera/rules.mk
+++ b/keyboards/coarse/cordillera/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/coarse/ixora/rules.mk b/keyboards/coarse/ixora/rules.mk
index ff4c3156fed4..af1134ce2989 100644
--- a/keyboards/coarse/ixora/rules.mk
+++ b/keyboards/coarse/ixora/rules.mk
@@ -11,5 +11,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 NO_USB_STARTUP_CHECK = no         	# Disable initialization only when usb is plugged in
 
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/coarse/vinta/info.json b/keyboards/coarse/vinta/info.json
index a430ea36b704..3dd9898f1aa6 100644
--- a/keyboards/coarse/vinta/info.json
+++ b/keyboards/coarse/vinta/info.json
@@ -17,6 +17,9 @@
   "bootloader": "stm32-dfu",
   "debounce": 0,
   "community_layouts": ["65_ansi_blocker"],
+  "layout_aliases": {
+    "LAYOUT_67_ansi": "LAYOUT_65_ansi_blocker"
+  },
   "layouts": {
     "LAYOUT_69_ansi": {
       "layout": [
diff --git a/keyboards/coarse/vinta/rules.mk b/keyboards/coarse/vinta/rules.mk
index 88f853eb44d1..cedbfeb321f9 100644
--- a/keyboards/coarse/vinta/rules.mk
+++ b/keyboards/coarse/vinta/rules.mk
@@ -10,5 +10,3 @@ COMMAND_ENABLE = no    				# Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 NO_USB_STARTUP_CHECK = no         	# Disable initialization only when usb is plugged in
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/coban/pad3a/config.h b/keyboards/coban/pad3a/config.h
index 9483086fb488..5299ccb4f1c9 100644
--- a/keyboards/coban/pad3a/config.h
+++ b/keyboards/coban/pad3a/config.h
@@ -16,8 +16,5 @@
 
 #pragma once
 
-#define ENCODERS_PAD_A { GP5 }
-#define ENCODERS_PAD_B { GP4 }
-
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
diff --git a/keyboards/coban/pad3a/info.json b/keyboards/coban/pad3a/info.json
index 3eadcb7f50f0..fc5c8ee71ee6 100644
--- a/keyboards/coban/pad3a/info.json
+++ b/keyboards/coban/pad3a/info.json
@@ -9,6 +9,11 @@
         "vid": "0xCB3A",
         "device_version": "1.1.0"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP5", "pin_b": "GP4"}
+        ]
+    },
     "matrix_pins": {
         "direct": [
             ["GP8", "GP7", "GP6"]
diff --git a/keyboards/contender/config.h b/keyboards/contender/config.h
index 971253f396aa..4254bdc63c3f 100644
--- a/keyboards/contender/config.h
+++ b/keyboards/contender/config.h
@@ -17,28 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 33
-#define RGBLIGHT_LED_MAP { \
-   0, 1, 2, 3, \
-   7, 6, 5, 4, \
-   8, 9, 10, 11, \
-   15, 14, 13, 12, \
-   16, 17, 18, 19, \
-   22, 21, 20, \
-   25, 24, 23, 26, 27, 28, 29, 30, 31, 32 }
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-
 /* 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/contender/info.json b/keyboards/contender/info.json
index 8a81ae164d7a..b09556f3d6fe 100644
--- a/keyboards/contender/info.json
+++ b/keyboards/contender/info.json
@@ -12,7 +12,22 @@
         "pin": "C6"
     },
     "rgblight": {
-        "max_brightness": 32
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 33,
+        "max_brightness": 32,
+        "sleep": true,
+        "led_map": [0, 1, 2, 3, 7, 6, 5, 4, 8, 9, 10, 11, 15, 14, 13, 12, 16, 17, 18, 19, 22, 21, 20, 25, 24, 23, 26, 27, 28, 29, 30, 31, 32],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        }
     },
     "matrix_pins": {
         "cols": ["C7", "D6", "B3", "B0", "B1"],
diff --git a/keyboards/contra/keymaps/bramver/README.md b/keyboards/contra/keymaps/bramver/README.md
index 3c7028a933f2..c5a887ce2c13 100644
--- a/keyboards/contra/keymaps/bramver/README.md
+++ b/keyboards/contra/keymaps/bramver/README.md
@@ -22,9 +22,9 @@ LOWER layer
   { _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ },
 
 EMOJI layer
-  { _______ , X(CLAP) , X(CUM)  , X(BNIS) , X(BUTT) , X(CAR)  , X(FIRE) , X(REDB) , X(MONY) , X(HNDR) , X(SOS)  , _______ },
-  { _______ , X(CELE) , X(PRAY) , X(NAIL) , X(OK)   , X(THNK) , X(UNAM) , X(HEYE) , X(COOL) , X(EYES) , X(SMIR) , _______ },
-  { _______ , X(TRIU) , X(SCRM) , X(VOMI) , X(DTIV) , X(EXPL) , X(HAIR) , X(DANC) , X(STRN) , X(LEFT) , X(RGHT) , _______ },
+  { _______ , 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
diff --git a/keyboards/contra/keymaps/bramver/keymap.c b/keyboards/contra/keymaps/bramver/keymap.c
index 3816ee629e2c..08f25119c272 100644
--- a/keyboards/contra/keymaps/bramver/keymap.c
+++ b/keyboards/contra/keymaps/bramver/keymap.c
@@ -106,9 +106,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 
 	[_EMOJI] = LAYOUT_ortho_4x12(
-			_______ , X(CLAP) , X(CUM)  , X(BNIS) , X(BUTT) , X(CAR)  , X(FIRE) , X(REDB) , X(MONY) , X(HNDR) , X(SOS)  , _______ ,
-			_______ , X(CELE) , X(PRAY) , X(NAIL) , X(OK)   , X(THNK) , X(UNAM) , X(HEYE) , X(COOL) , X(EYES) , X(SMIR) , _______ ,
-			_______ , X(TRIU) , X(SCRM) , X(VOMI) , X(DTIV) , X(EXPL) , X(HAIR) , X(DANC) , X(STRN) , X(LEFT) , X(RGHT) , _______ ,
+			_______ , 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) , _______ ,
 			_______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ 
 	),
 
diff --git a/keyboards/contra/keymaps/maxr1998/keymap.c b/keyboards/contra/keymaps/maxr1998/keymap.c
index 8a56c6074610..0802a211f062 100644
--- a/keyboards/contra/keymaps/maxr1998/keymap.c
+++ b/keyboards/contra/keymaps/maxr1998/keymap.c
@@ -176,10 +176,11 @@ void update_tri_layer_user(void) {
     }
 }
 
-void led_set_user(uint8_t usb_led) {
+bool led_update_user(led_t led_state) {
   // Force-enable Numlock
-  if (!(usb_led & (1<<USB_LED_NUM_LOCK))) {
+  if (!led_state.num_lock) {
     register_code(KC_NUM_LOCK);
     unregister_code(KC_NUM_LOCK);
   }
+  return false;
 }
diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h
new file mode 100644
index 000000000000..4e161532f2ac
--- /dev/null
+++ b/keyboards/controllerworks/city42/config.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2023 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have 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
+#define RGB_MATRIX_LED_COUNT 42
+
+#define SPI_SCK_PIN GP18
+#define SPI_MOSI_PIN GP19
+#define SPI_MISO_PIN GP16
+#define POINTING_DEVICE_CS_PIN GP17
+
+#define CIRQUE_PINNACLE_DIAMETER_MM 40
+#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
diff --git a/keyboards/controllerworks/city42/info.json b/keyboards/controllerworks/city42/info.json
new file mode 100644
index 000000000000..2976021b11a7
--- /dev/null
+++ b/keyboards/controllerworks/city42/info.json
@@ -0,0 +1,178 @@
+{
+    "manufacturer": "Controller Works",
+    "keyboard_name": "city42",
+    "maintainer": "controller-works",
+    "bootloader": "rp2040",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP0", "GP1", "GP2", "GP3", "GP4", "GP5"],
+        "rows": ["GP12", "GP13", "GP14", "GP15"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "solid_color": true,
+            "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, 5], "x": 80, "y": 17, "flags": 4},
+            {"matrix": [0, 4], "x": 66, "y": 11, "flags": 4},
+            {"matrix": [0, 3], "x": 52, "y": 6, "flags": 4},
+            {"matrix": [0, 2], "x": 37, "y": 4, "flags": 4},
+            {"matrix": [0, 1], "x": 22, "y": 4, "flags": 4},
+            {"matrix": [0, 0], "x": 8, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 4, "y": 13, "flags": 1},
+            {"matrix": [1, 1], "x": 18, "y": 17, "flags": 4},
+            {"matrix": [1, 2], "x": 34, "y": 17, "flags": 4},
+            {"matrix": [1, 3], "x": 49, "y": 18, "flags": 4},
+            {"matrix": [1, 4], "x": 63, "y": 24, "flags": 4},
+            {"matrix": [1, 5], "x": 76, "y": 29, "flags": 4},
+            {"matrix": [2, 5], "x": 73, "y": 43, "flags": 4},
+            {"matrix": [2, 4], "x": 59, "y": 37, "flags": 4},
+            {"matrix": [2, 3], "x": 45, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 30, "y": 30, "flags": 4},
+            {"matrix": [2, 1], "x": 15, "y": 29, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 26, "flags": 1},
+            {"matrix": [3, 3], "x": 49, "y": 50, "flags": 1},
+            {"matrix": [3, 4], "x": 66, "y": 56, "flags": 1},
+            {"matrix": [3, 5], "x": 76, "y": 64, "flags": 1},
+            {"matrix": [3, 6], "x": 148, "y": 64, "flags": 1},
+            {"matrix": [3, 7], "x": 158, "y": 56, "flags": 1},
+            {"matrix": [3, 8], "x": 175, "y": 50, "flags": 1},
+            {"matrix": [2, 11], "x": 224, "y": 26, "flags": 1},
+            {"matrix": [2, 10], "x": 209, "y": 29, "flags": 4},
+            {"matrix": [2, 9], "x": 193, "y": 29, "flags": 4},
+            {"matrix": [2, 8], "x": 179, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 165, "y": 37, "flags": 4},
+            {"matrix": [2, 6], "x": 151, "y": 43, "flags": 4},
+            {"matrix": [1, 6], "x": 148, "y": 30, "flags": 4},
+            {"matrix": [1, 7], "x": 161, "y": 24, "flags": 4},
+            {"matrix": [1, 8], "x": 175, "y": 18, "flags": 4},
+            {"matrix": [1, 9], "x": 190, "y": 17, "flags": 4},
+            {"matrix": [1, 10], "x": 206, "y": 17, "flags": 4},
+            {"matrix": [1, 11], "x": 220, "y": 13, "flags": 1},
+            {"matrix": [0, 11], "x": 217, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 202, "y": 4, "flags": 4},
+            {"matrix": [0, 9], "x": 187, "y": 4, "flags": 4},
+            {"matrix": [0, 8], "x": 172, "y": 6, "flags": 4},
+            {"matrix": [0, 7], "x": 158, "y": 11, "flags": 4},
+            {"matrix": [0, 6], "x": 144, "y": 17, "flags": 4}
+        ],
+        "max_brightness": 150
+    },
+    "tags": ["RP2040", "choc v1", "choc spaced"],
+    "url": "https://controller.works/products/city42-ergonomic-keyboard",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0005",
+        "vid": "0x4357"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP29"
+    },
+    "community_layouts": ["split_3x6_3"],
+    "layouts": {
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.4},
+                {"matrix": [0, 1], "x": 1, "y": 0.4},
+                {"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": 8, "y": 0.25},
+                {"matrix": [0, 7], "x": 9, "y": 0.125},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0.125},
+                {"matrix": [0, 10], "x": 12, "y": 0.4},
+                {"matrix": [0, 11], "x": 13, "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.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": 8, "y": 1.25},
+                {"matrix": [1, 7], "x": 9, "y": 1.125},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1.125},
+                {"matrix": [1, 10], "x": 12, "y": 1.4},
+                {"matrix": [1, 11], "x": 13, "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.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": 8, "y": 2.25},
+                {"matrix": [2, 7], "x": 9, "y": 2.125},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2.125},
+                {"matrix": [2, 10], "x": 12, "y": 2.4},
+                {"matrix": [2, 11], "x": 13, "y": 2.4},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.75, "h": 1.5},
+                {"matrix": [3, 6], "x": 7.5, "y": 3.75, "h": 1.5},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.5},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/controllerworks/city42/keymaps/default/keymap.c b/keyboards/controllerworks/city42/keymaps/default/keymap.c
new file mode 100644
index 000000000000..7f46648a7e87
--- /dev/null
+++ b/keyboards/controllerworks/city42/keymaps/default/keymap.c
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2023 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along 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,  RSFT_T(KC_ENT),
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI,   MO(1),  KC_SPC,     KC_SPC,   MO(2), KC_RALT
+                                      //`--------------------------'  `--------------------------'
+
+  ),
+
+  [1] = 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_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_PGUP,                      XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_PGDN,                      KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI, _______,  KC_ESC,     KC_ENT,   MO(3), KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [2] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB, 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_LBRC, KC_RBRC, KC_BSLS,  KC_GRV,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                      KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI,   MO(3),  KC_ESC,     KC_DEL, _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [3] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_NUM,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MOD,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_RMOD,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  )
+};
diff --git a/keyboards/controllerworks/city42/keymaps/via/keymap.c b/keyboards/controllerworks/city42/keymaps/via/keymap.c
new file mode 100644
index 000000000000..7f46648a7e87
--- /dev/null
+++ b/keyboards/controllerworks/city42/keymaps/via/keymap.c
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2023 Kevin Gee <info@controller.works>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along 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,  RSFT_T(KC_ENT),
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI,   MO(1),  KC_SPC,     KC_SPC,   MO(2), KC_RALT
+                                      //`--------------------------'  `--------------------------'
+
+  ),
+
+  [1] = 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_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_PGUP,                      XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_PGDN,                      KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI, _______,  KC_ESC,     KC_ENT,   MO(3), KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [2] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB, 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_LBRC, KC_RBRC, KC_BSLS,  KC_GRV,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                      KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI,   MO(3),  KC_ESC,     KC_DEL, _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [3] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC_NUM,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MOD,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_RMOD,                     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  )
+};
diff --git a/keyboards/controllerworks/city42/keymaps/via/rules.mk b/keyboards/controllerworks/city42/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/controllerworks/city42/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/controllerworks/city42/readme.md b/keyboards/controllerworks/city42/readme.md
new file mode 100644
index 000000000000..7dc382bffc6d
--- /dev/null
+++ b/keyboards/controllerworks/city42/readme.md
@@ -0,0 +1,31 @@
+# city42
+![city42](https://i.imgur.com/YZNW4EZh.jpg)
+*A pre-built, low profile, unibody split keyboard based on the RP2040 processor*
+* Keyboard Maintainer: [Kevin Gee](https://github.com/controller-works)
+* Hardware Supported: *city42 split unibody ergonomic keyboard*
+* Hardware Availability: *[Controller Works Retail Site](https://controller.works/products/city42-ergonomic-keyboard)* Hardware is available as pre-built units only.
+Make example for this keyboard (after setting up your build environment):
+```sh
+    make controllerworks/city42:default
+```
+Flashing example for this keyboard:
+
+```sh
+    make controllerworks/city42: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).
+## Features
+- Highly integrated design with microcontroller and USB connectors on the main board
+- RP2040 processor by Raspberry Pi Foundation running at 130 MHz with 16MB flash memory
+- 40mm Cirque trackpad
+- 42 per-key RGB LEDs
+- ESD and over-current protection on USB
+- Reset and boot tactile switches
+- USB C host connection
+- Hot swap connectors for Kailh Chocolate PG1350 switches
+- Chocolate key spacing (18mm horizontal x 17mm vertical) 
+## Bootloader
+Enter the bootloader in 3 ways:
+* **Bootmagic reset**: Hold down the upper left key while plugging in USB
+* **Physical reset button**: Press the RST button twice, rapidly
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/controllerworks/city42/rules.mk b/keyboards/controllerworks/city42/rules.mk
new file mode 100644
index 000000000000..2e0f2befbf49
--- /dev/null
+++ b/keyboards/controllerworks/city42/rules.mk
@@ -0,0 +1,2 @@
+POINTING_DEVICE_ENABLE = yes
+POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini36/config.h b/keyboards/controllerworks/mini36/config.h
index c9da0d411b6d..3a094c2fd101 100644
--- a/keyboards/controllerworks/mini36/config.h
+++ b/keyboards/controllerworks/mini36/config.h
@@ -18,8 +18,7 @@
 #pragma once
 
 #define WS2812_PIO_USE_PIO1
-#define RGBLED_NUM 48
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 48
 #define RGB_MATRIX_SPLIT \
         { 24, 24 }
 
diff --git a/keyboards/controllerworks/mini36/info.json b/keyboards/controllerworks/mini36/info.json
index dcab8a1b97c8..534dee94f10f 100644
--- a/keyboards/controllerworks/mini36/info.json
+++ b/keyboards/controllerworks/mini36/info.json
@@ -55,7 +55,7 @@
         "oled": true
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 2, "x": 71, "y": 4},
             {"flags": 2, "x": 32, "y": 2},
diff --git a/keyboards/controllerworks/mini36/rules.mk b/keyboards/controllerworks/mini36/rules.mk
index ee37cd7f6f05..161ec22b16e2 100644
--- a/keyboards/controllerworks/mini36/rules.mk
+++ b/keyboards/controllerworks/mini36/rules.mk
@@ -1,2 +1 @@
 SERIAL_DRIVER = vendor
-OLED_DRIVER   = SSD1306
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini42/config.h b/keyboards/controllerworks/mini42/config.h
index 0a4d8c84b77e..e7fc529592fe 100644
--- a/keyboards/controllerworks/mini42/config.h
+++ b/keyboards/controllerworks/mini42/config.h
@@ -18,8 +18,7 @@
 #pragma once
 
 #define WS2812_PIO_USE_PIO1
-#define RGBLED_NUM 54
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 54
 
 #define SPLIT_TRANSPORT_MIRROR
 #define SPLIT_LAYER_STATE_ENABLE
diff --git a/keyboards/controllerworks/mini42/info.json b/keyboards/controllerworks/mini42/info.json
index 4aa0b8eeaf8e..ae70408a9f48 100644
--- a/keyboards/controllerworks/mini42/info.json
+++ b/keyboards/controllerworks/mini42/info.json
@@ -56,7 +56,7 @@
         "oled": true
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "split_count": [27, 27],
         "layout": [
             {"flags": 2, "x": 75, "y": 4},
diff --git a/keyboards/controllerworks/mini42/rules.mk b/keyboards/controllerworks/mini42/rules.mk
index 71f52c4e4d26..161ec22b16e2 100644
--- a/keyboards/controllerworks/mini42/rules.mk
+++ b/keyboards/controllerworks/mini42/rules.mk
@@ -1,2 +1 @@
 SERIAL_DRIVER = vendor
-OLED_DRIVER   = SSD1306
diff --git a/keyboards/converter/a1200/mistress1200/config.h b/keyboards/converter/a1200/mistress1200/config.h
index 21ba99e0b7f9..bc137dc1856a 100644
--- a/keyboards/converter/a1200/mistress1200/config.h
+++ b/keyboards/converter/a1200/mistress1200/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAPPING_TOGGLE 3
-
 #undef LOCKING_SUPPORT_ENABLE
 #undef LOCKING_RESYNC_ENABLE
 #define LAYER_STATE_8BIT
diff --git a/keyboards/converter/a1200/mistress1200/info.json b/keyboards/converter/a1200/mistress1200/info.json
index c37bdadd617b..28de092b3dec 100644
--- a/keyboards/converter/a1200/mistress1200/info.json
+++ b/keyboards/converter/a1200/mistress1200/info.json
@@ -16,5 +16,8 @@
         "on_state": 0
     },
     "processor": "atmega16u4",
-    "bootloader": "atmel-dfu"
+    "bootloader": "atmel-dfu",
+    "tapping": {
+        "toggle": 3
+    }
 }
diff --git a/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c b/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c
index 0e11fa677975..3645dd7da723 100644
--- a/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c
+++ b/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c
@@ -226,9 +226,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 
     XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX,     XXXXXXX, X(CRY2),X(WEARY),X(EYERT),X(SMIRK), X(TJOY), X(RECYC),X(UNAMU),X(MUSIC),X(OKHND),X(PENSV),XXXXXXX, XXXXXXX,          XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX,     XXXXXXX, X(PRAY),X(SMILE),X(SMIL2),X(FLUSH), X(GRIN), X(HEART),X(BYE),  X(KISS), X(CELEB),X(COOL), XXXXXXX,          XXXXXXX, XXXXXXX,              XXXXXXX,              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX,X(SLEEP),X(CLAP), X(CRY),   X(VIC),  X(BHART),X(SUN),  X(SMEYE),X(WINK), X(MOON), X(CONFU),         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
     ),
 
diff --git a/keyboards/converter/ibm_terminal/led.c b/keyboards/converter/ibm_terminal/led.c
index e0f31ee4e15b..1bcde277a21e 100644
--- a/keyboards/converter/ibm_terminal/led.c
+++ b/keyboards/converter/ibm_terminal/led.c
@@ -20,14 +20,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "led.h"
 
 
-void led_set(uint8_t usb_led)
+bool led_update_kb(led_t led_state)
 {
     uint8_t ps2_led = 0;
-    if (usb_led &  (1<<USB_LED_SCROLL_LOCK))
+    if (led_state.scroll_lock)
         ps2_led |= (1<<PS2_LED_SCROLL_LOCK);
-    if (usb_led &  (1<<USB_LED_NUM_LOCK))
+    if (led_state.num_lock)
         ps2_led |= (1<<PS2_LED_NUM_LOCK);
-    if (usb_led &  (1<<USB_LED_CAPS_LOCK))
+    if (led_state.caps_lock)
         ps2_led |= (1<<PS2_LED_CAPS_LOCK);
     ps2_host_set_led(ps2_led);
+    return false;
 }
diff --git a/keyboards/converter/ibm_terminal/matrix.c b/keyboards/converter/ibm_terminal/matrix.c
index 3e3653696b5b..de346a0f70b4 100644
--- a/keyboards/converter/ibm_terminal/matrix.c
+++ b/keyboards/converter/ibm_terminal/matrix.c
@@ -131,7 +131,7 @@ uint8_t matrix_scan(void)
                 case 0x00:
                     break;
                 case 0xF0:
-                    state = F0;
+                    state = F0_BREAK;
                     debug(" ");
                     break;
                 default:    // normal key make
diff --git a/keyboards/converter/m0110_usb/readme.md b/keyboards/converter/m0110_usb/readme.md
index d066aa5a7cdd..1eb051f00018 100644
--- a/keyboards/converter/m0110_usb/readme.md
+++ b/keyboards/converter/m0110_usb/readme.md
@@ -5,7 +5,7 @@ This is a port of the original M0110 converter from TMK to QMK. The original con
 
 ## Enabling Bluetooth for the Adafruit Feather 32U4 BLE
 
-Simply add `BLUETOOTH = BluefruitLE` to your `rules.mk` file. This enables code specifically for the Adafruit Feather 32U4 BLE. If enabled, the device will use the `PRODUCT` value from `config.h` for the device name displayed by the Feather on host devices. You can simply change these values to change the device name.
+Simply add `BLUETOOTH = bluefruit_le` to your `rules.mk` file. This enables code specifically for the Adafruit Feather 32U4 BLE. If enabled, the device will use the `PRODUCT` value from `config.h` for the device name displayed by the Feather on host devices. You can simply change these values to change the device name.
 
 
 ## Pins
diff --git a/keyboards/converter/numeric_keypad_iie/keymaps/newbold/keymap.c b/keyboards/converter/numeric_keypad_iie/keymaps/newbold/keymap.c
index 58d23d2566da..566462837693 100644
--- a/keyboards/converter/numeric_keypad_iie/keymaps/newbold/keymap.c
+++ b/keyboards/converter/numeric_keypad_iie/keymaps/newbold/keymap.c
@@ -46,23 +46,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,      KC_TRNS,  KC_TRNS,      KC_TRNS,    KC_TRNS,        QK_BOOT
   ),
 };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void keyboard_post_init_user(void) {
-
-}
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/converter/siemens_tastatur/keymaps/default/keymap.c b/keyboards/converter/siemens_tastatur/keymaps/default/keymap.c
index 0ce8a64ab7ae..0f3911a2d362 100644
--- a/keyboards/converter/siemens_tastatur/keymaps/default/keymap.c
+++ b/keyboards/converter/siemens_tastatur/keymaps/default/keymap.c
@@ -51,10 +51,11 @@ void matrix_init_user(void) {
   writePinLow(B0);
 }
 
-void led_set_user(uint8_t usb_led) {
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         writePinHigh(B0);
     } else {
         writePinLow(B0);
     }
+    return false;
 }
diff --git a/keyboards/converter/siemens_tastatur/rules.mk b/keyboards/converter/siemens_tastatur/rules.mk
index bd42622805ad..1bc8ee188b85 100644
--- a/keyboards/converter/siemens_tastatur/rules.mk
+++ b/keyboards/converter/siemens_tastatur/rules.mk
@@ -15,5 +15,3 @@ SLEEP_LED_ENABLE = yes
 CUSTOM_MATRIX = yes
 
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/converter/sun_usb/led.c b/keyboards/converter/sun_usb/led.c
index 493825bac8d9..160664ffded0 100644
--- a/keyboards/converter/sun_usb/led.c
+++ b/keyboards/converter/sun_usb/led.c
@@ -19,15 +19,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "print.h"
 #include "uart.h"
 
-void led_set(uint8_t usb_led)
+bool led_update_kb(led_t led_state)
 {
-    uint8_t sun_led = 0;
-    if (usb_led & (1<<USB_LED_NUM_LOCK))    sun_led |= (1<<0);
-    if (usb_led & (1<<USB_LED_COMPOSE))     sun_led |= (1<<1);
-    if (usb_led & (1<<USB_LED_SCROLL_LOCK)) sun_led |= (1<<2);
-    if (usb_led & (1<<USB_LED_CAPS_LOCK))   sun_led |= (1<<3);
-    xprintf("LED: %02X\n", usb_led);
+    bool res = led_update_user(led_state);
+    if (res) {
+        uint8_t sun_led = 0;
+        if (led_state.num_lock)    sun_led |= (1<<0);
+        if (led_state.compose)     sun_led |= (1<<1);
+        if (led_state.scroll_lock) sun_led |= (1<<2);
+        if (led_state.caps_lock)   sun_led |= (1<<3);
 
-    uart_write(0x0E);
-    uart_write(sun_led);
+        uart_write(0x0E);
+        uart_write(sun_led);
+    }
+    return res;
 }
diff --git a/keyboards/converter/usb_usb/ble/info.json b/keyboards/converter/usb_usb/ble/info.json
index 56062f7ad371..18edf5f577c1 100644
--- a/keyboards/converter/usb_usb/ble/info.json
+++ b/keyboards/converter/usb_usb/ble/info.json
@@ -1,3 +1,6 @@
 {
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    }
 }
diff --git a/keyboards/converter/usb_usb/ble/rules.mk b/keyboards/converter/usb_usb/ble/rules.mk
index 86a4e15ffec5..5b0435372b70 100644
--- a/keyboards/converter/usb_usb/ble/rules.mk
+++ b/keyboards/converter/usb_usb/ble/rules.mk
@@ -3,5 +3,4 @@ F_CPU = 8000000
 
 EXTRAKEY_ENABLE = no
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
 LTO_ENABLE = yes
diff --git a/keyboards/converter/usb_usb/hasu/rules.mk b/keyboards/converter/usb_usb/hasu/rules.mk
index c2ee0bc86f97..6e7633bfe015 100644
--- a/keyboards/converter/usb_usb/hasu/rules.mk
+++ b/keyboards/converter/usb_usb/hasu/rules.mk
@@ -1,2 +1 @@
-# Processor frequency
-F_CPU = 16000000
+# This file intentionally left blank
diff --git a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
index 67e1075654a0..54d39a3e297a 100644
--- a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
@@ -65,22 +65,6 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     ),
 };
 
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
-
 /*
  * Keymap samples
  */
diff --git a/keyboards/converter/usb_usb/leonardo/info.json b/keyboards/converter/usb_usb/leonardo/info.json
new file mode 100644
index 000000000000..56062f7ad371
--- /dev/null
+++ b/keyboards/converter/usb_usb/leonardo/info.json
@@ -0,0 +1,3 @@
+{
+    "bootloader": "caterina"
+}
diff --git a/keyboards/converter/usb_usb/leonardo/rules.mk b/keyboards/converter/usb_usb/leonardo/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/converter/usb_usb/leonardo/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/converter/usb_usb/readme.md b/keyboards/converter/usb_usb/readme.md
index 594a9be877e4..50743b11fcc6 100644
--- a/keyboards/converter/usb_usb/readme.md
+++ b/keyboards/converter/usb_usb/readme.md
@@ -11,6 +11,10 @@ Make example for this keyboard (after setting up your build environment):
 
     make converter/usb_usb:default
 
+If you use Arduino Leonardo with a USB Host Shield:
+
+    make converter/usb_usb/leonardo: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.
 
 Note that you have to choose the right hardware variant as your subproject, otherwise you will probably have issues.
@@ -23,8 +27,6 @@ If you are sure you have this correct, try changeing the default in `usb_usb/rul
 
 The Pro Micro variant uses a 3.3V Pro Micro and thus runs at 8MHz, hence the following line in `usb_usb/pro_micro/rules.mk`:
 `F_CPU = 8000000`
-The converter sold by Hasu runs at 16MHz and so the corresponding line in `usb_usb/hasu/rules.mk` is:
-`F_CPU = 16000000`
 
 Getting the Hardware
 --------------------
diff --git a/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/keymap.c
index ed49188c5e91..0dc219faccc7 100644
--- a/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/keymap.c
+++ b/keyboards/coseyfannitutti/discipline/keymaps/briianpowell/keymap.c
@@ -30,68 +30,28 @@ enum discpline_keycodes {
 };
 
 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
+    ),
 
-  /* QWERTY: Default Layer
-  * ,--------------------------------------------------------------.
-  * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| Backs|  `~|
-  * |---------------------------------------------------------------|
-  * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|Del|
-  * |---------------------------------------------------------------|
-  * |Fn/CL |  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    |Gui |Alt |Ctrl|  |Lef|Dow|Rig|
-  * `---------------------------------------------------------------'
-  */
-  [_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
-   * ,---------------------------------------------------------------.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| Backs|  `~|
-   * |---------------------------------------------------------------|
-   * |Tab  |  Q|  D|  R|  W|  B|  J|  F|  U|  P|  ;|  [|  ]|   \| Del|
-   * |---------------------------------------------------------------|
-   * |Fn/CL |  A|  S|  H|  T|  G|  Y|  N|  E|  O|  I|  '|  Enter| PgU|
-   * |---------------------------------------------------------------|
-   * |Shift   |  Z|  X|  M|  C|  V|  K|  L|  ,|  .|  /|Shift |Up| PgD|
-   * |---------------------------------------------------------------|
-   * |Ctrl|Alt |Gui |         Space    |Gui |Alt |Ctrl|  |Lef|Dow|Rig|
-   * `---------------------------------------------------------------'
-   */
-  [_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
+    [_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
     ),
 
-    /* Function
-     * ,---------------------------------------------------------------.
-     * |RST| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|     |     |
-     * |---------------------------------------------------------------|
-     * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |INS|
-     * |---------------------------------------------------------------|
-     * |      |   |   |   |   |   |   |   |   |   |   |   |        |HME|
-     * |---------------------------------------------------------------|
-     * |    |   |   |   |   |   |   |   |   |   |   |   |      |VL+|END|
-     * |---------------------------------------------------------------|
-     * |    |    |    |      PLY/PS      |    |    |    |  |PRV|VL-|NXT|
-     * `---------------------------------------------------------------'
-     */
     [_FUNC] = 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,_______,   QK_BOOT,
-      _______,KC_WH_U,KC_BTN1,KC_MS_U,KC_BTN2,_______,_______,AG_NORM,AG_SWAP,QWERTY,WORKMAN,_______,_______,_______,   KC_INS,
-      _______,KC_WH_D,KC_MS_L,KC_MS_D,KC_MS_R,_______,_______,_______,_______,_______,_______,_______,       _______,  KC_PGUP,
-      _______,KC_WH_L,KC_BTN3,KC_WH_R,_______,_______,_______,_______,_______,_______,_______,        _______,KC_VOLU, KC_PGDN,
-      _______,_______,_______,                        KC_MPLY,                _______,_______,_______,KC_MPRV,KC_VOLD, KC_MNXT
+        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
     ),
 };
 
diff --git a/keyboards/coseyfannitutti/mullet/config.h b/keyboards/coseyfannitutti/mullet/config.h
deleted file mode 100644
index 760c1645b080..000000000000
--- a/keyboards/coseyfannitutti/mullet/config.h
+++ /dev/null
@@ -1,50 +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/>.
-*/
-
-#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 RGBLED_NUM 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-
-/*
- * 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/coseyfannitutti/mullet/info.json b/keyboards/coseyfannitutti/mullet/info.json
index 695d0729c173..3b63ece22095 100644
--- a/keyboards/coseyfannitutti/mullet/info.json
+++ b/keyboards/coseyfannitutti/mullet/info.json
@@ -8,6 +8,24 @@
         "pid": "0x6969",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "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": "D5"
     },
diff --git a/keyboards/cosmo65/config.h b/keyboards/cosmo65/config.h
deleted file mode 100644
index c97f9dbac4c8..000000000000
--- a/keyboards/cosmo65/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2022 BentoBox 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/.
-*/
-
-#pragma once
-
-
-/* RGB Lighting */
-#define RGBLED_NUM 16
-#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/cosmo65/info.json b/keyboards/cosmo65/info.json
index d20de266e473..1cc4ff4e637f 100644
--- a/keyboards/cosmo65/info.json
+++ b/keyboards/cosmo65/info.json
@@ -8,6 +8,20 @@
         "pid": "0x6331",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 16,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        }
+    },
     "ws2812": {
         "pin": "F7"
     },
diff --git a/keyboards/cozykeys/bloomer/config.h b/keyboards/cozykeys/bloomer/config.h
index 44f6aa36133f..922dec71d150 100644
--- a/keyboards/cozykeys/bloomer/config.h
+++ b/keyboards/cozykeys/bloomer/config.h
@@ -16,26 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
-// Enable RGB backlight
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
-#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/cozykeys/bloomer/info.json b/keyboards/cozykeys/bloomer/info.json
index 96db04787eba..dd0232bbcb5d 100644
--- a/keyboards/cozykeys/bloomer/info.json
+++ b/keyboards/cozykeys/bloomer/info.json
@@ -7,6 +7,24 @@
         "vid": "0xFEED",
         "pid": "0x1191"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "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": "D7"
     }
diff --git a/keyboards/cozykeys/speedo/v3/config.h b/keyboards/cozykeys/speedo/v3/config.h
index 8a13e5e509d0..2643e4de4a1f 100644
--- a/keyboards/cozykeys/speedo/v3/config.h
+++ b/keyboards/cozykeys/speedo/v3/config.h
@@ -16,24 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
-#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/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json
index d368fd25fc89..3a084b04baab 100644
--- a/keyboards/cozykeys/speedo/v3/info.json
+++ b/keyboards/cozykeys/speedo/v3/info.json
@@ -8,6 +8,24 @@
     "pid": "0x1192",
     "device_version": "0.0.3"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 12,
+    "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": "B5"
   },
diff --git a/keyboards/craftwalk/config.h b/keyboards/craftwalk/config.h
index 40d79db10cd3..4254bdc63c3f 100644
--- a/keyboards/craftwalk/config.h
+++ b/keyboards/craftwalk/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 19
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== or choose animations ==*/
-  #define RGBLIGHT_EFFECT_BREATHING
-  #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-  #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-  #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-  #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-  #define RGBLIGHT_EFFECT_RGB_TEST
-  #define RGBLIGHT_EFFECT_ALTERNATING
-
 /* 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/craftwalk/info.json b/keyboards/craftwalk/info.json
index b3f3fbbe577b..51030e9e64b8 100644
--- a/keyboards/craftwalk/info.json
+++ b/keyboards/craftwalk/info.json
@@ -8,6 +8,21 @@
       "pid": "0x2E8F",
       "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 19,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        }
+    },
     "ws2812": {
       "pin": "D3"
     },
diff --git a/keyboards/crawlpad/config.h b/keyboards/crawlpad/config.h
index 437843547131..cf006905ab2b 100755
--- a/keyboards/crawlpad/config.h
+++ b/keyboards/crawlpad/config.h
@@ -13,17 +13,3 @@
 #define IS_COMMAND() ( \
     false \
 )
-
-#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 RGBLED_NUM 3
-#endif
diff --git a/keyboards/crawlpad/info.json b/keyboards/crawlpad/info.json
index 0d4d38d4ead8..3eb3b3295554 100644
--- a/keyboards/crawlpad/info.json
+++ b/keyboards/crawlpad/info.json
@@ -8,6 +8,21 @@
     "pid": "0x6070",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "led_count": 3,
+    "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": "D3"
   },
diff --git a/keyboards/crazy_keyboard_68/config.h b/keyboards/crazy_keyboard_68/config.h
index 50fbb5dcb9af..b5128c936513 100644
--- a/keyboards/crazy_keyboard_68/config.h
+++ b/keyboards/crazy_keyboard_68/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 84
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/crazy_keyboard_68/info.json b/keyboards/crazy_keyboard_68/info.json
index 5e7416545df9..704bcb5897f6 100644
--- a/keyboards/crazy_keyboard_68/info.json
+++ b/keyboards/crazy_keyboard_68/info.json
@@ -17,6 +17,24 @@
         "caps_lock": "B0",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 84,
+        "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": "F6"
     },
diff --git a/keyboards/crin/rules.mk b/keyboards/crin/rules.mk
index 0aeca0dd9f35..7f4f202a1b70 100644
--- a/keyboards/crin/rules.mk
+++ b/keyboards/crin/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/crkbd/crkbd.c b/keyboards/crkbd/crkbd.c
index 3c1cd5565be2..2ac0e63125fa 100644
--- a/keyboards/crkbd/crkbd.c
+++ b/keyboards/crkbd/crkbd.c
@@ -71,6 +71,10 @@ uint8_t  last_col;
 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', '_', '-', '=', '[', ']', '\\', '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
 
 static void set_keylog(uint16_t keycode, keyrecord_t *record) {
+    // save the row and column (useful even if we can't find a keycode to show)
+    last_row = record->event.key.row;
+    last_col = record->event.key.col;
+
     key_name     = ' ';
     last_keycode = keycode;
     if (IS_QK_MOD_TAP(keycode)) {
@@ -92,8 +96,6 @@ static void set_keylog(uint16_t keycode, keyrecord_t *record) {
 
     // update keylog
     key_name = pgm_read_byte(&code_to_name[keycode]);
-    last_row = record->event.key.row;
-    last_col = record->event.key.col;
 }
 
 static const char *depad_str(const char *depad_str, char depad_char) {
@@ -103,11 +105,9 @@ static const char *depad_str(const char *depad_str, char depad_char) {
 }
 
 static void oled_render_keylog(void) {
-    const char *last_row_str = get_u8_str(last_row, ' ');
-    oled_write(depad_str(last_row_str, ' '), false);
+    oled_write_char('0' + last_row, false);
     oled_write_P(PSTR("x"), false);
-    const char *last_col_str = get_u8_str(last_col, ' ');
-    oled_write(depad_str(last_col_str, ' '), false);
+    oled_write_char('0' + last_col, false);
     oled_write_P(PSTR(", k"), false);
     const char *last_keycode_str = get_u16_str(last_keycode, ' ');
     oled_write(depad_str(last_keycode_str, ' '), false);
diff --git a/keyboards/crkbd/info.json b/keyboards/crkbd/info.json
index 198ef51d5f09..fa9abc574e62 100644
--- a/keyboards/crkbd/info.json
+++ b/keyboards/crkbd/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "features": {
         "bootmagic": true,
diff --git a/keyboards/crkbd/keymaps/ajarov/rules.mk b/keyboards/crkbd/keymaps/ajarov/rules.mk
index 3e637d11da4d..bc45ff83ba75 100644
--- a/keyboards/crkbd/keymaps/ajarov/rules.mk
+++ b/keyboards/crkbd/keymaps/ajarov/rules.mk
@@ -1,5 +1,4 @@
 MOUSEKEY_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 LTO_ENABLE      = yes
diff --git a/keyboards/crkbd/keymaps/armand1m/rules.mk b/keyboards/crkbd/keymaps/armand1m/rules.mk
index d34d066ded93..dd68e9d3b090 100644
--- a/keyboards/crkbd/keymaps/armand1m/rules.mk
+++ b/keyboards/crkbd/keymaps/armand1m/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/benrestech/rules.mk b/keyboards/crkbd/keymaps/benrestech/rules.mk
index c177a33cf525..462ceeb32b79 100644
--- a/keyboards/crkbd/keymaps/benrestech/rules.mk
+++ b/keyboards/crkbd/keymaps/benrestech/rules.mk
@@ -1,3 +1,2 @@
 RGBLIGHT_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/bermeo/rules.mk b/keyboards/crkbd/keymaps/bermeo/rules.mk
index e666f1f0cbc7..369b90ce3804 100644
--- a/keyboards/crkbd/keymaps/bermeo/rules.mk
+++ b/keyboards/crkbd/keymaps/bermeo/rules.mk
@@ -3,7 +3,6 @@ RGB_MATRIX_ENABLE  = yes
 MOUSEKEY_ENABLE    = no
 NKRO_ENABLE        = no
 OLED_ENABLE        = yes
-OLED_DRIVER        = SSD1306
 LTO_ENABLE         = yes
 SLEEP_LED_ENABLE   = yes
 WPM_ENABLE         = yes
@@ -16,4 +15,4 @@ BOOTMAGIC_ENABLE   = no
 COMBO_ENABLE	   = no
 AUDIO_ENABLE	   = no
 MIDI_ENABLE		   = no
-BLUETOOTH_ENABLE   = no
\ No newline at end of file
+BLUETOOTH_ENABLE   = no
diff --git a/keyboards/crkbd/keymaps/cameronjlarsen/rules.mk b/keyboards/crkbd/keymaps/cameronjlarsen/rules.mk
index f5998494482a..f0b00f3cf01b 100644
--- a/keyboards/crkbd/keymaps/cameronjlarsen/rules.mk
+++ b/keyboards/crkbd/keymaps/cameronjlarsen/rules.mk
@@ -1,7 +1,6 @@
 BOOTMAGIC_ENABLE = no
 BOOLOADER = atmel-dfu
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 RGBLIGHT_ENABLE = no    # Enable keyboard RGB underglow
 COMMAND_ENABLE = no 		# Disables the command feature
 COMBO_ENABLE = yes
@@ -12,4 +11,4 @@ MIDI_ENABLE = no
 BLUETOOTH_ENABLE = no
 BACKLIGHT_ENABLE = no
 CAPS_WORD_ENABLE = yes
-CUSTOM_ONESHOT_ENABLE = yes
\ No newline at end of file
+CUSTOM_ONESHOT_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/colemad/rules.mk b/keyboards/crkbd/keymaps/colemad/rules.mk
index 6f9d31a75517..70eb5c33188d 100644
--- a/keyboards/crkbd/keymaps/colemad/rules.mk
+++ b/keyboards/crkbd/keymaps/colemad/rules.mk
@@ -4,7 +4,6 @@ SPLIT_KEYBOARD = yes
 TAP_DANCE_ENABLE = yes
 MOUSEKEY_ENABLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 
 # Link Time Optimization (Reduces compiled size)
diff --git a/keyboards/crkbd/keymaps/colemak_luna/rules.mk b/keyboards/crkbd/keymaps/colemak_luna/rules.mk
index a26c4eb8a316..9ff3128931ae 100644
--- a/keyboards/crkbd/keymaps/colemak_luna/rules.mk
+++ b/keyboards/crkbd/keymaps/colemak_luna/rules.mk
@@ -3,6 +3,5 @@ RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes    # Enable WS2812 RGB underlight.
 VIA_ENABLE      = yes    # Enable VIA
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 LTO_ENABLE      = yes
 WPM_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/crkdves/rules.mk b/keyboards/crkbd/keymaps/crkdves/rules.mk
index d3a964424fe5..d95e1136bbb2 100644
--- a/keyboards/crkbd/keymaps/crkdves/rules.mk
+++ b/keyboards/crkbd/keymaps/crkdves/rules.mk
@@ -3,6 +3,4 @@ RGB_MATRIX_ENABLE  = yes
 MOUSEKEY_ENABLE    = no
 NKRO_ENABLE        = yes
 OLED_ENABLE        = yes
-OLED_DRIVER        = SSD1306
 LTO_ENABLE         = yes
-
diff --git a/keyboards/crkbd/keymaps/crkqwes/config.h b/keyboards/crkbd/keymaps/crkqwes/config.h
index 5be6a0449b45..b2209c7e6dfc 100644
--- a/keyboards/crkbd/keymaps/crkqwes/config.h
+++ b/keyboards/crkbd/keymaps/crkqwes/config.h
@@ -28,9 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-// #define SSD1306OLED
 #undef USE_I2C
-#undef SSD1306OLED
 
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 200
diff --git a/keyboards/crkbd/keymaps/crkqwes/rules.mk b/keyboards/crkbd/keymaps/crkqwes/rules.mk
index d3a964424fe5..d95e1136bbb2 100644
--- a/keyboards/crkbd/keymaps/crkqwes/rules.mk
+++ b/keyboards/crkbd/keymaps/crkqwes/rules.mk
@@ -3,6 +3,4 @@ RGB_MATRIX_ENABLE  = yes
 MOUSEKEY_ENABLE    = no
 NKRO_ENABLE        = yes
 OLED_ENABLE        = yes
-OLED_DRIVER        = SSD1306
 LTO_ENABLE         = yes
-
diff --git a/keyboards/crkbd/keymaps/devdev/rules.mk b/keyboards/crkbd/keymaps/devdev/rules.mk
index 4aaf22fd0495..4d53cc756414 100644
--- a/keyboards/crkbd/keymaps/devdev/rules.mk
+++ b/keyboards/crkbd/keymaps/devdev/rules.mk
@@ -2,4 +2,3 @@ MOUSEKEY_ENABLE = yes
 EXTRAKEY_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/edvorakjp/rules.mk b/keyboards/crkbd/keymaps/edvorakjp/rules.mk
index 1291d50e921d..c019c307569a 100644
--- a/keyboards/crkbd/keymaps/edvorakjp/rules.mk
+++ b/keyboards/crkbd/keymaps/edvorakjp/rules.mk
@@ -17,7 +17,6 @@ RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 TAP_DANCE_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 # 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/crkbd/keymaps/gotham/rules.mk b/keyboards/crkbd/keymaps/gotham/rules.mk
index 48a2c1d72aaa..455cf708a6a0 100644
--- a/keyboards/crkbd/keymaps/gotham/rules.mk
+++ b/keyboards/crkbd/keymaps/gotham/rules.mk
@@ -3,5 +3,4 @@ EXTRAKEY_ENABLE = yes
 AUDIO_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/hvp/keymap.c b/keyboards/crkbd/keymaps/hvp/keymap.c
index 7e1953e34d64..fc57fc1bb067 100644
--- a/keyboards/crkbd/keymaps/hvp/keymap.c
+++ b/keyboards/crkbd/keymaps/hvp/keymap.c
@@ -1,9 +1,5 @@
 #include QMK_KEYBOARD_H
 #include "hvp.c"
-#ifdef SSD1306OLED
-#    include "ssd1306.h"
-#    include <string.h>
-#endif
 
 #ifdef RGBLIGHT_ENABLE
 //Following line allows macro to read current RGB settings
diff --git a/keyboards/crkbd/keymaps/hvp/rules.mk b/keyboards/crkbd/keymaps/hvp/rules.mk
index c7ed029e3d44..3091ed20af44 100644
--- a/keyboards/crkbd/keymaps/hvp/rules.mk
+++ b/keyboards/crkbd/keymaps/hvp/rules.mk
@@ -10,5 +10,4 @@ SRC +=  ./lib/rgb_state_reader.c \
 TAP_DANCE_ENABLE = yes
 EXTRAKEY_ENABLE = yes        # Audio control and System control
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 # LOCAL_GLCDFONT = yes
diff --git a/keyboards/crkbd/keymaps/jarred/rules.mk b/keyboards/crkbd/keymaps/jarred/rules.mk
index f18100d7ff4e..efa378b09911 100644
--- a/keyboards/crkbd/keymaps/jarred/rules.mk
+++ b/keyboards/crkbd/keymaps/jarred/rules.mk
@@ -17,7 +17,6 @@ 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
-OLED_DRIVER     = SSD1306
 
 # 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/crkbd/keymaps/jpe230/rules.mk b/keyboards/crkbd/keymaps/jpe230/rules.mk
index b78c1d45f3ce..459cf9c69175 100644
--- a/keyboards/crkbd/keymaps/jpe230/rules.mk
+++ b/keyboards/crkbd/keymaps/jpe230/rules.mk
@@ -1,6 +1,5 @@
 # Shared rules for both of my Corne
 OLED_ENABLE       = yes
-OLED_DRIVER       = SSD1306
 VIA_ENABLE        = yes
 RGB_MATRIX_ENABLE = yes
 
@@ -22,4 +21,3 @@ else
     SRC +=  oled/avr/master/oled_master_handler.c \
             oled/avr/slave/oled_slave_handler.c
 endif
-
diff --git a/keyboards/crkbd/keymaps/julian_turner/rules.mk b/keyboards/crkbd/keymaps/julian_turner/rules.mk
index e6ddd80076dc..1717383ec49a 100644
--- a/keyboards/crkbd/keymaps/julian_turner/rules.mk
+++ b/keyboards/crkbd/keymaps/julian_turner/rules.mk
@@ -1,7 +1,6 @@
 RGBLIGHT_ENABLE = yes
 
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 WPM_ENABLE = yes
 
 
diff --git a/keyboards/crkbd/keymaps/kidbrazil/rules.mk b/keyboards/crkbd/keymaps/kidbrazil/rules.mk
index d2c2f649e0ee..c16efc66e30e 100644
--- a/keyboards/crkbd/keymaps/kidbrazil/rules.mk
+++ b/keyboards/crkbd/keymaps/kidbrazil/rules.mk
@@ -6,7 +6,6 @@ MOUSEKEY_ENABLE = no
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 # If you want to change the display of OLED, you need to change here
 SRC +=  logo_reader.c \
diff --git a/keyboards/crkbd/keymaps/madhatter/rules.mk b/keyboards/crkbd/keymaps/madhatter/rules.mk
index 89a2791bcd60..ed64986331fe 100644
--- a/keyboards/crkbd/keymaps/madhatter/rules.mk
+++ b/keyboards/crkbd/keymaps/madhatter/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 
 # If you want to change the display of OLED, you need to change here
 SRC +=  ./lib/rgb_state_reader.c \
diff --git a/keyboards/crkbd/keymaps/markstos/config.h b/keyboards/crkbd/keymaps/markstos/config.h
index 24101724de0e..0a3d7a360cf7 100644
--- a/keyboards/crkbd/keymaps/markstos/config.h
+++ b/keyboards/crkbd/keymaps/markstos/config.h
@@ -16,9 +16,6 @@ This is the C configuration file for the keymap
 #define MASTER_RIGHT
 // #define EE_HANDS
 
-//#define SSD1306OLED
-
-
 // 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
diff --git a/keyboards/crkbd/keymaps/mcrown/rules.mk b/keyboards/crkbd/keymaps/mcrown/rules.mk
index 922e246ba9ad..8b6f82d5df35 100644
--- a/keyboards/crkbd/keymaps/mcrown/rules.mk
+++ b/keyboards/crkbd/keymaps/mcrown/rules.mk
@@ -7,7 +7,6 @@ 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
-OLED_DRIVER = SSD1306
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = yes    # Breathing sleep LED during USB suspend
diff --git a/keyboards/crkbd/keymaps/nimishgautam/rules.mk b/keyboards/crkbd/keymaps/nimishgautam/rules.mk
index 84ae6248cbdd..dcb0007591b8 100644
--- a/keyboards/crkbd/keymaps/nimishgautam/rules.mk
+++ b/keyboards/crkbd/keymaps/nimishgautam/rules.mk
@@ -1,6 +1,5 @@
 RGB_MATRIX_ENABLE = yes
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 COMBO_ENABLE = yes
 TAP_DANCE_ENABLE = yes  # enable tap dance features
 EXTRAKEY_ENABLE = no
diff --git a/keyboards/crkbd/keymaps/ninjonas/rules.mk b/keyboards/crkbd/keymaps/ninjonas/rules.mk
index c40a827798ac..6dd34f26d775 100644
--- a/keyboards/crkbd/keymaps/ninjonas/rules.mk
+++ b/keyboards/crkbd/keymaps/ninjonas/rules.mk
@@ -1,7 +1,6 @@
 RGB_MATRIX_ENABLE = yes
 MOUSEKEY_ENABLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
diff --git a/keyboards/crkbd/keymaps/oled_sample/keymap.c b/keyboards/crkbd/keymaps/oled_sample/keymap.c
index 1a48165e3fa6..84a4f9204f03 100644
--- a/keyboards/crkbd/keymaps/oled_sample/keymap.c
+++ b/keyboards/crkbd/keymaps/oled_sample/keymap.c
@@ -147,12 +147,12 @@ void render_layer_state(void) {
     oled_write_P(PSTR("Raise"), layer_state_is(_RAISE));
 }
 
-void render_keylock_status(uint8_t led_usb_state) {
+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_usb_state & (1 << USB_LED_NUM_LOCK));
-    oled_write_P(PSTR("C"), led_usb_state & (1 << USB_LED_CAPS_LOCK));
-    oled_write_ln_P(PSTR("S"), led_usb_state & (1 << USB_LED_SCROLL_LOCK));
+    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) {
@@ -183,7 +183,7 @@ void render_bootmagic_status(void) {
 void render_status_main(void) {
     /* Show Keyboard Layout  */
     render_default_layer_state();
-    render_keylock_status(host_keyboard_leds());
+    render_keylock_status(host_keyboard_led_state());
     render_mod_status(get_mods());
     render_bootmagic_status();
 
diff --git a/keyboards/crkbd/keymaps/oled_sample/rules.mk b/keyboards/crkbd/keymaps/oled_sample/rules.mk
index d9db223cfa5e..676795847a39 100644
--- a/keyboards/crkbd/keymaps/oled_sample/rules.mk
+++ b/keyboards/crkbd/keymaps/oled_sample/rules.mk
@@ -5,4 +5,3 @@
 #
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/ollyhayes/rules.mk b/keyboards/crkbd/keymaps/ollyhayes/rules.mk
index 2dcd9007e573..f2bf2ce07b85 100644
--- a/keyboards/crkbd/keymaps/ollyhayes/rules.mk
+++ b/keyboards/crkbd/keymaps/ollyhayes/rules.mk
@@ -1,7 +1,6 @@
 SRC += oled.c
 
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 EXTRAKEY_ENABLE = yes
 UNICODE_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/oo/rules.mk b/keyboards/crkbd/keymaps/oo/rules.mk
index d34d066ded93..dd68e9d3b090 100644
--- a/keyboards/crkbd/keymaps/oo/rules.mk
+++ b/keyboards/crkbd/keymaps/oo/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/rarick/rules.mk b/keyboards/crkbd/keymaps/rarick/rules.mk
index 775268a1d472..2528fec9b0fc 100644
--- a/keyboards/crkbd/keymaps/rarick/rules.mk
+++ b/keyboards/crkbd/keymaps/rarick/rules.mk
@@ -4,9 +4,6 @@ BOOTLOADER = atmel-dfu
 # Enable RGB matric
 RGB_MATRIX_ENABLE = yes
 
-# Enable OLED driver
-OLED_DRIVER_ENABLE = yes
-
 # Enable media keys
 EXTRAKEY_ENABLE = yes
 
diff --git a/keyboards/crkbd/keymaps/rjhilgefort/rules.mk b/keyboards/crkbd/keymaps/rjhilgefort/rules.mk
index c6c258e255e1..e7c9b4b95376 100644
--- a/keyboards/crkbd/keymaps/rjhilgefort/rules.mk
+++ b/keyboards/crkbd/keymaps/rjhilgefort/rules.mk
@@ -5,4 +5,3 @@ BOOTLOADER = atmel-dfu
 EXTRAKEY_ENABLE = yes
 
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/rmeli/rules.mk b/keyboards/crkbd/keymaps/rmeli/rules.mk
index 58a00ed6ba32..107c4939782c 100644
--- a/keyboards/crkbd/keymaps/rmeli/rules.mk
+++ b/keyboards/crkbd/keymaps/rmeli/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 TAP_DANCE_ENABLE = yes
 AUTO_SHIFT_ENABLE = no // disable auto-shift with home row mods
diff --git a/keyboards/crkbd/keymaps/rpbaptist/oled.c b/keyboards/crkbd/keymaps/rpbaptist/oled.c
index a2cc43c37365..549826fac602 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/oled.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/oled.c
@@ -71,10 +71,10 @@ void render_status(void) {
 
     oled_write_P(PSTR("\n"), false);
 
-    uint8_t led_usb_state = host_keyboard_leds();
+    led_t led_state = host_keyboard_led_state();
     oled_write_P(PSTR("Mode:"), false);
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK) ? PSTR(" NUM ") : PSTR("\n"), false);
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK) ? PSTR(" CAPS") : PSTR("\n"), 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);
diff --git a/keyboards/crkbd/keymaps/rpbaptist/rules.mk b/keyboards/crkbd/keymaps/rpbaptist/rules.mk
index 21b8fd312786..9620e41253aa 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/rules.mk
+++ b/keyboards/crkbd/keymaps/rpbaptist/rules.mk
@@ -32,7 +32,6 @@ SLEEP_LED_ENABLE   = no    # Breathing sleep LED during USB suspend
 BOOTLOADER       = qmk-dfu
 
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 DEBOUNCE_TYPE = sym_eager_pk
 
diff --git a/keyboards/crkbd/keymaps/sharkby7e/rules.mk b/keyboards/crkbd/keymaps/sharkby7e/rules.mk
index 38a8cf1bdb5a..17406603fe2a 100644
--- a/keyboards/crkbd/keymaps/sharkby7e/rules.mk
+++ b/keyboards/crkbd/keymaps/sharkby7e/rules.mk
@@ -1,6 +1,5 @@
 MOUSEKEY_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 LTO_ENABLE      = yes
 BOOTLOADER = caterina
diff --git a/keyboards/crkbd/keymaps/snowe/rules.mk b/keyboards/crkbd/keymaps/snowe/rules.mk
index 96ae4bbf95f8..10cf2fa97ca9 100644
--- a/keyboards/crkbd/keymaps/snowe/rules.mk
+++ b/keyboards/crkbd/keymaps/snowe/rules.mk
@@ -14,7 +14,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 RGBLIGHT_TWINKLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 RGB_MATRIX_ENABLE = yes
 
 OCEAN_DREAM_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/soundmonster/rules.mk b/keyboards/crkbd/keymaps/soundmonster/rules.mk
index d3a964424fe5..d95e1136bbb2 100644
--- a/keyboards/crkbd/keymaps/soundmonster/rules.mk
+++ b/keyboards/crkbd/keymaps/soundmonster/rules.mk
@@ -3,6 +3,4 @@ RGB_MATRIX_ENABLE  = yes
 MOUSEKEY_ENABLE    = no
 NKRO_ENABLE        = yes
 OLED_ENABLE        = yes
-OLED_DRIVER        = SSD1306
 LTO_ENABLE         = yes
-
diff --git a/keyboards/crkbd/keymaps/sulrich/rules.mk b/keyboards/crkbd/keymaps/sulrich/rules.mk
index 24d83947a9ef..61b07ad0dfac 100644
--- a/keyboards/crkbd/keymaps/sulrich/rules.mk
+++ b/keyboards/crkbd/keymaps/sulrich/rules.mk
@@ -1,3 +1,2 @@
 EXTRAKEY_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/thumb_ctrl/rules.mk b/keyboards/crkbd/keymaps/thumb_ctrl/rules.mk
index 193aa14dac70..d3bbc97a236b 100755
--- a/keyboards/crkbd/keymaps/thumb_ctrl/rules.mk
+++ b/keyboards/crkbd/keymaps/thumb_ctrl/rules.mk
@@ -17,7 +17,6 @@ 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
-OLED_DRIVER     = SSD1306
 
 # 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/crkbd/keymaps/thunderbird2086/rules.mk b/keyboards/crkbd/keymaps/thunderbird2086/rules.mk
index adc61ea60d3d..0621b371e9c8 100644
--- a/keyboards/crkbd/keymaps/thunderbird2086/rules.mk
+++ b/keyboards/crkbd/keymaps/thunderbird2086/rules.mk
@@ -4,7 +4,6 @@ AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
 
 TAP_DANCE_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/toinux/rules.mk b/keyboards/crkbd/keymaps/toinux/rules.mk
index 07c98a08f803..59b90c792c25 100644
--- a/keyboards/crkbd/keymaps/toinux/rules.mk
+++ b/keyboards/crkbd/keymaps/toinux/rules.mk
@@ -2,7 +2,6 @@ MOUSEKEY_ENABLE   = yes    # Mouse keys
 RGBLIGHT_ENABLE   = no
 RGB_MATRIX_ENABLE = yes
 OLED_ENABLE       = yes
-OLED_DRIVER       = SSD1306
 LTO_ENABLE        = yes
 BOOTLOADER        = atmel-dfu
 
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_left/rules.mk b/keyboards/crkbd/keymaps/vlukash_trackpad_left/rules.mk
index ed4d34a70b87..d2e0957c4998 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_left/rules.mk
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_left/rules.mk
@@ -1,7 +1,6 @@
 # Build Options
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 
 BOOTLOADER = atmel-dfu
 
diff --git a/keyboards/crkbd/keymaps/vxid/rules.mk b/keyboards/crkbd/keymaps/vxid/rules.mk
index 432e21947686..b14970fbf363 100644
--- a/keyboards/crkbd/keymaps/vxid/rules.mk
+++ b/keyboards/crkbd/keymaps/vxid/rules.mk
@@ -17,7 +17,6 @@ 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_DRIVER     = SSD1306
 
 # 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/crkbd/keymaps/xyverz/rules.mk b/keyboards/crkbd/keymaps/xyverz/rules.mk
index d34d066ded93..dd68e9d3b090 100644
--- a/keyboards/crkbd/keymaps/xyverz/rules.mk
+++ b/keyboards/crkbd/keymaps/xyverz/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/lib/host_led_state_reader.c b/keyboards/crkbd/lib/host_led_state_reader.c
index a0684e4a277b..2593ac5f8b7a 100644
--- a/keyboards/crkbd/lib/host_led_state_reader.c
+++ b/keyboards/crkbd/lib/host_led_state_reader.c
@@ -5,11 +5,11 @@ char host_led_state_str[24];
 
 const char *read_host_led_state(void)
 {
-  uint8_t leds = host_keyboard_leds();
+  led_t led_state = host_keyboard_led_state();
   snprintf(host_led_state_str, sizeof(host_led_state_str), "NL:%s CL:%s SL:%s",
-           (leds & (1 << USB_LED_NUM_LOCK)) ? "on" : "- ",
-           (leds & (1 << USB_LED_CAPS_LOCK)) ? "on" : "- ",
-           (leds & (1 << USB_LED_SCROLL_LOCK)) ? "on" : "- ");
+           (led_state.num_lock) ? "on" : "- ",
+           (led_state.caps_lock) ? "on" : "- ",
+           (led_state.scroll_lock) ? "on" : "- ");
 
   return host_led_state_str;
 }
diff --git a/keyboards/crkbd/r2g/config.h b/keyboards/crkbd/r2g/config.h
index e44626739d49..4c2e37441518 100644
--- a/keyboards/crkbd/r2g/config.h
+++ b/keyboards/crkbd/r2g/config.h
@@ -19,27 +19,8 @@ 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 RGBLED_NUM 54
-#   define RGBLED_SPLIT \
-        { 27, 27 }
-#endif
-
 #ifdef RGB_MATRIX_ENABLE
-#    define RGBLED_NUM       54 // Number of LEDs
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT 54
 #    define RGB_MATRIX_SPLIT \
         { 27, 27 }
 #    define SPLIT_TRANSPORT_MIRROR
@@ -58,12 +39,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   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
+// #   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 cfd29368e61e..8cdf07854e97 100644
--- a/keyboards/crkbd/r2g/info.json
+++ b/keyboards/crkbd/r2g/info.json
@@ -5,6 +5,22 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "led_count": 54,
+        "split_count": [27, 27],
+        "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": "D3"
     },
diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h
index 2378a8637fb4..60a49100e3fa 100644
--- a/keyboards/crkbd/rev1/config.h
+++ b/keyboards/crkbd/rev1/config.h
@@ -18,16 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-#    define RGBLED_NUM 54 // Number of LEDs
-#    define RGBLED_SPLIT \
-        { 27, 27 }
-#    define RGBLIGHT_SPLIT
-#endif
-
 #ifdef RGB_MATRIX_ENABLE
-#    define RGBLED_NUM       54 // Number of LEDs
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT 54
 #    define RGB_MATRIX_SPLIT \
         { 27, 27 }
 #    define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/crkbd/rev1/info.json b/keyboards/crkbd/rev1/info.json
index 4f63c95170c4..48a27d11f34e 100644
--- a/keyboards/crkbd/rev1/info.json
+++ b/keyboards/crkbd/rev1/info.json
@@ -5,6 +5,10 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "led_count": 54,
+        "split_count": [27, 27]
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/crkbd/rev1/keymaps/dvorak_42_key/rules.mk b/keyboards/crkbd/rev1/keymaps/dvorak_42_key/rules.mk
index b696e1de8bd5..9fe565335aec 100644
--- a/keyboards/crkbd/rev1/keymaps/dvorak_42_key/rules.mk
+++ b/keyboards/crkbd/rev1/keymaps/dvorak_42_key/rules.mk
@@ -5,5 +5,4 @@ MOUSEKEY_ENABLE = yes    # Mouse keys
 RGBLIGHT_ENABLE = yes    # Enable WS2812 RGB underlight.
 # RGB_MATRIX_ENABLE = no
 OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
 LTO_ENABLE      = yes
diff --git a/keyboards/crypt_macro/config.h b/keyboards/crypt_macro/config.h
index ecdef4acaa15..4d9d9bf5c265 100644
--- a/keyboards/crypt_macro/config.h
+++ b/keyboards/crypt_macro/config.h
@@ -27,18 +27,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM3
 #define WS2812_DMA_CHANNEL 3
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
-
-#define RGBLED_NUM 11
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/info.json
index 8dcd2e264eaf..1b340ff74f61 100644
--- a/keyboards/crypt_macro/info.json
+++ b/keyboards/crypt_macro/info.json
@@ -8,6 +8,23 @@
         "pid": "0x434D",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 11,
+        "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": "B4",
         "driver": "pwm"
diff --git a/keyboards/crypt_macro/rules.mk b/keyboards/crypt_macro/rules.mk
index 000ee78e21a2..cc9d7bb3f537 100644
--- a/keyboards/crypt_macro/rules.mk
+++ b/keyboards/crypt_macro/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/custommk/ergostrafer/config.h b/keyboards/custommk/ergostrafer/config.h
index c5a0ec75b575..9622315defe9 100644
--- a/keyboards/custommk/ergostrafer/config.h
+++ b/keyboards/custommk/ergostrafer/config.h
@@ -16,8 +16,6 @@
 #define SPI_MISO_PIN B4
 #define SPI_MISO_PAL_MODE 5
 
-#define TAP_CODE_DELAY 10
-
 // Audio configuration
 #define AUDIO_PIN B8
 #define AUDIO_PWM_DRIVER PWMD4
diff --git a/keyboards/custommk/ergostrafer/info.json b/keyboards/custommk/ergostrafer/info.json
index 66f1562fd986..590925065e18 100644
--- a/keyboards/custommk/ergostrafer/info.json
+++ b/keyboards/custommk/ergostrafer/info.json
@@ -79,5 +79,8 @@
             { "pin_a": "B12", "pin_b": "B14"},
             { "pin_a": "B15", "pin_b": "A15"}
         ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
     }
 }
\ No newline at end of file
diff --git a/keyboards/custommk/evo70/config.h b/keyboards/custommk/evo70/config.h
index 3010e4989d41..00f78c6339dd 100644
--- a/keyboards/custommk/evo70/config.h
+++ b/keyboards/custommk/evo70/config.h
@@ -20,6 +20,4 @@
 
 #define OLED_DISABLE_TIMEOUT
 
-#define TAP_CODE_DELAY 10
-
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 4
diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/info.json
index 769e2e61188a..95464e691a60 100644
--- a/keyboards/custommk/evo70/info.json
+++ b/keyboards/custommk/evo70/info.json
@@ -29,6 +29,9 @@
             {"pin_a": "C7", "pin_b": "D5", "resolution": 2}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "backlight": {
         "pin": "B5",
         "levels": 17,
@@ -65,94 +68,90 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "x": 2.5, "y": 1.1},
-                {"matrix": [5, 0], "x": 3.5, "y": 1.1},
-                {"matrix": [0, 1], "x": 4.5, "y": 1.1},
-                {"matrix": [0, 2], "x": 5.5, "y": 1.1},
-                {"matrix": [0, 3], "x": 6.5, "y": 1.1},
-                {"matrix": [0, 4], "x": 7.5, "y": 1.1},
-                {"matrix": [0, 5], "x": 8.5, "y": 1.1},
-                {"matrix": [0, 6], "x": 9.5, "y": 1.1},
-                {"matrix": [0, 7], "x": 10.5, "y": 1.1},
-                {"matrix": [0, 8], "x": 11.5, "y": 1.1},
-                {"matrix": [0, 9], "x": 12.5, "y": 1.1},
-                {"matrix": [0, 10], "x": 13.5, "y": 1.1},
-                {"matrix": [0, 11], "x": 14.5, "y": 1.1},
-                {"matrix": [0, 12], "x": 15.5, "y": 1.1, "w": 2},
-                {"matrix": [0, 13], "x": 17.5, "y": 1.1},
-
-                {"matrix": [5, 1], "x": 2.5, "y": 2.1, "w": 1.5},
-                {"matrix": [1, 0], "x": 4, "y": 2.1},
-                {"matrix": [1, 1], "x": 5, "y": 2.1},
-                {"matrix": [1, 2], "x": 6, "y": 2.1},
-                {"matrix": [1, 3], "x": 7, "y": 2.1},
-                {"matrix": [1, 4], "x": 8, "y": 2.1},
-                {"matrix": [1, 5], "x": 9, "y": 2.1},
-                {"matrix": [1, 6], "x": 10, "y": 2.1},
-                {"matrix": [1, 7], "x": 11, "y": 2.1},
-                {"matrix": [1, 8], "x": 12, "y": 2.1},
-                {"matrix": [1, 9], "x": 13, "y": 2.1},
-                {"matrix": [1, 10], "x": 14, "y": 2.1},
-                {"matrix": [1, 11], "x": 15, "y": 2.1},
-                {"matrix": [1, 12], "x": 16, "y": 2.1, "w": 1.5},
-                {"matrix": [1, 13], "x": 17.5, "y": 2.1},
-
-                {"matrix": [5, 5], "x": 0, "y": 3.1},
-                {"matrix": [2, 0], "x": 1, "y": 3.1},
+                {"matrix": [0, 0], "x": 2.5, "y": 0},
+                {"matrix": [5, 0], "x": 3.5, "y": 0},
+                {"matrix": [0, 1], "x": 4.5, "y": 0},
+                {"matrix": [0, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 4], "x": 7.5, "y": 0},
+                {"matrix": [0, 5], "x": 8.5, "y": 0},
+                {"matrix": [0, 6], "x": 9.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, "w": 2},
+                {"matrix": [0, 13], "x": 17.5, "y": 0},
 
-                {"matrix": [5, 2], "x": 2.5, "y": 3.1, "w": 1.75},
-                {"matrix": [2, 1], "x": 4.25, "y": 3.1},
-                {"matrix": [2, 2], "x": 5.25, "y": 3.1},
-                {"matrix": [2, 3], "x": 6.25, "y": 3.1},
-                {"matrix": [2, 4], "x": 7.25, "y": 3.1},
-                {"matrix": [2, 5], "x": 8.25, "y": 3.1},
-                {"matrix": [2, 6], "x": 9.25, "y": 3.1},
-                {"matrix": [2, 7], "x": 10.25, "y": 3.1},
-                {"matrix": [2, 8], "x": 11.25, "y": 3.1},
-                {"matrix": [2, 9], "x": 12.25, "y": 3.1},
-                {"matrix": [2, 10], "x": 13.25, "y": 3.1},
-                {"matrix": [2, 11], "x": 14.25, "y": 3.1},
-                {"matrix": [2, 12], "x": 15.25, "y": 3.1, "w": 2.25},
-                {"matrix": [2, 13], "x": 17.5, "y": 3.1},
+                {"matrix": [5, 1], "x": 2.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 4, "y": 1},
+                {"matrix": [1, 1], "x": 5, "y": 1},
+                {"matrix": [1, 2], "x": 6, "y": 1},
+                {"matrix": [1, 3], "x": 7, "y": 1},
+                {"matrix": [1, 4], "x": 8, "y": 1},
+                {"matrix": [1, 5], "x": 9, "y": 1},
+                {"matrix": [1, 6], "x": 10, "y": 1},
+                {"matrix": [1, 7], "x": 11, "y": 1},
+                {"matrix": [1, 8], "x": 12, "y": 1},
+                {"matrix": [1, 9], "x": 13, "y": 1},
+                {"matrix": [1, 10], "x": 14, "y": 1},
+                {"matrix": [1, 11], "x": 15, "y": 1},
+                {"matrix": [1, 12], "x": 16, "y": 1, "w": 1.5},
+                {"matrix": [1, 13], "x": 17.5, "y": 1},
 
-                {"matrix": [4, 6], "x": 0, "y": 4.1},
-                {"matrix": [4, 4], "x": 1, "y": 4.1},
+                {"matrix": [5, 5], "x": 0, "y": 2},
+                {"matrix": [2, 0], "x": 1, "y": 2},
 
-                {"matrix": [3, 0], "x": 2.5, "y": 4.1, "w": 2.25},
-                {"matrix": [3, 1], "x": 4.75, "y": 4.1},
-                {"matrix": [3, 2], "x": 5.75, "y": 4.1},
-                {"matrix": [3, 3], "x": 6.75, "y": 4.1},
-                {"matrix": [3, 4], "x": 7.75, "y": 4.1},
-                {"matrix": [3, 5], "x": 8.75, "y": 4.1},
-                {"matrix": [3, 6], "x": 9.75, "y": 4.1},
-                {"matrix": [3, 7], "x": 10.75, "y": 4.1},
-                {"matrix": [3, 8], "x": 11.75, "y": 4.1},
-                {"matrix": [3, 9], "x": 12.75, "y": 4.1},
-                {"matrix": [3, 10], "x": 13.75, "y": 4.1},
-                {"matrix": [3, 11], "x": 14.75, "y": 4.1, "w": 1.75},
-                {"matrix": [3, 12], "x": 16.5, "y": 4.1},
-                {"matrix": [3, 13], "x": 17.5, "y": 4.1},
+                {"matrix": [5, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 4.25, "y": 2},
+                {"matrix": [2, 2], "x": 5.25, "y": 2},
+                {"matrix": [2, 3], "x": 6.25, "y": 2},
+                {"matrix": [2, 4], "x": 7.25, "y": 2},
+                {"matrix": [2, 5], "x": 8.25, "y": 2},
+                {"matrix": [2, 6], "x": 9.25, "y": 2},
+                {"matrix": [2, 7], "x": 10.25, "y": 2},
+                {"matrix": [2, 8], "x": 11.25, "y": 2},
+                {"matrix": [2, 9], "x": 12.25, "y": 2},
+                {"matrix": [2, 10], "x": 13.25, "y": 2},
+                {"matrix": [2, 11], "x": 14.25, "y": 2},
+                {"matrix": [2, 12], "x": 15.25, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 17.5, "y": 2},
 
-                {"matrix": [4, 1], "x": 0, "y": 5.1},
-                {"matrix": [4, 3], "x": 1, "y": 5.1},
+                {"matrix": [4, 6], "x": 0, "y": 3},
+                {"matrix": [4, 4], "x": 1, "y": 3},
 
-                {"matrix": [5, 4], "x": 2.5, "y": 5.1, "w": 1.25},
-                {"matrix": [4, 0], "x": 3.75, "y": 5.1, "w": 1.25},
-                {"matrix": [4, 2], "x": 5, "y": 5.1, "w": 1.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 5.1, "w": 6.25},
+                {"matrix": [3, 0], "x": 2.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 4.75, "y": 3},
+                {"matrix": [3, 2], "x": 5.75, "y": 3},
+                {"matrix": [3, 3], "x": 6.75, "y": 3},
+                {"matrix": [3, 4], "x": 7.75, "y": 3},
+                {"matrix": [3, 5], "x": 8.75, "y": 3},
+                {"matrix": [3, 6], "x": 9.75, "y": 3},
+                {"matrix": [3, 7], "x": 10.75, "y": 3},
+                {"matrix": [3, 8], "x": 11.75, "y": 3},
+                {"matrix": [3, 9], "x": 12.75, "y": 3},
+                {"matrix": [3, 10], "x": 13.75, "y": 3},
+                {"matrix": [3, 11], "x": 14.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 16.5, "y": 3},
+                {"matrix": [3, 13], "x": 17.5, "y": 3},
 
-                {"matrix": [5, 6], "x": 0.5, "y": 1.1},
+                {"matrix": [4, 1], "x": 0, "y": 4},
+                {"matrix": [4, 3], "x": 1, "y": 4},
 
-                {"matrix": [4, 7], "x": 0, "y": 0},
+                {"matrix": [5, 4], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 0], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4, "w": 6.25},
 
-                {"matrix": [4, 8], "x": 12.5, "y": 5.1, "w": 1.25},
-                {"matrix": [4, 9], "x": 13.75, "y": 5.1, "w": 1.25},
+                {"matrix": [5, 6], "x": 0.5, "y": 0},
 
-                {"matrix": [4, 10], "x": 1, "y": 0},
+                {"matrix": [4, 8], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25},
 
-                {"matrix": [4, 11], "x": 15.5, "y": 5.1},
-                {"matrix": [4, 12], "x": 16.5, "y": 5.1},
-                {"matrix": [4, 13], "x": 17.5, "y": 5.1}
+                {"matrix": [4, 11], "x": 15.5, "y": 4},
+                {"matrix": [4, 12], "x": 16.5, "y": 4},
+                {"matrix": [4, 13], "x": 17.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/custommk/evo70/keymaps/default/keymap.c b/keyboards/custommk/evo70/keymaps/default/keymap.c
index 6f518dd96448..b577b885b23b 100644
--- a/keyboards/custommk/evo70/keymaps/default/keymap.c
+++ b/keyboards/custommk/evo70/keymaps/default/keymap.c
@@ -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_BSLS, KC_PGUP,
 		KC_F1,   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_QUOT, KC_ENT,  KC_PGDN,
 	    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_UP,   KC_END,
-		KC_F5,   KC_F6,   KC_LCTL, KC_LWIN,          KC_LALT,                    KC_SPACE, KC_NO,   KC_VOLD, KC_RALT, KC_RCTL, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT
+		KC_F5,   KC_F6,   KC_LCTL, KC_LWIN,          KC_LALT,                    KC_SPACE, KC_NO,   KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
 	[1] = LAYOUT(
@@ -31,6 +31,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 						  KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_F7,   KC_F8,   KC_TRNS,          BL_TOGG, BL_STEP, BL_BRTG,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 	    KC_F9,   KC_F10,           KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD,  RGB_HUI, RGB_HUD, 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_F11,  KC_F12,  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/evo70/keymaps/via/keymap.c b/keyboards/custommk/evo70/keymaps/via/keymap.c
index 34de0889ee7e..bff3309e6391 100644
--- a/keyboards/custommk/evo70/keymaps/via/keymap.c
+++ b/keyboards/custommk/evo70/keymaps/via/keymap.c
@@ -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_BSLS, KC_PGUP,
 		KC_F1,   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_QUOT, KC_ENT,  KC_PGDN,
 	    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_UP,   KC_END,
-		KC_F5,   KC_F6,   KC_LCTL, KC_LWIN,          KC_LALT,                    KC_SPACE, KC_NO,   KC_VOLD, KC_RALT, KC_RCTL, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT
+		KC_F5,   KC_F6,   KC_LCTL, KC_LWIN,          KC_LALT,                    KC_SPACE, KC_NO,   KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
 	[1] = LAYOUT(
@@ -31,57 +31,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 						  KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_F7,   KC_F8,   KC_TRNS,          BL_TOGG, BL_STEP, BL_BRTG,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 	    KC_F9,   KC_F10,           KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD,  RGB_HUI, RGB_HUD, 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_F11,  KC_F12,  KC_TRNS, KC_TRNS,          KC_TRNS,                    KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 };
 
-static bool custom_encoder_mode = false;
-
-void set_custom_encoder_mode_user(bool custom_mode) {
-	custom_encoder_mode = custom_mode;
-}
-
-
-keyevent_t encoder_ccw = {
-    .key = (keypos_t){.row = 4, .col = 7},
-    .pressed = false,
-	.type = KEY_EVENT
-};
-
-keyevent_t encoder_cw = {
-    .key = (keypos_t){.row = 4, .col = 10},
-    .pressed = false,
-	.type = KEY_EVENT
+#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(_______, _______) },
 };
-
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-	if (custom_encoder_mode) {
-	    if (clockwise) {
-	        encoder_cw.pressed = true;
-		    encoder_cw.time = timer_read();
-		    action_exec(encoder_cw);
-	    }
-	    else {
-		    encoder_ccw.pressed = true;
-		    encoder_ccw.time = timer_read();
-		    action_exec(encoder_ccw);
-	    }
-		return false;
-	}
-	return true;
-}
-
-void matrix_scan_user(void) {
-	if (encoder_ccw.pressed) {
-		encoder_ccw.pressed = false;
-		encoder_ccw.time = timer_read();
-		action_exec(encoder_ccw);
-	}
-
-	if (encoder_cw.pressed) {
-		encoder_cw.pressed = false;
-		encoder_cw.time = timer_read();
-		action_exec(encoder_cw);
-	}
-}
+#endif
diff --git a/keyboards/custommk/evo70/keymaps/via/rules.mk b/keyboards/custommk/evo70/keymaps/via/rules.mk
index 1e5b99807cb7..f1adcab005e8 100644
--- a/keyboards/custommk/evo70/keymaps/via/rules.mk
+++ b/keyboards/custommk/evo70/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/custommk/evo70_r2/info.json b/keyboards/custommk/evo70_r2/info.json
index 772325e7f82d..18c618abc6d2 100644
--- a/keyboards/custommk/evo70_r2/info.json
+++ b/keyboards/custommk/evo70_r2/info.json
@@ -59,88 +59,256 @@
         "levels": 17,
         "pin": "A6"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Encoder", "matrix": [1, 0], "x": 0.5, "y": 0},
+                {"label": "Esc", "matrix": [0, 0], "x": 2.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 15.75, "y": 1, "w": 1.5},
+                {"label": "PgUp", "matrix": [1, 15], "x": 17.25, "y": 1},
+
+                {"label": "F1", "matrix": [2, 2], "x": 0, "y": 2},
+                {"label": "F2", "matrix": [2, 0], "x": 1, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 1], "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, 14], "x": 15, "y": 2, "w": 2.25},
+                {"label": "PgDn", "matrix": [2, 15], "x": 17.25, "y": 2},
+
+                {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3},
+                {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3, "w": 1},
+                {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 14], "x": 16.25, "y": 3},
+                {"label": "End", "matrix": [3, 15], "x": 17.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 3], "x": 0, "y": 4},
+                {"label": "F6", "matrix": [4, 0], "x": 1, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 6, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 13], "x": 15.25, "y": 4},
+                {"label": "Down", "matrix": [4, 14], "x": 16.25, "y": 4},
+                {"label": "Right", "matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker": {
+            "layout": [
+                {"label": "Encoder", "matrix": [1, 0], "x": 0.5, "y": 0},
+                {"label": "Esc", "matrix": [0, 0], "x": 2.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 15.75, "y": 1, "w": 1.5},
+                {"label": "PgUp", "matrix": [1, 15], "x": 17.25, "y": 1},
+
+                {"label": "F1", "matrix": [2, 2], "x": 0, "y": 2},
+                {"label": "F2", "matrix": [2, 0], "x": 1, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 1], "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, 14], "x": 15, "y": 2, "w": 2.25},
+                {"label": "PgDn", "matrix": [2, 15], "x": 17.25, "y": 2},
+
+                {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3},
+                {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 14], "x": 16.25, "y": 3},
+                {"label": "End", "matrix": [3, 15], "x": 17.25, "y": 3},
+
+                {"label": "F5", "matrix": [4, 3], "x": 0, "y": 4},
+                {"label": "F6", "matrix": [4, 0], "x": 1, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 6, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 13], "x": 15.25, "y": 4},
+                {"label": "Down", "matrix": [4, 14], "x": 16.25, "y": 4},
+                {"label": "Right", "matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker": {
             "layout": [
-                {"label":"Encoder", "matrix": [1, 0], "x":0.5, "y":0},
-                {"label":"Esc", "matrix": [0, 0], "x":2.5, "y":0},
-                {"label":"1", "matrix": [0, 2], "x":3.5, "y":0},
-                {"label":"2", "matrix": [0, 3], "x":4.5, "y":0},
-                {"label":"3", "matrix": [0, 4], "x":5.5, "y":0},
-                {"label":"4", "matrix": [0, 5], "x":6.5, "y":0},
-                {"label":"5", "matrix": [0, 6], "x":7.5, "y":0},
-                {"label":"6", "matrix": [0, 7], "x":8.5, "y":0},
-                {"label":"7", "matrix": [0, 8], "x":9.5, "y":0},
-                {"label":"8", "matrix": [0, 9], "x":10.5, "y":0},
-                {"label":"9", "matrix": [0, 10], "x":11.5, "y":0},
-                {"label":"0", "matrix": [0, 11], "x":12.5, "y":0},
-                {"label":"-", "matrix": [0, 12], "x":13.5, "y":0},
-                {"label":"=", "matrix": [0, 13], "x":14.5, "y":0},
-                {"label":"Backspace", "matrix": [0, 14], "x":15.5, "y":0, "w":2},
-                {"label":"Delete", "matrix": [0, 15], "x":17.5, "y":0},
+                {"label": "Encoder", "matrix": [1, 0], "x": 0.5, "y": 0},
+                {"label": "Esc", "matrix": [0, 0], "x": 2.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 8], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 9], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 10], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 11], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 12], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 13], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 15.25, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [0, 15], "x": 17.25, "y": 0},
 
-                {"label":"Tab", "matrix": [1, 1], "x":2.5, "y":1, "w":1.5},
-                {"label":"Q", "matrix": [1, 2], "x":4, "y":1},
-                {"label":"W", "matrix": [1, 3], "x":5, "y":1},
-                {"label":"E", "matrix": [1, 4], "x":6, "y":1},
-                {"label":"R", "matrix": [1, 5], "x":7, "y":1},
-                {"label":"T", "matrix": [1, 6], "x":8, "y":1},
-                {"label":"Y", "matrix": [1, 7], "x":9, "y":1},
-                {"label":"U", "matrix": [1, 8], "x":10, "y":1},
-                {"label":"I", "matrix": [1, 9], "x":11, "y":1},
-                {"label":"O", "matrix": [1, 10], "x":12, "y":1},
-                {"label":"P", "matrix": [1, 11], "x":13, "y":1},
-                {"label":"[", "matrix": [1, 12], "x":14, "y":1},
-                {"label":"]", "matrix": [1, 13], "x":15, "y":1},
-                {"label":"\\", "matrix": [1, 14], "x":16, "y":1, "w":1.5},
-                {"label":"PgUp", "matrix": [1, 15], "x":17.5, "y":1},
+                {"label": "Tab", "matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1},
+                {"label": "PgUp", "matrix": [1, 15], "x": 17.25, "y": 1},
 
-                {"label":"F1", "matrix": [2, 2], "x":0, "y":2},
-                {"label":"F2", "matrix": [2, 0], "x":1, "y":2},
-                {"label":"Caps Lock", "matrix": [2, 1], "x":2.5, "y":2, "w":1.75},
-                {"label":"A", "matrix": [2, 3], "x":4.25, "y":2},
-                {"label":"S", "matrix": [2, 4], "x":5.25, "y":2},
-                {"label":"D", "matrix": [2, 5], "x":6.25, "y":2},
-                {"label":"F", "matrix": [2, 6], "x":7.25, "y":2},
-                {"label":"G", "matrix": [2, 7], "x":8.25, "y":2},
-                {"label":"H", "matrix": [2, 8], "x":9.25, "y":2},
-                {"label":"J", "matrix": [2, 9], "x":10.25, "y":2},
-                {"label":"K", "matrix": [2, 10], "x":11.25, "y":2},
-                {"label":"L", "matrix": [2, 11], "x":12.25, "y":2},
-                {"label":";", "matrix": [2, 12], "x":13.25, "y":2},
-                {"label":"'", "matrix": [2, 13], "x":14.25, "y":2},
-                {"label":"Enter", "matrix": [2, 14], "x":15.25, "y":2, "w":2.25},
-                {"label":"PgDn", "matrix": [2, 15], "x":17.5, "y":2},
+                {"label": "F1", "matrix": [2, 2], "x": 0, "y": 2},
+                {"label": "F2", "matrix": [2, 0], "x": 1, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 1], "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, 14], "x": 15, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 16, "y": 1, "w": 1.25, "h": 2},
+                {"label": "PgDn", "matrix": [2, 15], "x": 17.25, "y": 2},
 
-                {"label":"F3", "matrix": [3, 1], "x":0, "y":3},
-                {"label":"F4", "matrix": [3, 0], "x":1, "y":3},
-                {"label":"Shift", "matrix": [3, 2], "x":2.5, "y":3, "w":1.25},
-                {"label":"\u2298", "matrix": [0, 1], "x":3.75, "y":3, "w":1},
-                {"label":"Z", "matrix": [3, 3], "x":4.75, "y":3},
-                {"label":"X", "matrix": [3, 4], "x":5.75, "y":3},
-                {"label":"C", "matrix": [3, 5], "x":6.75, "y":3},
-                {"label":"V", "matrix": [3, 6], "x":7.75, "y":3},
-                {"label":"B", "matrix": [3, 7], "x":8.75, "y":3},
-                {"label":"N", "matrix": [3, 8], "x":9.75, "y":3},
-                {"label":"M", "matrix": [3, 9], "x":10.75, "y":3},
-                {"label":",", "matrix": [3, 10], "x":11.75, "y":3},
-                {"label":".", "matrix": [3, 11], "x":12.75, "y":3},
-                {"label":"/", "matrix": [3, 12], "x":13.75, "y":3},
-                {"label":"Shift", "matrix": [3, 13], "x":14.75, "y":3, "w":1.75},
-                {"label":"Up", "matrix": [3, 14], "x":16.5, "y":3},
-                {"label":"End", "matrix": [3, 15], "x":17.5, "y":3},
+                {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3},
+                {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3, "w": 1},
+                {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 8], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 9], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 11], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 12], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 14], "x": 16.25, "y": 3},
+                {"label": "End", "matrix": [3, 15], "x": 17.25, "y": 3},
 
-                {"label":"F5", "matrix": [4, 3], "x":0, "y":4},
-                {"label":"F6", "matrix": [4, 0], "x":1, "y":4},
-                {"label":"Ctrl", "matrix": [4, 1], "x":2.5, "y":4, "w":1.25},
-                {"label":"GUI", "matrix": [4, 2], "x":3.75, "y":4, "w":1.25},
-                {"label":"Alt", "matrix": [4, 4], "x":5, "y":4, "w":1.25},
-                {"label":"Space", "matrix": [4, 7], "x":6.25, "y":4, "w":6.25},
-                {"label":"Alt", "matrix": [4, 10], "x":12.5, "y":4, "w":1.25},
-                {"label":"Ctrl", "matrix": [4, 11], "x":13.75, "y":4, "w":1.25},
-                {"label":"Left", "matrix": [4, 13], "x":15.5, "y":4},
-                {"label":"Down", "matrix": [4, 14], "x":16.5, "y":4},
-                {"label":"Right", "matrix": [4, 15], "x":17.5, "y":4}
+                {"label": "F5", "matrix": [4, 3], "x": 0, "y": 4},
+                {"label": "F6", "matrix": [4, 0], "x": 1, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 7], "x": 6, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 13], "x": 15.25, "y": 4},
+                {"label": "Down", "matrix": [4, 14], "x": 16.25, "y": 4},
+                {"label": "Right", "matrix": [4, 15], "x": 17.25, "y": 4}
             ]
         }
     },
@@ -149,4 +317,4 @@
             { "pin_a": "B7",  "pin_b": "A4", "resolution": 2}
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/custommk/evo70_r2/keymaps/default/keymap.c b/keyboards/custommk/evo70_r2/keymaps/default/keymap.c
index 9dc7beabdda4..9faf2088dd78 100644
--- a/keyboards/custommk/evo70_r2/keymaps/default/keymap.c
+++ b/keyboards/custommk/evo70_r2/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT(
+	[0] = LAYOUT_all(
 			KC_ESC,	      KC_ESC, KC_1,    KC_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_F1,   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_QUOT, KC_ENT,  KC_PGDN, 
diff --git a/keyboards/custommk/evo70_r2/keymaps/via/keymap.c b/keyboards/custommk/evo70_r2/keymaps/via/keymap.c
index a971aa4e28b2..4c467c018eb7 100644
--- a/keyboards/custommk/evo70_r2/keymaps/via/keymap.c
+++ b/keyboards/custommk/evo70_r2/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT(
+	[0] = LAYOUT_all(
 			KC_ESC,	      KC_ESC, KC_1,    KC_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_F1,   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_QUOT, KC_ENT,  KC_PGDN, 
diff --git a/keyboards/custommk/evo70_r2/matrix_diagram.md b/keyboards/custommk/evo70_r2/matrix_diagram.md
new file mode 100644
index 000000000000..e4ac5ef20edc
--- /dev/null
+++ b/keyboards/custommk/evo70_r2/matrix_diagram.md
@@ -0,0 +1,18 @@
+# Matrix Diagram for customMK EVO70 R2
+
+```
+  ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+  │10 │  │00 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E     │0F │
+  └───┘  ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤      ┌─────┐
+         │11   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │1F │      │     │
+┌───┬───┐├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2E  │ ISO Enter
+│22 │20 ││21    │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E      │2F │   │1E │    │
+├───┼───┤├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+│31 │30 ││32  │01 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D    │3E │3F │
+├───┼───┤├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+│43 │40 ││41  │42  │44  │47                      │4A  │4B  │ │4D │4E │4F │
+└───┴───┘└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+         ┌────────┐
+         │32      │ 2.25u LShift
+         └────────┘
+```
diff --git a/keyboards/custommk/genesis/rev1/config.h b/keyboards/custommk/genesis/rev1/config.h
index d894b55edfc1..95d393590406 100644
--- a/keyboards/custommk/genesis/rev1/config.h
+++ b/keyboards/custommk/genesis/rev1/config.h
@@ -16,21 +16,5 @@
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
-#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 13
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 4
 
diff --git a/keyboards/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/info.json
index 4915497bb04d..f859a6b9bf33 100644
--- a/keyboards/custommk/genesis/rev1/info.json
+++ b/keyboards/custommk/genesis/rev1/info.json
@@ -12,7 +12,22 @@
         "pin": "E6"
     },
     "rgblight": {
-        "max_brightness": 128
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 13,
+        "max_brightness": 128,
+        "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": ["F4", "F5", "D7", "B4"],
@@ -25,6 +40,9 @@
             {"pin_a": "D2", "pin_b": "D1", "resolution": 2}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "layouts": {
diff --git a/keyboards/custommk/genesis/rev2/config.h b/keyboards/custommk/genesis/rev2/config.h
index 126caeab6af8..b6e7c0cdf73e 100644
--- a/keyboards/custommk/genesis/rev2/config.h
+++ b/keyboards/custommk/genesis/rev2/config.h
@@ -16,22 +16,6 @@
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
-#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 13
 #define RGBLIGHT_LAYERS
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 4
 
diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/info.json
index 0ee3d9a53701..5760ba52cdcc 100644
--- a/keyboards/custommk/genesis/rev2/info.json
+++ b/keyboards/custommk/genesis/rev2/info.json
@@ -12,7 +12,22 @@
         "pin": "E6"
     },
     "rgblight": {
-        "max_brightness": 128
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 13,
+        "max_brightness": 128,
+        "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": ["F4", "F5", "D7", "B4"],
@@ -25,6 +40,9 @@
             {"pin_a": "D2", "pin_b": "D1", "resolution": 2}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "layouts": {
@@ -80,39 +98,6 @@
                 {"matrix": [4, 2], "x": 0, "y": 4, "w": 2},
                 {"matrix": [4, 3], "x": 2, "y": 4}
             ]
-        },
-        "LAYOUT_via_6x4": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-                {"matrix": [5, 1], "x": 1, "y": 0},
-                {"matrix": [5, 2], "x": 3, "y": 0},
-                {"matrix": [5, 3], "x": 4, "y": 0},
-
-                {"matrix": [0, 0], "x": 0.5, "y": 1.1},
-                {"matrix": [0, 1], "x": 1.5, "y": 1.1},
-                {"matrix": [0, 2], "x": 2.5, "y": 1.1},
-                {"matrix": [0, 3], "x": 3.5, "y": 1.1},
-
-                {"matrix": [1, 0], "x": 0.5, "y": 2.1},
-                {"matrix": [1, 1], "x": 1.5, "y": 2.1},
-                {"matrix": [1, 2], "x": 2.5, "y": 2.1},
-                {"matrix": [1, 3], "x": 3.5, "y": 2.1},
-
-                {"matrix": [2, 0], "x": 0.5, "y": 3.1},
-                {"matrix": [2, 1], "x": 1.5, "y": 3.1},
-                {"matrix": [2, 2], "x": 2.5, "y": 3.1},
-                {"matrix": [2, 3], "x": 3.5, "y": 3.1},
-
-                {"matrix": [3, 0], "x": 0.5, "y": 4.1},
-                {"matrix": [3, 1], "x": 1.5, "y": 4.1},
-                {"matrix": [3, 2], "x": 2.5, "y": 4.1},
-                {"matrix": [3, 3], "x": 3.5, "y": 4.1},
-
-                {"matrix": [4, 0], "x": 0.5, "y": 5.1},
-                {"matrix": [4, 1], "x": 1.5, "y": 5.1},
-                {"matrix": [4, 2], "x": 2.5, "y": 5.1},
-                {"matrix": [4, 3], "x": 3.5, "y": 5.1}
-            ]
         }
     }
 }
diff --git a/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c b/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c
index 6739b8857d77..e49f614cb757 100644
--- a/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c
+++ b/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c
@@ -13,7 +13,7 @@
  * You should have received 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
@@ -24,36 +24,32 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT_via_6x4(
-		    KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU,
-			MO(1),   KC_PSLS, KC_PAST, KC_PMNS,
-			KC_P7,   KC_P8,   KC_P9,   KC_PGUP,
-			KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-			KC_P1,   KC_P2,   KC_P3,   KC_PGDN,
+	[0] = LAYOUT_ortho_5x4(
+			MO(1),   KC_PSLS, KC_PAST, KC_PMNS, 
+			KC_P7,   KC_P8,   KC_P9,   KC_PGUP, 
+			KC_P4,   KC_P5,   KC_P6,   KC_PPLS, 
+			KC_P1,   KC_P2,   KC_P3,   KC_PGDN, 
 			KC_P0,   KC_SPC,  KC_PDOT, KC_PENT),
 
-	[1] = LAYOUT_via_6x4(
-		    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-			KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-			RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	[1] = LAYOUT_ortho_5x4(
+			KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, 
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+			RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, 
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 			RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS),
 
-	[2] = LAYOUT_via_6x4(
-		    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	[2] = LAYOUT_ortho_5x4(
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+			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_via_6x4(
-		    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	[3] = LAYOUT_ortho_5x4(
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 };
@@ -92,80 +88,11 @@ void keyboard_post_init_user(void) {
 }
 #endif
 
-
-keyevent_t encoder_left_ccw = {
-    .key = (keypos_t){.row = 5, .col = 0},
-    .pressed = false,
-	.type = KEY_EVENT
-};
-
-keyevent_t encoder_left_cw = {
-    .key = (keypos_t){.row = 5, .col = 1},
-    .pressed = false,
-	.type = KEY_EVENT
-};
-
-keyevent_t encoder_right_ccw = {
-    .key = (keypos_t){.row = 5, .col = 2},
-    .pressed = false,
-	.type = KEY_EVENT
-};
-
-keyevent_t encoder_right_cw = {
-    .key = (keypos_t){.row = 5, .col = 3},
-    .pressed = false,
-	.type = KEY_EVENT
+#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)  },
+    [1] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  },
+    [2] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  },
+    [3] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  }
 };
-
-void matrix_scan_user(void) {
-    if (encoder_left_ccw.pressed) {
-        encoder_left_ccw.pressed = false;
-        encoder_left_ccw.time = timer_read();
-        action_exec(encoder_left_ccw);
-    }
-
-    if (encoder_left_cw.pressed) {
-        encoder_left_cw.pressed = false;
-        encoder_left_cw.time = timer_read();
-        action_exec(encoder_left_cw);
-    }
-
-    if (encoder_right_ccw.pressed) {
-        encoder_right_ccw.pressed = false;
-        encoder_right_ccw.time = timer_read();
-        action_exec(encoder_right_ccw);
-    }
-
-    if (encoder_right_cw.pressed) {
-        encoder_right_cw.pressed = false;
-        encoder_right_cw.time = timer_read();
-        action_exec(encoder_right_cw);
-    }
-
-}
-
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-	if (index == 0) {
-		if (clockwise) {
-			encoder_left_cw.pressed = true;
-			encoder_left_cw.time = timer_read();
-			action_exec(encoder_left_cw);
-		} else {
-			encoder_left_ccw.pressed = true;
-			encoder_left_ccw.time = timer_read();
-			action_exec(encoder_left_ccw);
-		}
-	} else {
-		if (clockwise) {
-			encoder_right_cw.pressed = true;
-			encoder_right_cw.time = timer_read();
-			action_exec(encoder_right_cw);
-		} else {
-			encoder_right_ccw.pressed = true;
-			encoder_right_ccw.time = timer_read();
-			action_exec(encoder_right_ccw);
-		}
-	}
-    return false;
-}
+#endif
diff --git a/keyboards/custommk/genesis/rev2/keymaps/via/rules.mk b/keyboards/custommk/genesis/rev2/keymaps/via/rules.mk
index 43061db1dd46..1189f4ad1927 100644
--- a/keyboards/custommk/genesis/rev2/keymaps/via/rules.mk
+++ b/keyboards/custommk/genesis/rev2/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
+LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/cutie_club/wraith/keymaps/amber/keymap.c b/keyboards/cutie_club/wraith/keymaps/amber/keymap.c
index 41d5b39c4088..f3ea61ba5e38 100644
--- a/keyboards/cutie_club/wraith/keymaps/amber/keymap.c
+++ b/keyboards/cutie_club/wraith/keymaps/amber/keymap.c
@@ -40,11 +40,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-
-void matrix_init_user(void) {
-
-}
-
 void matrix_scan_user(void) {
   // escape LED on layer 1
   if (IS_LAYER_ON(1)) {
@@ -53,7 +48,3 @@ void matrix_scan_user(void) {
     writePinHigh(B0);
   }
 }
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/cx60/config.h b/keyboards/cx60/config.h
deleted file mode 100644
index f14a164f57b8..000000000000
--- a/keyboards/cx60/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2019 Rodrigo Feijao <hello@rodrigofeijao.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should 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 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 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/cx60/info.json b/keyboards/cx60/info.json
index 89da7fa8b37d..e03587e3e46d 100644
--- a/keyboards/cx60/info.json
+++ b/keyboards/cx60/info.json
@@ -21,6 +21,22 @@
         "caps_lock": "B5",
         "on_state": 0
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 14,
+        "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": "B6"
     },
diff --git a/keyboards/cxt_studio/info.json b/keyboards/cxt_studio/info.json
index 07b5ff17ea9d..6166ea229616 100644
--- a/keyboards/cxt_studio/info.json
+++ b/keyboards/cxt_studio/info.json
@@ -31,7 +31,7 @@
     },
     "processor": "atmega32u4",
     "rgb_matrix": {
-       "driver": "WS2812",
+       "driver": "ws2812",
        "layout": [
          {"flags": 4, "matrix": [0, 3], "x": 3, "y": 0},
          {"flags": 4, "matrix": [0, 2], "x": 2, "y": 0},
diff --git a/keyboards/dailycraft/claw44/keymaps/oled/rules.mk b/keyboards/dailycraft/claw44/keymaps/oled/rules.mk
index d34d066ded93..dd68e9d3b090 100644
--- a/keyboards/dailycraft/claw44/keymaps/oled/rules.mk
+++ b/keyboards/dailycraft/claw44/keymaps/oled/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/dailycraft/owl8/info.json b/keyboards/dailycraft/owl8/info.json
index b1bcacb60bc5..9dc42c8fd786 100644
--- a/keyboards/dailycraft/owl8/info.json
+++ b/keyboards/dailycraft/owl8/info.json
@@ -18,31 +18,26 @@
     "bootloader": "atmel-dfu",
     "matrix_pins": {
         "direct": [
-            ["F4", "F7", "B3", "B6", "F5", "F6", "B1", "B2", "D4", "C6", "D7", "E6", null, null, null, null]
+            ["F4", "F7", "B3", "B6", "F5", "F6", "B1", "B2", "D4", "C6", "D7", "E6"]
         ]
     },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0, "matrix": [0, 12]},
-                {"x": 1, "y": 0, "matrix": [0, 13]},
-                {"x": 2, "y": 0, "matrix": [0, 14]},
-                {"x": 3, "y": 0, "matrix": [0, 15]},
+                {"x":0, "y":0, "matrix": [0, 8]},
+                {"x":1, "y":0, "matrix": [0, 9]},
+                {"x":2, "y":0, "matrix": [0, 10]},
+                {"x":3, "y":0, "matrix": [0, 11]},
 
-                {"x": 0, "y": 1.25, "matrix": [0, 8]},
-                {"x": 1, "y": 1.25, "matrix": [0, 9]},
-                {"x": 2, "y": 1.25, "matrix": [0, 10]},
-                {"x": 3, "y": 1.25, "matrix": [0, 11]},
+                {"x": 0, "y": 1.25, "matrix": [0, 0]},
+                {"x": 1, "y": 1.25, "matrix": [0, 1]},
+                {"x": 2, "y": 1.25, "matrix": [0, 2]},
+                {"x": 3, "y": 1.25, "matrix": [0, 3]},
 
-                {"x": 0, "y": 2.5, "matrix": [0, 0]},
-                {"x": 1, "y": 2.5, "matrix": [0, 1]},
-                {"x": 2, "y": 2.5, "matrix": [0, 2]},
-                {"x": 3, "y": 2.5, "matrix": [0, 3]},
-
-                {"x": 0, "y": 3.5, "matrix": [0, 4]},
-                {"x": 1, "y": 3.5, "matrix": [0, 5]},
-                {"x": 2, "y": 3.5, "matrix": [0, 6]},
-                {"x": 3, "y": 3.5, "matrix": [0, 7]}
+                {"x": 0, "y": 2.25, "matrix": [0, 4]},
+                {"x": 1, "y": 2.25, "matrix": [0, 5]},
+                {"x": 2, "y": 2.25, "matrix": [0, 6]},
+                {"x": 3, "y": 2.25, "matrix": [0, 7]}
             ]
         }
     }
diff --git a/keyboards/dailycraft/owl8/keymaps/default/keymap.c b/keyboards/dailycraft/owl8/keymaps/default/keymap.c
index e840263639d8..7ff5519e5aa9 100644
--- a/keyboards/dailycraft/owl8/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/owl8/keymaps/default/keymap.c
@@ -25,25 +25,21 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        KC_NO,   KC_NO,   KC_NO,  KC_NO, // for encoders
         KC_NO,   KC_NO,   KC_NO,  KC_NO, // for ext keys
         MO(1),   KC_BSPC, KC_SPC, KC_ENT,
         KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
     ),
     [_FN1] = LAYOUT(
-        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
     ),
     [_FN2] = LAYOUT(
-        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
     ),
     [_FN3] = LAYOUT(
-        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
@@ -64,5 +60,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             tap_code(KC_UP);
         }
     }
-    return true;
+    return false;
 }
diff --git a/keyboards/dailycraft/owl8/keymaps/via/keymap.c b/keyboards/dailycraft/owl8/keymaps/via/keymap.c
index 1a3bb0f0ae23..d010bbe10e93 100644
--- a/keyboards/dailycraft/owl8/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/owl8/keymaps/via/keymap.c
@@ -25,103 +25,32 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        KC_NO,   KC_NO,   KC_NO,  KC_NO, // for encoders
         KC_NO,   KC_NO,   KC_NO,  KC_NO, // for ext keys
         MO(1),   KC_BSPC, KC_SPC, KC_ENT,
         KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
     ),
     [_FN1] = LAYOUT(
-        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
     ),
     [_FN2] = LAYOUT(
-        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
     ),
     [_FN3] = LAYOUT(
-        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
     )
 };
 
-keyevent_t encoder1_ccw = {
-    .key = (keypos_t){.row = 0, .col = 12},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-keyevent_t encoder1_cw = {
-    .key = (keypos_t){.row = 0, .col = 13},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-keyevent_t encoder2_ccw = {
-    .key = (keypos_t){.row = 0, .col = 14},
-    .pressed = false,
-    .type = KEY_EVENT
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  },
+    [1] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  },
+    [2] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  },
+    [3] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  }
 };
-
-keyevent_t encoder2_cw = {
-    .key = (keypos_t){.row = 0, .col = 15},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-void matrix_scan_user(void) {
-    if (encoder1_ccw.pressed) {
-        encoder1_ccw.pressed = false;
-        encoder1_ccw.time = timer_read();
-        action_exec(encoder1_ccw);
-    }
-
-    if (encoder1_cw.pressed) {
-        encoder1_cw.pressed = false;
-        encoder1_cw.time = timer_read();
-        action_exec(encoder1_cw);
-    }
-
-    if (encoder2_ccw.pressed) {
-        encoder2_ccw.pressed = false;
-        encoder2_ccw.time = timer_read();
-        action_exec(encoder2_ccw);
-    }
-
-    if (encoder2_cw.pressed) {
-        encoder2_cw.pressed = false;
-        encoder2_cw.time = timer_read();
-        action_exec(encoder2_cw);
-    }
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            encoder1_cw.pressed = true;
-            encoder1_cw.time = timer_read();
-            action_exec(encoder1_cw);
-        } else {
-            encoder1_ccw.pressed = true;
-            encoder1_ccw.time = timer_read();
-            action_exec(encoder1_ccw);
-        }
-    } else if (index == 1) {
-        if (clockwise) {
-            encoder2_cw.pressed = true;
-            encoder2_cw.time = timer_read();
-            action_exec(encoder2_cw);
-        } else {
-            encoder2_ccw.pressed = true;
-            encoder2_ccw.time = timer_read();
-            action_exec(encoder2_ccw);
-        }
-    }
-
-    return true;
-}
+#endif
diff --git a/keyboards/dailycraft/owl8/keymaps/via/rules.mk b/keyboards/dailycraft/owl8/keymaps/via/rules.mk
index 1e5b99807cb7..f1adcab005e8 100644
--- a/keyboards/dailycraft/owl8/keymaps/via/rules.mk
+++ b/keyboards/dailycraft/owl8/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/dailycraft/stickey4/info.json b/keyboards/dailycraft/stickey4/info.json
index c8d580371885..156a6d63a1f1 100644
--- a/keyboards/dailycraft/stickey4/info.json
+++ b/keyboards/dailycraft/stickey4/info.json
@@ -18,7 +18,7 @@
     "bootloader": "atmel-dfu",
     "matrix_pins": {
         "direct": [
-            ["D4", "C6", "D7", "E6", null, null, null, null]
+            ["D4", "C6", "D7", "E6"]
         ]
     },
     "layouts": {
@@ -27,12 +27,7 @@
                 {"x": 0, "y": 0, "matrix": [0, 0]},
                 {"x": 1, "y": 0, "matrix": [0, 1]},
                 {"x": 2, "y": 0, "matrix": [0, 2]},
-                {"x": 3, "y": 0, "matrix": [0, 3]},
-
-                {"label": "Encoder 1 CCW", "x": 0, "y": 1, "matrix": [0, 4]},
-                {"label": "Encoder 1 CW", "x": 1, "y": 1, "matrix": [0, 5]},
-                {"label": "Encoder 2 CCW", "x": 2, "y": 1, "matrix": [0, 6]},
-                {"label": "Encoder 2 CW", "x": 3, "y": 1, "matrix": [0, 7]}
+                {"x": 3, "y": 0, "matrix": [0, 3]}
             ]
         }
     }
diff --git a/keyboards/dailycraft/stickey4/keymaps/default/keymap.c b/keyboards/dailycraft/stickey4/keymaps/default/keymap.c
index 70de5dca4483..40cfc22a0f5a 100644
--- a/keyboards/dailycraft/stickey4/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/stickey4/keymaps/default/keymap.c
@@ -25,19 +25,6 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        KC_A,    KC_B,    KC_C,   KC_D,
-        KC_NO,   KC_NO,   KC_NO,  KC_NO // for encoders
-    ),
-    [_FN1] = LAYOUT(
-        KC_NO,   KC_NO,   KC_NO,  KC_NO,
-        KC_NO,   KC_NO,   KC_NO,  KC_NO
-    ),
-    [_FN2] = LAYOUT(
-        KC_NO,   KC_NO,   KC_NO,  KC_NO,
-        KC_NO,   KC_NO,   KC_NO,  KC_NO
-    ),
-    [_FN3] = LAYOUT(
-        KC_NO,   KC_NO,   KC_NO,  KC_NO,
-        KC_NO,   KC_NO,   KC_NO,  KC_NO
+        KC_A,    KC_B,    KC_C,   KC_D
     )
 };
diff --git a/keyboards/dailycraft/stickey4/keymaps/via/keymap.c b/keyboards/dailycraft/stickey4/keymaps/via/keymap.c
index 30de32fa600c..0e577fcf6214 100644
--- a/keyboards/dailycraft/stickey4/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/stickey4/keymaps/via/keymap.c
@@ -25,95 +25,24 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-        KC_A,    KC_B,    KC_C,   KC_D,
-        KC_NO,   KC_NO,   KC_NO,  KC_NO // for encoders
+        KC_A,    KC_B,    KC_C,   KC_D
     ),
     [_FN1] = LAYOUT(
-        KC_NO,   KC_NO,   KC_NO,  KC_NO,
         KC_NO,   KC_NO,   KC_NO,  KC_NO
     ),
     [_FN2] = LAYOUT(
-        KC_NO,   KC_NO,   KC_NO,  KC_NO,
         KC_NO,   KC_NO,   KC_NO,  KC_NO
     ),
     [_FN3] = LAYOUT(
-        KC_NO,   KC_NO,   KC_NO,  KC_NO,
         KC_NO,   KC_NO,   KC_NO,  KC_NO
     )
 };
 
-keyevent_t encoder1_ccw = {
-    .key = (keypos_t){.row = 0, .col = 4},
-    .pressed = false,
-    .type = KEY_EVENT
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  },
+    [1] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  },
+    [2] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  },
+    [3] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  }
 };
-
-keyevent_t encoder1_cw = {
-    .key = (keypos_t){.row = 0, .col = 5},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-keyevent_t encoder2_ccw = {
-    .key = (keypos_t){.row = 0, .col = 6},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-keyevent_t encoder2_cw = {
-    .key = (keypos_t){.row = 0, .col = 7},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-void matrix_scan_user(void) {
-    if (encoder1_ccw.pressed) {
-        encoder1_ccw.pressed = false;
-        encoder1_ccw.time = timer_read();
-        action_exec(encoder1_ccw);
-    }
-
-    if (encoder1_cw.pressed) {
-        encoder1_cw.pressed = false;
-        encoder1_cw.time = timer_read();
-        action_exec(encoder1_cw);
-    }
-
-    if (encoder2_ccw.pressed) {
-        encoder2_ccw.pressed = false;
-        encoder2_ccw.time = timer_read();
-        action_exec(encoder2_ccw);
-    }
-
-    if (encoder2_cw.pressed) {
-        encoder2_cw.pressed = false;
-        encoder2_cw.time = timer_read();
-        action_exec(encoder2_cw);
-    }
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            encoder1_cw.pressed = true;
-            encoder1_cw.time = timer_read();
-            action_exec(encoder1_cw);
-        } else {
-            encoder1_ccw.pressed = true;
-            encoder1_ccw.time = timer_read();
-            action_exec(encoder1_ccw);
-        }
-    } else if (index == 1) {
-        if (clockwise) {
-            encoder2_cw.pressed = true;
-            encoder2_cw.time = timer_read();
-            action_exec(encoder2_cw);
-        } else {
-            encoder2_ccw.pressed = true;
-            encoder2_ccw.time = timer_read();
-            action_exec(encoder2_ccw);
-        }
-    }
-
-    return true;
-}
+#endif
diff --git a/keyboards/dailycraft/stickey4/keymaps/via/rules.mk b/keyboards/dailycraft/stickey4/keymaps/via/rules.mk
index 1e5b99807cb7..f1adcab005e8 100644
--- a/keyboards/dailycraft/stickey4/keymaps/via/rules.mk
+++ b/keyboards/dailycraft/stickey4/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/dailycraft/wings42/rev2/info.json b/keyboards/dailycraft/wings42/rev2/info.json
index 09cf423e9311..a3c3e2396efe 100644
--- a/keyboards/dailycraft/wings42/rev2/info.json
+++ b/keyboards/dailycraft/wings42/rev2/info.json
@@ -16,10 +16,23 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "features": {
+      "encoder": true
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "B5", "pin_b": "B4" },
+            { "pin_a": "B6", "pin_b": "B2" }
+        ]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT_split_3x6_3_2": "LAYOUT_split_3x6_3"
+    },
+    "community_layouts": ["split_3x6_3"],
     "layouts": {
-        "LAYOUT_split_3x6_3_2": {
+        "LAYOUT_split_3x6_3": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0.875},
                 {"matrix": [0, 1], "x": 1, "y": 0.625},
@@ -41,9 +54,7 @@
                 {"matrix": [1, 3], "x": 3, "y": 1},
                 {"matrix": [1, 4], "x": 4, "y": 1},
                 {"matrix": [1, 5], "x": 5, "y": 1.125},
-                {"matrix": [3, 1], "x": 6, "y": 1.625},
 
-                {"matrix": [8, 2], "x": 8, "y": 1.625},
                 {"matrix": [6, 5], "x": 9, "y": 1.125},
                 {"matrix": [6, 4], "x": 10, "y": 1},
                 {"matrix": [6, 3], "x": 11, "y": 1},
@@ -57,9 +68,7 @@
                 {"matrix": [2, 3], "x": 3, "y": 2},
                 {"matrix": [2, 4], "x": 4, "y": 2},
                 {"matrix": [2, 5], "x": 5, "y": 2.125},
-                {"matrix": [3, 2], "x": 6, "y": 2.625},
 
-                {"matrix": [8, 1], "x": 8, "y": 2.625},
                 {"matrix": [7, 5], "x": 9, "y": 2.125},
                 {"matrix": [7, 4], "x": 10, "y": 2},
                 {"matrix": [7, 3], "x": 11, "y": 2},
diff --git a/keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c b/keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c
index 501b5d2e1209..51647fe79566 100644
--- a/keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c
@@ -31,49 +31,49 @@ enum layer_number {
 #define KC_A_DEL ALT_T(KC_DEL)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_split_3x6_3_2(
+    [_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_MINS,
     //|--------+--------+--------+--------+--------+--------|                     |--------+---------+--------+---------+--------+--------|
-       KC_G_TAB, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,  KC_BSPC, KC_BSPC,    KC_H   , KC_J    , KC_K   , KC_L    , KC_SCLN, KC_G_BS,
+       KC_G_TAB, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,                       KC_H   , KC_J    , KC_K   , KC_L    , KC_SCLN, KC_G_BS,
     //|--------+--------+--------+--------+--------+--------|                     |--------+---------+--------+---------+--------+--------|
-        KC_LCTL, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,  KC_DEL , KC_DEL ,    KC_N   , KC_M    , KC_COMM, KC_DOT  , KC_SLSH, KC_RCTL,
+        KC_LCTL, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,                       KC_N   , KC_M    , KC_COMM, KC_DOT  , KC_SLSH, KC_RCTL,
     //`--------+--------+--------+--------+--------+--------/                     \--------+---------+--------+---------+--------+--------'
                                   KC_A_DEL,KC_S_EN ,KC_L_SPC,                      KC_R_ENT, KC_S_JA , KC_A_DEL
     //                          `+--------+--------+--------'                     `--------+---------+--------+'
     ),
 
-    [_RAISE] = LAYOUT_split_3x6_3_2(
+    [_RAISE] = LAYOUT_split_3x6_3(
     //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
         _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE,                       KC_AT  , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
-        KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD,  _______, _______,    KC_LEFT, KC_DOWN,  KC_UP , KC_RGHT, KC_GRV , KC_RPRN,
+        KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD,                       KC_LEFT, KC_DOWN,  KC_UP , KC_RGHT, KC_GRV , KC_RPRN,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
-        _______, _______, _______, _______, KC_LCBR, KC_LBRC,  _______, _______,    KC_RBRC, KC_RCBR, _______, _______, _______, _______,
+        _______, _______, _______, _______, KC_LCBR, KC_LBRC,                       KC_RBRC, KC_RCBR, _______, _______, _______, _______,
     //`--------+--------+--------+--------+--------+--------/                     \--------+--------+--------+--------+--------+--------'
                                   _______, _______, _______,                        _______, _______, QK_BOOT
     //                          `+--------+--------+--------'                      `--------+-------+--------+'
     ),
 
-    [_LOWER] = LAYOUT_split_3x6_3_2(
+    [_LOWER] = LAYOUT_split_3x6_3(
     //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
         KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  ,                       _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
-        _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,  _______, _______,    KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
+        _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                       KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
-        KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,  _______, _______,    _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______,
+        KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,                       _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______,
     //`--------+--------+--------+--------+--------+--------/                     \--------+--------+--------+--------+--------+--------'
                                   QK_BOOT  , _______, _______,                        _______, _______, _______
     //                          `+--------+--------+--------'                     `--------+--------+--------+'
     ),
 
-    [_ADJUST] = LAYOUT_split_3x6_3_2(
+    [_ADJUST] = LAYOUT_split_3x6_3(
     //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
         _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
-        _______, _______, _______, _______, _______, _______,  _______, _______,    _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
-        _______, _______, _______, _______, _______, _______,  _______, _______,    _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
     //`--------+--------+--------+--------+--------+--------/                     \--------+--------+--------+--------+--------+--------'
                                   _______, _______, _______,                        _______, _______, _______
     //                          `+--------+--------+--------'                     `--------+--------+--------+'
diff --git a/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
index 7349bf2411be..0995600a4735 100644
--- a/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
@@ -31,196 +31,60 @@ enum layer_number {
 #define KC_A_DEL ALT_T(KC_DEL)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_split_3x6_3_2(
+    [_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_MINS,
     //|--------+--------+--------+--------+--------+--------|                     |--------+---------+--------+---------+--------+--------|
-       KC_G_TAB, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,  KC_BSPC, KC_BSPC,    KC_H   , KC_J    , KC_K   , KC_L    , KC_SCLN, KC_G_BS,
+       KC_G_TAB, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,                       KC_H   , KC_J    , KC_K   , KC_L    , KC_SCLN, KC_G_BS,
     //|--------+--------+--------+--------+--------+--------|                     |--------+---------+--------+---------+--------+--------|
-        KC_LCTL, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,  KC_DEL , KC_DEL ,    KC_N   , KC_M    , KC_COMM, KC_DOT  , KC_SLSH, KC_RCTL,
+        KC_LCTL, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,                       KC_N   , KC_M    , KC_COMM, KC_DOT  , KC_SLSH, KC_RCTL,
     //`--------+--------+--------+--------+--------+--------/                     \--------+---------+--------+---------+--------+--------'
                                   KC_A_DEL,KC_S_EN ,KC_L_SPC,                      KC_R_ENT, KC_S_JA , KC_A_DEL
     //                          `+--------+--------+--------'                     `--------+---------+--------+'
     ),
 
-    [_RAISE] = LAYOUT_split_3x6_3_2(
+    [_RAISE] = LAYOUT_split_3x6_3(
     //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
         _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE,                       KC_AT  , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
-        KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD,  _______, _______,    KC_LEFT, KC_DOWN,  KC_UP , KC_RGHT, KC_GRV , KC_RPRN,
+        KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD,                       KC_LEFT, KC_DOWN,  KC_UP , KC_RGHT, KC_GRV , KC_RPRN,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
-        _______, _______, _______, _______, KC_LCBR, KC_LBRC,  _______, _______,    KC_RBRC, KC_RCBR, _______, _______, _______, _______,
+        _______, _______, _______, _______, KC_LCBR, KC_LBRC,                       KC_RBRC, KC_RCBR, _______, _______, _______, _______,
     //`--------+--------+--------+--------+--------+--------/                     \--------+--------+--------+--------+--------+--------'
                                   _______, _______, _______,                        _______, _______, QK_BOOT
     //                          `+--------+--------+--------'                      `--------+-------+--------+'
     ),
 
-    [_LOWER] = LAYOUT_split_3x6_3_2(
+    [_LOWER] = LAYOUT_split_3x6_3(
     //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
         KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  ,                       _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
-        _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,  _______, _______,    KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
+        _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                       KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
-        KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,  _______, _______,    _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______,
+        KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,                       _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______,
     //`--------+--------+--------+--------+--------+--------/                     \--------+--------+--------+--------+--------+--------'
                                   QK_BOOT  , _______, _______,                        _______, _______, _______
     //                          `+--------+--------+--------'                     `--------+--------+--------+'
     ),
 
-    [_ADJUST] = LAYOUT_split_3x6_3_2(
+    [_ADJUST] = LAYOUT_split_3x6_3(
     //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
         _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
-        _______, _______, _______, _______, _______, _______,  _______, _______,    _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
     //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
-        _______, _______, _______, _______, _______, _______,  _______, _______,    _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
     //`--------+--------+--------+--------+--------+--------/                     \--------+--------+--------+--------+--------+--------'
                                   _______, _______, _______,                        _______, _______, _______
     //                          `+--------+--------+--------'                     `--------+--------+--------+'
     ),
 };
 
-keyevent_t encoder1_ccw = {
-    .key = (keypos_t){.row = 4, .col = 0},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-keyevent_t encoder1_cw = {
-    .key = (keypos_t){.row = 4, .col = 1},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-keyevent_t encoder2_ccw = {
-    .key = (keypos_t){.row = 4, .col = 2},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-keyevent_t encoder2_cw = {
-    .key = (keypos_t){.row = 4, .col = 3},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-keyevent_t encoder3_ccw = {
-    .key = (keypos_t){.row = 9, .col = 1},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-keyevent_t encoder3_cw = {
-    .key = (keypos_t){.row = 9, .col = 0},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-keyevent_t encoder4_ccw = {
-    .key = (keypos_t){.row = 9, .col = 3},
-    .pressed = false,
-    .type = KEY_EVENT
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =   { ENCODER_CCW_CW(KC_BSPC, KC_DEL),  ENCODER_CCW_CW(KC_BSPC, KC_DEL)   },
+    [1] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  },
+    [2] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  },
+    [3] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  }
 };
-
-keyevent_t encoder4_cw = {
-    .key = (keypos_t){.row = 9, .col = 2},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-
-void matrix_scan_user(void) {
-    if (encoder1_ccw.pressed) {
-        encoder1_ccw.pressed = false;
-        encoder1_ccw.time = timer_read();
-        action_exec(encoder1_ccw);
-    }
-
-    if (encoder1_cw.pressed) {
-        encoder1_cw.pressed = false;
-        encoder1_cw.time = timer_read();
-        action_exec(encoder1_cw);
-    }
-
-    if (encoder2_ccw.pressed) {
-        encoder2_ccw.pressed = false;
-        encoder2_ccw.time = timer_read();
-        action_exec(encoder2_ccw);
-    }
-
-    if (encoder2_cw.pressed) {
-        encoder2_cw.pressed = false;
-        encoder2_cw.time = timer_read();
-        action_exec(encoder2_cw);
-    }
-
-    if (encoder3_ccw.pressed) {
-        encoder3_ccw.pressed = false;
-        encoder3_ccw.time = timer_read();
-        action_exec(encoder3_ccw);
-    }
-
-    if (encoder3_cw.pressed) {
-        encoder3_cw.pressed = false;
-        encoder3_cw.time = timer_read();
-        action_exec(encoder3_cw);
-    }
-
-    if (encoder4_ccw.pressed) {
-        encoder4_ccw.pressed = false;
-        encoder4_ccw.time = timer_read();
-        action_exec(encoder4_ccw);
-    }
-
-    if (encoder4_cw.pressed) {
-        encoder4_cw.pressed = false;
-        encoder4_cw.time = timer_read();
-        action_exec(encoder4_cw);
-    }
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            encoder1_cw.pressed = true;
-            encoder1_cw.time = timer_read();
-            action_exec(encoder1_cw);
-        } else {
-            encoder1_ccw.pressed = true;
-            encoder1_ccw.time = timer_read();
-            action_exec(encoder1_ccw);
-        }
-    } else if (index == 1) {
-        if (clockwise) {
-            encoder2_cw.pressed = true;
-            encoder2_cw.time = timer_read();
-            action_exec(encoder2_cw);
-        } else {
-            encoder2_ccw.pressed = true;
-            encoder2_ccw.time = timer_read();
-            action_exec(encoder2_ccw);
-        }
-    } else if (index == 2) {
-        if (clockwise) {
-            encoder3_cw.pressed = true;
-            encoder3_cw.time = timer_read();
-            action_exec(encoder3_cw);
-        } else {
-            encoder3_ccw.pressed = true;
-            encoder3_ccw.time = timer_read();
-            action_exec(encoder3_ccw);
-        }
-    } else if (index == 3) {
-        if (clockwise) {
-            encoder4_cw.pressed = true;
-            encoder4_cw.time = timer_read();
-            action_exec(encoder4_cw);
-        } else {
-            encoder4_ccw.pressed = true;
-            encoder4_ccw.time = timer_read();
-            action_exec(encoder4_ccw);
-        }
-    }
-
-    return true;
-}
+#endif
diff --git a/keyboards/dailycraft/wings42/rev2/keymaps/via/rules.mk b/keyboards/dailycraft/wings42/rev2/keymaps/via/rules.mk
index eea5e1e2a265..f1adcab005e8 100644
--- a/keyboards/dailycraft/wings42/rev2/keymaps/via/rules.mk
+++ b/keyboards/dailycraft/wings42/rev2/keymaps/via/rules.mk
@@ -1,2 +1,2 @@
-ENCODER_ENABLE = yes
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/daji/seis_cinco/rules.mk b/keyboards/daji/seis_cinco/rules.mk
index 9e42693cb694..c3b8e77d77a9 100644
--- a/keyboards/daji/seis_cinco/rules.mk
+++ b/keyboards/daji/seis_cinco/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/darkproject/kd87a_bfg_edition/config.h b/keyboards/darkproject/kd87a_bfg_edition/config.h
new file mode 100644
index 000000000000..335648df9ab7
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/config.h
@@ -0,0 +1,44 @@
+/* Copyright 2022 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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 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
+#define SPI_SCK_PIN A5
+#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 68
+#define DRIVER_2_LED_TOTAL 54
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/darkproject/kd87a_bfg_edition/halconf.h b/keyboards/darkproject/kd87a_bfg_edition/halconf.h
new file mode 100644
index 000000000000..8f61d3fc64ff
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 2022 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#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/darkproject/kd87a_bfg_edition/info.json b/keyboards/darkproject/kd87a_bfg_edition/info.json
new file mode 100644
index 000000000000..1cf428a97f15
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/info.json
@@ -0,0 +1,274 @@
+{
+    "manufacturer": "Kd87a_bfg_edition",
+    "keyboard_name": "Kd87a_bfg_edition",
+    "maintainer": "Gsky",
+    "bootloader": "wb32-dfu",
+    "bootmagic": {
+        "matrix": [1, 3]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "indicators": {
+        "caps_lock": "C14"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B12"]
+    },
+    "processor": "WB32FQ95",
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "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
+        },
+        "center_point": [87, 35],
+        "driver": "aw20216",
+        "layout": [
+            { "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 },
+            { "flags": 4, "matrix": [2, 6], "x": 20, "y": 0 },
+            { "flags": 4, "matrix": [3, 6], "x": 30, "y": 0 },
+            { "flags": 4, "matrix": [3, 1], "x": 40, "y": 0 },
+            { "flags": 4, "matrix": [3, 3], "x": 50, "y": 0 },
+            { "flags": 4, "matrix": [0, 7], "x": 65, "y": 0 },
+            { "flags": 4, "matrix": [6, 3], "x": 75, "y": 0 },
+            { "flags": 4, "matrix": [7, 1], "x": 85, "y": 0 },
+            { "flags": 4, "matrix": [7, 6], "x": 95, "y": 0 },
+            { "flags": 4, "matrix": [10, 6], "x": 110, "y": 0 },
+            { "flags": 4, "matrix": [10, 7], "x": 120, "y": 0 },
+            { "flags": 4, "matrix": [10, 3], "x": 130, "y": 0 },
+            { "flags": 4, "matrix": [10, 5], "x": 140, "y": 0 },
+            { "flags": 4, "matrix": [9, 7], "x": 155, "y": 0 },
+            { "flags": 4, "matrix": [10, 0], "x": 165, "y": 0 },
+            { "flags": 4, "matrix": [9, 6], "x": 175, "y": 0 },
+
+            { "flags": 4, "matrix": [1, 6], "x": 0, "y": 15 },
+            { "flags": 4, "matrix": [1, 7], "x": 10, "y": 15 },
+            { "flags": 4, "matrix": [2, 7], "x": 20, "y": 15 },
+            { "flags": 4, "matrix": [3, 7], "x": 30, "y": 15 },
+            { "flags": 4, "matrix": [4, 7], "x": 40, "y": 15 },
+            { "flags": 4, "matrix": [4, 6], "x": 50, "y": 15 },
+            { "flags": 4, "matrix": [5, 6], "x": 60, "y": 15 },
+            { "flags": 4, "matrix": [5, 7], "x": 70, "y": 15 },
+            { "flags": 4, "matrix": [6, 7], "x": 80, "y": 15 },
+            { "flags": 4, "matrix": [7, 7], "x": 90, "y": 15 },
+            { "flags": 4, "matrix": [8, 7], "x": 100, "y": 15 },
+            { "flags": 4, "matrix": [8, 6], "x": 110, "y": 15 },
+            { "flags": 4, "matrix": [6, 6], "x": 120, "y": 15 },
+            { "flags": 4, "matrix": [10, 1], "x": 130, "y": 15 },
+            { "flags": 4, "matrix": [11, 6], "x": 155, "y": 15 },
+            { "flags": 4, "matrix": [0, 2], "x": 165, "y": 15 },
+            { "flags": 4, "matrix": [1, 5], "x": 175, "y": 15 },
+
+            { "flags": 4, "matrix": [1, 1], "x": 0, "y": 25 },
+            { "flags": 4, "matrix": [1, 0], "x": 15, "y": 25 },
+            { "flags": 4, "matrix": [2, 0], "x": 25, "y": 25 },
+            { "flags": 4, "matrix": [3, 0], "x": 35, "y": 25 },
+            { "flags": 4, "matrix": [4, 0], "x": 45, "y": 25 },
+            { "flags": 4, "matrix": [4, 1], "x": 55, "y": 25 },
+            { "flags": 4, "matrix": [5, 1], "x": 65, "y": 25 },
+            { "flags": 4, "matrix": [5, 0], "x": 75, "y": 25 },
+            { "flags": 4, "matrix": [6, 0], "x": 85, "y": 25 },
+            { "flags": 4, "matrix": [7, 0], "x": 95, "y": 25 },
+            { "flags": 4, "matrix": [8, 0], "x": 105, "y": 25 },
+            { "flags": 4, "matrix": [8, 1], "x": 115, "y": 25 },
+            { "flags": 4, "matrix": [6, 1], "x": 125, "y": 25 },
+            { "flags": 4, "matrix": [10, 2], "x": 135, "y": 25 },
+            { "flags": 4, "matrix": [6, 5], "x": 155, "y": 25 },
+            { "flags": 4, "matrix": [7, 5], "x": 165, "y": 25 },
+            { "flags": 4, "matrix": [2, 5], "x": 175, "y": 25 },
+
+            { "flags": 8, "matrix": [2, 1], "x": 0, "y": 35 },
+            { "flags": 4, "matrix": [1, 2], "x": 17.5, "y": 35 },
+            { "flags": 4, "matrix": [2, 2], "x": 27.5, "y": 35 },
+            { "flags": 4, "matrix": [3, 2], "x": 37.5, "y": 35 },
+            { "flags": 4, "matrix": [4, 2], "x": 47.5, "y": 35 },
+            { "flags": 4, "matrix": [4, 3], "x": 57.5, "y": 35 },
+            { "flags": 4, "matrix": [5, 3], "x": 67.5, "y": 35 },
+            { "flags": 4, "matrix": [5, 2], "x": 77.5, "y": 35 },
+            { "flags": 4, "matrix": [6, 2], "x": 87.5, "y": 35 },
+            { "flags": 4, "matrix": [7, 2], "x": 97.5, "y": 35 },
+            { "flags": 4, "matrix": [8, 2], "x": 107.5, "y": 35 },
+            { "flags": 4, "matrix": [8, 3], "x": 117.5, "y": 35 },
+            { "flags": 4, "matrix": [10, 4], "x": 127.5, "y": 35 },
+
+            { "flags": 4, "matrix": [0, 0], "x": 0, "y": 45 },
+            { "flags": 4, "matrix": [1, 4], "x": 22.5, "y": 45 },
+            { "flags": 4, "matrix": [2, 4], "x": 32.5, "y": 45 },
+            { "flags": 4, "matrix": [3, 4], "x": 42.5, "y": 45 },
+            { "flags": 4, "matrix": [4, 4], "x": 52.5, "y": 45 },
+            { "flags": 4, "matrix": [4, 5], "x": 62.5, "y": 45 },
+            { "flags": 4, "matrix": [5, 5], "x": 72.5, "y": 45 },
+            { "flags": 4, "matrix": [5, 4], "x": 82.5, "y": 45 },
+            { "flags": 4, "matrix": [6, 4], "x": 92.5, "y": 45 },
+            { "flags": 4, "matrix": [7, 4], "x": 102.5, "y": 45 },
+            { "flags": 4, "matrix": [8, 5], "x": 112.5, "y": 45 },
+            { "flags": 4, "matrix": [9, 1], "x": 122.5, "y": 45 },
+            { "flags": 4, "matrix": [3, 5], "x": 165, "y": 45 },
+
+            { "flags": 4, "matrix": [0, 6], "x": 0, "y": 55 },
+            { "flags": 4, "matrix": [9, 0], "x": 12.5, "y": 55 },
+            { "flags": 4, "matrix": [9, 3], "x": 25, "y": 55 },
+            { "flags": 4, "matrix": [9, 4], "x": 37.5, "y": 55 },
+            { "flags": 4, "matrix": [9, 5], "x": 100, "y": 55 },
+            { "flags": 4, "matrix": [9, 2], "x": 112.5, "y": 55 },
+            { "flags": 4, "matrix": [8, 4], "x": 125, "y": 55 },
+            { "flags": 4, "matrix": [0, 4], "x": 137.5, "y": 55 },
+            { "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 }
+        ]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "0.0.3",
+        "pid": "0xE393",
+        "vid": "0x342D"
+    },
+    "eeprom": {
+        "driver": "wear_leveling"
+    },
+    "community_layouts": ["tkl_ansi"],
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                { "label": "ESC", "matrix": [1, 3], "x": 0, "y": 0 },
+                { "label": "F1", "matrix": [2, 6], "x": 2, "y": 0 },
+                { "label": "F2", "matrix": [3, 6], "x": 3, "y": 0 },
+                { "label": "F3", "matrix": [3, 1], "x": 4, "y": 0 },
+                { "label": "F4", "matrix": [3, 3], "x": 5, "y": 0 },
+                { "label": "F5", "matrix": [0, 7], "x": 6.5, "y": 0 },
+                { "label": "F6", "matrix": [6, 3], "x": 7.5, "y": 0 },
+                { "label": "F7", "matrix": [7, 1], "x": 8.5, "y": 0 },
+                { "label": "F8", "matrix": [7, 6], "x": 9.5, "y": 0 },
+                { "label": "F9", "matrix": [10, 6], "x": 11, "y": 0 },
+                { "label": "F10", "matrix": [10, 7], "x": 12, "y": 0 },
+                { "label": "F11", "matrix": [10, 3], "x": 13, "y": 0 },
+                { "label": "F12", "matrix": [10, 5], "x": 14, "y": 0 },
+                { "label": "Printscreen", "matrix": [9, 7], "x": 15.5, "y": 0 },
+                { "label": "Scroll Lock", "matrix": [10, 0], "x": 16.5, "y": 0 },
+                { "label": "Pause Break", "matrix": [9, 6], "x": 17.5, "y": 0 },
+                { "label": "`", "matrix": [1, 6], "x": 0, "y": 1.5 },
+                { "label": "1", "matrix": [1, 7], "x": 1, "y": 1.5 },
+                { "label": "2", "matrix": [2, 7], "x": 2, "y": 1.5 },
+                { "label": "3", "matrix": [3, 7], "x": 3, "y": 1.5 },
+                { "label": "4", "matrix": [4, 7], "x": 4, "y": 1.5 },
+                { "label": "5", "matrix": [4, 6], "x": 5, "y": 1.5 },
+                { "label": "6", "matrix": [5, 6], "x": 6, "y": 1.5 },
+                { "label": "7", "matrix": [5, 7], "x": 7, "y": 1.5 },
+                { "label": "8", "matrix": [6, 7], "x": 8, "y": 1.5 },
+                { "label": "9", "matrix": [7, 7], "x": 9, "y": 1.5 },
+                { "label": "0", "matrix": [8, 7], "x": 10, "y": 1.5 },
+                { "label": "-", "matrix": [8, 6], "x": 11, "y": 1.5 },
+                { "label": "=", "matrix": [6, 6], "x": 12, "y": 1.5 },
+                { "label": "Backspace", "matrix": [10, 1], "w": 2, "x": 13, "y": 1.5 },
+                { "label": "INS", "matrix": [11, 6], "x": 15.5, "y": 1.5 },
+                { "label": "Home", "matrix": [0, 2], "x": 16.5, "y": 1.5 },
+                { "label": "PgUp", "matrix": [1, 5], "x": 17.5, "y": 1.5 },
+                { "label": "Tab", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 2.5 },
+                { "label": "Q", "matrix": [1, 0], "x": 1.5, "y": 2.5 },
+                { "label": "W", "matrix": [2, 0], "x": 2.5, "y": 2.5 },
+                { "label": "E", "matrix": [3, 0], "x": 3.5, "y": 2.5 },
+                { "label": "R", "matrix": [4, 0], "x": 4.5, "y": 2.5 },
+                { "label": "T", "matrix": [4, 1], "x": 5.5, "y": 2.5 },
+                { "label": "Y", "matrix": [5, 1], "x": 6.5, "y": 2.5 },
+                { "label": "U", "matrix": [5, 0], "x": 7.5, "y": 2.5 },
+                { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 2.5 },
+                { "label": "O", "matrix": [7, 0], "x": 9.5, "y": 2.5 },
+                { "label": "P", "matrix": [8, 0], "x": 10.5, "y": 2.5 },
+                { "label": "[", "matrix": [8, 1], "x": 11.5, "y": 2.5 },
+                { "label": "]", "matrix": [6, 1], "x": 12.5, "y": 2.5 },
+                { "label": "\\", "matrix": [10, 2], "w": 1.5, "x": 13.5, "y": 2.5 },
+                { "label": "Delete", "matrix": [6, 5], "x": 15.5, "y": 2.5 },
+                { "label": "End", "matrix": [7, 5], "x": 16.5, "y": 2.5 },
+                { "label": "PgDn", "matrix": [2, 5], "x": 17.5, "y": 2.5 },
+                { "label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 3.5 },
+                { "label": "A", "matrix": [1, 2], "x": 1.75, "y": 3.5 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 3.5 },
+                { "label": "D", "matrix": [3, 2], "x": 3.75, "y": 3.5 },
+                { "label": "F", "matrix": [4, 2], "x": 4.75, "y": 3.5 },
+                { "label": "G", "matrix": [4, 3], "x": 5.75, "y": 3.5 },
+                { "label": "H", "matrix": [5, 3], "x": 6.75, "y": 3.5 },
+                { "label": "J", "matrix": [5, 2], "x": 7.75, "y": 3.5 },
+                { "label": "K", "matrix": [6, 2], "x": 8.75, "y": 3.5 },
+                { "label": "L", "matrix": [7, 2], "x": 9.75, "y": 3.5 },
+                { "label": ";", "matrix": [8, 2], "x": 10.75, "y": 3.5 },
+                { "label": "'", "matrix": [8, 3], "x": 11.75, "y": 3.5 },
+                { "label": "Enter", "matrix": [10, 4], "w": 2.25, "x": 12.75, "y": 3.5 },
+                { "label": "Shift", "matrix": [0, 0], "w": 2.25, "x": 0, "y": 4.5 },
+                { "label": "Z", "matrix": [1, 4], "x": 2.25, "y": 4.5 },
+                { "label": "X", "matrix": [2, 4], "x": 3.25, "y": 4.5 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 4.5 },
+                { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.5 },
+                { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.5 },
+                { "label": "N", "matrix": [5, 5], "x": 7.25, "y": 4.5 },
+                { "label": "M", "matrix": [5, 4], "x": 8.25, "y": 4.5 },
+                { "label": ",", "matrix": [6, 4], "x": 9.25, "y": 4.5 },
+                { "label": ".", "matrix": [7, 4], "x": 10.25, "y": 4.5 },
+                { "label": "/", "matrix": [8, 5], "x": 11.25, "y": 4.5 },
+                { "label": "Shift", "matrix": [9, 1], "w": 2.75, "x": 12.25, "y": 4.5 },
+                { "label": "Up", "matrix": [3, 5], "x": 16.5, "y": 4.5 },
+                { "label": "Ctrl", "matrix": [0, 6], "w": 1.25, "x": 0, "y": 5.5 },
+                { "label": "Win", "matrix": [9, 0], "w": 1.25, "x": 1.25, "y": 5.5 },
+                { "label": "Alt", "matrix": [9, 3], "w": 1.25, "x": 2.5, "y": 5.5 },
+                { "label": "Space", "matrix": [9, 4], "w": 6.25, "x": 3.75, "y": 5.5 },
+                { "label": "Alt", "matrix": [9, 5], "w": 1.25, "x": 10, "y": 5.5 },
+                { "label": "FN", "matrix": [9, 2], "w": 1.25, "x": 11.25, "y": 5.5 },
+                { "label": "APP", "matrix": [8, 4], "w": 1.25, "x": 12.5, "y": 5.5 },
+                { "label": "Ctrl", "matrix": [0, 4], "w": 1.25, "x": 13.75, "y": 5.5 },
+                { "label": "Left", "matrix": [0, 3], "x": 15.5, "y": 5.5 },
+                { "label": "Down", "matrix": [7, 3], "x": 16.5, "y": 5.5 },
+                { "label": "Right", "matrix": [0, 5], "x": 17.5, "y": 5.5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c
new file mode 100644
index 000000000000..0ce0799e14cb
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c
@@ -0,0 +1,174 @@
+/* Copyright 2022 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "kd87a_bfg_edition.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const aw_led g_aw_leds[RGB_MATRIX_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, 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, 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
+};
+
+#endif
+
+#ifdef EEPROM_ENABLE
+
+#include "spi_master.h"
+
+void spi_init(void) {
+    static bool is_initialised = false;
+    if (!is_initialised) {
+        is_initialised = true;
+
+        // Try releasing special pins for a short time
+        setPinInput(SPI_SCK_PIN);
+        setPinInput(SPI_MOSI_PIN);
+        setPinInput(SPI_MISO_PIN);
+
+        chThdSleepMilliseconds(10);
+
+        palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_ALTERNATE(SPI_SCK_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST | PAL_WB32_CURRENT_LEVEL3);
+        palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_ALTERNATE(SPI_MOSI_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+        palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_ALTERNATE(SPI_MISO_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+    }
+}
+
+#endif
+
+void keyboard_pre_init_kb(void) {
+    setPinOutput(C0);
+    setPinOutput(C15);
+    keyboard_pre_init_user();
+};
+void housekeeping_task_kb(void) {
+    writePin(C15, keymap_config.no_gui);
+};
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+    switch (keycode) {
+        case KC_SIRI:
+            if (record->event.pressed) {
+                host_consumer_send(0xCF);
+            } else {
+                host_consumer_send(0);
+            }
+            return false; /* Skip all further processing of this key */
+        default:
+            return true; /* Process all other keycodes normally */
+    }
+};
diff --git a/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.h b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.h
new file mode 100644
index 000000000000..e2c656eb0eb2
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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"
+
+enum keyboard_keycodes {
+    KC_SIRI = QK_KB_0
+};
diff --git a/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c b/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c
new file mode 100644
index 000000000000..4abb1bdc9158
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c
@@ -0,0 +1,69 @@
+/* Copyright 2022 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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 {
+    Win,
+    Mac,
+    Winfn,
+    Macfn,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[Win] = 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(Winfn),KC_APP,   KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Mac] = LAYOUT_tkl_ansi(
+  KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_SIRI,  KC_F5,    KC_F6,    KC_MRWD,  KC_MPLY,  KC_MFFD,  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_LALT,  KC_LGUI,                      KC_SPC,                                 KC_RALT,  MO(Macfn),KC_APP,    KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Winfn] = LAYOUT_tkl_ansi(
+  QK_BOOT,  KC_MYCM,  KC_MAIL,  KC_WSCH,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,            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,  RGB_HUI,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  TO(Win),  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,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                                RGB_VAI,
+  KC_TRNS,  GUI_TOG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+[Macfn] = LAYOUT_tkl_ansi(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_TRNS,  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,  KC_TRNS,  RGB_HUI,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  TO(Win),  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,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                                RGB_VAI,  
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    writePin(C0, layer_state_cmp(state, 1));
+    return state;
+};
\ No newline at end of file
diff --git a/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c b/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c
new file mode 100644
index 000000000000..71fbfa4ff203
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c
@@ -0,0 +1,69 @@
+/* Copyright 2022 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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 {
+    Win,
+    Mac,
+    Winfn,
+    Macfn,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[Win] = 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(Winfn),KC_APP,   KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Mac] = LAYOUT_tkl_ansi(
+  KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_SIRI,  KC_F5,    KC_F6,    KC_MRWD,  KC_MPLY,  KC_MFFD,  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_LALT,  KC_LGUI,                      KC_SPC,                                 KC_RALT,  MO(Macfn),KC_APP,   KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Winfn] = LAYOUT_tkl_ansi(
+  QK_BOOT,  KC_MYCM,  KC_MAIL,  KC_WSCH,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,            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,  RGB_HUI,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  TO(Win),  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,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                                RGB_VAI,
+  KC_TRNS,  GUI_TOG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+[Macfn] = LAYOUT_tkl_ansi(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_TRNS,  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,  KC_TRNS,  RGB_HUI,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  TO(Win),  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,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                                RGB_VAI,  
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    writePin(C0, layer_state_cmp(state, 1));
+    return state;
+};
diff --git a/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/rules.mk b/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/darkproject/kd87a_bfg_edition/mcuconf.h b/keyboards/darkproject/kd87a_bfg_edition/mcuconf.h
new file mode 100644
index 000000000000..440f78d2bc27
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright (C) 2022 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
+
+#undef WB32_SPI_USE_SPIM2
+#define WB32_SPI_USE_SPIM2 TRUE
diff --git a/keyboards/darkproject/kd87a_bfg_edition/readme.md b/keyboards/darkproject/kd87a_bfg_edition/readme.md
new file mode 100644
index 000000000000..83cc8a923db9
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/readme.md
@@ -0,0 +1,24 @@
+# KD87A_BFG_Edition 
+![KD87A_BFG_Edition](https://imgur.com/uOUvWvwh.png)
+
+An 87 keys keyboard, Equipped with the WestBerry Q95 microcontroller.
+
+* Keyboard Maintainer: [GSKY](https://github.com/gksygithub)
+* Hardware Supported: KD87A_BFG_Edition
+* Hardware Availability: [GSKY GitHub](https://github.com/gksygithub/keyboard1)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make darkproject/kd87a_bfg_edition:default
+
+Flashing example for this keyboard:
+
+    make darkproject/kd87a_bfg_edition:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Hold the Reset switch mounted on the surface of the PCB back side after the USB cable is connected
+* Hold the Escape key while connecting the USB cable (also erases persistent settings)
+* Fn+ESC will reset the board to 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).
diff --git a/keyboards/darkproject/kd87a_bfg_edition/rules.mk b/keyboards/darkproject/kd87a_bfg_edition/rules.mk
new file mode 100644
index 000000000000..002458405eed
--- /dev/null
+++ b/keyboards/darkproject/kd87a_bfg_edition/rules.mk
@@ -0,0 +1 @@
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/db/db63/config.h b/keyboards/db/db63/config.h
deleted file mode 100644
index 7a7d3584de7e..000000000000
--- a/keyboards/db/db63/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2020 Hung DO <hungdohuy@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 RGBLED_NUM 18
-#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/db/db63/info.json b/keyboards/db/db63/info.json
index c8004a2bae17..30a94c2b9cfd 100644
--- a/keyboards/db/db63/info.json
+++ b/keyboards/db/db63/info.json
@@ -16,6 +16,21 @@
     "backlight": {
         "pin": "D4"
     },
+    "rgblight": {
+        "led_count": 18,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/dcpedit/redherring/config.h b/keyboards/dcpedit/redherring/config.h
new file mode 100755
index 000000000000..115be3306e57
--- /dev/null
+++ b/keyboards/dcpedit/redherring/config.h
@@ -0,0 +1,10 @@
+// Copyright 2023 Ming-Gih Lam (@dcpedit)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
+#define SOLENOID_PIN   B5
+#define OLED_IC OLED_IC_SH1107
+#define OLED_DISPLAY_64X128
\ No newline at end of file
diff --git a/keyboards/dcpedit/redherring/info.json b/keyboards/dcpedit/redherring/info.json
new file mode 100644
index 000000000000..2a91291fcb12
--- /dev/null
+++ b/keyboards/dcpedit/redherring/info.json
@@ -0,0 +1,139 @@
+{
+    "manufacturer": "dcpedit",
+    "keyboard_name": "Red Herring",
+    "maintainer": "dcpedit",
+    "bootloader": "usbasploader",
+    "bootmagic": {
+        "matrix": [5, 14]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C2", "pin_b": "D7"}
+        ]
+    },
+    "indicators": {
+        "caps_lock": "A0"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "encoder": true,
+        "oled": true,
+        "haptic": true
+    },
+    "matrix_pins": {
+        "cols": ["A1", "A2", "A3", "B0", "B1", "B2", "B3", "B4", "D0", "D1", "D5", "D6", "C5", "C4", "C3"],
+        "rows": ["C6", "A6", "A7", "A4", "C7", "A5"]
+    },
+    "processor": "atmega32a",
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "url": "https://github.com/dcpedit/redherring",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x12ED",
+        "vid": "0xDC9E"
+    },
+    "dynamic_keymap": {
+        "layer_count": 2
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "5,14", "matrix": [5, 14], "x": 0.75, "y": 0.25},
+                {"label": "0,0", "matrix": [0, 0], "x": 2.25, "y": 0.25},
+                {"label": "0,1", "matrix": [0, 1], "x": 3.25, "y": 0.25},
+                {"label": "0,2", "matrix": [0, 2], "x": 4.75, "y": 0.25},
+                {"label": "0,3", "matrix": [0, 3], "x": 5.75, "y": 0.13},
+                {"label": "0,4", "matrix": [0, 4], "x": 6.75, "y": 0.25},
+                {"label": "0,5", "matrix": [0, 5], "x": 7.75, "y": 0.38},
+                {"label": "0,6", "matrix": [0, 6], "x": 11.5, "y": 0.38},
+                {"label": "0,7", "matrix": [0, 7], "x": 12.5, "y": 0.25},
+                {"label": "0,8", "matrix": [0, 8], "x": 13.5, "y": 0.13},
+                {"label": "0,9", "matrix": [0, 9], "x": 14.5, "y": 0.25},
+                {"label": "0,10", "matrix": [0, 10], "x": 16, "y": 0.25},
+                {"label": "0,11", "matrix": [0, 11], "x": 17, "y": 0.25},
+                {"label": "0,12", "matrix": [0, 12], "x": 18.13, "y": 0.25},
+                {"label": "0,13", "matrix": [0, 13], "x": 19.13, "y": 0.25},
+                {"label": "0,14", "matrix": [0, 14], "x": 21, "y": 0.25},
+                {"label": "1,0", "matrix": [1, 0], "x": 2, "y": 1.5},
+                {"label": "1,1", "matrix": [1, 1], "x": 3, "y": 1.5},
+                {"label": "1,2", "matrix": [1, 2], "x": 4.75, "y": 1.5},
+                {"label": "1,3", "matrix": [1, 3], "x": 5.75, "y": 1.38},
+                {"label": "1,4", "matrix": [1, 4], "x": 6.75, "y": 1.5},
+                {"label": "1,5", "matrix": [1, 5], "x": 7.75, "y": 1.63},
+                {"label": "1,6", "matrix": [1, 6], "x": 11.5, "y": 1.63},
+                {"label": "1,7", "matrix": [1, 7], "x": 12.5, "y": 1.5},
+                {"label": "1,8", "matrix": [1, 8], "x": 13.5, "y": 1.38},
+                {"label": "1,9", "matrix": [1, 9], "x": 14.5, "y": 1.5},
+                {"label": "1,10", "matrix": [1, 10], "x": 16.25, "y": 1.5},
+                {"label": "1,11", "matrix": [1, 11], "x": 17.25, "y": 1.5},
+                {"label": "1,12", "matrix": [1, 12], "x": 18.25, "y": 1.5},
+                {"label": "1,13", "matrix": [1, 13], "x": 19.25, "y": 1.5},
+                {"label": "1,14", "matrix": [1, 14], "x": 20.25, "y": 1.5},
+                {"label": "2,14", "matrix": [2, 14], "x": 21.75, "y": 1.5},
+                {"label": "2,0", "matrix": [2, 0], "x": 1.25, "y": 2.5, "w": 1.5},
+                {"label": "2,1", "matrix": [2, 1], "x": 2.75, "y": 2.5},
+                {"label": "2,2", "matrix": [2, 2], "x": 4.75, "y": 2.5},
+                {"label": "2,3", "matrix": [2, 3], "x": 5.75, "y": 2.38},
+                {"label": "2,4", "matrix": [2, 4], "x": 6.75, "y": 2.5},
+                {"label": "2,5", "matrix": [2, 5], "x": 7.75, "y": 2.63},
+                {"label": "2,6", "matrix": [2, 6], "x": 11.5, "y": 2.63},
+                {"label": "2,7", "matrix": [2, 7], "x": 12.5, "y": 2.5},
+                {"label": "2,8", "matrix": [2, 8], "x": 13.5, "y": 2.38},
+                {"label": "2,9", "matrix": [2, 9], "x": 14.5, "y": 2.5},
+                {"label": "2,10", "matrix": [2, 10], "x": 16.5, "y": 2.5},
+                {"label": "2,11", "matrix": [2, 11], "x": 17.5, "y": 2.5},
+                {"label": "2,12", "matrix": [2, 12], "x": 18.5, "y": 2.5},
+                {"label": "2,13", "matrix": [2, 13], "x": 19.5, "y": 2.5, "w": 1.5},
+                {"label": "3,13", "matrix": [3, 13], "x": 21.5, "y": 2.5},
+                {"label": "3,0", "matrix": [3, 0], "x": 0.75, "y": 3.5, "w": 1.75},
+                {"label": "3,1", "matrix": [3, 1], "x": 2.5, "y": 3.5},
+                {"label": "3,2", "matrix": [3, 2], "x": 4.75, "y": 3.5},
+                {"label": "3,3", "matrix": [3, 3], "x": 5.75, "y": 3.38},
+                {"label": "3,4", "matrix": [3, 4], "x": 6.75, "y": 3.5},
+                {"label": "3,5", "matrix": [3, 5], "x": 7.75, "y": 3.63},
+                {"label": "3,6", "matrix": [3, 6], "x": 11.5, "y": 3.63},
+                {"label": "3,7", "matrix": [3, 7], "x": 12.5, "y": 3.5},
+                {"label": "3,8", "matrix": [3, 8], "x": 13.5, "y": 3.38},
+                {"label": "3,9", "matrix": [3, 9], "x": 14.5, "y": 3.5},
+                {"label": "3,10", "matrix": [3, 10], "x": 16.75, "y": 3.5},
+                {"label": "3,11", "matrix": [3, 11], "x": 17.75, "y": 3.5},
+                {"label": "3,12", "matrix": [3, 12], "x": 18.75, "y": 3.5, "w": 2.25},
+                {"label": "3,14", "matrix": [3, 14], "x": 21.25, "y": 3.5},
+                {"label": "4,14", "matrix": [4, 14], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "4,0", "matrix": [4, 0], "x": 1.25, "y": 4.5},
+                {"label": "4,1", "matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"label": "4,2", "matrix": [4, 2], "x": 4.75, "y": 4.5},
+                {"label": "4,3", "matrix": [4, 3], "x": 5.75, "y": 4.38},
+                {"label": "4,4", "matrix": [4, 4], "x": 6.75, "y": 4.5},
+                {"label": "4,5", "matrix": [4, 5], "x": 7.75, "y": 4.63},
+                {"label": "5,5", "matrix": [5, 5], "x": 8.75, "y": 4.63},
+                {"label": "5,6", "matrix": [5, 6], "x": 10.5, "y": 4.63},
+                {"label": "4,6", "matrix": [4, 6], "x": 11.5, "y": 4.63},
+                {"label": "4,7", "matrix": [4, 7], "x": 12.5, "y": 4.5},
+                {"label": "4,8", "matrix": [4, 8], "x": 13.5, "y": 4.38},
+                {"label": "4,9", "matrix": [4, 9], "x": 14.5, "y": 4.5},
+                {"label": "4,10", "matrix": [4, 10], "x": 17, "y": 4.5},
+                {"label": "4,11", "matrix": [4, 11], "x": 18, "y": 4.5},
+                {"label": "4,12", "matrix": [4, 12], "x": 19, "y": 4.5, "w": 1.25},
+                {"label": "4,13", "matrix": [4, 13], "x": 20.5, "y": 4.75},
+                {"label": "5,0", "matrix": [5, 0], "x": 0.5, "y": 5.5, "w": 1.25},
+                {"label": "5,1", "matrix": [5, 1], "x": 1.75, "y": 5.5, "w": 1.25},
+                {"label": "5,2", "matrix": [5, 2], "x": 5.25, "y": 5.5, "w": 1.25},
+                {"label": "5,3", "matrix": [5, 3], "x": 6.5, "y": 5.5, "w": 1.25},
+                {"label": "5,4", "matrix": [5, 4], "x": 7.75, "y": 5.63, "w": 2},
+                {"label": "5,7", "matrix": [5, 7], "x": 10.5, "y": 5.63, "w": 2.75},
+                {"label": "5,8", "matrix": [5, 8], "x": 13.25, "y": 5.5, "w": 1.25},
+                {"label": "5,9", "matrix": [5, 9], "x": 16.75, "y": 5.5, "w": 1.25},
+                {"label": "5,10", "matrix": [5, 10], "x": 18, "y": 5.5, "w": 1.25},
+                {"label": "5,11", "matrix": [5, 11], "x": 19.5, "y": 5.75},
+                {"label": "5,12", "matrix": [5, 12], "x": 20.5, "y": 5.75},
+                {"label": "5,13", "matrix": [5, 13], "x": 21.5, "y": 5.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dcpedit/redherring/keymaps/default/keymap.c b/keyboards/dcpedit/redherring/keymaps/default/keymap.c
new file mode 100644
index 000000000000..36711740506c
--- /dev/null
+++ b/keyboards/dcpedit/redherring/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+// Copyright 2023 Ming-Gih Lam (@dcpedit)
+// 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_PSCR, KC_SCRL,          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_BSLS, 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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    MO(1),   MO(1),   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,          KC_UP,
+               KC_LCTL, KC_LGUI,          KC_LALT, KC_MENU, KC_SPC,                    KC_SPC,  KC_ALGR,          KC_RGUI, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT ),
+
+  [1] = LAYOUT(
+      QK_RBT,  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,          HF_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, KC_TRNS,          KC_TRNS,
+               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+               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_PGUP, KC_PGDN) },
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/dcpedit/redherring/keymaps/default/rules.mk b/keyboards/dcpedit/redherring/keymaps/default/rules.mk
new file mode 100644
index 000000000000..a40474b4d5c7
--- /dev/null
+++ b/keyboards/dcpedit/redherring/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/dcpedit/redherring/keymaps/via/keymap.c b/keyboards/dcpedit/redherring/keymaps/via/keymap.c
new file mode 100644
index 000000000000..de67f00042c8
--- /dev/null
+++ b/keyboards/dcpedit/redherring/keymaps/via/keymap.c
@@ -0,0 +1,31 @@
+// Copyright 2023 Ming-Gih Lam (@dcpedit)
+// 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_PSCR, KC_SCRL,          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_BSLS, 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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    MO(1),   MO(1),   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,          KC_UP,
+               KC_LCTL, KC_LGUI,          KC_LALT, KC_MENU, KC_SPC,                    KC_SPC,  KC_ALGR,          KC_RGUI, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT ),
+
+  [1] = LAYOUT(
+
+      QK_RBT,  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,          HF_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, KC_TRNS,          KC_TRNS,
+               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+               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_PGUP, KC_PGDN) },
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/hfdkb/keyboard_sw/k83/keymaps/via/rules.mk b/keyboards/dcpedit/redherring/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/hfdkb/keyboard_sw/k83/keymaps/via/rules.mk
rename to keyboards/dcpedit/redherring/keymaps/via/rules.mk
diff --git a/keyboards/dcpedit/redherring/readme.md b/keyboards/dcpedit/redherring/readme.md
new file mode 100644
index 000000000000..67f2bdf33db7
--- /dev/null
+++ b/keyboards/dcpedit/redherring/readme.md
@@ -0,0 +1,27 @@
+# Red Herring
+
+![Red Herring](https://i.imgur.com/b6lKmW0h.jpg)
+
+Unibody ergonomic orthilinar keyboard with through-hole components.  Supports standard keycaps, a 64x128 OLED, large rotary encoder knob, and a solenoid.
+
+* Keyboard Maintainer: [dcpedit](https://github.com/dcpedit)
+* Hardware Supported: ATMEGA32A
+* Hardware Availability: https://github.com/dcpedit/redherring
+
+Make example for this keyboard (after setting up your build environment):
+
+    make dcpedit/redherring:default
+
+Flashing example for this keyboard:
+
+    make dcpedit/redherring: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 (top-left key) and plug in the keyboard
+* **Physical reset button**: On the PCB, while holding down the BOOT button, press and release the RESET button
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/dcpedit/redherring/redherring.c b/keyboards/dcpedit/redherring/redherring.c
new file mode 100644
index 000000000000..b2c25eb703c9
--- /dev/null
+++ b/keyboards/dcpedit/redherring/redherring.c
@@ -0,0 +1,91 @@
+// Copyright 2023 Ming-Gih Lam (@dcpedit)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#define LOGO_SIZE 1024
+
+#ifdef OLED_ENABLE
+
+static void render_logo(void) {
+    static const char PROGMEM oled_logo[LOGO_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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        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, 0x30, 0x60, 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, 0x20, 0xc3, 0x06, 0x18, 0xe1, 0x03, 0x0c, 0xb0, 0x60, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x80, 0x78, 0x00, 0x00, 0x00, 0xe0, 0x1c, 
+        0x00, 0x00, 0xc0, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0xe0, 0x00, 0x00, 0x04, 0x78, 0x80, 0x00, 
+        0x00, 0x38, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 
+
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0xff, 0x1f, 0x3f, 0xfe, 0x3e, 0x7f, 0xfe, 0x7c, 0x7f, 0x7c, 
+        0x3c, 0x20, 0x20, 0xe0, 0x7c, 0x43, 0x40, 0xc0, 0xf8, 0x87, 0x80, 0x80, 0xe0, 0x1e, 0x01, 0x00, 
+        0xc0, 0x7c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0xe0, 0x00, 0x00, 0x07, 0x78, 
+        0x80, 0x80, 0x83, 0xbf, 0xff, 0xff, 0xe3, 0xc1, 0xc1, 0xc1, 0xc1, 0xf7, 0xfe, 0xfe, 0xfc, 0x78, 
+        0x00, 0x00, 0x10, 0x90, 0x88, 0x4c, 0x64, 0x22, 0x12, 0x11, 0x08, 0x0c, 0x07, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x3c, 0x03, 0x00, 0x80, 0x78, 0x07, 0x00, 0x00, 0xe0, 0x1e, 0x01, 0x01, 0xc1, 0x3d, 
+        0x07, 0x02, 0x02, 0xf2, 0x0e, 0x02, 0x02, 0x06, 0x7e, 0xc2, 0x02, 0x03, 0x1f, 0xe1, 0x01, 0x01, 
+        0x07, 0x78, 0x80, 0x00, 0x03, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x03, 0x00, 0x00, 
+        0x02, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x20, 0x1e, 0x01, 0x00, 0xc0, 0x7c, 0x07, 0x00, 
+        0x00, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x7c, 0xc0, 0x00, 0x01, 0x1e, 0xe0, 
+        0x00, 0x00, 0x07, 0x38, 0x00, 0x00, 0x03, 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, 0x01, 0x00, 0x00, 0x00, 
+        0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 
+        0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 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, 
+        0x38, 0xfe, 0xc7, 0x83, 0xff, 0xff, 0x01, 0x81, 0x03, 0x0f, 0xfe, 0xf0, 0x00, 0xff, 0xff, 0x01, 
+        0x01, 0x61, 0xff, 0x9f, 0x01, 0xfe, 0xef, 0x83, 0xff, 0xff, 0x01, 0x01, 0x03, 0x07, 0xfe, 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, 0x01, 0x19, 0xff, 0xff, 0x3b, 0x79, 0xf8, 0xcf, 0x07, 0x01, 0x00, 0xf1, 0xff, 0x0e, 
+        0x0e, 0x0e, 0x04, 0x00, 0x00, 0x00, 0x01, 0x01, 0xff, 0xff, 0x03, 0x01, 0x00, 0x80, 0xff, 0x7f, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x30, 0xf0, 0xf0, 0x00, 0x00, 0x10, 0xf0, 0xf0, 0x00, 0xf0, 0xf0, 0x30, 0x30, 0x30, 0xb0, 0xf0, 
+        0x70, 0x90, 0xc0, 0xe2, 0xf3, 0xf3, 0x70, 0x30, 0x31, 0x63, 0xe3, 0xc2, 0x00, 0x83, 0xc3, 0xe3, 
+        0xf3, 0xf3, 0x73, 0x33, 0x33, 0x60, 0xe0, 0x82, 0x03, 0xf3, 0xf3, 0x13, 0x63, 0xf3, 0xb1, 0xf0, 
+        0xe0, 0x00, 0x00, 0x00, 0x10, 0xf0, 0xf0, 0x00, 0xc0, 0xe0, 0x70, 0x30, 0x30, 0x30, 0xe0, 0xc0, 
+
+        0x00, 0xff, 0xff, 0x30, 0x30, 0x30, 0xff, 0xff, 0x80, 0x1f, 0x7f, 0xe0, 0xc0, 0xc0, 0x9f, 0x1f, 
+        0x00, 0x07, 0x1f, 0x38, 0xff, 0xff, 0x60, 0x60, 0x10, 0x80, 0xff, 0xff, 0x00, 0x0f, 0x1f, 0x38, 
+        0xff, 0xff, 0x60, 0x60, 0x00, 0x80, 0xff, 0x7f, 0x00, 0xff, 0xff, 0x00, 0x00, 0x01, 0x03, 0xff, 
+        0xff, 0x1c, 0x78, 0xe0, 0xc0, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0x04, 0xe6, 0xe7, 0x63, 
+        0x60, 0x7f, 0x7f, 0x00, 0x02, 0x46, 0x7f, 0x7f, 0x00, 0x7c, 0x7f, 0x63, 0x61, 0x61, 0x60, 0x60, 
+        0x60, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x47, 0x07, 0x0f, 0x3f, 0x79, 0x60, 0x40, 0x00, 0x00, 0x00, 
+        0x7f, 0x7f, 0x47, 0x07, 0x0f, 0x3f, 0x71, 0x40, 0x00, 0x7f, 0x7f, 0x40, 0x00, 0x00, 0x00, 0x7f, 
+        0x7f, 0x40, 0x00, 0x00, 0x47, 0x7f, 0x7f, 0x00, 0x1f, 0x3f, 0x70, 0x60, 0x60, 0x7f, 0x7f, 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, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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_logo, LOGO_SIZE);
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    render_logo();
+    return true;
+}
+#endif
\ No newline at end of file
diff --git a/keyboards/dcpedit/redherring/rules.mk b/keyboards/dcpedit/redherring/rules.mk
new file mode 100644
index 000000000000..35c76d4cf1cf
--- /dev/null
+++ b/keyboards/dcpedit/redherring/rules.mk
@@ -0,0 +1,2 @@
+F_CPU = 16000000
+HAPTIC_DRIVER = solenoid
\ No newline at end of file
diff --git a/keyboards/dekunukem/duckypad/config.h b/keyboards/dekunukem/duckypad/config.h
index 692f679d24f1..cc4c962462c3 100644
--- a/keyboards/dekunukem/duckypad/config.h
+++ b/keyboards/dekunukem/duckypad/config.h
@@ -20,63 +20,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 15
-#define RGB_MATRIX_LED_COUNT 15
-
 #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
-// 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 I2C1_SCL_PIN B8
diff --git a/keyboards/dekunukem/duckypad/duckypad.c b/keyboards/dekunukem/duckypad/duckypad.c
index d03d284b9590..7e486c455071 100644
--- a/keyboards/dekunukem/duckypad/duckypad.c
+++ b/keyboards/dekunukem/duckypad/duckypad.c
@@ -20,32 +20,6 @@ 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 = { {
-    { 2, 1, 0, 3, 4, 5, 8, 7, 6, 9, 10, 11, 14, 13, 12, NO_LED, NO_LED }
-}, {
-    {224, 0},
-    {112, 0},
-    {0, 0},
-    {0, 16},
-    {112, 16},
-    {224, 16},
-    {224, 32},
-    {112, 32},
-    {0, 32},
-    {0, 48},
-    {112, 48},
-    {224, 48},
-    {224, 64},
-    {112, 64},
-    {0, 64},
-}, {
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-} };
-
-#endif
-
 void keyboard_pre_init_kb(void) {
     setPinOutput(A0);
     writePinHigh(A0);
@@ -55,3 +29,21 @@ void keyboard_pre_init_kb(void) {
 
     keyboard_pre_init_user();
 }
+
+#ifdef OLED_ENABLE
+#    define LOGO_SIZE 384
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    static const char PROGMEM ducky_logo[LOGO_SIZE] = {
+      // clang-format off
+      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,232, 24, 24,232, 0, 24, 48, 48, 24, 0,232, 24, 24,232, 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, 0, 21,127,127,252,252,252,253,253,252,252,252,255,255,255, 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, 0, 0, 0, 0, 0, 0, 8, 7, 11, 3, 11, 7, 11, 7, 7, 31, 0, 0
+      //clang-format on
+    };
+    oled_write_raw_P(ducky_logo, LOGO_SIZE);
+    return false;
+}
+#endif
diff --git a/keyboards/dekunukem/duckypad/info.json b/keyboards/dekunukem/duckypad/info.json
index e5859b718a5c..9ca8e7bc93fa 100644
--- a/keyboards/dekunukem/duckypad/info.json
+++ b/keyboards/dekunukem/duckypad/info.json
@@ -8,11 +8,79 @@
         "pid": "0x4450",
         "device_version": "0.0.1"
     },
+    "features": {
+      "extrakey": true,
+      "rgb_matrix": true,
+      "oled": true
+    },
     "ws2812": {
         "pin": "A10"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 2], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 0, "y": 16, "flags": 4},
+            {"matrix": [0, 4], "x": 112, "y": 16, "flags": 4},
+            {"matrix": [0, 5], "x": 224, "y": 16, "flags": 4},
+            {"matrix": [0, 8], "x": 224, "y": 32, "flags": 4},
+            {"matrix": [0, 7], "x": 112, "y": 32, "flags": 4},
+            {"matrix": [0, 6], "x": 0, "y": 32, "flags": 4},
+            {"matrix": [0, 9], "x": 0, "y": 48, "flags": 4},
+            {"matrix": [0, 10], "x": 112, "y": 48, "flags": 4},
+            {"matrix": [0, 11], "x": 224, "y": 48, "flags": 4},
+            {"matrix": [0, 14], "x": 224, "y": 64, "flags": 4},
+            {"matrix": [0, 13], "x": 112, "y": 64, "flags": 4},
+            {"matrix": [0, 12], "x": 0, "y": 64, "flags": 4}
+        ],
+        "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
+        }
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/dekunukem/duckypad/keymaps/default/keymap.c b/keyboards/dekunukem/duckypad/keymaps/default/keymap.c
index 3b74640fe6d7..482f816fb33f 100644
--- a/keyboards/dekunukem/duckypad/keymaps/default/keymap.c
+++ b/keyboards/dekunukem/duckypad/keymaps/default/keymap.c
@@ -40,9 +40,10 @@ enum my_keycodes {
     Z12, Z13, Z14
 };
 
-#define _DEFAULT 0
-#define _RGB 1
-
+enum layers {
+  _DEFAULT,
+  _RGB
+};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /*
diff --git a/keyboards/dekunukem/duckypad/keymaps/via/keymap.c b/keyboards/dekunukem/duckypad/keymaps/via/keymap.c
index 01baaeb59377..c3bb88353fd1 100644
--- a/keyboards/dekunukem/duckypad/keymaps/via/keymap.c
+++ b/keyboards/dekunukem/duckypad/keymaps/via/keymap.c
@@ -20,9 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include QMK_KEYBOARD_H
 
-#define LOGO_SIZE 384
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   LAYOUT(
       KC_KP_1, KC_KP_2, KC_KP_3,
@@ -31,43 +28,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS, KC_KP_0, 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
-  ),
-  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
-  ),
-  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
-  ),
+  )
 };
-
-static void render_logo(void) {
-   static const char PROGMEM ducky_logo[LOGO_SIZE] = {
-      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,232, 24, 24,232, 0, 24, 48, 48, 24, 0,232, 24, 24,232, 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, 0, 21,127,127,252,252,252,253,253,252,252,252,255,255,255, 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, 0, 0, 0, 0, 0, 0, 8, 7, 11, 3, 11, 7, 11, 7, 7, 31, 0, 0
-   };
-   oled_write_raw_P(ducky_logo, LOGO_SIZE);
-}
-
-bool oled_task_user(void) {
-  render_logo();
-    return false;
-}
diff --git a/keyboards/dekunukem/duckypad/keymaps/via/rules.mk b/keyboards/dekunukem/duckypad/keymaps/via/rules.mk
index 5085d50a04fa..1e5b99807cb7 100644
--- a/keyboards/dekunukem/duckypad/keymaps/via/rules.mk
+++ b/keyboards/dekunukem/duckypad/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = no
diff --git a/keyboards/dekunukem/duckypad/rules.mk b/keyboards/dekunukem/duckypad/rules.mk
index d9bd708a95ff..6e7633bfe015 100644
--- a/keyboards/dekunukem/duckypad/rules.mk
+++ b/keyboards/dekunukem/duckypad/rules.mk
@@ -1,17 +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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-RGB_MATRIX_ENABLE = yes
-
-OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
+# This file intentionally left blank
diff --git a/keyboards/delikeeb/flatbread60/config.h b/keyboards/delikeeb/flatbread60/config.h
index 545ce1fadb00..93fec1ee2daf 100644
--- a/keyboards/delikeeb/flatbread60/config.h
+++ b/keyboards/delikeeb/flatbread60/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 19
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/delikeeb/flatbread60/info.json b/keyboards/delikeeb/flatbread60/info.json
index e43a3458ea21..ac581c2d0e6a 100644
--- a/keyboards/delikeeb/flatbread60/info.json
+++ b/keyboards/delikeeb/flatbread60/info.json
@@ -8,6 +8,24 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 19,
+        "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": "F7"
     },
diff --git a/keyboards/delikeeb/vaguettelite/config.h b/keyboards/delikeeb/vaguettelite/config.h
index b2c1315f3adb..93fec1ee2daf 100644
--- a/keyboards/delikeeb/vaguettelite/config.h
+++ b/keyboards/delikeeb/vaguettelite/config.h
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 9
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/delikeeb/vaguettelite/info.json b/keyboards/delikeeb/vaguettelite/info.json
index b6ddb96725a3..45e17c432a0d 100644
--- a/keyboards/delikeeb/vaguettelite/info.json
+++ b/keyboards/delikeeb/vaguettelite/info.json
@@ -19,6 +19,17 @@
             {"pin_a": "F1", "pin_b": "F0"}
         ]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 9,
+        "sleep": true,
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "C7"
     },
diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h
index 984a14d94fd8..f5d10c1915f0 100644
--- a/keyboards/delikeeb/vanana/rev1/config.h
+++ b/keyboards/delikeeb/vanana/rev1/config.h
@@ -19,21 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define B7_AUDIO
 
-#    define RGBLED_NUM 16
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/delikeeb/vanana/rev1/info.json b/keyboards/delikeeb/vanana/rev1/info.json
index 4a7d4c77180d..a4c101ec237c 100644
--- a/keyboards/delikeeb/vanana/rev1/info.json
+++ b/keyboards/delikeeb/vanana/rev1/info.json
@@ -3,6 +3,17 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "sleep": true,
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "F0"
     },
diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h
index 984a14d94fd8..f5d10c1915f0 100644
--- a/keyboards/delikeeb/vanana/rev2/config.h
+++ b/keyboards/delikeeb/vanana/rev2/config.h
@@ -19,21 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define B7_AUDIO
 
-#    define RGBLED_NUM 16
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/delikeeb/vanana/rev2/info.json b/keyboards/delikeeb/vanana/rev2/info.json
index e8ff47d85529..252e111fb2aa 100644
--- a/keyboards/delikeeb/vanana/rev2/info.json
+++ b/keyboards/delikeeb/vanana/rev2/info.json
@@ -3,6 +3,17 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "sleep": true,
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "C7"
     },
diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h
index 36ef7a27bf39..6450b251b795 100644
--- a/keyboards/delikeeb/waaffle/rev3/config.h
+++ b/keyboards/delikeeb/waaffle/rev3/config.h
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 10
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/delikeeb/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json
index b251334154a0..1201411d46b0 100644
--- a/keyboards/delikeeb/waaffle/rev3/info.json
+++ b/keyboards/delikeeb/waaffle/rev3/info.json
@@ -8,6 +8,17 @@
         "pid": "0x0012",
         "device_version": "0.0.3"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "sleep": true,
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "C7"
     },
diff --git a/keyboards/deltasplit75/v2/config.h b/keyboards/deltasplit75/v2/config.h
index 4d2439ad3c1e..9b7700e0139b 100644
--- a/keyboards/deltasplit75/v2/config.h
+++ b/keyboards/deltasplit75/v2/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 RGBLED_NUM 12    // Number of LEDs
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/deltasplit75/v2/info.json b/keyboards/deltasplit75/v2/info.json
index 857fa12e9a97..d583f3bb65b7 100644
--- a/keyboards/deltasplit75/v2/info.json
+++ b/keyboards/deltasplit75/v2/info.json
@@ -15,6 +15,9 @@
     "split": {
       "soft_serial_pin": "D0"
     },
+    "rgblight": {
+      "led_count": 12
+    },
     "ws2812": {
       "pin": "D3"
     },
diff --git a/keyboards/demiurge/config.h b/keyboards/demiurge/config.h
deleted file mode 100755
index 2d3108fae321..000000000000
--- a/keyboards/demiurge/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2021 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/>.
-*/
-
-#pragma once
-
-#define RGBLED_NUM 21
-#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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
diff --git a/keyboards/demiurge/info.json b/keyboards/demiurge/info.json
index 88c938131909..8fc707be2c22 100644
--- a/keyboards/demiurge/info.json
+++ b/keyboards/demiurge/info.json
@@ -17,7 +17,20 @@
         "pin": "F1"
     },
     "rgblight": {
-        "max_brightness": 153
+        "led_count": 21,
+        "max_brightness": 153,
+        "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",
diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json
index c78e814505d2..c7fe59ff0a4b 100644
--- a/keyboards/deng/djam/info.json
+++ b/keyboards/deng/djam/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
diff --git a/keyboards/deng/thirty/config.h b/keyboards/deng/thirty/config.h
index d80983202fb0..20e6673dd2ce 100644
--- a/keyboards/deng/thirty/config.h
+++ b/keyboards/deng/thirty/config.h
@@ -15,6 +15,9 @@
  */
 #pragma once
 
+#define BACKLIGHT_PWM_DRIVER PWMD2
+#define BACKLIGHT_PWM_CHANNEL 4
+
 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_MATRIX_LED_COUNT 30
diff --git a/keyboards/deng/thirty/halconf.h b/keyboards/deng/thirty/halconf.h
new file mode 100644
index 000000000000..b107a87e75af
--- /dev/null
+++ b/keyboards/deng/thirty/halconf.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json
index 1d9b018e6bbc..8836273865b4 100644
--- a/keyboards/deng/thirty/info.json
+++ b/keyboards/deng/thirty/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B13", "B14", "B3", "A4", "A6"],
@@ -17,7 +17,6 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
-        "driver": "software",
         "pin": "B11",
         "levels": 5,
         "on_state": 0
diff --git a/keyboards/deng/thirty/mcuconf.h b/keyboards/deng/thirty/mcuconf.h
new file mode 100644
index 000000000000..8ff617051f0d
--- /dev/null
+++ b/keyboards/deng/thirty/mcuconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
diff --git a/keyboards/deng/thirty/rules.mk b/keyboards/deng/thirty/rules.mk
index e8ce9e854be6..d1753c1e6c44 100644
--- a/keyboards/deng/thirty/rules.mk
+++ b/keyboards/deng/thirty/rules.mk
@@ -1,5 +1,3 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
diff --git a/keyboards/deng/thirty/thirty.c b/keyboards/deng/thirty/thirty.c
index 2e582d68337a..7d49bc1b036f 100644
--- a/keyboards/deng/thirty/thirty.c
+++ b/keyboards/deng/thirty/thirty.c
@@ -46,3 +46,8 @@ led_config_t g_led_config = {
 };
 
 #endif
+
+void board_init(void) {
+    // Remap B11 AF to TIM2_CH4
+    AFIO->MAPR |= AFIO_MAPR_TIM2_REMAP_PARTIALREMAP2;
+}
diff --git a/keyboards/dinofizz/fnrow/v1/rules.mk b/keyboards/dinofizz/fnrow/v1/rules.mk
index 2f7ef9fbe89d..a1e56ea4862c 100644
--- a/keyboards/dinofizz/fnrow/v1/rules.mk
+++ b/keyboards/dinofizz/fnrow/v1/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h
index 7ca2b8cded02..d1c1201a5488 100644
--- a/keyboards/dm9records/ergoinu/config.h
+++ b/keyboards/dm9records/ergoinu/config.h
@@ -24,8 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define RGBLED_NUM 7
-
 #ifndef IOS_DEVICE_ENABLE
   #if RGBLED_NUM <= 7
     #define RGBLIGHT_LIMIT_VAL 255
@@ -36,9 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_VAL_STEP 4
 #endif
 
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
   #define USB_MAX_POWER_CONSUMPTION 500
 #else
diff --git a/keyboards/dm9records/ergoinu/info.json b/keyboards/dm9records/ergoinu/info.json
index 1813baa24103..4f3b03b6f9e3 100644
--- a/keyboards/dm9records/ergoinu/info.json
+++ b/keyboards/dm9records/ergoinu/info.json
@@ -16,6 +16,10 @@
   "split": {
     "soft_serial_pin": "D2"
   },
+  "rgblight": {
+    "hue_steps": 10,
+    "led_count": 7
+  },
   "ws2812": {
     "pin": "B6"
   },
diff --git a/keyboards/dmqdesign/spin/config.h b/keyboards/dmqdesign/spin/config.h
index 2a1bafaacf7f..cc43876148bc 100644
--- a/keyboards/dmqdesign/spin/config.h
+++ b/keyboards/dmqdesign/spin/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//Number of RGB LEDs
-#define RGBLED_NUM 3
-
 /* 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/dmqdesign/spin/info.json b/keyboards/dmqdesign/spin/info.json
index 52fc9f40ea25..aeeb19299e21 100644
--- a/keyboards/dmqdesign/spin/info.json
+++ b/keyboards/dmqdesign/spin/info.json
@@ -20,6 +20,9 @@
             {"pin_a": "D6", "pin_b": "D4"}
         ]
     },
+    "rgblight": {
+        "led_count": 3
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/dmqdesign/spin/keymaps/gorbachev/rules.mk b/keyboards/dmqdesign/spin/keymaps/gorbachev/rules.mk
index 6af3117b94fd..cd11afc8d497 100644
--- a/keyboards/dmqdesign/spin/keymaps/gorbachev/rules.mk
+++ b/keyboards/dmqdesign/spin/keymaps/gorbachev/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 MOUSEKEY_ENABLE    = no
 MIDI_ENABLE        = no
diff --git a/keyboards/dnworks/9973/config.h b/keyboards/dnworks/9973/config.h
new file mode 100644
index 000000000000..77970ce4d344
--- /dev/null
+++ b/keyboards/dnworks/9973/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/9973/info.json b/keyboards/dnworks/9973/info.json
new file mode 100644
index 000000000000..616960602623
--- /dev/null
+++ b/keyboards/dnworks/9973/info.json
@@ -0,0 +1,480 @@
+{
+    "keyboard_name": "DN 997.3",
+    "maintainer": "itsme-zeix",
+    "manufacturer": "dnworks",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "usb": {
+        "vid": "0x4C23",
+        "pid": "0x2936",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true    
+    },
+    "indicators": {
+        "caps_lock": "GP27",
+        "scroll_lock": "GP1",
+        "on_state": 1
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "rows": ["GP2", "GP3", "GP4", "GP29", "GP12", "GP13"],
+        "cols": ["GP28", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP15", "GP14", "GP6", "GP5", "GP0"]
+    },
+    "community_layouts": ["tkl_ansi_tsangan", "tkl_iso_tsangan"],
+    "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.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": [1, 16], "x": 17.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": [2, 16], "x": 17.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, 12], "w": 2.25, "x": 12.75, "y": 3.5 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.5 },
+                { "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], "w": 2.75, "x": 12.25, "y": 4.5 },
+                { "matrix": [4, 15], "x": 16.25, "y": 4.5 },
+                { "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], "x": 12.5, "y": 5.5 },
+                { "matrix": [5, 12], "w": 1.5, "x": 13.5, "y": 5.5 },
+                { "matrix": [5, 14], "x": 15.25, "y": 5.5 },
+                { "matrix": [5, 15], "x": 16.25, "y": 5.5 },
+                { "matrix": [5, 16], "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "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.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": [1, 16], "x": 17.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": [2, 16], "x": 17.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, 12], "w": 2.25, "x": 12.75, "y": 3.5 },
+                { "matrix": [4, 0], "w": 2.25, "x": 0, "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], "w": 2.75, "x": 12.25, "y": 4.5 },
+                { "matrix": [4, 15], "x": 16.25, "y": 4.5 },
+                { "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], "x": 12.5, "y": 5.5 },
+                { "matrix": [5, 12], "w": 1.5, "x": 13.5, "y": 5.5 },
+                { "matrix": [5, 14], "x": 15.25, "y": 5.5 },
+                { "matrix": [5, 15], "x": 16.25, "y": 5.5 },
+                { "matrix": [5, 16], "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "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.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": [1, 16], "x": 17.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": [2, 16], "x": 17.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, 12], "w": 2.25, "x": 12.75, "y": 3.5 },
+                { "matrix": [4, 0], "w": 2.25, "x": 0, "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], "w": 2.75, "x": 12.25, "y": 4.5 },
+                { "matrix": [4, 15], "x": 16.25, "y": 4.5 },
+                { "matrix": [5, 0], "w": 1.5, "x": 0, "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, 12], "w": 1.5, "x": 13.5, "y": 5.5 },
+                { "matrix": [5, 14], "x": 15.25, "y": 5.5 },
+                { "matrix": [5, 15], "x": 16.25, "y": 5.5 },
+                { "matrix": [5, 16], "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "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.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": [1, 16], "x": 17.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, 14], "x": 15.25, "y": 2.5 },
+                { "matrix": [2, 15], "x": 16.25, "y": 2.5 },
+                { "matrix": [2, 16], "x": 17.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": [2, 13], "x": 12.75, "y": 3.5 },
+                { "matrix": [3, 12], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.5 },
+                { "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], "w": 2.75, "x": 12.25, "y": 4.5 },
+                { "matrix": [4, 15], "x": 16.25, "y": 4.5 },
+                { "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], "x": 12.5, "y": 5.5 },
+                { "matrix": [5, 12], "w": 1.5, "x": 13.5, "y": 5.5 },
+                { "matrix": [5, 14], "x": 15.25, "y": 5.5 },
+                { "matrix": [5, 15], "x": 16.25, "y": 5.5 },
+                { "matrix": [5, 16], "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "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.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": [1, 16], "x": 17.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, 14], "x": 15.25, "y": 2.5 },
+                { "matrix": [2, 15], "x": 16.25, "y": 2.5 },
+                { "matrix": [2, 16], "x": 17.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": [2, 13], "x": 12.75, "y": 3.5 },
+                { "matrix": [3, 12], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.5 },
+                { "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], "w": 2.75, "x": 12.25, "y": 4.5 },
+                { "matrix": [4, 15], "x": 16.25, "y": 4.5 },
+                { "matrix": [5, 0], "w": 1.5, "x": 0, "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, 12], "w": 1.5, "x": 13.5, "y": 5.5 },
+                { "matrix": [5, 14], "x": 15.25, "y": 5.5 },
+                { "matrix": [5, 15], "x": 16.25, "y": 5.5 },
+                { "matrix": [5, 16], "x": 17.25, "y": 5.5 }            
+            ]
+        }
+    }
+}
diff --git a/keyboards/dnworks/9973/keymaps/default/keymap.c b/keyboards/dnworks/9973/keymaps/default/keymap.c
new file mode 100644
index 000000000000..8307bf9e7663
--- /dev/null
+++ b/keyboards/dnworks/9973/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/*
+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_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_DEL,  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_INS,  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_UP, 
+  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RIGHT)
+};
diff --git a/keyboards/dnworks/9973/keymaps/via/keymap.c b/keyboards/dnworks/9973/keymaps/via/keymap.c
new file mode 100644
index 000000000000..8307bf9e7663
--- /dev/null
+++ b/keyboards/dnworks/9973/keymaps/via/keymap.c
@@ -0,0 +1,27 @@
+/*
+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_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_DEL,  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_INS,  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_UP, 
+  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RIGHT)
+};
diff --git a/keyboards/dnworks/9973/keymaps/via/rules.mk b/keyboards/dnworks/9973/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/dnworks/9973/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/dnworks/9973/readme.md b/keyboards/dnworks/9973/readme.md
new file mode 100644
index 000000000000..790f236cb776
--- /dev/null
+++ b/keyboards/dnworks/9973/readme.md
@@ -0,0 +1,27 @@
+# 997.3 TKL
+
+![997.3 TKL](https://i.imgur.com/iPPLKg1h.jpeg)
+
+PCB that supports the 997.3 TKL designed by dnworks, including its variants.
+
+* Keyboard Maintainer: [Zeix](https://github.com/itsme-zeix)
+* Hardware Supported: 997.3 Solder PCB rev1 
+* Hardware Availability: dnworks.co
+
+Make example for this keyboard (after setting up your build environment):
+
+    make dnworks/997pt3:default
+
+Flashing example for this keyboard:
+
+    make dnworks/997pt3: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/9973/rules.mk b/keyboards/dnworks/9973/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/dnworks/9973/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/dnworks/frltkl/info.json b/keyboards/dnworks/frltkl/info.json
index dda394649b24..86796a6084c7 100644
--- a/keyboards/dnworks/frltkl/info.json
+++ b/keyboards/dnworks/frltkl/info.json
@@ -26,8 +26,15 @@
         "rows": ["GP4","GP3","GP2","GP1","GP29","GP28","GP19","GP20","GP10","GP11"],
         "cols": ["GP26","GP25","GP24","GP23","GP22","GP21","GP6","GP5","GP0"]
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "community_layouts": [
+        "tkl_nofrow_ansi",
+        "tkl_nofrow_iso"
+    ],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 { "matrix": [1, 0], "x": 0, "y": 0 },
                 { "matrix": [0, 0], "x": 1, "y": 0 },
@@ -108,6 +115,956 @@
                 { "matrix": [9, 8], "x": 16.25, "y": 4 },
                 { "matrix": [8, 8], "x": 17.25, "y": 4 }
             ]
-        }        
+        },
+        "LAYOUT_tkl_nofrow_ansi": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "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, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "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, "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": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "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, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "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, "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, 7], "x": 14, "y": 3},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_ansi_tsangan": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "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, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "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, "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": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 12.5, "y": 4},
+                {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "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, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "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, "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, 7], "x": 14, "y": 3},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 12.5, "y": 4},
+                {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_ansi_wkl": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "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, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "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, "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": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "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, 7], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "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, "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, 7], "x": 14, "y": 3},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_iso": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "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": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "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": [3, 7], "x": 12.75, "y": 2},
+                {"matrix": [4, 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": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "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": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "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": [3, 7], "x": 12.75, "y": 2},
+                {"matrix": [4, 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, 7], "x": 14, "y": 3},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_iso_tsangan": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "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": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "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": [3, 7], "x": 12.75, "y": 2},
+                {"matrix": [4, 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": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 12.5, "y": 4},
+                {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "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": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "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": [3, 7], "x": 12.75, "y": 2},
+                {"matrix": [4, 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, 7], "x": 14, "y": 3},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 12.5, "y": 4},
+                {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_iso_wkl": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "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": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "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": [3, 7], "x": 12.75, "y": 2},
+                {"matrix": [4, 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": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 6], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "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": [2, 7], "x": 15.25, "y": 1},
+                {"matrix": [3, 8], "x": 16.25, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "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": [3, 7], "x": 12.75, "y": 2},
+                {"matrix": [4, 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, 7], "x": 14, "y": 3},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 7], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 8], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        }
     }
 }
diff --git a/keyboards/dnworks/frltkl/keymaps/default/keymap.c b/keyboards/dnworks/frltkl/keymaps/default/keymap.c
index 295066696d4c..d761ce63a7a5 100644
--- a/keyboards/dnworks/frltkl/keymaps/default/keymap.c
+++ b/keyboards/dnworks/frltkl/keymaps/default/keymap.c
@@ -17,14 +17,14 @@ 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_BSLS, 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, 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_RIGHT),
   
-[1] = LAYOUT(
+[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_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,         
diff --git a/keyboards/dnworks/frltkl/keymaps/via/keymap.c b/keyboards/dnworks/frltkl/keymaps/via/keymap.c
index 295066696d4c..d761ce63a7a5 100644
--- a/keyboards/dnworks/frltkl/keymaps/via/keymap.c
+++ b/keyboards/dnworks/frltkl/keymaps/via/keymap.c
@@ -17,14 +17,14 @@ 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_BSLS, 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, 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_RIGHT),
   
-[1] = LAYOUT(
+[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_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,         
diff --git a/keyboards/dnworks/frltkl/matrix_diagram.md b/keyboards/dnworks/frltkl/matrix_diagram.md
new file mode 100644
index 000000000000..6a0cbe43edae
--- /dev/null
+++ b/keyboards/dnworks/frltkl/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for dnworks DN FRLTKL
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐    ┌───────┐
+│10 │00 │11 │01 │12 │02 │13 │03 │14 │04 │15 │05 │16 │06 │17 ││07 │18 │08 │    │06     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤    └─┬─────┤
+│20   │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │37   ││27 │38 │28 │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘   ┌──┴┐46  │ ISO Enter
+│40    │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │46      │                │37 │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐       └───┴────┘
+│60  │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │66    │77 │    │68 │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+│80  │90  │81  │93                      │85  │95  │86  │97  ││87 │98 │88 │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+┌────────┐                                       ┌──────────┐
+│60      │ 2.25u LShift             2.75u RShift │66        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│80   │90 │81   │93                         │95   │86 │97   │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```
diff --git a/keyboards/do60/config.h b/keyboards/do60/config.h
index 21160e0a8da0..5a870e5f7eeb 100644
--- a/keyboards/do60/config.h
+++ b/keyboards/do60/config.h
@@ -17,26 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB Underglow
- */
-#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    			// Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 15
-#define RGBLIGHT_VAL_STEP 15
-
 /* 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 TAPPING_TERM 200
diff --git a/keyboards/do60/info.json b/keyboards/do60/info.json
index 9267a9814129..e3cab833a045 100644
--- a/keyboards/do60/info.json
+++ b/keyboards/do60/info.json
@@ -21,6 +21,24 @@
         "caps_lock": "B2",
         "on_state": 0
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "saturation_steps": 15,
+        "brightness_steps": 15,
+        "led_count": 20,
+        "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": "F5"
     },
diff --git a/keyboards/doio/kb12/config.h b/keyboards/doio/kb12/config.h
new file mode 100644
index 000000000000..d853409b8587
--- /dev/null
+++ b/keyboards/doio/kb12/config.h
@@ -0,0 +1,69 @@
+/* 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
new file mode 100644
index 000000000000..fc75fd8c0d93
--- /dev/null
+++ b/keyboards/doio/kb12/info.json
@@ -0,0 +1,78 @@
+{
+    "keyboard_name": "KB12-01",
+    "manufacturer": "DOIO",
+    "url": "",
+    "maintainer": "DOIO2022",
+    "usb": {
+        "vid": "0xD010",
+        "pid": "0x1201",
+        "device_version": "0.0.1"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 75, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 150, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 32, "flags": 4},
+            {"matrix": [1, 1], "x": 75, "y": 32, "flags": 4},
+            {"matrix": [1, 2], "x": 150, "y": 32, "flags": 4},
+            {"matrix": [1, 3], "x": 224, "y": 32, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 64, "flags": 4},
+            {"matrix": [2, 1], "x": 75, "y": 64, "flags": 4},
+            {"matrix": [2, 2], "x": 150, "y": 64, "flags": 4},
+            {"matrix": [2, 3], "x": 224, "y": 64, "flags": 4}
+        ],
+        "max_brightness": 200
+    },
+    "matrix_pins": {
+        "cols": ["B14", "B13", "B12", "B0", "A7"],
+        "rows": ["B3", "B4", "B9"]
+    },
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 6
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B6"}
+        ]
+    },
+    "ws2812": {
+        "pin": "A10"
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 4], "x": 0, "y": 0 },
+                { "matrix": [0, 0], "x": 3.25, "y": 0 },
+                { "matrix": [0, 1], "x": 4.25, "y": 0 },
+                { "matrix": [0, 2], "x": 5.25, "y": 0 },
+                { "matrix": [0, 3], "x": 6.25, "y": 0 },
+
+                { "matrix": [1, 0], "x": 7.75, "y": 0 },
+                { "matrix": [1, 1], "x": 8.75, "y": 0 },
+                { "matrix": [1, 2], "x": 9.75, "y": 0 },
+                { "matrix": [1, 3], "x": 10.75, "y": 0 },
+
+                { "matrix": [2, 0], "x": 12.25, "y": 0 },
+                { "matrix": [2, 1], "x": 13.25, "y": 0 },
+                { "matrix": [2, 2], "x": 14.25, "y": 0 },
+                { "matrix": [2, 3], "x": 15.25, "y": 0 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/doio/kb12/keymaps/default/keymap.c b/keyboards/doio/kb12/keymaps/default/keymap.c
new file mode 100644
index 000000000000..72360f1a8b25
--- /dev/null
+++ b/keyboards/doio/kb12/keymaps/default/keymap.c
@@ -0,0 +1,55 @@
+/* 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), KC_F1,   KC_F2,   KC_F3,   KC_F4,      KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,   KC_F10,  KC_F11,  KC_F12),
+  [_LAY1] = LAYOUT(
+		TO(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),
+  [_LAY2] = LAYOUT(
+		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),
+  [_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),
+  [_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),
+  [_LAY5] = LAYOUT(
+		TO(0), RGB_TOG, RGB_MOD, RGB_SPI, RGB_SPD,    RGB_SAI, RGB_SAD, RGB_HUI, RGB_HUD,    RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS)
+
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_LAY0] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
+    [_LAY1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_LAY2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_LAY3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_LAY4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_LAY5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
+#endif
diff --git a/keyboards/doio/kb12/keymaps/via/keymap.c b/keyboards/doio/kb12/keymaps/via/keymap.c
new file mode 100644
index 000000000000..72360f1a8b25
--- /dev/null
+++ b/keyboards/doio/kb12/keymaps/via/keymap.c
@@ -0,0 +1,55 @@
+/* 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), KC_F1,   KC_F2,   KC_F3,   KC_F4,      KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,   KC_F10,  KC_F11,  KC_F12),
+  [_LAY1] = LAYOUT(
+		TO(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),
+  [_LAY2] = LAYOUT(
+		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),
+  [_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),
+  [_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),
+  [_LAY5] = LAYOUT(
+		TO(0), RGB_TOG, RGB_MOD, RGB_SPI, RGB_SPD,    RGB_SAI, RGB_SAD, RGB_HUI, RGB_HUD,    RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS)
+
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_LAY0] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
+    [_LAY1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_LAY2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_LAY3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_LAY4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [_LAY5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
+#endif
diff --git a/keyboards/doio/kb12/keymaps/via/rules.mk b/keyboards/doio/kb12/keymaps/via/rules.mk
new file mode 100644
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/doio/kb12/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/doio/kb12/readme.md b/keyboards/doio/kb12/readme.md
new file mode 100644
index 000000000000..1dd7a310f168
--- /dev/null
+++ b/keyboards/doio/kb12/readme.md
@@ -0,0 +1,24 @@
+# doio/kb12
+
+QMK for DOIO Knob 12% .
+
+* Keyboard Maintainer: DOIO2022
+* Hardware Supported: DOIO Knob 12%
+
+Make example for this keyboard (after setting up your build environment):
+
+    make doio/kb12:default
+
+Flashing example for this keyboard:
+
+    make doio/kb12: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/kb12/rules.mk b/keyboards/doio/kb12/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/doio/kb12/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/doio/kb16/kb16.c b/keyboards/doio/kb16/kb16.c
index 34b315a87b15..05f5792ea7e6 100644
--- a/keyboards/doio/kb16/kb16.c
+++ b/keyboards/doio/kb16/kb16.c
@@ -20,6 +20,11 @@
 // OLED animation
 #include "./lib/logo.h"
 
+// Default timeout for displaying boot logo.
+#ifndef OLED_LOGO_TIMEOUT
+    #define OLED_LOGO_TIMEOUT 5000
+#endif
+
 #ifdef OLED_ENABLE
     uint16_t startup_timer; 
 
@@ -32,16 +37,14 @@
     bool oled_task_kb(void) {
         static bool finished_logo = false;
 
-        if ((timer_elapsed(startup_timer) < 5000) && !finished_logo) {
+        if ((timer_elapsed(startup_timer) < OLED_LOGO_TIMEOUT) && !finished_logo) {
             render_logo();
         } else {
             finished_logo = true;
-			
             if (!oled_task_user()) {
                 return false;
             }
         }
-
         return true;
     }
 #endif
diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json
index 4d2852fe0518..bcf2c2eb0ee6 100644
--- a/keyboards/doio/kb16/rev1/info.json
+++ b/keyboards/doio/kb16/rev1/info.json
@@ -10,7 +10,7 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F5", "F4", "F1", "F0", "B7"],
diff --git a/keyboards/doio/kb16/rev1/rules.mk b/keyboards/doio/kb16/rev1/rules.mk
index 5c5ad3de8c27..b234c1ca6a99 100644
--- a/keyboards/doio/kb16/rev1/rules.mk
+++ b/keyboards/doio/kb16/rev1/rules.mk
@@ -20,7 +20,6 @@ SPACE_CADET_ENABLE = no
 
 # OLED enabled
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json
index 1e83ca77cc4c..c3cf6b9a12ee 100644
--- a/keyboards/doio/kb16/rev2/info.json
+++ b/keyboards/doio/kb16/rev2/info.json
@@ -10,7 +10,7 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B14", "B13", "B12", "B0", "A7"],
diff --git a/keyboards/doio/kb16/rev2/rules.mk b/keyboards/doio/kb16/rev2/rules.mk
index f931af11e4f0..88879a4ffaea 100644
--- a/keyboards/doio/kb16/rev2/rules.mk
+++ b/keyboards/doio/kb16/rev2/rules.mk
@@ -19,7 +19,6 @@ AUDIO_ENABLE = no           # Audio output
 
 # OLED enabled
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/doio/kb30/info.json b/keyboards/doio/kb30/info.json
index 71a300b9cd81..cd3c7729947c 100644
--- a/keyboards/doio/kb30/info.json
+++ b/keyboards/doio/kb30/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B14", "B13", "B12", "B0", "A7", "A9", "A8"],
diff --git a/keyboards/doio/kb30/rules.mk b/keyboards/doio/kb30/rules.mk
index b12899890e44..1e48f891f280 100644
--- a/keyboards/doio/kb30/rules.mk
+++ b/keyboards/doio/kb30/rules.mk
@@ -12,8 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
-
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/info.json
index 0601ba881ca5..95d3be13d391 100644
--- a/keyboards/doio/kb38/info.json
+++ b/keyboards/doio/kb38/info.json
@@ -36,7 +36,7 @@
         "pin": "F6"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
             {"flags": 4, "matrix": [0, 1], "x": 62.2, "y": 0},
@@ -118,6 +118,10 @@
                 {"matrix": [2, 5], "label": "HOME", "x": 5.25, "y": 2.25},
                 {"matrix": [2, 6], "label": "PGUP", "x": 6.25, "y": 2.25},
 
+                {"matrix": [5, 5], "label": "KNOB_L", "x": 7.5, "y": 2.25},
+
+                {"matrix": [5, 6], "label": "KNOB_R", "x": 9.5, "y": 2.25},
+
                 {"matrix": [3, 0], "label": "4", "x": 0, "y": 3.25},
                 {"matrix": [3, 1], "label": "5", "x": 1, "y": 3.25},
                 {"matrix": [3, 2], "label": "6", "x": 2, "y": 3.25},
@@ -131,14 +135,13 @@
                 {"matrix": [4, 3], "label": "PENT", "x": 3, "y": 4.25, "h": 2},
                 {"matrix": [4, 5], "label": "UP", "x": 5.25, "y": 4.25},
 
+                {"matrix": [5, 7], "label": "KNOB_D", "x": 7.5, "y": 3.25, "w": 3, "h": 3}
+
                 {"matrix": [5, 0], "label": "0", "x": 0, "y": 5.25, "w": 2},
                 {"matrix": [5, 1], "label": "PDOT", "x": 2, "y": 5.25},
                 {"matrix": [5, 2], "label": "LEFT", "x": 4.25, "y": 5.25},
                 {"matrix": [5, 3], "label": "DOWN", "x": 5.25, "y": 5.25},
-                {"matrix": [5, 4], "label": "RIGHT", "x": 6.25, "y": 5.25},
-                {"matrix": [5, 5], "label": "KNOB_L", "x": 7.5, "y": 2.25},
-                {"matrix": [5, 6], "label": "KNOB_R", "x": 9.5, "y": 2.25},
-                {"matrix": [5, 7], "label": "KNOB_D", "x": 7.5, "y": 3.25, "w": 3, "h": 3}
+                {"matrix": [5, 4], "label": "RIGHT", "x": 6.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/doio/kb38/keymaps/default/keymap.c b/keyboards/doio/kb38/keymaps/default/keymap.c
index b2fd7d2273d7..96a548e512e2 100644
--- a/keyboards/doio/kb38/keymaps/default/keymap.c
+++ b/keyboards/doio/kb38/keymaps/default/keymap.c
@@ -27,31 +27,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └───┘   └───────┘└───┴───┴───┘└───┴───┴───┘
      * ┌───┬───┬───┬───┐┌───┬───┬───┐
      * │NUM│ / │ * │ - ││PAS│SCR│PSC│
-     * ├───┼───┼───┼───┤├───┼───┼───┤
-     * │ 7 │ 8 │ 9 │   ││INS│HOM│PGU│
-     * ├───┼───┼───┤ + │├───┼───┼───┤
-     * │ 4 │ 5 │ 6 │   ││END│DEL│PGD│
-     * ├───┼───┼───┼───┤└───┼───┼───┘
-     * │ 1 │ 2 │ 3 │ E │    │UP │
-     * ├───┴───┼───┤ N │┌───┼───┼───┐┌───┬───┬───┐
-     * │   0   │DEL│ T ││LFT│DWN│RHT││ O │ O │ O │
-     * └───────┴───┴───┘└───┴───┴───┘└───┴───┴───┘
+     * ├───┼───┼───┼───┤├───┼───┼───┤┌───┐   ┌───┐
+     * │ 7 │ 8 │ 9 │   ││INS│HOM│PGU││HOM│   │END│
+     * ├───┼───┼───┤ + │├───┼───┼───┤├───┴───┴───┤
+     * │ 4 │ 5 │ 6 │   ││END│DEL│PGD││           │
+     * ├───┼───┼───┼───┤└───┼───┼───┘│           │
+     * │ 1 │ 2 │ 3 │ E │    │UP │    │     B     │
+     * ├───┴───┼───┤ N │┌───┼───┼───┐│           │
+     * │   0   │DEL│ T ││LFT│DWN│RHT││           │
+     * └───────┴───┴───┘└───┴───┴───┘└───────────┘
      */
     [_QWERTY] = LAYOUT(
         MO(1),            KC_BSPC,             RGB_RMOD, RGB_TOG, RGB_MOD,    KC_F1,   KC_F2,   KC_F3,
         KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,    KC_PAUS,  KC_SCRL, KC_PSCR,
-        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_INS,   KC_HOME, KC_PGUP,
+        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_INS,   KC_HOME, KC_PGUP,    KC_HOME,          KC_END,
         KC_P4,   KC_P5,   KC_P6,               KC_END,   KC_DEL,  KC_PGDN,
-        KC_P1,   KC_P2,   KC_P3,   KC_PENT,              KC_UP,
-        KC_P0,            KC_PDOT,             KC_LEFT,  KC_DOWN, KC_RGHT,    KC_HOME, KC_END,  KC_B
+        KC_P1,   KC_P2,   KC_P3,   KC_PENT,              KC_UP,                        KC_B,
+        KC_P0,            KC_PDOT,             KC_LEFT,  KC_DOWN, KC_RGHT
     ),
     [_LAYERTWO] = LAYOUT(
         _______,          KC_BSPC,             RGB_RMOD, RGB_TOG, RGB_MOD,    KC_A,    QK_RBT,  QK_BOOT,
         KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,    KC_PAUS,  KC_SCRL, KC_PSCR,
-        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_INS,   KC_HOME, KC_PGUP,
+        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_INS,   KC_HOME, KC_PGUP,    KC_HOME,          KC_END,
         KC_P4,   KC_P5,   KC_P6,               KC_END,   KC_DEL,  KC_PGDN,
-        KC_P1,   KC_P2,   KC_P3,   KC_PENT,              KC_UP,
-        KC_P0,            KC_PDOT,             KC_LEFT,  KC_DOWN, KC_RGHT,    KC_HOME, KC_END,  KC_B
+        KC_P1,   KC_P2,   KC_P3,   KC_PENT,              KC_UP,                        KC_B,
+        KC_P0,            KC_PDOT,             KC_LEFT,  KC_DOWN, KC_RGHT
     )
 };
 
diff --git a/keyboards/donutcables/budget96/config.h b/keyboards/donutcables/budget96/config.h
deleted file mode 100644
index 398b0be3c84e..000000000000
--- a/keyboards/donutcables/budget96/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2020 DonutCables <contact@donutcables.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define RGBLED_NUM 18
-
-#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/donutcables/budget96/info.json b/keyboards/donutcables/budget96/info.json
index 98c878d12fca..a60281153530 100644
--- a/keyboards/donutcables/budget96/info.json
+++ b/keyboards/donutcables/budget96/info.json
@@ -16,6 +16,21 @@
     "backlight": {
         "pin": "D4"
     },
+    "rgblight": {
+        "led_count": 18,
+        "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": {
         "driver": "i2c"
     },
@@ -25,6 +40,7 @@
     },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
+    "community_layouts": ["96_ansi", "96_iso"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -141,6 +157,225 @@
             ]
         },
         "LAYOUT_96_ansi": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 1, "y": 0},
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [5, 5], "x": 4, "y": 0},
+                {"matrix": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 10], "x": 6, "y": 0},
+                {"matrix": [7, 10], "x": 7, "y": 0},
+                {"matrix": [7, 0], "x": 8, "y": 0},
+                {"matrix": [5, 11], "x": 9, "y": 0},
+                {"matrix": [5, 12], "x": 10, "y": 0},
+                {"matrix": [5, 13], "x": 11, "y": 0},
+                {"matrix": [5, 14], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [2, 14], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [7, 6], "x": 16, "y": 0},
+                {"matrix": [7, 8], "x": 17, "y": 0},
+                {"matrix": [7, 9], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [6, 1], "x": 6, "y": 1},
+                {"matrix": [6, 11], "x": 7, "y": 1},
+                {"matrix": [7, 11], "x": 8, "y": 1},
+                {"matrix": [7, 1], "x": 9, "y": 1},
+                {"matrix": [4, 10], "x": 10, "y": 1},
+                {"matrix": [4, 11], "x": 11, "y": 1},
+                {"matrix": [4, 12], "x": 12, "y": 1},
+                {"matrix": [4, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [4, 6], "x": 15, "y": 1},
+                {"matrix": [4, 7], "x": 16, "y": 1},
+                {"matrix": [4, 8], "x": 17, "y": 1},
+                {"matrix": [4, 9], "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": [6, 2], "x": 6.5, "y": 2},
+                {"matrix": [6, 12], "x": 7.5, "y": 2},
+                {"matrix": [7, 12], "x": 8.5, "y": 2},
+                {"matrix": [7, 2], "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, 6], "x": 15, "y": 2},
+                {"matrix": [3, 7], "x": 16, "y": 2},
+                {"matrix": [3, 8], "x": 17, "y": 2},
+                {"matrix": [3, 9], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [6, 13], "x": 7.75, "y": 3},
+                {"matrix": [7, 13], "x": 8.75, "y": 3},
+                {"matrix": [7, 3], "x": 9.75, "y": 3},
+                {"matrix": [2, 10], "x": 10.75, "y": 3},
+                {"matrix": [2, 11], "x": 11.75, "y": 3},
+                {"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [2, 6], "x": 15, "y": 3},
+                {"matrix": [2, 7], "x": 16, "y": 3},
+                {"matrix": [2, 8], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 4},
+                {"matrix": [1, 2], "x": 3.25, "y": 4},
+                {"matrix": [1, 3], "x": 4.25, "y": 4},
+                {"matrix": [1, 4], "x": 5.25, "y": 4},
+                {"matrix": [1, 5], "x": 6.25, "y": 4},
+                {"matrix": [6, 4], "x": 7.25, "y": 4},
+                {"matrix": [6, 14], "x": 8.25, "y": 4},
+                {"matrix": [7, 14], "x": 9.25, "y": 4},
+                {"matrix": [7, 4], "x": 10.25, "y": 4},
+                {"matrix": [1, 10], "x": 11.25, "y": 4},
+                {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [6, 8], "x": 14, "y": 4},
+                {"matrix": [1, 6], "x": 15, "y": 4},
+                {"matrix": [1, 7], "x": 16, "y": 4},
+                {"matrix": [1, 8], "x": 17, "y": 4},
+                {"matrix": [1, 9], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [7, 5], "x": 10, "y": 5},
+                {"matrix": [0, 10], "x": 11, "y": 5},
+                {"matrix": [0, 11], "x": 12, "y": 5},
+                {"matrix": [6, 6], "x": 13, "y": 5},
+                {"matrix": [6, 7], "x": 14, "y": 5},
+                {"matrix": [6, 9], "x": 15, "y": 5},
+                {"matrix": [0, 6], "x": 16, "y": 5},
+                {"matrix": [0, 8], "x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_96_iso": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 1, "y": 0},
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [5, 5], "x": 4, "y": 0},
+                {"matrix": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 10], "x": 6, "y": 0},
+                {"matrix": [7, 10], "x": 7, "y": 0},
+                {"matrix": [7, 0], "x": 8, "y": 0},
+                {"matrix": [5, 11], "x": 9, "y": 0},
+                {"matrix": [5, 12], "x": 10, "y": 0},
+                {"matrix": [5, 13], "x": 11, "y": 0},
+                {"matrix": [5, 14], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [2, 14], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15, "y": 0},
+                {"matrix": [7, 6], "x": 16, "y": 0},
+                {"matrix": [7, 8], "x": 17, "y": 0},
+                {"matrix": [7, 9], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [6, 1], "x": 6, "y": 1},
+                {"matrix": [6, 11], "x": 7, "y": 1},
+                {"matrix": [7, 11], "x": 8, "y": 1},
+                {"matrix": [7, 1], "x": 9, "y": 1},
+                {"matrix": [4, 10], "x": 10, "y": 1},
+                {"matrix": [4, 11], "x": 11, "y": 1},
+                {"matrix": [4, 12], "x": 12, "y": 1},
+                {"matrix": [4, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [4, 6], "x": 15, "y": 1},
+                {"matrix": [4, 7], "x": 16, "y": 1},
+                {"matrix": [4, 8], "x": 17, "y": 1},
+                {"matrix": [4, 9], "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": [6, 2], "x": 6.5, "y": 2},
+                {"matrix": [6, 12], "x": 7.5, "y": 2},
+                {"matrix": [7, 12], "x": 8.5, "y": 2},
+                {"matrix": [7, 2], "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, 6], "x": 15, "y": 2},
+                {"matrix": [3, 7], "x": 16, "y": 2},
+                {"matrix": [3, 8], "x": 17, "y": 2},
+                {"matrix": [3, 9], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [6, 13], "x": 7.75, "y": 3},
+                {"matrix": [7, 13], "x": 8.75, "y": 3},
+                {"matrix": [7, 3], "x": 9.75, "y": 3},
+                {"matrix": [2, 10], "x": 10.75, "y": 3},
+                {"matrix": [2, 11], "x": 11.75, "y": 3},
+                {"matrix": [2, 12], "x": 12.75, "y": 3},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [2, 6], "x": 15, "y": 3},
+                {"matrix": [2, 7], "x": 16, "y": 3},
+                {"matrix": [2, 8], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [0, 3], "x": 1.25, "y": 4},
+                {"matrix": [1, 1], "x": 2.25, "y": 4},
+                {"matrix": [1, 2], "x": 3.25, "y": 4},
+                {"matrix": [1, 3], "x": 4.25, "y": 4},
+                {"matrix": [1, 4], "x": 5.25, "y": 4},
+                {"matrix": [1, 5], "x": 6.25, "y": 4},
+                {"matrix": [6, 4], "x": 7.25, "y": 4},
+                {"matrix": [6, 14], "x": 8.25, "y": 4},
+                {"matrix": [7, 14], "x": 9.25, "y": 4},
+                {"matrix": [7, 4], "x": 10.25, "y": 4},
+                {"matrix": [1, 10], "x": 11.25, "y": 4},
+                {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [6, 8], "x": 14, "y": 4},
+                {"matrix": [1, 6], "x": 15, "y": 4},
+                {"matrix": [1, 7], "x": 16, "y": 4},
+                {"matrix": [1, 8], "x": 17, "y": 4},
+                {"matrix": [1, 9], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [7, 5], "x": 10, "y": 5},
+                {"matrix": [0, 10], "x": 11, "y": 5},
+                {"matrix": [0, 11], "x": 12, "y": 5},
+                {"matrix": [6, 6], "x": 13, "y": 5},
+                {"matrix": [6, 7], "x": 14, "y": 5},
+                {"matrix": [6, 9], "x": 15, "y": 5},
+                {"matrix": [0, 6], "x": 16, "y": 5},
+                {"matrix": [0, 8], "x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_96_ansi_2_right_mod": {
             "layout": [
                 {"matrix": [5, 0], "x": 0, "y": 0},
                 {"matrix": [5, 2], "x": 1, "y": 0},
@@ -234,6 +469,7 @@
                 {"matrix": [1, 6], "x": 15, "y": 4},
                 {"matrix": [1, 7], "x": 16, "y": 4},
                 {"matrix": [1, 8], "x": 17, "y": 4},
+                {"matrix": [1, 9], "x": 18, "y": 4, "h": 2},
 
                 {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
                 {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
@@ -245,8 +481,7 @@
                 {"matrix": [6, 7], "x": 14, "y": 5},
                 {"matrix": [6, 9], "x": 15, "y": 5},
                 {"matrix": [0, 6], "x": 16, "y": 5},
-                {"matrix": [0, 8], "x": 17, "y": 5},
-                {"matrix": [0, 9], "x": 18, "y": 4, "h": 2}
+                {"matrix": [0, 8], "x": 17, "y": 5}
             ]
         }
     }
diff --git a/keyboards/donutcables/budget96/keymaps/default/keymap.c b/keyboards/donutcables/budget96/keymaps/default/keymap.c
index da335622d0fb..023c570e7f0d 100644
--- a/keyboards/donutcables/budget96/keymaps/default/keymap.c
+++ b/keyboards/donutcables/budget96/keymaps/default/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_96_ansi(
+[0] = 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_PSCR, KC_NUM,  KC_INS,  KC_HOME, KC_PGUP, KC_PSLS,
       KC_GRV,   KC_1,    KC_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_PGDN, 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,
@@ -24,21 +24,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_LSFT,  KC_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_LEFT, KC_DOWN, KC_RIGHT, KC_P0,   KC_PDOT, KC_PENT),
 
-[1] = LAYOUT_96_ansi(
-      QK_BOOT, EE_CLR,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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,  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,
-      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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-[2] = LAYOUT_96_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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+[1] = LAYOUT_96_ansi_2_right_mod(
+      QK_BOOT, EE_CLR,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      BL_TOGG, BL_STEP,  BL_ON,   BL_OFF,  BL_UP,   BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
 };
 
 
diff --git a/keyboards/donutcables/budget96/keymaps/donut/keymap.c b/keyboards/donutcables/budget96/keymaps/donut/keymap.c
index d7e2bfd0d08e..f726fe2228c6 100644
--- a/keyboards/donutcables/budget96/keymaps/donut/keymap.c
+++ b/keyboards/donutcables/budget96/keymaps/donut/keymap.c
@@ -45,7 +45,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [_BASE] = LAYOUT_96_ansi(
+    [_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, 
@@ -54,29 +54,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	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(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+    [_B] = LAYOUT_96_ansi_2_right_mod(
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+	_______, _______, _______, _______, _______, B, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
 
     /* (2) Fn 1 */
-    [_FN1] = LAYOUT_96_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_PGDN, TG(1), KC_PGUP, KC_VOLD, KC_MUTE, KC_VOLU, 
-	ALT0, KC_TRNS, KC_TRNS, ALT1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, ALT2, KC_TRNS, KC_TRNS, KC_NUM, KC_TRNS, KC_TRNS, 
-	KC_TRNS, CD, KC_TRNS, KC_TRNS, KC_TRNS, ALT3, KC_TRNS, KC_TRNS, KC_TRNS, ALT4, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, AES, xkcd, KC_TRNS, KC_TRNS, KC_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, X, KC_TRNS, img, B, KC_TRNS, ALT7, ALT5, ALT6, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+    [_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(
+    [_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, 
-	KC_TRNS, 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, 
+	_______, 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),
 
diff --git a/keyboards/donutcables/budget96/keymaps/via/keymap.c b/keyboards/donutcables/budget96/keymaps/via/keymap.c
index 26a3c7cf0c55..257dff57a4cc 100644
--- a/keyboards/donutcables/budget96/keymaps/via/keymap.c
+++ b/keyboards/donutcables/budget96/keymaps/via/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_96_ansi(
+[0] = 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_PSCR, KC_NUM,  KC_INS,  KC_HOME, KC_PGUP, KC_PSLS,
       KC_GRV,   KC_1,    KC_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_PGDN, 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,
@@ -24,19 +24,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_LSFT,  KC_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_LEFT, KC_DOWN, KC_RIGHT, KC_P0,   KC_PDOT, KC_PENT),
 
-[1] = LAYOUT_96_ansi(
-      QK_BOOT, EE_CLR,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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,  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,
-      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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-[2] = LAYOUT_96_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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+[1] = LAYOUT_96_ansi_2_right_mod(
+      QK_BOOT, EE_CLR,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      BL_TOGG, BL_STEP,  BL_ON,   BL_OFF,  BL_UP,   BL_DOWN, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
 };
diff --git a/keyboards/donutcables/budget96/matrix_diagram.md b/keyboards/donutcables/budget96/matrix_diagram.md
new file mode 100644
index 000000000000..1b6255c8c89c
--- /dev/null
+++ b/keyboards/donutcables/budget96/matrix_diagram.md
@@ -0,0 +1,23 @@
+# Matrix Diagram for Donutcables Budget96
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│50 │52 │53 │54 │55 │6A │7A │70 │5B │5C │5C │5D │5E │1D │2E │0D │76 │78 │79 │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤    ┌───────┐
+│40 │41 │42 │43 │44 │45 │61 │6B │7B │71 │4A │4B │4C │4D │4E │46 │47 │48 │49 │    │4D     │ 2u Backpsace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┼───┼───┼───┤    └─┬─────┤                ┌───┐
+│30   │31 │32 │33 │34 │35 │62 │6C │7C │72 │3A │3B │3C │3D   │36 │37 │38 │39 │      │     │                │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┼───┤   ┌──┴┐2D  │ ISO Enter      │39 │ Numpad "+" 2u
+│20    │21 │22 │23 │24 │25 │63 │6D │7D │73 │2A │2B │2C      │26 │27 │28 │29 │   │2C │    │                │   │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤   └───┴────┘                ├───┤
+│10  │03 │11 │12 │13 │14 │15 │64 │6E │7E │74 │1A │1B    │68 │16 │17 │18 │19 │                             │   │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┼───┼───┼───┤                 ┌───────┐   │19 │ Numpad Enter 2U
+│00  │01  │02  │65                      │75 │0A │0B │66 │67 │69 │06 │08 │09 │     Numpad 0 2u │06     │   │   │
+└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┴───┴───┴───┘                 └───────┘   └───┘
+┌────────┐                                       ┌──────────┐
+│10      │ 2.25u LShift             2.75u RShift │1B        │
+└────────┘                                       └──────────┘
+┌────┬────┬────┬────────────────────────┬─────┬─────┐
+│00  │01  │02  │65                      │75   │0B   │ 2x1.5u Right Mod
+└────┴────┴────┴────────────────────────┴─────┴─────┘
+```
diff --git a/keyboards/doodboard/duckboard/config.h b/keyboards/doodboard/duckboard/config.h
deleted file mode 100644
index a73678faf255..000000000000
--- a/keyboards/doodboard/duckboard/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020-2021 doodboard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* media key slowdown for windows */
-#define TAP_CODE_DELAY 20
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 8    // Number of LEDs
-#endif
diff --git a/keyboards/doodboard/duckboard/info.json b/keyboards/doodboard/duckboard/info.json
index 367a9b7d72cc..3d4577011213 100644
--- a/keyboards/doodboard/duckboard/info.json
+++ b/keyboards/doodboard/duckboard/info.json
@@ -18,6 +18,12 @@
             {"pin_a": "F5", "pin_b": "F6", "resolution": 2}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 20
+    },
+    "rgblight": {
+        "led_count": 8
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/doodboard/duckboard/rules.mk b/keyboards/doodboard/duckboard/rules.mk
index 4ddaccda461d..0551c8b37099 100644
--- a/keyboards/doodboard/duckboard/rules.mk
+++ b/keyboards/doodboard/duckboard/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/doodboard/duckboard_r2/config.h b/keyboards/doodboard/duckboard_r2/config.h
deleted file mode 100644
index a73678faf255..000000000000
--- a/keyboards/doodboard/duckboard_r2/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020-2021 doodboard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* media key slowdown for windows */
-#define TAP_CODE_DELAY 20
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 8    // Number of LEDs
-#endif
diff --git a/keyboards/doodboard/duckboard_r2/info.json b/keyboards/doodboard/duckboard_r2/info.json
index 00d0fc64521f..4c47e9a70ea4 100644
--- a/keyboards/doodboard/duckboard_r2/info.json
+++ b/keyboards/doodboard/duckboard_r2/info.json
@@ -18,6 +18,12 @@
             {"pin_a": "F6", "pin_b": "F5", "resolution": 2}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 20
+    },
+    "rgblight": {
+        "led_count": 8
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/doodboard/duckboard_r2/rules.mk b/keyboards/doodboard/duckboard_r2/rules.mk
index 4ddaccda461d..0551c8b37099 100644
--- a/keyboards/doodboard/duckboard_r2/rules.mk
+++ b/keyboards/doodboard/duckboard_r2/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/doppelganger/config.h b/keyboards/doppelganger/config.h
index bc64bd9001c0..a18b48474656 100644
--- a/keyboards/doppelganger/config.h
+++ b/keyboards/doppelganger/config.h
@@ -21,10 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // #define USE_I2C
 
-#define RGBLED_NUM 2
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 1, 1 }
-
 /* 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/doppelganger/info.json b/keyboards/doppelganger/info.json
index 83a3e68be750..ea53bfb9156c 100644
--- a/keyboards/doppelganger/info.json
+++ b/keyboards/doppelganger/info.json
@@ -22,6 +22,10 @@
             }
         }
     },
+    "rgblight": {
+        "led_count": 2,
+        "split_count": [1, 1]
+    },
     "ws2812": {
         "pin": "B4"
     },
diff --git a/keyboards/doro67/multi/info.json b/keyboards/doro67/multi/info.json
index db8da861c13f..10cd3bb652a9 100644
--- a/keyboards/doro67/multi/info.json
+++ b/keyboards/doro67/multi/info.json
@@ -24,6 +24,9 @@
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["65_ansi_blocker"],
+  "layout_aliases": {
+    "LAYOUT_ansi": "LAYOUT_65_ansi_blocker"
+  },
   "layouts": {
     "LAYOUT_65_ansi_blocker": {
       "layout": [
diff --git a/keyboards/doro67/regular/info.json b/keyboards/doro67/regular/info.json
index 70997d3e1a3c..863d935b0a68 100644
--- a/keyboards/doro67/regular/info.json
+++ b/keyboards/doro67/regular/info.json
@@ -19,6 +19,9 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker"],
+    "layout_aliases": {
+      "LAYOUT": "LAYOUT_65_ansi_blocker"
+    },
     "layouts": {
       "LAYOUT_65_ansi_blocker": {
         "layout": [
diff --git a/keyboards/doro67/rgb/config.h b/keyboards/doro67/rgb/config.h
index cca3e4d26fbd..e18a23138074 100644
--- a/keyboards/doro67/rgb/config.h
+++ b/keyboards/doro67/rgb/config.h
@@ -70,8 +70,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#define RGBLED_NUM 67
-
 /* 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 f4a7d40dcef0..ad7661830a9c 100644
--- a/keyboards/doro67/rgb/info.json
+++ b/keyboards/doro67/rgb/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-      "driver": "WS2812"
+      "driver": "ws2812"
     },
     "matrix_pins": {
       "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6", "F7"],
@@ -26,6 +26,9 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["65_ansi_blocker"],
+    "layout_aliases": {
+      "LAYOUT": "LAYOUT_65_ansi_blocker"
+    },
     "layouts": {
       "LAYOUT_65_ansi_blocker": {
         "layout": [
diff --git a/keyboards/dotmod/dymium65/info.json b/keyboards/dotmod/dymium65/info.json
index 83e2951baa98..650260483c6b 100644
--- a/keyboards/dotmod/dymium65/info.json
+++ b/keyboards/dotmod/dymium65/info.json
@@ -38,7 +38,7 @@
         "pin": "D7"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "animations": {
             "breathing": true,
             "band_val": true,
diff --git a/keyboards/dp3000/dp3000.c b/keyboards/dp3000/dp3000.c
index 3d99670fe36d..6daeaa56630e 100644
--- a/keyboards/dp3000/dp3000.c
+++ b/keyboards/dp3000/dp3000.c
@@ -15,20 +15,75 @@
  */
 #include "quantum.h"
 
-bool oled_task_kb(void) {
-     if (!oled_task_user()) {
-          return false;
-     }
+#define LOGO_TIMEOUT 3000
+
+static uint32_t logo_timer = 0;
+static bool display_logo = true;
+
+void dp3000_logo(void) {
+    static const char PROGMEM dp3000_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, 0x80, 0xc0, 0xe0, 0x60, 0x7c, 0x7c, 0x60, 0x60, 0x60, 0x60,
+        0x7c, 0x7c, 0x60, 0x60, 0x60, 0x60, 0x7c, 0x7c, 0x60, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x86, 0x86, 0x86, 0xff, 0xff, 0x00, 0x00, 0xf8, 0xf8, 0x18, 0x18, 0xf0, 0xe0,
+        0x00, 0x00, 0xf8, 0xf8, 0x18, 0x18, 0xf8, 0xf0, 0x00, 0x00, 0xff, 0xff, 0x86, 0x86, 0x86, 0x00,
+        0x00, 0x00, 0x00, 0x18, 0x18, 0x98, 0x98, 0xf8, 0xf0, 0x00, 0xf0, 0xf8, 0x18, 0x18, 0xf8, 0xf0,
+        0x00, 0xf0, 0xf8, 0x18, 0x18, 0xf8, 0xf0, 0x00, 0xf0, 0xf8, 0x18, 0x18, 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, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x61, 0x61, 0x61, 0xff, 0xff, 0x00, 0x00, 0x1f, 0x1f, 0x18, 0x18, 0x0f, 0x07,
+        0x00, 0x00, 0x1f, 0x1f, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0xff, 0xff, 0x61, 0x61, 0x61, 0x00,
+        0x00, 0x00, 0x00, 0x18, 0x18, 0x19, 0x19, 0x1f, 0x0f, 0x00, 0x0f, 0x1f, 0x18, 0x18, 0x1f, 0x0f,
+        0x00, 0x0f, 0x1f, 0x18, 0x18, 0x1f, 0x0f, 0x00, 0x0f, 0x1f, 0x18, 0x18, 0x1f, 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, 0x01, 0x03, 0x07, 0x06, 0x3e, 0x3e, 0x06, 0x06, 0x06, 0x06,
+        0x3e, 0x3e, 0x06, 0x06, 0x06, 0x06, 0x3e, 0x3e, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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(dp3000_logo, sizeof(dp3000_logo));
+}
+
+void default_status(void) {
+    oled_set_cursor(0, 0);
     oled_write_P(PSTR("LAYER: "), false);
     oled_write_char('0' + get_highest_layer(layer_state), false);
-
+    oled_advance_page(true);
+    oled_write_P(PSTR("LOCK: "), false);
     led_t led_state = host_keyboard_led_state();
-    oled_set_cursor(0, 1);
     oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
-    oled_set_cursor(0, 2);
     oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
-    oled_set_cursor(0, 3);
     oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    if (display_logo && timer_elapsed32(logo_timer) > LOGO_TIMEOUT) {
+        display_logo = false;
+        oled_clear();
+        logo_timer = 0;
+    }
+    if (display_logo) {
+        dp3000_logo();
+    } else {
+        default_status();
+    }
 
     return false;
 }
diff --git a/keyboards/dp3000/info.json b/keyboards/dp3000/info.json
index c7348c81a89f..cdb9fe4547d9 100644
--- a/keyboards/dp3000/info.json
+++ b/keyboards/dp3000/info.json
@@ -34,7 +34,7 @@
         "pin": "B5"
     },
     "rgb_matrix":{
-        "driver":"WS2812",
+        "driver":"ws2812",
         "max_brightness": 180,
         "animations": {
             "alphas_mods": true,
diff --git a/keyboards/dp3000/post_config.h b/keyboards/dp3000/post_config.h
new file mode 100644
index 000000000000..ef2ce27e2190
--- /dev/null
+++ b/keyboards/dp3000/post_config.h
@@ -0,0 +1,22 @@
+/*
+ * 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
+
+#if !defined(OLED_TIMEOUT)
+#    define OLED_TIMEOUT 30000
+#endif
diff --git a/keyboards/dp60/config.h b/keyboards/dp60/config.h
index b1518cb5fb25..fd83fe2d6800 100644
--- a/keyboards/dp60/config.h
+++ b/keyboards/dp60/config.h
@@ -32,22 +32,6 @@
 /* disable print */
 //#define NO_PRINT
 
-//rgb light setting
-#define RGBLED_NUM      18
-#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
-
 //rgb matrix setting
 #define DRIVER_ADDR_1 0b1110100
 #define DRIVER_ADDR_2 0b1110111
@@ -88,18 +72,18 @@
 #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
+// #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 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/dp60/info.json b/keyboards/dp60/info.json
index 625ca2a23853..10af7cb6cac2 100644
--- a/keyboards/dp60/info.json
+++ b/keyboards/dp60/info.json
@@ -8,11 +8,28 @@
         "pid": "0x00BE",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "D7"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/draculad/config.h b/keyboards/draculad/config.h
index a9f78283d0c8..aabdb63b8d18 100644
--- a/keyboards/draculad/config.h
+++ b/keyboards/draculad/config.h
@@ -22,17 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define OLED_TIMEOUT 30000
 #endif
 
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLED_NUM 10
-#define RGBLIGHT_SPLIT
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-
 #define EE_HANDS
 
 #define LAYER_STATE_8BIT
diff --git a/keyboards/draculad/info.json b/keyboards/draculad/info.json
index 57250d57efed..cd157a0ed58f 100644
--- a/keyboards/draculad/info.json
+++ b/keyboards/draculad/info.json
@@ -8,6 +8,19 @@
         "pid": "0x1B1E",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "sleep": true,
+        "split": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/draculad/keymaps/pimoroni/rules.mk b/keyboards/draculad/keymaps/pimoroni/rules.mk
index 66d3bf0e46b4..72ace5a3df1f 100644
--- a/keyboards/draculad/keymaps/pimoroni/rules.mk
+++ b/keyboards/draculad/keymaps/pimoroni/rules.mk
@@ -2,5 +2,4 @@
 POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = pimoroni_trackball
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 MOUSEKEY_ENABLE = yes
diff --git a/keyboards/draculad/rules.mk b/keyboards/draculad/rules.mk
index 453d3b26b1de..5f5fd002a1a0 100644
--- a/keyboards/draculad/rules.mk
+++ b/keyboards/draculad/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
diff --git a/keyboards/draytronics/daisy/config.h b/keyboards/draytronics/daisy/config.h
index 7b129153937b..96a439558477 100644
--- a/keyboards/draytronics/daisy/config.h
+++ b/keyboards/draytronics/daisy/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -37,21 +35,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
-
-//Underglow
-  #define RGBLED_NUM 4
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-  /*== all animations 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
diff --git a/keyboards/draytronics/daisy/info.json b/keyboards/draytronics/daisy/info.json
index ae0579b66782..4597ca9d178d 100644
--- a/keyboards/draytronics/daisy/info.json
+++ b/keyboards/draytronics/daisy/info.json
@@ -19,6 +19,27 @@
             {"pin_a": "D0", "pin_b": "D1"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "D4"
     },
diff --git a/keyboards/draytronics/elise/config.h b/keyboards/draytronics/elise/config.h
index 9d350995526f..0df48812aa31 100644
--- a/keyboards/draytronics/elise/config.h
+++ b/keyboards/draytronics/elise/config.h
@@ -22,21 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-// ws2812 options
-  #define RGBLED_NUM 7
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-  /*== all animations 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
diff --git a/keyboards/draytronics/elise/info.json b/keyboards/draytronics/elise/info.json
index 81be5cffd7c2..80f4fa69e534 100644
--- a/keyboards/draytronics/elise/info.json
+++ b/keyboards/draytronics/elise/info.json
@@ -13,6 +13,24 @@
         "rows": ["B2", "B3", "B1", "F0", "F1"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 7,
+        "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": "D1"
     },
diff --git a/keyboards/draytronics/elise_v2/config.h b/keyboards/draytronics/elise_v2/config.h
index fdbdb23ce427..0df48812aa31 100644
--- a/keyboards/draytronics/elise_v2/config.h
+++ b/keyboards/draytronics/elise_v2/config.h
@@ -22,21 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-// ws2812 options
-  #define RGBLED_NUM 16
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-  /*== all animations 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
diff --git a/keyboards/draytronics/elise_v2/info.json b/keyboards/draytronics/elise_v2/info.json
index faef95cbee0a..966ca3faa42b 100644
--- a/keyboards/draytronics/elise_v2/info.json
+++ b/keyboards/draytronics/elise_v2/info.json
@@ -8,6 +8,24 @@
         "pid": "0x454C",
         "device_version": "2.0.0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "D1"
     },
diff --git a/keyboards/drewkeys/mercury65/info.json b/keyboards/drewkeys/mercury65/info.json
index 93f7b2ec3bc7..68fa52d8d375 100644
--- a/keyboards/drewkeys/mercury65/info.json
+++ b/keyboards/drewkeys/mercury65/info.json
@@ -21,79 +21,386 @@
         "cols": ["B0", "B1", "B2", "B3", "B7", "D1", "D2", "D3", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5"],
         "rows": ["D5", "D4", "D6", "D0", "E6"]
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "label":"`", "x":0, "y":0},
+                {"matrix": [0, 1], "label":"!", "x":1, "y":0},
+                {"matrix": [0, 2], "label":"@", "x":2, "y":0},
+                {"matrix": [0, 3], "label":"#", "x":3, "y":0},
+                {"matrix": [0, 4], "label":"$", "x":4, "y":0},
+                {"matrix": [0, 5], "label":"%", "x":5, "y":0},
+                {"matrix": [0, 6], "label":"^", "x":6, "y":0},
+                {"matrix": [0, 7], "label":"&", "x":7, "y":0},
+                {"matrix": [0, 8], "label":"*", "x":8, "y":0},
+                {"matrix": [0, 9], "label":"(", "x":9, "y":0},
+                {"matrix": [0, 10], "label":")", "x":10, "y":0},
+                {"matrix": [0, 11], "label":"_", "x":11, "y":0},
+                {"matrix": [0, 12], "label":"+", "x":12, "y":0},
+                {"matrix": [0, 13], "label":"Del", "x":13, "y":0},
+                {"matrix": [0, 14], "label":"Bsp", "x":14, "y":0},
+
+                {"matrix": [1, 0], "label":"Tab", "x":0, "y":1, "w":1.5},
+                {"matrix": [1, 2], "label":"Q", "x":1.5, "y":1},
+                {"matrix": [1, 3], "label":"W", "x":2.5, "y":1},
+                {"matrix": [1, 4], "label":"E", "x":3.5, "y":1},
+                {"matrix": [1, 5], "label":"R", "x":4.5, "y":1},
+                {"matrix": [1, 6], "label":"T", "x":5.5, "y":1},
+                {"matrix": [1, 7], "label":"Y", "x":6.5, "y":1},
+                {"matrix": [1, 8], "label":"U", "x":7.5, "y":1},
+                {"matrix": [1, 9], "label":"I", "x":8.5, "y":1},
+                {"matrix": [1, 10], "label":"O", "x":9.5, "y":1},
+                {"matrix": [1, 11], "label":"P", "x":10.5, "y":1},
+                {"matrix": [1, 12], "label":"{", "x":11.5, "y":1},
+                {"matrix": [1, 13], "label":"}", "x":12.5, "y":1},
+                {"matrix": [1, 14], "label":"|", "x":13.5, "y":1, "w":1.5},
+                {"matrix": [1, 16], "label":"PgUp", "x":15.5, "y":1},
+
+                {"matrix": [2, 0], "label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"matrix": [2, 2], "label":"A", "x":1.75, "y":2},
+                {"matrix": [2, 3], "label":"S", "x":2.75, "y":2},
+                {"matrix": [2, 4], "label":"D", "x":3.75, "y":2},
+                {"matrix": [2, 5], "label":"F", "x":4.75, "y":2},
+                {"matrix": [2, 6], "label":"G", "x":5.75, "y":2},
+                {"matrix": [2, 7], "label":"H", "x":6.75, "y":2},
+                {"matrix": [2, 8], "label":"J", "x":7.75, "y":2},
+                {"matrix": [2, 9], "label":"K", "x":8.75, "y":2},
+                {"matrix": [2, 10], "label":"L", "x":9.75, "y":2},
+                {"matrix": [2, 11], "label":":", "x":10.75, "y":2},
+                {"matrix": [2, 12], "label":"@", "x":11.75, "y":2},
+                {"matrix": [2, 13], "label":"ISO", "x":12.75, "y":2},
+                {"matrix": [2, 14], "label":"Enter", "x":13.75, "y":2, "w":1.25},
+                {"matrix": [2, 16], "label":"Home", "x":15.5, "y":2},
+
+                {"matrix": [3, 0], "label":"Shift", "x":0, "y":3, "w":1.25},
+                {"matrix": [3, 1], "label":"\\", "x":1.25, "y":3},
+                {"matrix": [3, 2], "label":"Z", "x":2.25, "y":3},
+                {"matrix": [3, 3], "label":"X", "x":3.25, "y":3},
+                {"matrix": [3, 4], "label":"C", "x":4.25, "y":3},
+                {"matrix": [3, 5], "label":"V", "x":5.25, "y":3},
+                {"matrix": [3, 6], "label":"B", "x":6.25, "y":3},
+                {"matrix": [3, 7], "label":"N", "x":7.25, "y":3},
+                {"matrix": [3, 8], "label":"M", "x":8.25, "y":3},
+                {"matrix": [3, 9], "label":"<", "x":9.25, "y":3},
+                {"matrix": [3, 10], "label":">", "x":10.25, "y":3},
+                {"matrix": [3, 11], "label":"?", "x":11.25, "y":3},
+                {"matrix": [3, 13], "label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"matrix": [3, 14], "label":"\u2191", "x":14.25, "y":3.25},
+                {"matrix": [3, 16], "label":"End", "x":15.5, "y":3},
+
+                {"matrix": [4, 0], "label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"matrix": [4, 1], "label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"matrix": [4, 2], "label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"matrix": [4, 6], "x":3.75, "y":4, "w":6.25},
+                {"matrix": [4, 10], "label":"AltGr", "x":10, "y":4, "w":1.25},
+                {"matrix": [4, 11], "label":"Win", "x":11.25, "y":4, "w":1.25},
+                {"matrix": [4, 13], "label":"\u2190", "x":13.25, "y":4.25},
+                {"matrix": [4, 14], "label":"\u2193", "x":14.25, "y":4.25},
+                {"matrix": [4, 15], "label":"\u2192", "x":15.25, "y":4.25}
+            ]
+        },
+        "LAYOUT_ansi_blocker_split_bs": {
+            "layout": [
+                {"label": "`", "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": "Del", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Bsp", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "PgUp", "matrix": [1, 16], "x": 15.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Home", "matrix": [2, 16], "x": 15.5, "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25},
+                {"label": "End", "matrix": [3, 16], "x": 15.5, "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": "AltGr", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"label": "\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "`", "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": "Del", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Bsp", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "PgUp", "matrix": [1, 16], "x": 15.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Home", "matrix": [2, 16], "x": 15.5, "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25},
+                {"label": "End", "matrix": [3, 16], "x": 15.5, "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, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "GUI", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"label": "\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso_blocker_split_bs": {
             "layout": [
-                {"matrix": [0, 0], "label":"`", "x":0, "y":0}, 
-                {"matrix": [0, 1], "label":"!", "x":1, "y":0}, 
-                {"matrix": [0, 2], "label":"@", "x":2, "y":0}, 
-                {"matrix": [0, 3], "label":"#", "x":3, "y":0}, 
-                {"matrix": [0, 4], "label":"$", "x":4, "y":0}, 
-                {"matrix": [0, 5], "label":"%", "x":5, "y":0}, 
-                {"matrix": [0, 6], "label":"^", "x":6, "y":0}, 
-                {"matrix": [0, 7], "label":"&", "x":7, "y":0}, 
-                {"matrix": [0, 8], "label":"*", "x":8, "y":0}, 
-                {"matrix": [0, 9], "label":"(", "x":9, "y":0}, 
-                {"matrix": [0, 10], "label":")", "x":10, "y":0}, 
-                {"matrix": [0, 11], "label":"_", "x":11, "y":0}, 
-                {"matrix": [0, 12], "label":"+", "x":12, "y":0}, 
-                {"matrix": [0, 13], "label":"Del", "x":13, "y":0}, 
-                {"matrix": [0, 14], "label":"Bsp", "x":14, "y":0}, 
-                {"matrix": [1, 0], "label":"Tab", "x":0, "y":1, "w":1.5}, 
-                {"matrix": [1, 2], "label":"Q", "x":1.5, "y":1}, 
-                {"matrix": [1, 3], "label":"W", "x":2.5, "y":1}, 
-                {"matrix": [1, 4], "label":"E", "x":3.5, "y":1}, 
-                {"matrix": [1, 5], "label":"R", "x":4.5, "y":1}, 
-                {"matrix": [1, 6], "label":"T", "x":5.5, "y":1}, 
-                {"matrix": [1, 7], "label":"Y", "x":6.5, "y":1}, 
-                {"matrix": [1, 8], "label":"U", "x":7.5, "y":1}, 
-                {"matrix": [1, 9], "label":"I", "x":8.5, "y":1}, 
-                {"matrix": [1, 10], "label":"O", "x":9.5, "y":1}, 
-                {"matrix": [1, 11], "label":"P", "x":10.5, "y":1}, 
-                {"matrix": [1, 12], "label":"{", "x":11.5, "y":1}, 
-                {"matrix": [1, 13], "label":"}", "x":12.5, "y":1}, 
-                {"matrix": [1, 14], "label":"|", "x":13.5, "y":1, "w":1.5}, 
-                {"matrix": [1, 16], "label":"PgUp", "x":15.5, "y":1}, 
-                {"matrix": [2, 0], "label":"Caps Lock", "x":0, "y":2, "w":1.75}, 
-                {"matrix": [2, 2], "label":"A", "x":1.75, "y":2}, 
-                {"matrix": [2, 3], "label":"S", "x":2.75, "y":2}, 
-                {"matrix": [2, 4], "label":"D", "x":3.75, "y":2}, 
-                {"matrix": [2, 5], "label":"F", "x":4.75, "y":2}, 
-                {"matrix": [2, 6], "label":"G", "x":5.75, "y":2}, 
-                {"matrix": [2, 7], "label":"H", "x":6.75, "y":2}, 
-                {"matrix": [2, 8], "label":"J", "x":7.75, "y":2}, 
-                {"matrix": [2, 9], "label":"K", "x":8.75, "y":2}, 
-                {"matrix": [2, 10], "label":"L", "x":9.75, "y":2}, 
-                {"matrix": [2, 11], "label":":", "x":10.75, "y":2}, 
-                {"matrix": [2, 12], "label":"@", "x":11.75, "y":2}, 
-                {"matrix": [2, 13], "label":"ISO", "x":12.75, "y":2}, 
-                {"matrix": [2, 14], "label":"Enter", "x":13.75, "y":2, "w":1.25}, 
-                {"matrix": [2, 16], "label":"Home", "x":15.5, "y":2}, 
-                {"matrix": [3, 0], "label":"Shift", "x":0, "y":3, "w":1.25}, 
-                {"matrix": [3, 1], "label":"\\", "x":1.25, "y":3}, 
-                {"matrix": [3, 2], "label":"Z", "x":2.25, "y":3}, 
-                {"matrix": [3, 3], "label":"X", "x":3.25, "y":3}, 
-                {"matrix": [3, 4], "label":"C", "x":4.25, "y":3}, 
-                {"matrix": [3, 5], "label":"V", "x":5.25, "y":3}, 
-                {"matrix": [3, 6], "label":"B", "x":6.25, "y":3}, 
-                {"matrix": [3, 7], "label":"N", "x":7.25, "y":3}, 
-                {"matrix": [3, 8], "label":"M", "x":8.25, "y":3}, 
-                {"matrix": [3, 9], "label":"<", "x":9.25, "y":3}, 
-                {"matrix": [3, 10], "label":">", "x":10.25, "y":3}, 
-                {"matrix": [3, 11], "label":"?", "x":11.25, "y":3}, 
-                {"matrix": [3, 13], "label":"Shift", "x":12.25, "y":3, "w":1.75}, 
-                {"matrix": [3, 14], "label":"End", "x":15.5, "y":3}, 
-                {"matrix": [3, 16], "label":"\u2191", "x":14.25, "y":3.25}, 
-                {"matrix": [4, 0], "label":"Ctrl", "x":0, "y":4, "w":1.25}, 
-                {"matrix": [4, 1], "label":"Win", "x":1.25, "y":4, "w":1.25}, 
-                {"matrix": [4, 2], "label":"Alt", "x":2.5, "y":4, "w":1.25}, 
-                {"matrix": [4, 6], "x":3.75, "y":4, "w":6.25}, 
-                {"matrix": [4, 10], "label":"AltGr", "x":10, "y":4, "w":1.25}, 
-                {"matrix": [4, 11], "label":"Win", "x":11.25, "y":4, "w":1.25}, 
-                {"matrix": [4, 13], "label":"\u2190", "x":13.25, "y":4.25}, 
-                {"matrix": [4, 14], "label":"\u2193", "x":14.25, "y":4.25}, 
-                {"matrix": [4, 15], "label":"\u2192", "x":15.25, "y":4.25}]
+                {"label": "`", "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": "Del", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Bsp", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 12.5, "y": 1},
+                {"label": "PgUp", "matrix": [1, 16], "x": 15.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Home", "matrix": [2, 16], "x": 15.5, "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25},
+                {"label": "End", "matrix": [3, 16], "x": 15.5, "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": "AltGr", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"label": "\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "`", "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": "Del", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Bsp", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 12], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 13], "x": 12.5, "y": 1},
+                {"label": "PgUp", "matrix": [1, 16], "x": 15.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 12], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Home", "matrix": [2, 16], "x": 15.5, "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25},
+                {"label": "End", "matrix": [3, 16], "x": 15.5, "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, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "GUI", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"label": "\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+                {"label": "\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25}
+            ]
         }
     }
-
 }
diff --git a/keyboards/drewkeys/mercury65/keymaps/default/keymap.c b/keyboards/drewkeys/mercury65/keymaps/default/keymap.c
index 2f9cc945c9d2..c37dac5359c3 100644
--- a/keyboards/drewkeys/mercury65/keymaps/default/keymap.c
+++ b/keyboards/drewkeys/mercury65/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base https://i.imgur.com/viQdtbB.png */
-    [_BASE] = LAYOUT(
+    [_BASE] = LAYOUT_all(
         KC_ESC,     KC_1, KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,     KC_9,    KC_0, KC_MINS, KC_EQL,  KC_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_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,
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                     KC_SPC,                           MO(1), KC_RGUI,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_FN] = LAYOUT(
+    [_FN] = 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_BSLS, KC_BSPC,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
diff --git a/keyboards/drewkeys/mercury65/keymaps/via/keymap.c b/keyboards/drewkeys/mercury65/keymaps/via/keymap.c
index 2af6a064f298..faa3cfc3ec0f 100644
--- a/keyboards/drewkeys/mercury65/keymaps/via/keymap.c
+++ b/keyboards/drewkeys/mercury65/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base https://i.imgur.com/viQdtbB.png */
-    [_BASE] = LAYOUT(
+    [_BASE] = LAYOUT_all(
         KC_ESC,     KC_1, KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,     KC_9,    KC_0, KC_MINS, KC_EQL,  KC_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_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,
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                     KC_SPC,                           MO(1), KC_RGUI,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_FN1] = LAYOUT(
+    [_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_BSLS, KC_BSPC,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
diff --git a/keyboards/drewkeys/mercury65/matrix_diagram.md b/keyboards/drewkeys/mercury65/matrix_diagram.md
new file mode 100644
index 000000000000..32fd838a3e47
--- /dev/null
+++ b/keyboards/drewkeys/mercury65/matrix_diagram.md
@@ -0,0 +1,25 @@
+# Matrix Diagram for RocketKeyboards mercury65
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │??     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ┌───┐      ┌─────┐
+│10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │ │1G │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤   ┌──┴┐2E  │ ISO Enter
+│20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E      │ │2G │   │2D │    │  
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤   └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │┌───┐│3G │ 
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─────┘│3E │└───┘
+│40  │41  │42  │46                      │4A  │4B  │  ┌───┼───┼───┐
+└────┴────┴────┴────────────────────────┴────┴────┘  │4D │4E │4F │
+                                                     └───┴───┴───┘
+┌────────┐
+│30      │ 2.25u LShift
+└────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┐
+│40   │41 │42   │46                         │4B   │ Blocker Tsangan
+└─────┴───┴─────┴───────────────────────────┴─────┘
+```
diff --git a/keyboards/drop/alt/v2/config.h b/keyboards/drop/alt/v2/config.h
index f3f432390e1a..5de22f7bcf53 100644
--- a/keyboards/drop/alt/v2/config.h
+++ b/keyboards/drop/alt/v2/config.h
@@ -21,7 +21,6 @@
 #define ISSI_PWM_FREQUENCY 0b010 // 26k
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_DEFAULT_VAL 100
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
diff --git a/keyboards/drop/alt/v2/info.json b/keyboards/drop/alt/v2/info.json
index 432dd4b2d1a1..c234f03090c4 100644
--- a/keyboards/drop/alt/v2/info.json
+++ b/keyboards/drop/alt/v2/info.json
@@ -104,7 +104,8 @@
         }
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733",
+        "driver": "is31fl3733",
+        "max_brightness": 191,
         "animations": {
             "alphas_mods": true,
             "gradient_up_down": true,
diff --git a/keyboards/drop/cstm80/board.h b/keyboards/drop/cstm80/board.h
new file mode 100644
index 000000000000..ed3ea4b1f776
--- /dev/null
+++ b/keyboards/drop/cstm80/board.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/drop/cstm80/config.h b/keyboards/drop/cstm80/config.h
new file mode 100644
index 000000000000..2aefadfe303d
--- /dev/null
+++ b/keyboards/drop/cstm80/config.h
@@ -0,0 +1,22 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define I2C1_SCL_PIN B8
+#define I2C1_SDA_PIN B9
+
+#define EXTERNAL_EEPROM_I2C_BASE_ADDRESS 0b10101000
+#define EXTERNAL_EEPROM_WP_PIN B7
+#define EEPROM_I2C_24LC256
+
+#define DRIVER_ADDR_1 0b1010000
+#define DRIVER_ADDR_2 0b1011111
+#define DRIVER_COUNT 2
+#define RGB_MATRIX_LED_COUNT 88
+#define ISSI_PWM_FREQUENCY 0b010 // 26k
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#define RGB_MATRIX_CAPS_LOCK_INDEX 48
diff --git a/keyboards/drop/cstm80/cstm80.c b/keyboards/drop/cstm80/cstm80.c
new file mode 100644
index 000000000000..c60f347cb9b7
--- /dev/null
+++ b/keyboards/drop/cstm80/cstm80.c
@@ -0,0 +1,96 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#ifdef RGB_MATRIX_ENABLE
+#    include "rgb_matrix.h"
+
+const is31_led PROGMEM g_is31_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 },
+};
+#endif
diff --git a/keyboards/drop/cstm80/halconf.h b/keyboards/drop/cstm80/halconf.h
new file mode 100644
index 000000000000..2677c2a654c8
--- /dev/null
+++ b/keyboards/drop/cstm80/halconf.h
@@ -0,0 +1,7 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/drop/cstm80/info.json b/keyboards/drop/cstm80/info.json
new file mode 100644
index 000000000000..170538027e41
--- /dev/null
+++ b/keyboards/drop/cstm80/info.json
@@ -0,0 +1,272 @@
+{
+    "keyboard_name": "CSTM80",
+    "manufacturer": "Drop Inc.",
+    "maintainer": "zvecr",
+    "processor": "STM32F303",
+    "bootloader": "tinyuf2",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["C15", "C14", "C13", "C12", "C11", "C10", "C9", "C8", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "D2"],
+        "rows": ["B15", "B14", "B13", "B12", "B11", "B10"]
+    },
+    "usb": {
+        "vid": "0x359B",
+        "pid": "0x0004",
+        "device_version": "1.0.0"
+    },
+    "eeprom": {
+        "driver": "i2c"
+    },
+    "features": {
+        "rgb_matrix": true,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "community_layouts": ["tkl_f13_ansi"],
+    "layouts": {
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                { "matrix": [0,  0], "label":"Esc",   "x":0, "y":0},
+                { "matrix": [0,  1], "label":"F1",    "x":1.25, "y":0},
+                { "matrix": [0,  2], "label":"F2",    "x":2.25, "y":0},
+                { "matrix": [0,  3], "label":"F3",    "x":3.25, "y":0},
+                { "matrix": [0,  4], "label":"F4",    "x":4.25, "y":0},
+                { "matrix": [0,  5], "label":"F5",    "x":5.5, "y":0},
+                { "matrix": [0,  6], "label":"F6",    "x":6.5, "y":0},
+                { "matrix": [0,  7], "label":"F7",    "x":7.5, "y":0},
+                { "matrix": [0,  8], "label":"F8",    "x":8.5, "y":0},
+                { "matrix": [0,  9], "label":"F9",    "x":9.75, "y":0},
+                { "matrix": [0, 10], "label":"F10",   "x":10.75, "y":0},
+                { "matrix": [0, 11], "label":"F11",   "x":11.75, "y":0},
+                { "matrix": [0, 12], "label":"F12",   "x":12.75, "y":0},
+                { "matrix": [0, 13], "label":"F13",   "x":14, "y":0},
+                { "matrix": [0, 14], "label":"PrtSc", "x":15.25, "y":0},
+                { "matrix": [0, 15], "label":"ScrLk", "x":16.25, "y":0},
+                { "matrix": [0, 16], "label":"Pause", "x":17.25, "y":0},
+
+                { "matrix": [1,  0], "label":"~",      "x":0, "y":1.25},
+                { "matrix": [1,  1], "label":"!",      "x":1, "y":1.25},
+                { "matrix": [1,  2], "label":"@",      "x":2, "y":1.25},
+                { "matrix": [1,  3], "label":"#",      "x":3, "y":1.25},
+                { "matrix": [1,  4], "label":"$",      "x":4, "y":1.25},
+                { "matrix": [1,  5], "label":"%",      "x":5, "y":1.25},
+                { "matrix": [1,  6], "label":"^",      "x":6, "y":1.25},
+                { "matrix": [1,  7], "label":"&",      "x":7, "y":1.25},
+                { "matrix": [1,  8], "label":"*",      "x":8, "y":1.25},
+                { "matrix": [1,  9], "label":"(",      "x":9, "y":1.25},
+                { "matrix": [1, 10], "label":")",      "x":10, "y":1.25},
+                { "matrix": [1, 11], "label":"_",      "x":11, "y":1.25},
+                { "matrix": [1, 12], "label":"+",      "x":12, "y":1.25},
+                { "matrix": [1, 13], "label":"Bksp",   "x":13, "y":1.25, "w":2},
+                { "matrix": [1, 14], "label":"Insert", "x":15.25, "y":1.25},
+                { "matrix": [1, 15], "label":"Home",   "x":16.25, "y":1.25},
+                { "matrix": [1, 16], "label":"Page Up", "x":17.25, "y":1.25},
+
+                { "matrix": [2,  0], "label":"Tab",     "x":0, "y":2.25, "w":1.5},
+                { "matrix": [2,  1], "label":"Q",       "x":1.5, "y":2.25},
+                { "matrix": [2,  2], "label":"W",       "x":2.5, "y":2.25},
+                { "matrix": [2,  3], "label":"E",       "x":3.5, "y":2.25},
+                { "matrix": [2,  4], "label":"R",       "x":4.5, "y":2.25},
+                { "matrix": [2,  5], "label":"T",       "x":5.5, "y":2.25},
+                { "matrix": [2,  6], "label":"Y",       "x":6.5, "y":2.25},
+                { "matrix": [2,  7], "label":"U",       "x":7.5, "y":2.25},
+                { "matrix": [2,  8], "label":"I",       "x":8.5, "y":2.25},
+                { "matrix": [2,  9], "label":"O",       "x":9.5, "y":2.25},
+                { "matrix": [2, 10], "label":"P",       "x":10.5, "y":2.25},
+                { "matrix": [2, 11], "label":"{",       "x":11.5, "y":2.25},
+                { "matrix": [2, 12], "label":"}",       "x":12.5, "y":2.25},
+                { "matrix": [2, 13], "label":"|",       "x":13.5, "y":2.25, "w":1.5},
+                { "matrix": [2, 14], "label":"Delete",  "x":15.25, "y":2.25},
+                { "matrix": [2, 15], "label":"End",     "x":16.25, "y":2.25},
+                { "matrix": [2, 16], "label":"Page Dn", "x":17.25, "y":2.25},
+
+                { "matrix": [3,  0], "label":"CapsLk", "x":0, "y":3.25, "w":1.75},
+                { "matrix": [3,  1], "label":"A",      "x":1.75, "y":3.25},
+                { "matrix": [3,  2], "label":"S",      "x":2.75, "y":3.25},
+                { "matrix": [3,  3], "label":"D",      "x":3.75, "y":3.25},
+                { "matrix": [3,  4], "label":"F",      "x":4.75, "y":3.25},
+                { "matrix": [3,  5], "label":"G",      "x":5.75, "y":3.25},
+                { "matrix": [3,  6], "label":"H",      "x":6.75, "y":3.25},
+                { "matrix": [3,  7], "label":"J",      "x":7.75, "y":3.25},
+                { "matrix": [3,  8], "label":"K",      "x":8.75, "y":3.25},
+                { "matrix": [3,  9], "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, 13], "label":"Enter",  "x":12.75, "y":3.25, "w":2.25},
+
+                { "matrix": [4,  0], "label":"Shift",  "x":0, "y":4.25, "w":2.25},
+                { "matrix": [4,  1], "label":"Z",      "x":2.25, "y":4.25},
+                { "matrix": [4,  2], "label":"X",      "x":3.25, "y":4.25},
+                { "matrix": [4,  3], "label":"C",      "x":4.25, "y":4.25},
+                { "matrix": [4,  4], "label":"V",      "x":5.25, "y":4.25},
+                { "matrix": [4,  5], "label":"B",      "x":6.25, "y":4.25},
+                { "matrix": [4,  6], "label":"N",      "x":7.25, "y":4.25},
+                { "matrix": [4,  7], "label":"M",      "x":8.25, "y":4.25},
+                { "matrix": [4,  8], "label":"<",      "x":9.25, "y":4.25},
+                { "matrix": [4,  9], "label":">",      "x":10.25, "y":4.25},
+                { "matrix": [4, 10], "label":"?",      "x":11.25, "y":4.25},
+                { "matrix": [4, 12], "label":"Shift",  "x":12.25, "y":4.25, "w":2.75},
+                { "matrix": [4, 15], "label":"\u2191", "x":16.25, "y":4.25},
+
+                { "matrix": [5,  0], "label":"Ctrl",   "x":0, "y":5.25, "w":1.25},
+                { "matrix": [5,  1], "label":"Win",    "x":1.25, "y":5.25, "w":1.25},
+                { "matrix": [5,  2], "label":"Alt",    "x":2.5, "y":5.25, "w":1.25},
+                { "matrix": [5,  6], "label":" ",      "x":3.75, "y":5.25, "w":6.25},
+                { "matrix": [5, 10], "label":"Alt",    "x":10, "y":5.25, "w":1.25},
+                { "matrix": [5, 11], "label":"Fn",     "x":11.25, "y":5.25, "w":1.25},
+                { "matrix": [5, 12], "label":"Menu",   "x":12.5, "y":5.25, "w":1.25},
+                { "matrix": [5, 13], "label":"Ctrl",   "x":13.75, "y":5.25, "w":1.25},
+                { "matrix": [5, 14], "label":"\u2190", "x":15.25, "y":5.25},
+                { "matrix": [5, 15], "label":"\u2193", "x":16.25, "y":5.25},
+                { "matrix": [5, 16], "label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        }
+    },
+    "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,
+            "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":   6, "y":  8 },
+            { "flags": 4, "matrix": [0,  1], "x":  21, "y":  8 },
+            { "flags": 4, "matrix": [0,  2], "x":  33, "y":  8 },
+            { "flags": 4, "matrix": [0,  3], "x":  45, "y":  8 },
+            { "flags": 4, "matrix": [0,  4], "x":  57, "y":  8 },
+            { "flags": 4, "matrix": [0,  5], "x":  74, "y":  8 },
+            { "flags": 4, "matrix": [0,  6], "x":  86, "y":  8 },
+            { "flags": 4, "matrix": [0,  7], "x":  98, "y":  8 },
+            { "flags": 4, "matrix": [0,  8], "x": 110, "y":  8 },
+            { "flags": 4, "matrix": [0,  9], "x": 125, "y":  8 },
+            { "flags": 4, "matrix": [0, 10], "x": 137, "y":  8 },
+            { "flags": 4, "matrix": [0, 11], "x": 150, "y":  8 },
+            { "flags": 4, "matrix": [0, 12], "x": 161, "y":  8 },
+            { "flags": 4, "matrix": [0, 13], "x": 176, "y":  8 },
+            { "flags": 4, "matrix": [0, 14], "x": 192, "y":  8 },
+            { "flags": 4, "matrix": [0, 15], "x": 204, "y":  8 },
+
+            { "flags": 4, "matrix": [1,  0], "x":   6, "y": 21 },
+            { "flags": 4, "matrix": [1,  1], "x":  18, "y": 21 },
+            { "flags": 4, "matrix": [1,  2], "x":  37, "y": 21 },
+            { "flags": 4, "matrix": [1,  3], "x":  43, "y": 21 },
+            { "flags": 4, "matrix": [1,  4], "x":  55, "y": 21 },
+            { "flags": 4, "matrix": [1,  5], "x":  67, "y": 21 },
+            { "flags": 4, "matrix": [1,  6], "x":  79, "y": 21 },
+            { "flags": 4, "matrix": [1,  7], "x":  92, "y": 21 },
+            { "flags": 4, "matrix": [1,  8], "x": 104, "y": 21 },
+            { "flags": 4, "matrix": [1,  9], "x": 116, "y": 21 },
+            { "flags": 4, "matrix": [1, 10], "x": 128, "y": 21 },
+            { "flags": 4, "matrix": [1, 11], "x": 141, "y": 21 },
+            { "flags": 4, "matrix": [1, 12], "x": 153, "y": 21 },
+            { "flags": 4, "matrix": [1, 13], "x": 171, "y": 21 },
+            { "flags": 4, "matrix": [1, 14], "x": 192, "y": 21 },
+            { "flags": 4, "matrix": [1, 15], "x": 204, "y": 21 },
+
+            { "flags": 4, "matrix": [2,  0], "x":   9, "y": 31 },
+            { "flags": 4, "matrix": [2,  1], "x":  24, "y": 31 },
+            { "flags": 4, "matrix": [2,  2], "x":  36, "y": 31 },
+            { "flags": 4, "matrix": [2,  3], "x":  48, "y": 31 },
+            { "flags": 4, "matrix": [2,  4], "x":  61, "y": 31 },
+            { "flags": 4, "matrix": [2,  5], "x":  73, "y": 31 },
+            { "flags": 4, "matrix": [2,  6], "x":  86, "y": 31 },
+            { "flags": 4, "matrix": [2,  7], "x":  98, "y": 31 },
+            { "flags": 4, "matrix": [2,  8], "x": 110, "y": 31 },
+            { "flags": 4, "matrix": [2,  9], "x": 122, "y": 31 },
+            { "flags": 4, "matrix": [2, 10], "x": 134, "y": 31 },
+            { "flags": 4, "matrix": [2, 11], "x": 146, "y": 31 },
+            { "flags": 4, "matrix": [2, 12], "x": 159, "y": 31 },
+            { "flags": 4, "matrix": [2, 13], "x": 174, "y": 31 },
+            { "flags": 4, "matrix": [2, 14], "x": 192, "y": 31 },
+            { "flags": 4, "matrix": [2, 15], "x": 204, "y": 31 },
+
+            { "flags": 4, "matrix": [3,  0], "x":  11, "y": 41 },
+            { "flags": 4, "matrix": [3,  1], "x":  27, "y": 41 },
+            { "flags": 4, "matrix": [3,  2], "x":  40, "y": 41 },
+            { "flags": 4, "matrix": [3,  3], "x":  52, "y": 41 },
+            { "flags": 4, "matrix": [3,  4], "x":  64, "y": 41 },
+            { "flags": 4, "matrix": [3,  5], "x":  76, "y": 41 },
+            { "flags": 4, "matrix": [3,  6], "x":  88, "y": 41 },
+            { "flags": 4, "matrix": [3,  7], "x": 100, "y": 41 },
+            { "flags": 4, "matrix": [3,  8], "x": 113, "y": 41 },
+            { "flags": 4, "matrix": [3,  9], "x": 124, "y": 41 },
+            { "flags": 4, "matrix": [3, 10], "x": 137, "y": 41 },
+            { "flags": 4, "matrix": [3, 11], "x": 150, "y": 41 },
+            { "flags": 4, "matrix": [3, 12], "x": 170, "y": 41 },
+            { "flags": 4, "matrix": [0, 16], "x": 217, "y":  8 },
+            { "flags": 4, "matrix": [1, 16], "x": 217, "y": 21 },
+            { "flags": 4, "matrix": [2, 16], "x": 217, "y": 31 },
+
+            { "flags": 4, "matrix": [4,  0], "x":  13, "y": 51 },
+            { "flags": 4, "matrix": [4,  1], "x":  34, "y": 51 },
+            { "flags": 4, "matrix": [4,  2], "x":  45, "y": 51 },
+            { "flags": 4, "matrix": [4,  3], "x":  58, "y": 51 },
+            { "flags": 4, "matrix": [4,  4], "x":  70, "y": 51 },
+            { "flags": 4, "matrix": [4,  5], "x":  82, "y": 51 },
+            { "flags": 4, "matrix": [4,  6], "x":  94, "y": 51 },
+            { "flags": 4, "matrix": [4,  7], "x": 107, "y": 51 },
+            { "flags": 4, "matrix": [4,  8], "x": 119, "y": 51 },
+            { "flags": 4, "matrix": [4,  9], "x": 131, "y": 51 },
+            { "flags": 4, "matrix": [4, 10], "x": 143, "y": 51 },
+            { "flags": 4, "matrix": [4, 12], "x": 166, "y": 51 },
+            { "flags": 4, "matrix": [4, 15], "x": 204, "y": 51 },
+
+            { "flags": 4, "matrix": [5,  0], "x":   8, "y": 61 },
+            { "flags": 4, "matrix": [5,  1], "x":  23, "y": 61 },
+            { "flags": 4, "matrix": [5,  2], "x":  38, "y": 61 },
+            { "flags": 4, "matrix": [5,  6], "x":  84, "y": 61 },
+            { "flags": 4, "matrix": [5, 10], "x": 129, "y": 61 },
+            { "flags": 4, "matrix": [5, 11], "x": 144, "y": 61 },
+            { "flags": 4, "matrix": [5, 12], "x": 160, "y": 61 },
+            { "flags": 4, "matrix": [5, 13], "x": 175, "y": 61 },
+            { "flags": 4, "matrix": [5, 14], "x": 192, "y": 61 },
+            { "flags": 4, "matrix": [5, 15], "x": 204, "y": 61 },
+            { "flags": 4, "matrix": [5, 16], "x": 217, "y": 61 }
+        ]
+    }
+}
diff --git a/keyboards/drop/cstm80/keymaps/default/keymap.c b/keyboards/drop/cstm80/keymaps/default/keymap.c
new file mode 100644
index 000000000000..e820a0a74358
--- /dev/null
+++ b/keyboards/drop/cstm80/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+// Copyright 2023 Massdrop, Inc.
+// 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││F13││PSc│Scr│Pse│
+     * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+     * │ ` │ 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 │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │    │ ↑ │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+     * │Ctrl│GUI │Alt │                        │ Alt│ GUI│Menu│Ctrl││ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+     */
+    [0] = LAYOUT_tkl_f13_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_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_f13_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,    _______, _______, _______,
+        _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,_______, NK_TOGG, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                            EE_CLR,                             _______, _______, _______, _______,    _______, _______, _______
+    )
+};
diff --git a/keyboards/drop/cstm80/keymaps/via/config.h b/keyboards/drop/cstm80/keymaps/via/config.h
new file mode 100644
index 000000000000..616f8e329102
--- /dev/null
+++ b/keyboards/drop/cstm80/keymaps/via/config.h
@@ -0,0 +1,5 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
diff --git a/keyboards/drop/cstm80/keymaps/via/keymap.c b/keyboards/drop/cstm80/keymaps/via/keymap.c
new file mode 100644
index 000000000000..e820a0a74358
--- /dev/null
+++ b/keyboards/drop/cstm80/keymaps/via/keymap.c
@@ -0,0 +1,38 @@
+// Copyright 2023 Massdrop, Inc.
+// 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││F13││PSc│Scr│Pse│
+     * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+     * │ ` │ 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 │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │    │ ↑ │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+     * │Ctrl│GUI │Alt │                        │ Alt│ GUI│Menu│Ctrl││ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+     */
+    [0] = LAYOUT_tkl_f13_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_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_f13_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,    _______, _______, _______,
+        _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,_______, NK_TOGG, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                            EE_CLR,                             _______, _______, _______, _______,    _______, _______, _______
+    )
+};
diff --git a/keyboards/drop/cstm80/keymaps/via/rules.mk b/keyboards/drop/cstm80/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/drop/cstm80/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/drop/cstm80/mcuconf.h b/keyboards/drop/cstm80/mcuconf.h
new file mode 100644
index 000000000000..819aa70bf7fa
--- /dev/null
+++ b/keyboards/drop/cstm80/mcuconf.h
@@ -0,0 +1,14 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PLLM_VALUE
+#define STM32_PLLM_VALUE 16
+
+#undef STM32_PREDIV_VALUE
+#define STM32_PREDIV_VALUE 2
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/drop/cstm80/readme.md b/keyboards/drop/cstm80/readme.md
new file mode 100644
index 000000000000..f0851cc045bf
--- /dev/null
+++ b/keyboards/drop/cstm80/readme.md
@@ -0,0 +1,24 @@
+# CSTM80
+
+The CSTM80 is a tenkeyless keyboard with customizable switch plates and weights, as well as a magnetically attached top case.
+
+* Keyboard Maintainer: [zvecr](https://github.com/zvecr)
+* Hardware Availability: [Drop CSTM80 Mechanical Keyboard](https://drop.com/buy/drop-cstm80-mechanical-keyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make drop/cstm80:default
+
+Flashing example for this keyboard:
+
+    make drop/cstm80: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**: Quickly double tap the button located under the spacebar
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/drop/cstm80/rules.mk b/keyboards/drop/cstm80/rules.mk
new file mode 100644
index 000000000000..21d76468cf59
--- /dev/null
+++ b/keyboards/drop/cstm80/rules.mk
@@ -0,0 +1,4 @@
+UF2_DEVICE_TYPE_ID = 0x8bfa7750
+UF2CONV_ARGS = --device-type $(UF2_DEVICE_TYPE_ID)
+
+SRC += lib/common.c
diff --git a/keyboards/drop/ctrl/v2/config.h b/keyboards/drop/ctrl/v2/config.h
index 539c505cb38c..2cff42074a38 100644
--- a/keyboards/drop/ctrl/v2/config.h
+++ b/keyboards/drop/ctrl/v2/config.h
@@ -21,7 +21,6 @@
 #define ISSI_PWM_FREQUENCY 0b010 // 26k
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_DEFAULT_VAL 100
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
diff --git a/keyboards/drop/ctrl/v2/info.json b/keyboards/drop/ctrl/v2/info.json
index 30b86db9b5e9..11af6a553c63 100644
--- a/keyboards/drop/ctrl/v2/info.json
+++ b/keyboards/drop/ctrl/v2/info.json
@@ -124,7 +124,8 @@
         }
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733",
+        "driver": "is31fl3733",
+        "max_brightness": 191,
         "animations": {
             "alphas_mods": true,
             "gradient_up_down": true,
diff --git a/keyboards/drop/lib/common.c b/keyboards/drop/lib/common.c
index 515625a68637..04845ed17a00 100644
--- a/keyboards/drop/lib/common.c
+++ b/keyboards/drop/lib/common.c
@@ -2,19 +2,18 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #ifdef RGB_MATRIX_ENABLE
 #    include "host.h"
+#    include "quantum.h"
 #    include "rgb_matrix.h"
 
-#    define LED_FLAG_ANY_SWITCH (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR)
-
 #    ifdef RGB_MATRIX_CAPS_LOCK_INDEX
 bool rgb_matrix_indicators_kb(void) {
     if (!rgb_matrix_indicators_user()) {
         return false;
     }
 
-    if (host_keyboard_led_state().caps_lock) {
+    if (host_keyboard_led_state().caps_lock && (rgb_matrix_get_flags() != LED_FLAG_NONE)) {
         rgb_matrix_set_color(RGB_MATRIX_CAPS_LOCK_INDEX, RGB_WHITE);
-    } else if ((rgb_matrix_get_flags() & LED_FLAG_ANY_SWITCH) == 0) {
+    } else if (rgb_matrix_get_flags() == LED_FLAG_UNDERGLOW) {
         rgb_matrix_set_color(RGB_MATRIX_CAPS_LOCK_INDEX, RGB_OFF);
     }
     return true;
@@ -32,9 +31,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
             case RGB_TOG:
                 switch (rgb_matrix_get_flags()) {
                     case LED_FLAG_ALL:
-                        rgb_matrix_set_flags(LED_FLAG_ANY_SWITCH);
+                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
                         break;
-                    case LED_FLAG_ANY_SWITCH:
+                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR):
                         rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
                         break;
                     case LED_FLAG_UNDERGLOW:
diff --git a/keyboards/drop/sense75/config.h b/keyboards/drop/sense75/config.h
index 13b8257fbba2..b8d47c311c2b 100644
--- a/keyboards/drop/sense75/config.h
+++ b/keyboards/drop/sense75/config.h
@@ -9,58 +9,15 @@
 #define EXTERNAL_EEPROM_WP_PIN B7
 #define EEPROM_I2C_24LC256
 
-#ifdef RGB_MATRIX_ENABLE
-#    define DRIVER_ADDR_1 0b1010000
-#    define DRIVER_ADDR_2 0b1011111
-#    define DRIVER_COUNT 2
-#    define RGB_MATRIX_LED_COUNT (58 + 53)
-#    define ISSI_PWM_FREQUENCY 0b010 // 26k
+#define DRIVER_ADDR_1 0b1010000
+#define DRIVER_ADDR_2 0b1011111
+#define DRIVER_COUNT 2
+#define RGB_MATRIX_LED_COUNT 111
+#define ISSI_PWM_FREQUENCY 0b010 // 26k
 
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    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_PIXEL_FRACTAL
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    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
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#define RGB_MATRIX_CYCLE_ZONES_ENABLE
+#define RGB_MATRIX_CAPS_LOCK_INDEX 62
diff --git a/keyboards/drop/sense75/info.json b/keyboards/drop/sense75/info.json
index f5df3d61524b..2df7b0ae5a9d 100644
--- a/keyboards/drop/sense75/info.json
+++ b/keyboards/drop/sense75/info.json
@@ -14,6 +14,9 @@
         "pid": "0x0001",
         "device_version": "1.0.0"
     },
+    "eeprom": {
+        "driver": "i2c"
+    },
     "features": {
         "rgb_matrix": true,
         "encoder": true,
@@ -113,7 +116,52 @@
         }
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733",
+        "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,
+            "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": 2, "y": 0},
             {"flags": 2, "x": 22, "y": 0},
diff --git a/keyboards/drop/sense75/keymaps/default/keymap.c b/keyboards/drop/sense75/keymaps/default/keymap.c
index 44d58b052103..36b17d967ea5 100644
--- a/keyboards/drop/sense75/keymaps/default/keymap.c
+++ b/keyboards/drop/sense75/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,          KC_HOME,
         _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______,          KC_END,
         _______,          RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,_______, NK_TOGG, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______,                            EE_CLR,                             _______, _______, _______, _______, _______, _______
+        _______, _______, _______,                            EE_CLR,                             KC_APP,  _______, _______, _______, _______, _______
     )
 };
 
@@ -44,10 +44,3 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [1] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) }
 };
 #endif
-
-bool rgb_matrix_indicators_user(void) {
-    if (host_keyboard_led_state().caps_lock) {
-        rgb_matrix_set_color(62, RGB_WHITE);
-    }
-    return false;
-}
diff --git a/keyboards/drop/sense75/keymaps/default_md/keymap.c b/keyboards/drop/sense75/keymaps/default_md/keymap.c
index 871cdb2b6dca..fb81be272134 100644
--- a/keyboards/drop/sense75/keymaps/default_md/keymap.c
+++ b/keyboards/drop/sense75/keymaps/default_md/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,          KC_HOME,
         _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______,          KC_END,
         _______,          RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,_______, NK_TOGG, _______, _______, _______, _______,          _______, _______,
-        MO(2),   _______, _______,                            EE_CLR,                             _______, _______, _______, _______, _______, _______
+        MO(2),   _______, _______,                            EE_CLR,                             KC_APP,  _______, _______, _______, _______, _______
     ),
     [2] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
@@ -86,22 +86,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 rgb_matrix_sethsv_noeeprom(HSV_WHITE);
                 test_mode = true;
                 break;
-            case RGB_TOG:
-                switch (rgb_matrix_get_flags()) {
-                    case LED_FLAG_ALL:
-                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-                        break;
-                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR):
-                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                        break;
-                    case LED_FLAG_UNDERGLOW:
-                        rgb_matrix_set_flags(LED_FLAG_NONE);
-                        break;
-                    default:
-                        rgb_matrix_set_flags(LED_FLAG_ALL);
-                        break;
-                }
-                return false;
         }
     }
     return true;
diff --git a/keyboards/drop/sense75/keymaps/via/keymap.c b/keyboards/drop/sense75/keymaps/via/keymap.c
index 7304ec42d539..12328cc1482d 100644
--- a/keyboards/drop/sense75/keymaps/via/keymap.c
+++ b/keyboards/drop/sense75/keymaps/via/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,          KC_HOME,
         _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______,          KC_END,
         _______,          RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,_______, NK_TOGG, _______, _______, _______, _______,          _______, _______,
-        MO(2),   _______, _______,                            EE_CLR,                             _______, _______, _______, _______, _______, _______
+        MO(2),   _______, _______,                            EE_CLR,                             KC_APP,  _______, _______, _______, _______, _______
     ),
     [2] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
@@ -53,27 +53,3 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [2] = { ENCODER_CCW_CW(_______, _______) }
 };
 #endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (!record->event.pressed) {
-        switch (keycode) {
-            case RGB_TOG:
-                switch (rgb_matrix_get_flags()) {
-                    case LED_FLAG_ALL:
-                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-                        break;
-                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR):
-                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                        break;
-                    case LED_FLAG_UNDERGLOW:
-                        rgb_matrix_set_flags(LED_FLAG_NONE);
-                        break;
-                    default:
-                        rgb_matrix_set_flags(LED_FLAG_ALL);
-                        break;
-                }
-                return false;
-        }
-    }
-    return true;
-};
diff --git a/keyboards/drop/sense75/rules.mk b/keyboards/drop/sense75/rules.mk
index 44adba039b51..ed0ad9a493cb 100644
--- a/keyboards/drop/sense75/rules.mk
+++ b/keyboards/drop/sense75/rules.mk
@@ -1 +1 @@
-EEPROM_DRIVER = i2c
+SRC += lib/common.c
diff --git a/keyboards/drop/sense75/sense75.c b/keyboards/drop/sense75/sense75.c
index cbc194ee8fbc..40577054cc13 100644
--- a/keyboards/drop/sense75/sense75.c
+++ b/keyboards/drop/sense75/sense75.c
@@ -1,8 +1,8 @@
 // Copyright 2022 Massdrop, Inc.
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include "rgb_matrix.h"
-
 #ifdef RGB_MATRIX_ENABLE
+#    include "rgb_matrix.h"
+
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 // top underglow sd2-sd17
     { 0, B_2,  A_2,  C_2  },
diff --git a/keyboards/drop/shift/v2/config.h b/keyboards/drop/shift/v2/config.h
index 6c651d1f83a1..a4faafe39498 100644
--- a/keyboards/drop/shift/v2/config.h
+++ b/keyboards/drop/shift/v2/config.h
@@ -22,7 +22,6 @@
 #define ISSI_PWM_FREQUENCY 0b010 // 26k
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_DEFAULT_VAL 100
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
diff --git a/keyboards/drop/shift/v2/info.json b/keyboards/drop/shift/v2/info.json
index f58b76e9d172..3615fdef4fc9 100644
--- a/keyboards/drop/shift/v2/info.json
+++ b/keyboards/drop/shift/v2/info.json
@@ -132,7 +132,8 @@
         }
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733",
+        "driver": "is31fl3733",
+        "max_brightness": 191,
         "animations": {
             "alphas_mods": true,
             "gradient_up_down": true,
diff --git a/keyboards/drop/shift/v2/v2.c b/keyboards/drop/shift/v2/v2.c
index 3d96cdf7cba6..326c41827940 100644
--- a/keyboards/drop/shift/v2/v2.c
+++ b/keyboards/drop/shift/v2/v2.c
@@ -1,6 +1,7 @@
 // Copyright 2023 Massdrop, Inc.
 // SPDX-License-Identifier: GPL-2.0-or-later
 #ifdef RGB_MATRIX_ENABLE
+#    include "host.h"
 #    include "rgb_matrix.h"
 
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/drop/thekey/v2/config.h b/keyboards/drop/thekey/v2/config.h
deleted file mode 100644
index ca6944c2c9a0..000000000000
--- a/keyboards/drop/thekey/v2/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2023 Massdrop, Inc.
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#define RGBLIGHT_LED_MAP {4, 0, 1, 2, 3}
diff --git a/keyboards/drop/thekey/v2/info.json b/keyboards/drop/thekey/v2/info.json
index 7870599fe181..ced9901bea0b 100644
--- a/keyboards/drop/thekey/v2/info.json
+++ b/keyboards/drop/thekey/v2/info.json
@@ -25,6 +25,7 @@
     "diode_direction": "ROW2COL",
     "rgblight": {
         "led_count": 5,
+        "led_map": [4, 0, 1, 2, 3],
         "sleep": true,
         "animations": {
             "alternating": true,
diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/info.json
index 35a731111289..e90d21725a5e 100644
--- a/keyboards/dtisaac/dosa40rgb/info.json
+++ b/keyboards/dtisaac/dosa40rgb/info.json
@@ -8,11 +8,14 @@
         "pid": "0x4973",
         "device_version": "0.0.4"
     },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
     "ws2812": {
         "pin": "D0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D1", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"],
diff --git a/keyboards/dtisaac/dosa40rgb/rules.mk b/keyboards/dtisaac/dosa40rgb/rules.mk
index 5cc9ef68e40e..265652de509a 100644
--- a/keyboards/dtisaac/dosa40rgb/rules.mk
+++ b/keyboards/dtisaac/dosa40rgb/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes      # Enable Bluetooth
-BLUETOOTH_DRIVER = BluefruitLE
 RGB_MATRIX_ENABLE = yes
 
 LTO_ENABLE = yes
diff --git a/keyboards/duck/eagle_viper/v2/config.h b/keyboards/duck/eagle_viper/v2/config.h
index e39099ef56f2..94b38574fa7f 100644
--- a/keyboards/duck/eagle_viper/v2/config.h
+++ b/keyboards/duck/eagle_viper/v2/config.h
@@ -23,17 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 15
 
 #define DIODE_DIRECTION COL2ROW
-
-#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 17
-
-#define TAPPING_TERM 200
diff --git a/keyboards/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/info.json
index 4d6019ddba09..c2acc3b0d95c 100644
--- a/keyboards/duck/eagle_viper/v2/info.json
+++ b/keyboards/duck/eagle_viper/v2/info.json
@@ -12,6 +12,21 @@
     "bootmagic": {
         "matrix": [4, 10]
     },
+    "rgblight": {
+        "led_count": 17,
+        "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": "D6"
     },
diff --git a/keyboards/duck/jetfire/config.h b/keyboards/duck/jetfire/config.h
index 95459e67b1ac..ec1826db3378 100644
--- a/keyboards/duck/jetfire/config.h
+++ b/keyboards/duck/jetfire/config.h
@@ -25,18 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#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 23
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/info.json
index 287ab0ac4ab6..fbd5d8cb1405 100644
--- a/keyboards/duck/jetfire/info.json
+++ b/keyboards/duck/jetfire/info.json
@@ -15,6 +15,21 @@
     "bootmagic": {
         "matrix": [5, 10]
     },
+    "rgblight": {
+        "led_count": 23,
+        "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": "D6"
     },
diff --git a/keyboards/duck/lightsaver/config.h b/keyboards/duck/lightsaver/config.h
index cb5a419f566d..88a728942f2d 100644
--- a/keyboards/duck/lightsaver/config.h
+++ b/keyboards/duck/lightsaver/config.h
@@ -23,17 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 19
 
 #define DIODE_DIRECTION COL2ROW
-
-#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 17
-
-#define TAPPING_TERM 200
diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/info.json
index 296820d7caf2..06d0d59ed197 100644
--- a/keyboards/duck/lightsaver/info.json
+++ b/keyboards/duck/lightsaver/info.json
@@ -15,6 +15,21 @@
   "bootmagic": {
     "matrix": [5, 10]
   },
+  "rgblight": {
+    "led_count": 17,
+    "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": "D6"
   },
diff --git a/keyboards/duck/octagon/v1/config.h b/keyboards/duck/octagon/v1/config.h
index 9b557edaba3f..bee7675b0c40 100644
--- a/keyboards/duck/octagon/v1/config.h
+++ b/keyboards/duck/octagon/v1/config.h
@@ -23,17 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 16
 
 #define DIODE_DIRECTION COL2ROW
-
-#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 17
-
-#define TAPPING_TERM 200
diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json
index 8186ce878ef8..fbbae2723a8b 100644
--- a/keyboards/duck/octagon/v1/info.json
+++ b/keyboards/duck/octagon/v1/info.json
@@ -15,6 +15,21 @@
     "bootmagic": {
         "matrix": [5, 10]
     },
+    "rgblight": {
+        "led_count": 17,
+        "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": "D6"
     },
diff --git a/keyboards/duck/octagon/v1/v1.c b/keyboards/duck/octagon/v1/v1.c
index dc3b7fc7286f..35aea54456f2 100644
--- a/keyboards/duck/octagon/v1/v1.c
+++ b/keyboards/duck/octagon/v1/v1.c
@@ -43,8 +43,8 @@ void backlight_set(uint8_t level) {
 bool led_update_kb(led_t led_state) {
   bool res = led_update_user(led_state);
   if(res) {
-    backlight_os_state & (1<<USB_LED_CAPS_LOCK) ? (PORTB &= ~0b00000001) : (PORTB |= 0b00000001);
-    backlight_os_state & (1<<USB_LED_SCROLL_LOCK) ? (PORTB &= ~0b00010000) : (PORTB |= 0b00010000);
+    backlight_os_state & 2 ? (PORTB &= ~0b00000001) : (PORTB |= 0b00000001);
+    backlight_os_state & 4 ? (PORTB &= ~0b00010000) : (PORTB |= 0b00010000);
   }
   return res;
 }
diff --git a/keyboards/duck/octagon/v2/config.h b/keyboards/duck/octagon/v2/config.h
index 2530cedc0f0a..c6fbcdab00ef 100644
--- a/keyboards/duck/octagon/v2/config.h
+++ b/keyboards/duck/octagon/v2/config.h
@@ -23,17 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 17
 
 #define DIODE_DIRECTION COL2ROW
-
-#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 17
-
-#define TAPPING_TERM 200
diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/info.json
index f3bd30fbe579..be552c7b57aa 100644
--- a/keyboards/duck/octagon/v2/info.json
+++ b/keyboards/duck/octagon/v2/info.json
@@ -15,14 +15,32 @@
     "bootmagic": {
         "matrix": [5, 10]
     },
+    "rgblight": {
+        "led_count": 17,
+        "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": "D6"
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
-    "community_layouts": ["75_ansi"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "community_layouts": ["75_ansi", "75_iso"],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -208,7 +226,101 @@
                 {"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, 16], "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, 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, 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, 14], "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, 12], "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, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 8], "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/duck/octagon/v2/v2.c b/keyboards/duck/octagon/v2/v2.c
index 612df9aa3e23..7a3ad76027fc 100644
--- a/keyboards/duck/octagon/v2/v2.c
+++ b/keyboards/duck/octagon/v2/v2.c
@@ -101,17 +101,17 @@ bool led_update_kb(led_t led_state) {
   bool res = led_update_user(led_state);
   if(res) {
     bool status[7] = {
-      backlight_os_state & (1<<USB_LED_CAPS_LOCK),
-      backlight_os_state & (1<<USB_LED_SCROLL_LOCK),
-      backlight_os_state & (1<<USB_LED_NUM_LOCK),
+      backlight_os_state & 2,
+      backlight_os_state & 4,
+      backlight_os_state & 1,
       backlight_layer_state & (1<<1),
       backlight_layer_state & (1<<2),
       backlight_layer_state & (1<<3),
       backlight_layer_state & (1<<4)
     };
     indicator_leds_set(status);
-    backlight_os_state & (1<<USB_LED_CAPS_LOCK) ? (PORTB &= ~0b00000001) : (PORTB |= 0b00000001);
-    backlight_os_state & (1<<USB_LED_SCROLL_LOCK) ? (PORTB &= ~0b00010000) : (PORTB |= 0b00010000);
+    backlight_os_state & 2 ? (PORTB &= ~0b00000001) : (PORTB |= 0b00000001);
+    backlight_os_state & 4 ? (PORTB &= ~0b00010000) : (PORTB |= 0b00010000);
   }
   return res;
 }
diff --git a/keyboards/duck/orion/v3/config.h b/keyboards/duck/orion/v3/config.h
index e8d87e0719da..bbe9a4dbe4c8 100644
--- a/keyboards/duck/orion/v3/config.h
+++ b/keyboards/duck/orion/v3/config.h
@@ -23,17 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 18
 
 #define DIODE_DIRECTION COL2ROW
-
-#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 18
-
-#define TAPPING_TERM 200
diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/info.json
index eff1e5f88cf5..97885c091020 100644
--- a/keyboards/duck/orion/v3/info.json
+++ b/keyboards/duck/orion/v3/info.json
@@ -16,6 +16,21 @@
     "bootmagic": {
         "matrix": [4, 10]
     },
+    "rgblight": {
+        "led_count": 18,
+        "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": "D6"
     },
diff --git a/keyboards/duck/tcv3/config.h b/keyboards/duck/tcv3/config.h
index 13f2d7613988..2f67da17bfc5 100644
--- a/keyboards/duck/tcv3/config.h
+++ b/keyboards/duck/tcv3/config.h
@@ -23,15 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 20
 
 #define DIODE_DIRECTION COL2ROW
-
-#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 17
diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/info.json
index 69f1033d222d..cee675229d9c 100644
--- a/keyboards/duck/tcv3/info.json
+++ b/keyboards/duck/tcv3/info.json
@@ -11,6 +11,21 @@
     "bootmagic": {
         "matrix": [5, 10]
     },
+    "rgblight": {
+        "led_count": 17,
+        "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": "D6"
     },
diff --git a/keyboards/duck/tcv3/tcv3.c b/keyboards/duck/tcv3/tcv3.c
index ab89e180c0fe..87b22443e471 100644
--- a/keyboards/duck/tcv3/tcv3.c
+++ b/keyboards/duck/tcv3/tcv3.c
@@ -24,69 +24,6 @@ enum BACKLIGHT_AREAS {
   BACKLIGHT_SWITCH   = 0b0001111
 };
 
-// uint8_t backlight_rgb_r = 255;
-// uint8_t backlight_rgb_g = 0;
-// uint8_t backlight_rgb_b = 0;
-// uint8_t backlight_os_state = 0;
-// uint32_t backlight_layer_state = 0;
-
-// void backlight_toggle_rgb(bool enabled)
-// {
-//   if(enabled) {
-//     uint8_t rgb[17][3] = {
-//       {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-//       {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-//       {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-//       {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-//       {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-//       {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-//       {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-//       {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-//       {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-//       {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-//       {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-//       {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-//       {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-//       {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-//       {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-//       {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-//       {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b}
-//     };
-//     backlight_set_rgb(rgb);
-//   } else {
-//     uint8_t rgb[17][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}
-//     };
-//     backlight_set_rgb(rgb);
-//   }
-// }
-
-// void backlight_set_rgb(uint8_t cfg[17][3])
-// {
-//   cli();
-//   for(uint8_t i = 0; i < 17; ++i) {
-//     send_color(cfg[i][0], cfg[i][1], cfg[i][2], Device_PCBRGB);
-//   }
-//   sei();
-//   show();
-// }
-
 // Q5, Q6, Q7 is connected to B1 - alphas
 // Q8, Q9 is connected to B2 - frow
 // Q1, Q2, Q3 is connected to B3 - mods
@@ -99,26 +36,6 @@ void backlight_set(uint8_t level) {
   level & BACKLIGHT_MACRO ? (PORTE |= 0b01000000) : (PORTE &= ~0b01000000);
 }
 
-// // Port from backlight_update_state
-// bool led_update_kb(led_t led_state) {
-//   bool res = led_update_user(led_state);
-//   if(res) {
-//       bool status[7] = {
-//       backlight_os_state & (1<<USB_LED_CAPS_LOCK),
-//       backlight_os_state & (1<<USB_LED_SCROLL_LOCK),
-//       backlight_os_state & (1<<USB_LED_NUM_LOCK),
-//       backlight_layer_state & (1<<1),
-//       backlight_layer_state & (1<<2),
-//       backlight_layer_state & (1<<3),
-//       backlight_layer_state & (1<<4)
-//     };
-//     indicator_leds_set(status);
-//     backlight_os_state & (1<<USB_LED_CAPS_LOCK) ? (PORTB &= ~0b00000001) : (PORTB |= 0b00000001);
-//     backlight_os_state & (1<<USB_LED_SCROLL_LOCK) ? (PORTB &= ~0b00010000) : (PORTB |= 0b00010000);
-//   }
-//   return res;
-// }
-
 // U5 Pin 1, 2, 3 connected to top left LEDs
 
 // U6 Pin 1, 2, 3 connected to bottom right leds col of 3
diff --git a/keyboards/ducky/one2mini/1861st/rules.mk b/keyboards/ducky/one2mini/1861st/rules.mk
index a5b4708b26f4..b7db490c11ec 100644
--- a/keyboards/ducky/one2mini/1861st/rules.mk
+++ b/keyboards/ducky/one2mini/1861st/rules.mk
@@ -30,5 +30,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/ducky/one2sf/1967st/rules.mk b/keyboards/ducky/one2sf/1967st/rules.mk
index a5b4708b26f4..b7db490c11ec 100644
--- a/keyboards/ducky/one2sf/1967st/rules.mk
+++ b/keyboards/ducky/one2sf/1967st/rules.mk
@@ -30,5 +30,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/dumbo/keymaps/default/rules.mk b/keyboards/dumbo/keymaps/default/rules.mk
index a2d6e788f985..0f4dda264784 100644
--- a/keyboards/dumbo/keymaps/default/rules.mk
+++ b/keyboards/dumbo/keymaps/default/rules.mk
@@ -1,3 +1,2 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
diff --git a/keyboards/dumbo/keymaps/trip-trap/rules.mk b/keyboards/dumbo/keymaps/trip-trap/rules.mk
index 1913e10c490b..023239d3eeaf 100644
--- a/keyboards/dumbo/keymaps/trip-trap/rules.mk
+++ b/keyboards/dumbo/keymaps/trip-trap/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 WPM_ENABLE = yes
diff --git a/keyboards/dumbpad/config.h b/keyboards/dumbpad/config.h
deleted file mode 100644
index 879046ea07ae..000000000000
--- a/keyboards/dumbpad/config.h
+++ /dev/null
@@ -1,20 +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/>.
-*/
-#pragma once
-
-/* Reduce tapdance required taps from 5 to 2 */
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/dumbpad/info.json b/keyboards/dumbpad/info.json
index 341a1bcf8b7c..605d90fbb486 100644
--- a/keyboards/dumbpad/info.json
+++ b/keyboards/dumbpad/info.json
@@ -6,5 +6,8 @@
     "usb": {
         "vid": "0xDEAF",
         "pid": "0x0913"
+    },
+    "tapping": {
+        "toggle": 2
     }
 }
diff --git a/keyboards/dumbpad/v1x_oled/config.h b/keyboards/dumbpad/v1x_oled/config.h
deleted file mode 100644
index 1293e859792e..000000000000
--- a/keyboards/dumbpad/v1x_oled/config.h
+++ /dev/null
@@ -1,17 +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/>.
-*/
-#pragma once
-
-/* Reduce tapdance required taps from 5 to 2 */
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/dumbpad/v1x_oled/rules.mk b/keyboards/dumbpad/v1x_oled/rules.mk
index 073a351a03c2..53db407bc362 100644
--- a/keyboards/dumbpad/v1x_oled/rules.mk
+++ b/keyboards/dumbpad/v1x_oled/rules.mk
@@ -13,5 +13,4 @@ AUDIO_ENABLE = no           # Audio output
 
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
diff --git a/keyboards/dumbpad/v3x/config.h b/keyboards/dumbpad/v3x/config.h
index 1944244c3bd3..7667bb39d06a 100644
--- a/keyboards/dumbpad/v3x/config.h
+++ b/keyboards/dumbpad/v3x/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Cleanup RGB
 #ifdef RGB_MATRIX_ENABLE
 
-#define RGB_MATRIX_TIMEOUT 300000 // 5 minutes (5 * 60 * 1000ms)
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain
diff --git a/keyboards/dumbpad/v3x/info.json b/keyboards/dumbpad/v3x/info.json
index 5be344c17b02..24c16ac0afb4 100644
--- a/keyboards/dumbpad/v3x/info.json
+++ b/keyboards/dumbpad/v3x/info.json
@@ -6,7 +6,8 @@
         "device_version": "0.1.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812",
+        "timeout": 300000
     },
     "matrix_pins": {
         "cols": ["C6", "D7", "E6", "B4", "B5"],
diff --git a/keyboards/durgod/dgk6x/info.json b/keyboards/durgod/dgk6x/info.json
index df4c004ab5f8..a52d0a9b8f71 100644
--- a/keyboards/durgod/dgk6x/info.json
+++ b/keyboards/durgod/dgk6x/info.json
@@ -5,7 +5,7 @@
         "on_state": 0
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "processor": "STM32F072", // F070
     "bootloader": "stm32-dfu",
diff --git a/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c b/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
index 7f49352de45f..4092126d7fa6 100644
--- a/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
+++ b/keyboards/durgod/k320/keymaps/kuenhlee/keymap.c
@@ -132,11 +132,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_UL] = LAYOUT_tkl_ansi( /* Unicode Layer */
       XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            XXXXXXX,  XXXXXXX,  XXXXXXX,
-      X(APPR),  X(NEQU),  X(POW2),  X(POW3),  XXXXXXX,  XXXXXXX,  X(BSQR),  X(WSQR),  X(INFI),  X(BDOT),  X(WDOT),  XXXXXXX,  X(PONE),  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  X(SUM),   XXXXXXX,  X(MYU),   X(SAME),  XXXXXXX,  X(OHM),   X(DLAR),  X(DRAR),  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-      XXXXXXX,  XXXXXXX,  X(SQRT),  X(DELT),  XXXXXXX,  XXXXXXX,  X(THFR),  XXXXXXX,  XXXXXXX,  XXXXXXX,  X(THET),  X(DEGR),  XXXXXXX,
-      XXXXXXX,            XXXXXXX,  XXXXXXX,  X(COPY),  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  X(LTOE),  X(MTOE),  X(DIV),   XXXXXXX,                      X(UARR),
-      XXXXXXX,  XXXXXXX,  XXXXXXX,                                XXXXXXX,                                XXXXXXX,  KC_TRNS,  KC_TRNS,  XXXXXXX,  X(LARR),  X(DARR),  X(RARR)
+      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)
   )
 };
 
diff --git a/keyboards/dyz/dyz40/config.h b/keyboards/dyz/dyz40/config.h
index 87e057133dcb..7e7ca8b69490 100644
--- a/keyboards/dyz/dyz40/config.h
+++ b/keyboards/dyz/dyz40/config.h
@@ -17,6 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAP_CODE_DELAY 10 // Need this delay for some keys like VOLD/VOLU to work
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/dyz/dyz40/info.json b/keyboards/dyz/dyz40/info.json
index bb54647fedc3..fdd14a7c428b 100644
--- a/keyboards/dyz/dyz40/info.json
+++ b/keyboards/dyz/dyz40/info.json
@@ -13,6 +13,9 @@
             {"pin_a": "D1", "pin_b": "D0"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "rgblight": {
         "led_count": 13,
         "hue_steps": 10,
diff --git a/keyboards/dyz/dyz60/config.h b/keyboards/dyz/dyz60/config.h
index 87e057133dcb..7e7ca8b69490 100644
--- a/keyboards/dyz/dyz60/config.h
+++ b/keyboards/dyz/dyz60/config.h
@@ -17,6 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAP_CODE_DELAY 10 // Need this delay for some keys like VOLD/VOLU to work
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/dyz/dyz60/info.json b/keyboards/dyz/dyz60/info.json
index 05e0a2dae718..28300d791437 100644
--- a/keyboards/dyz/dyz60/info.json
+++ b/keyboards/dyz/dyz60/info.json
@@ -39,6 +39,9 @@
             {"pin_a": "D0", "pin_b": "D1"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "indicators": {
         "caps_lock": "F1"
     },
diff --git a/keyboards/dyz/dyz60_hs/config.h b/keyboards/dyz/dyz60_hs/config.h
index 4dd98dcbdfe9..7e7ca8b69490 100644
--- a/keyboards/dyz/dyz60_hs/config.h
+++ b/keyboards/dyz/dyz60_hs/config.h
@@ -17,5 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAP_CODE_DELAY 10 // Need this delay for some keys like VOLD/VOLU to work
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/dyz/dyz60_hs/info.json b/keyboards/dyz/dyz60_hs/info.json
index c23b0dca6a54..598f236980b6 100644
--- a/keyboards/dyz/dyz60_hs/info.json
+++ b/keyboards/dyz/dyz60_hs/info.json
@@ -37,6 +37,9 @@
         "pid": "0x001A",
         "device_version": "0.0.1"
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb", "60_iso", "60_iso_split_bs_rshift"],
diff --git a/keyboards/dyz/dyz_tkl/config.h b/keyboards/dyz/dyz_tkl/config.h
index 87e057133dcb..7e7ca8b69490 100644
--- a/keyboards/dyz/dyz_tkl/config.h
+++ b/keyboards/dyz/dyz_tkl/config.h
@@ -17,6 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAP_CODE_DELAY 10 // Need this delay for some keys like VOLD/VOLU to work
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/dyz/dyz_tkl/info.json b/keyboards/dyz/dyz_tkl/info.json
index c44e9b585cd8..298611a742f2 100644
--- a/keyboards/dyz/dyz_tkl/info.json
+++ b/keyboards/dyz/dyz_tkl/info.json
@@ -34,6 +34,9 @@
     "indicators": {
         "caps_lock": "D2"
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_f13_ansi", "tkl_f13_iso"],
diff --git a/keyboards/dyz/selka40/config.h b/keyboards/dyz/selka40/config.h
index 87e057133dcb..7e7ca8b69490 100644
--- a/keyboards/dyz/selka40/config.h
+++ b/keyboards/dyz/selka40/config.h
@@ -17,6 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAP_CODE_DELAY 10 // Need this delay for some keys like VOLD/VOLU to work
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/dyz/selka40/info.json b/keyboards/dyz/selka40/info.json
index 8fe32e5071c6..95ac00a88318 100644
--- a/keyboards/dyz/selka40/info.json
+++ b/keyboards/dyz/selka40/info.json
@@ -39,6 +39,9 @@
             {"pin_a": "D6", "pin_b": "D7"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "indicators": {
         "caps_lock": "B1",
         "num_lock": "B3",
diff --git a/keyboards/dz60/config.h b/keyboards/dz60/config.h
index 98673bdef015..bec7fcc3dcd7 100644
--- a/keyboards/dz60/config.h
+++ b/keyboards/dz60/config.h
@@ -1,21 +1,5 @@
 #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 RGBLED_NUM 16
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP
-
 /* 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/dz60/dz60.h b/keyboards/dz60/dz60.h
new file mode 100644
index 000000000000..e5b6b1cdd21d
--- /dev/null
+++ b/keyboards/dz60/dz60.h
@@ -0,0 +1,792 @@
+#pragma once
+
+#include "quantum.h"
+
+// Corresponding changes to the layout names and/or definitions must also be made to info.json
+
+// 标准配列
+/* Standard arrangement / LAYOUT
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
+ * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤
+ * │40  │41  │43  │44      │46  │48        │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
+*/
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, 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, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
+    k40, k41,      k43, k44,      k46,      k48,      k4a, k4b, k4c, k4d, k4e  \
+) { \
+    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,  k0c,   k0d,  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,  k31,   k32,   k33,  k34,  k35,   k36,  k37,   k38,  k39,   k3a,  k3b,  KC_NO, k3d,  k3e   }, \
+    { k40,  k41,   KC_NO, k43,  k44,  KC_NO, k46,  KC_NO, k48,  KC_NO, k4a,  k4b,  k4c,   k4d,  k4e   }  \
+}
+
+/* LAYOUT_60_ansi_arrow_split_bs_7u_spc
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3c    │3d │3e │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴──┬───┼───┼───┤
+ * │40   │41 │43   │46                         │4b │4c │4d │4e │
+ * └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
+*/
+#define LAYOUT_60_ansi_arrow_split_bs_7u_spc( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, 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,      k3c, k3d, k3e, \
+    k40, k41,      k43,           k46,                     k4b, k4c, k4d, k4e  \
+) { \
+    { k00, k01,   k02,   k03, k04,   k05,   k06, k07,   k08,   k09,   k0a,   k0b,   k0c, k0d, 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,   KC_NO, k3c, k3d, k3e   }, \
+    { k40, k41,   KC_NO, k43, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4b,   k4c, k4d, k4e   }  \
+}
+
+/*
+ * LAYOUT_60_ansi_arrow
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3c    │3d │3e │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤
+ * │40  │41  │43  │46                      │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+ */
+#define LAYOUT_60_ansi_arrow( \
+    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,      k3c, k3d, k3e, \
+    k40, k41,      k43,           k46,                k4a, k4b, k4c, 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, k3c, KC_NO, k3d,   k3e   }, \
+    { k40, k41,   KC_NO, k43, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4a, k4b,   k4c, k4d,   k4e   }  \
+}
+
+/* LAYOUT_true_hhkb
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
+ * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴┬─────┴───┤
+ * │▓▓▓▓▓│41 │43   │46 (6u)                │4a   │4b │▓▓▓▓▓▓▓▓▓│
+ * └─────┴───┴─────┴───────────────────────┴─────┴───┴─────────┘
+*/
+#define LAYOUT_true_hhkb( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, 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, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
+         k41,      k43,            k46,               k4a, k4b  \
+) { \
+    { k00,   k01,   k02,   k03,  k04,   k05,   k06,  k07,   k08,   k09,   k0a,  k0b,  k0c,   k0d,   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,   k31,   k32,   k33,  k34,   k35,   k36,  k37,   k38,   k39,   k3a,  k3b,  KC_NO, k3d,   k3e   }, \
+    { KC_NO, k41,   KC_NO, k43,  KC_NO, KC_NO, k46,  KC_NO, KC_NO, KC_NO, k4a,  k4b,  KC_NO, KC_NO, KC_NO }  \
+}
+
+/* LAYOUT_60_hhkb
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+ * │▓▓▓▓▓│41 │43   │46 (7u)                    │4b   │4d │▓▓▓▓▓│
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+*/
+#define LAYOUT_60_hhkb( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, 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, \
+         k41,      k43,           k46,                     k4b,      k4d       \
+) { \
+    { k00,   k01,   k02,   k03,  k04,   k05,   k06,  k07,   k08,   k09,   k0a,   k0b,  k0c,   k0d,  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   }, \
+    { KC_NO, k41,   KC_NO, k43,  KC_NO, KC_NO, k46,  KC_NO, KC_NO, KC_NO, KC_NO, k4b,  KC_NO, k4d,  KC_NO }  \
+}
+
+/* LAYOUT_60_ansi_split_bs_rshift
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+ * │40  │41  │43  │46                      │4a  │4b  │4d  │4e  │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+*/
+#define LAYOUT_60_ansi_split_bs_rshift( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, 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,   k0d,  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   }  \
+}
+
+// 带方向配列
+/* Directional arrangement | LAYOUT_directional
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤
+ * │30     │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │3e │
+ * ├────┬──┴─┬─┴──┬┴───┴───┼───┴┬──┴───┴───┼───┼───┼───┼───┼───┤
+ * │40  │41  │43  │44      │46  │48        │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
+*/
+#define LAYOUT_directional( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, 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, k3c, k3d, k3e, \
+    k40, k41,      k43, k44,      k46,      k48,      k4a, k4b, k4c, k4d, k4e  \
+) { \
+    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,  k0c,  k0d,  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,  k3c,  k3d,  k3e   }, \
+    { k40,  k41,   KC_NO, k43,  k44,  KC_NO, k46,  KC_NO, k48,  KC_NO, k4a,  k4b,  k4c,  k4d,  k4e   }  \
+}
+
+/* LAYOUT_all
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├───┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤
+ * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │3e │
+ * ├───┴┬──┴─┬─┴──┬┴───┴───┼───┴┬──┴───┴───┼───┼───┼───┼───┼───┤
+ * │40  │41  │43  │44      │46  │48        │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
+*/
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    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, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k40, k41,      k43, k44,      k46,      k48,      k4a, k4b, k4c, k4d, k4e  \
+) { \
+    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,  k0c,  k0d,  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,  k31,   k32,   k33,  k34,  k35,   k36,  k37,   k38,  k39,   k3a,  k3b,  k3c,  k3d,  k3e   }, \
+    { k40,  k41,   KC_NO, k43,  k44,  KC_NO, k46,  KC_NO, k48,  KC_NO, k4a,  k4b,  k4c,  k4d,  k4e   }  \
+}
+
+/* LAYOUT_60_ansi
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d        │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │40  │41  │43  │46                      │4a  │4b  │4d  │4e  │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+*/
+#define LAYOUT_60_ansi( \
+    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,      \
+    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,   KC_NO }, \
+    { k40,  k41,   KC_NO, k43,  KC_NO, KC_NO, k46,  KC_NO, KC_NO, KC_NO, k4a,  k4b,  KC_NO, k4d,   k4e   }  \
+}
+
+/* LAYOUT_60_ansi_split
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d        │
+ * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │40  │41  │43  │44      │46  │48        │4a  │4b  │4d  │4e  │
+ * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘
+*/
+#define LAYOUT_60_ansi_split( \
+    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,      \
+    k40, k41,      k43, k44,      k46,      k48,      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,   KC_NO }, \
+    { k40,  k41,   KC_NO, k43,  k44,   KC_NO, k46,  KC_NO, k48,   KC_NO, k4a,  k4b,  KC_NO, k4d,   k4e   }  \
+}
+
+/* LAYOUT_60_ansi_split_space_rshift
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴┬──┴─┬─┴───┴──┬┴───┼───┴┬────┬┴───┤
+ * │40  │41  │43  │44        │46  │48      │4a  │4b  │4d  │4e  │
+ * └────┴────┴────┴──────────┴────┴────────┴────┴────┴────┴────┘
+*/
+#define LAYOUT_60_ansi_split_space_rshift( \
+    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, k44,      k46,      k48,      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,  k44,   KC_NO, k46,  KC_NO, k48,   KC_NO, k4a,  k4b,  KC_NO, k4d,   k4e   }  \
+}
+
+/* LAYOUT_60_iso
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2d  │
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │1e │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d        │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │40  │41  │43  │46                      │4a  │4b  │4d  │4e  │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+*/
+#define LAYOUT_60_iso( \
+    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,      \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,      \
+    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,  k31,   k32,   k33,  k34,   k35,   k36,  k37,   k38,   k39,   k3a,  k3b,  KC_NO, k3d,   KC_NO }, \
+    { k40,  k41,   KC_NO, k43,  KC_NO, KC_NO, k46,  KC_NO, KC_NO, KC_NO, k4a,  k4b,  KC_NO, k4d,   k4e   }  \
+}
+
+/* LAYOUT_60_abnt2
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2d  │
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │1e │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤
+ * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │  3d  │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬──┴─┬────┤
+ * │40  │41  │43  │46                      │4a  │4b  │4d  │4e  │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+*/
+#define LAYOUT_60_abnt2( \
+    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,      \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      \
+    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,  k31,   k32,   k33,  k34,   k35,   k36,  k37,   k38,   k39,   k3a,  k3b,  k3c,   k3d,   KC_NO }, \
+    { k40,  k41,   KC_NO, k43,  KC_NO, KC_NO, k46,  KC_NO, KC_NO, KC_NO, k4a,  k4b,  KC_NO, k4d,   k4e   }  \
+}
+
+/* LAYOUT_60_iso_5x1u
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2d  │
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │1e │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d        │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┬───┤
+ * │40  │41  │43  │46                      │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+*/
+#define LAYOUT_60_iso_5x1u( \
+    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,      \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,      \
+    k40, k41,      k43,           k46,                k4a, k4b, k4c, 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,  k31,   k32,   k33,  k34,   k35,   k36,  k37,   k38,   k39,   k3a,  k3b,  KC_NO, k3d,   KC_NO }, \
+    { k40,  k41,   KC_NO, k43,  KC_NO, KC_NO, k46,  KC_NO, KC_NO, KC_NO, k4a,  k4b,  k4c,   k4d,   k4e   }  \
+}
+
+/* LAYOUT_60_iso_5x1u_split_rshift
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2d  │
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │1e │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
+ * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤
+ * │40  │41  │43  │46                      │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+*/
+#define LAYOUT_60_iso_5x1u_split_rshift( \
+    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,      \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e,      \
+    k40, k41,      k43,           k46,                k4a, k4b, k4c, 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,  k31,   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,  k4c,   k4d,   k4e   }  \
+}
+
+/* LAYOUT_60_iso_split
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2d  │
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │1e │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d        │
+ * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │40  │41  │43  │44      │46  │48        │4a  │4b  │4d  │4e  │
+ * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘
+*/
+#define LAYOUT_60_iso_split( \
+    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,      \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,      \
+    k40, k41,      k43, k44,      k46,      k48,      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,  k31,   k32,   k33,  k34,   k35,   k36,  k37,   k38,   k39,   k3a,  k3b,  KC_NO, k3d,   KC_NO }, \
+    { k40,  k41,   KC_NO, k43,  k44,   KC_NO, k46,  KC_NO, k48,   KC_NO, k4a,  k4b,  KC_NO, k4d,   k4e   }  \
+}
+
+/* LAYOUT_60_b_ansi (maximized DZ60 Plate B layout for ANSI)
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3c    │3d │3e │
+ * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬───┼───┼───┤
+ * │40  │41  │43  │44      │46  │48        │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
+*/
+#define LAYOUT_60_b_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, 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,      k3c, k3d, k3e, \
+    k40, k41,      k43, k44,      k46,      k48,      k4a, k4b, k4c, k4d, k4e  \
+) { \
+    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,   k0c,  k0d,  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,  KC_NO, k3c,  k3d,  k3e   }, \
+    { k40,  k41,   KC_NO, k43,  k44,  KC_NO, k46,  KC_NO, k48,  KC_NO, k4a,  k4b,   k4c,  k4d,  k4e   }  \
+}
+
+/* LAYOUT_60_b_iso (maximized DZ60 Plate B layout for ISO)
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2d  │
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │1e │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬──┴────┤
+ * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3c    │3d │3e │
+ * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬───┼───┼───┤
+ * │40  │41  │43  │44      │46  │48        │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
+*/
+#define LAYOUT_60_b_iso( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a,      k3c, k3d, k3e, \
+    k40, k41,      k43, k44,      k46,      k48,      k4a, k4b, k4c, k4d, k4e  \
+) { \
+    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,   k0c,  k0d,  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,  k31,   k32,   k33,  k34,  k35,   k36,  k37,   k38,  k39,   k3a,  KC_NO, k3c,  k3d,  k3e   }, \
+    { k40,  k41,   KC_NO, k43,  k44,  KC_NO, k46,  KC_NO, k48,  KC_NO, k4a,  k4b,   k4c,  k4d,  k4e   }  \
+}
+
+/* LAYOUT_60_tsangan
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │    0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+ * │40   │41 │43   │46 (7u)                    │4b   │4d │4e   │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+*/
+#define LAYOUT_60_tsangan( \
+    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,                     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, KC_NO, k4b,  KC_NO, k4d,    k4e   }  \
+}
+
+/* LAYOUT_60_tsangan_hhkb
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+ * │40   │41 │43   │46 (7u)                    │4b   │4d │4e   │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+*/
+#define LAYOUT_60_tsangan_hhkb( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, 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,                     k4b,      k4d, k4e  \
+) { \
+    { k00,   k01,   k02,   k03,  k04,   k05,   k06,  k07,   k08,   k09,   k0a,   k0b,  k0c,   k0d,  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, KC_NO, k4b,  KC_NO, k4d,  k4e   }  \
+}
+
+/* LAYOUT_60_calbatr0ss
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+ * │40  │41  │43  │44      │46  │48        │4a  │4b  │4d  │4e  │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+#define LAYOUT_60_calbatr0ss( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, 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, k44,      k46,      k48,      k4a, k4b,      k4d, k4e  \
+) { \
+    { k00, k01,   k02,   k03, k04, k05,   k06, k07,   k08, k09,   k0a, k0b, k0c,   k0d, 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, k44, KC_NO, k46, KC_NO, k48, KC_NO, k4a, k4b, KC_NO, k4d, k4e   }  \
+}
+
+/* LAYOUT_60_iso_split_space_bs_rshift
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2d  │
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │1e │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
+ * │30  |31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
+ * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───┤
+ * │40  │41  │43  │44      │46  │48        │4a  │4b  │4d  │4e  │
+ * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘
+*/
+#define LAYOUT_60_iso_split_space_bs_rshift( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
+    k40, k41,      k43, k44,      k46,      k48,      k4a, k4b,      k4d, k4e  \
+) { \
+    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,   k0c,  k0d,  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,  k31,   k32,   k33,  k34,  k35,   k36,  k37,   k38,  k39,   k3a,  k3b,   KC_NO,k3d,  k3e   }, \
+    { k40,  k41,   KC_NO, k43,  k44,  KC_NO, k46,  KC_NO, k48,  KC_NO, k4a,  k4b,   KC_NO,k4d,  k4e   }  \
+}
+
+/* LAYOUT_60_2_function
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┤
+ * │40  │41  │43  │46                      │4a   │4c   │4d │4e │
+ * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┘
+*/
+#define LAYOUT_60_2_function( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, 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, k4c,      k4d, k4e  \
+) { \
+    { k00,   k01,   k02,   k03,  k04,   k05,   k06,  k07,   k08,   k09,   k0a,   k0b,  k0c,   k0d,  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, KC_NO,  k4c, k4d,   k4e   }  \
+}
+
+/* LAYOUT_60_iso_5x1u_split_bs_rshift_spc
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2d  │
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │1e │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
+ * │30  |31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
+ * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤
+ * │40  │41  │43  │44      │46  │48        │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
+*/
+#define LAYOUT_60_iso_5x1u_split_bs_rshift_spc( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
+    k40, k41,      k43, k44,      k46,      k48,      k4a, k4b, k4c, k4d, k4e  \
+) { \
+    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,   k0c,  k0d,  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,  k31,   k32,   k33,  k34,  k35,   k36,  k37,   k38,  k39,   k3a,  k3b,   KC_NO,k3d,  k3e   }, \
+    { k40,  k41,   KC_NO, k43,  k44,  KC_NO, k46,  KC_NO, k48,  KC_NO, k4a,  k4b,   k4c,  k4d,  k4e   }  \
+}
+
+/* LAYOUT_60_olivierko
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───────┤
+ * │30     │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d     │
+ * ├─────┬─┴─┬─┴───┼───┴───┴───┴───┴───┴───┴───┼───┼───┼───┬───┤
+ * │40   │41 │43   │46 (7u)                    │4b │4c │4d │4e │
+ * └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
+*/
+#define LAYOUT_olivierko( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, 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, k3c, k3d,      \
+	k40, k41,      k43,           k46,                     k4b, k4c, k4d, k4e  \
+) { \
+    { k00,  k01,   k02,   k03,  k04,   k05,   k06,  k07,   k08,   k09,   k0a,   k0b,  k0c,   k0d,   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,  k3c,   k3d,   KC_NO }, \
+	{ k40,  k41,   KC_NO, k43,  KC_NO, KC_NO, k46,  KC_NO, KC_NO, KC_NO, KC_NO, k4b,  k4c,   k4d,   k4e   }  \
+}
+
+/* LAYOUT_60_iso_4th_row_all_1u
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2d  │
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │1e │    │
+ * ├───┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┤
+ * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │3e │
+ * ├───┴┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┼───┼───┼───┼───┤
+ * │40  │41  │43  │46                      │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+*/
+#define LAYOUT_60_iso_4th_row_all_1u( \
+    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,      \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k40, k41,      k43,           k46,                k4a, k4b, k4c, 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,  k31,   k32,   k33,  k34,   k35,   k36,  k37,   k38,   k39,   k3a,  k3b,  k3c,   k3d,   k3e   }, \
+    { k40,  k41,   KC_NO, k43,  KC_NO, KC_NO, k46,  KC_NO, KC_NO, KC_NO, k4a,  k4b,  k4c,   k4d,   k4e   }  \
+}
+
+/* LAYOUT_64_ansi
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤
+ * │30     │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │3e │
+ * ├────┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┼───┼───┼───┼───┤
+ * │40  │41  │43  │46                      │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+*/
+#define LAYOUT_64_ansi( \
+    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, k3c, k3d, k3e, \
+    k40, k41,      k43,           k46,                k4a, k4b, k4c, 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,  k3c,  k3d,   k3e   }, \
+    { k40,  k41,   KC_NO, k43,  KC_NO, KC_NO, k46,  KC_NO, KC_NO, KC_NO, k4a,  k4b,  k4c,  k4d,   k4e   }  \
+}
+
+/* LAYOUT_64_ansi_split_bs
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤
+ * │30     │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │3e │
+ * ├────┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┼───┼───┼───┼───┤
+ * │40  │41  │43  │46                      │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+*/
+#define LAYOUT_64_ansi_split_bs( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, 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, k3c, k3d, k3e, \
+    k40, k41,      k43,           k46,                k4a, k4b, k4c, k4d, k4e  \
+) { \
+    { k00,  k01,   k02,   k03,  k04,   k05,   k06,  k07,   k08,   k09,   k0a,  k0b,  k0c,  k0d,   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,  k3c,  k3d,   k3e   }, \
+    { k40,  k41,   KC_NO, k43,  KC_NO, KC_NO, k46,  KC_NO, KC_NO, KC_NO, k4a,  k4b,  k4c,  k4d,   k4e   }  \
+}
+
+/*
+ * LAYOUT_63_ansi_arrow_split_rshift
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤
+ * │40  │41  │43  │46                      │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+ */
+#define LAYOUT_63_ansi_arrow_split_rshift( \
+    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, k4c, 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,   k4c, k4d,   k4e   }  \
+}
diff --git a/keyboards/dz60/info.json b/keyboards/dz60/info.json
index 4c5fb59d2e66..a46b1564ec56 100644
--- a/keyboards/dz60/info.json
+++ b/keyboards/dz60/info.json
@@ -21,6 +21,24 @@
         "caps_lock": "B2",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "E2"
     },
diff --git a/keyboards/dz60/keymaps/badger/keymap.c b/keyboards/dz60/keymaps/badger/keymap.c
new file mode 100644
index 000000000000..93b085928234
--- /dev/null
+++ b/keyboards/dz60/keymaps/badger/keymap.c
@@ -0,0 +1,52 @@
+/*
+Copyright 2020 Dan White <opensource@bluetufa.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "badger.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_QWERTY]     = LAYOUT_60_ansi_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_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, \
+     MOVE_MAC,  KC_A,     KC_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,   LT_END,            \
+     KC_LCTL,   KC_LALT,  KC_LGUI,  KC_SPC,   FUNCTION, KC_UP,    KC_DOWN,  KC_LEFT,  KC_RIGHT),
+
+[_MOVE]       = LAYOUT_60_ansi_arrow(\
+     MAC_FRC,   MM_LEFT,  MM_RGHT,  KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  P_PAREN,  P_BRACE,  P_BRACK,   IJ_BOTT,  WD_DELE, \
+     KC_BACK,   VS_STEP,  VS_INTO,  VS_OUT,   VS_RUN,   VS_STOP,  VS_MVUP,  WD_BACK,  KC_HOME,  KC_END,   WD_FRWD,  IJ_BACK,   IJ_FWD,   KC_NEXT, \
+     _______,   MM_LH,    MM_MAX,   MM_RH,    IJ_FIND,  VS_LINE,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CM_RIGHT, CM_DOWN,   _______,           \
+     _______,   MM_UH,    MM_BH,    MAC_CPY,  MAC_PST,  IJ_IMPH,  _______,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,  _______,   _______,           \
+     _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______),
+
+[_FUNCTION]   = LAYOUT_60_ansi_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_DEL,  \
+     _______,   VS_CMD,   VS_SCC,   VS_EXP,   VS_DBG,    KC_MSTP,  KC_MPLY,  KC_PGUP,  _______,  _______,  KC_PGDN,  KC_VOLD,   KC_VOLU,  KC_INS,  \
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,           \
+     _______,   _______,  _______,  KC_CAPS,  _______,   KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,   CONFIG,            \
+     _______,   _______,  _______,  _______,  _______,   KC_RALT,  KC_RGUI,  KC_RCTL,  _______),
+
+[_MACRO]      = LAYOUT_60_ansi_arrow(\
+     _______,   KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL, \
+     _______,   _______,  _______,  _______,  SED,       KC_MSTP,  KC_MPLY,  KC_PGUP,  BASH_IF,  _______,  KC_PGDN,  KC_VOLD,   KC_VOLU,  KC_INS, \
+     _______,   _______,  SELECT,   _______,  FN,        _______,  _______,  _______,  _______,  FOR_LOOP, _______,  _______,   _______,          \
+     _______,   DF_1,     DF_2,     CONST,    _______,   SHEBANG,  KC_MNXT,  TS_IMPT,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,   _______,          \
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______),
+
+[_CONFIG]     = LAYOUT_60_ansi_arrow(\
+     _______,   DF_1,     DF_2,     DF_3,     DF_4,      KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL,  \
+     _______,   NK_ON,    NK_OFF,   EEP_RST,  RESET,     _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS,  \
+     _______,   GE_SWAP,  GE_NORM,  DEBUG,    RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,           \
+     _______,   LAG_SWP,  LAG_NRM,  _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,   _______,           \
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______)
+};
diff --git a/keyboards/dz60/keymaps/muzfuz/keymap.c b/keyboards/dz60/keymaps/muzfuz/keymap.c
index 36b843d45984..1a71b9bb868e 100644
--- a/keyboards/dz60/keymaps/muzfuz/keymap.c
+++ b/keyboards/dz60/keymaps/muzfuz/keymap.c
@@ -25,38 +25,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
 };
 
-void led_set_user(uint8_t usb_led) {
-
-	if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-
-	} else {
-
-	}
-
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+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);
 	}
-
-	if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-
-	} else {
-
-	}
-
-	if (usb_led & (1 << USB_LED_COMPOSE)) {
-
-	} else {
-
-	}
-
-	if (usb_led & (1 << USB_LED_KANA)) {
-
-	} else {
-
-	}
-
+	return false;
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record)
diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/config.h
index ba8626e95c8a..9ad357341e9d 100644
--- a/keyboards/dztech/bocc/config.h
+++ b/keyboards/dztech/bocc/config.h
@@ -15,22 +15,6 @@
  */
 #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 RGBLED_NUM 20
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP
-
 /* 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/dztech/bocc/info.json b/keyboards/dztech/bocc/info.json
index 525ec939477c..1b284df4e354 100644
--- a/keyboards/dztech/bocc/info.json
+++ b/keyboards/dztech/bocc/info.json
@@ -17,6 +17,24 @@
         "pin": "B7",
         "levels": 5
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "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": "E2"
     },
diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h
index 4685510d8b95..361706e57643 100644
--- a/keyboards/dztech/duo_s/config.h
+++ b/keyboards/dztech/duo_s/config.h
@@ -16,23 +16,8 @@
 
 #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_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) 
 #define RGBLIGHT_DEFAULT_SPD 15
-#define RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
-#define RGBLIGHT_SLEEP
 
 /* 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 3d806edf4120..027767501855 100644
--- a/keyboards/dztech/duo_s/info.json
+++ b/keyboards/dztech/duo_s/info.json
@@ -8,6 +8,25 @@
     "pid": "0x1012",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "hue_steps": 10,
+    "saturation_steps": 10,
+    "brightness_steps": 10,
+    "led_count": 16,
+    "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": "B15"
   },
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
index 8d58eed10ecc..e446178b62bb 100644
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/keymap.c
@@ -25,7 +25,6 @@ enum dz60rgb_keycodes {
 #define _V_V_V_ KC_TRNS
 #define LT_CAPS LT(_NAV, KC_CAPS)
 #define LT_DEL  LT(_RGB, KC_DEL)
-extern bool autoshift_enabled;
 #define MT_SLSH RSFT_T(KC_SLSH)
 #define MT_APP  RALT_T(KC_APP)
 #define LM_LALT LM(_FNM, MOD_LALT)
@@ -92,12 +91,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 bool rgb_matrix_indicators_user(void) {
-	uint8_t this_led = host_keyboard_leds();
+	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 (this_led & (1 << USB_LED_NUM_LOCK)) {
+			if (led_state.num_lock) {
 				rgb_matrix_set_color(13, 0xFF, 0x00, 0x00);
 				rgb_matrix_set_color(19, 0xFF, 0xFF, 0x00);
 			} else {
@@ -204,17 +203,11 @@ bool rgb_matrix_indicators_user(void) {
 			rgb_matrix_set_color(41, 0xFF, 0x00, 0x40); // ctrl+delete
 			rgb_matrix_set_color(43, 0xFF, 0x00, 0x40); // ctrl+slash
 
-			if (this_led & (1 << !autoshift_enabled)) {
-				rgb_matrix_set_color(0, 0xFF, 0x00, 0x00); // AS_TOGG
-			} else {
-				rgb_matrix_set_color(0, 0xFF, 0xFF, 0x00);
-			}
-
 			break;
 		}
 	}
 
-	if (this_led & (1 << USB_LED_CAPS_LOCK)) {
+	if (led_state.caps_lock) {
 		rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
 	}
     return false;
diff --git a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
index 4dca4d2396bc..52b7643850e1 100644
--- a/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
+++ b/keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c
@@ -58,7 +58,7 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
 }
 
 bool rgb_matrix_indicators_user(void) {
-	uint8_t this_led = host_keyboard_leds();
+	led_t led_state = host_keyboard_led_state();
 
 	if (!g_suspend_state && rgb_matrix_config.enable) {
 		switch (get_highest_layer(layer_state)) {
@@ -73,13 +73,13 @@ bool rgb_matrix_indicators_user(void) {
 		}
 	}
 
-	if (this_led & (1 << USB_LED_CAPS_LOCK)) {
+	if (led_state.caps_lock) {
 		rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
 	}
 
 	switch (get_highest_layer(layer_state)) {
 	case _LAYER3:
-		if (this_led & (1 << USB_LED_NUM_LOCK)) {
+		if (led_state.num_lock) {
 			rgb_matrix_set_color(13, 0xFF, 0x00, 0x00);
 		} else {
 			rgb_matrix_set_color(13, 0x00, 0x00, 0x00);
@@ -152,22 +152,3 @@ bool rgb_matrix_indicators_user(void) {
 	}
     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/v1/info.json b/keyboards/dztech/dz60rgb/v1/info.json
index 56a70183f532..0033c3acc7a2 100644
--- a/keyboards/dztech/dz60rgb/v1/info.json
+++ b/keyboards/dztech/dz60rgb/v1/info.json
@@ -4,7 +4,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
diff --git a/keyboards/dztech/dz60rgb/v2/info.json b/keyboards/dztech/dz60rgb/v2/info.json
index 0b263d809986..4801792d98e1 100644
--- a/keyboards/dztech/dz60rgb/v2/info.json
+++ b/keyboards/dztech/dz60rgb/v2/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "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/info.json b/keyboards/dztech/dz60rgb/v2_1/info.json
index 796b1bc4a338..9028f69d4fbf 100644
--- a/keyboards/dztech/dz60rgb/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb/v2_1/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.1.0"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c
index 3de7e1c19486..5f9a7311d8f0 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c
@@ -15,25 +15,25 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "badger.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY_MAC] = 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,
-     MOVE_MAC,   KC_A,     KC_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,   ADJUST,   KC_RGUI,  KC_RALT,  MAC_POP),
-
-  [_MOVE_MAC]   = LAYOUT_60_ansi(
-     MAC_FRC,    MM_LEFT,  MM_RGHT,  KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_0,     IJ_TOP,    IJ_BOTT,  KC_DEL,
-     KC_BACK,    IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_RUN,   IJ_STOP,  _______,  WD_BACK,  KC_HOME,  KC_END,   WD_FRWD,  IJ_BACK,   IJ_FWD,   KC_NEXT,
-     _______,    MM_LH,    MM_MAX,   MM_RH,    IJ_FIND,  IJ_IMPS,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CM_RIGHT, CM_DOWN,   _______,
-     _______,    MM_UH,    MM_BH,    MAC_CPY,  MAC_PST,  IJ_IMPH,  _______,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,  _______,
+  [_QWERTY_MAC] = 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, \
+     MOVE_MAC,   KC_A,     KC_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,   ADJUST,   KC_RGUI,  KC_RALT,  CFG_MAC    ),
+
+  [_MOVE_MAC]   = LAYOUT_60_ansi(\
+     MAC_FRC,    MM_LEFT,  MM_RGHT,  KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_0,     IJ_TOP,    IJ_BOTT,  KC_DEL, \
+     KC_BACK,    IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_RUN,   IJ_STOP,  IJ_RELD,  WD_BACK,  KC_HOME,  KC_END,   WD_FRWD,  IJ_BACK,   IJ_FWD,   KC_NEXT, \
+     _______,    MM_LH,    MM_MAX,   MM_RH,    IJ_FIND,  IJ_IMPS,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CM_RIGHT, CM_DOWN,   _______,  \
+     _______,    MM_UH,    MM_BH,    MAC_CPY,  MAC_PST,  IJ_IMPH,  _______,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,  _______,   \
      _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
-     
-  [_QWERTY_LINUX] = 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,
-     MOVE,       KC_A,     KC_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,
+
+  [_QWERTY_LINUX] = 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, \
+     MOVE,       KC_A,     KC_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,   ADJUST,   KC_LALT,  KC_RGUI,  KC_RCTL),
 
   [_MOVE_LINUX] = LAYOUT_60_ansi(
@@ -43,12 +43,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      _______,    WM_VD3,   WM_BH,    OS_COPY,  OS_PAST,  WD_BACK,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  _______,  _______,
      _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
 
-  [_ADJUST]     = 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_WREF,   KC_MSTP,  KC_MPLY,  KC_PGUP,  _______,  _______,  KC_PGDN,  KC_VOLD,   KC_VOLU,  KC_INS,
-     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,
-     _______,   DF_1,     DF_2,     KC_CAPS,  _______,   KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,
-     _______,   _______,  _______,  _______,  _______,   _______,  _______,  MO(_CONFIG)),
+  [_ADJUST]     = 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_WREF,   KC_MSTP,  KC_MPLY,  KC_PGUP,  _______,  _______,  KC_PGDN,  KC_VOLD,   KC_VOLU,  KC_INS, \
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  \
+     _______,   DF_1,     DF_2,     KC_CAPS,  _______,   KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,   \
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______),
 
   [_CONFIG]     = 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,
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
index 7f3b24de74ef..e5f5083ee5fe 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
@@ -85,7 +85,7 @@ void highlight_layer3(void){
 }
 
 bool rgb_matrix_indicators_user(void) {
-	  uint8_t this_led = host_keyboard_leds();
+	  led_t led_state = host_keyboard_led_state();
       if (!g_suspend_state) {
         switch (get_highest_layer(layer_state)) {
           case 3:
@@ -94,7 +94,7 @@ bool rgb_matrix_indicators_user(void) {
             break;
         }
       }
-	  if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
+	  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
index af2d9fa3dcfa..ff829f53fa0c 100644
--- a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
@@ -146,7 +146,7 @@ void highlight_layer3(void) {
 }
 
 bool rgb_matrix_indicators_user(void) {
-	  uint8_t this_led = host_keyboard_leds();
+	  led_t led_state = host_keyboard_led_state();
       if (!g_suspend_state) {
         switch (get_highest_layer(layer_state)) {
           case 1:
@@ -161,7 +161,7 @@ bool rgb_matrix_indicators_user(void) {
             break;
         }
       }
-	  if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
+	  if (led_state.caps_lock) {
 	        rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
 	  }
     return false;
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/info.json b/keyboards/dztech/dz60rgb_ansi/v1/info.json
index 77a9e801c64b..9c8b271cc957 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v1/info.json
@@ -4,7 +4,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "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/info.json b/keyboards/dztech/dz60rgb_ansi/v2/info.json
index 734d07db3149..cc239f74b32a 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v2/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "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 09e76f52d5d7..90b6c71e67f3 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
@@ -66,7 +66,7 @@
 // #    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_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 #    define DRIVER_ADDR_1 0b1010000
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
index 1d72dc44eef3..edd27d45771d 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.1.0"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/info.json b/keyboards/dztech/dz60rgb_wkl/v1/info.json
index 65bb086dc39b..0a61ae0d834b 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v1/info.json
@@ -4,7 +4,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "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/info.json b/keyboards/dztech/dz60rgb_wkl/v2/info.json
index b9a2126e3df5..adc6fb3b4c0d 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v2/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "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/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
index ce830f6b01a5..cea77d59cff1 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.1.0"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz60v2/info.json b/keyboards/dztech/dz60v2/info.json
new file mode 100644
index 000000000000..bd1479b77c08
--- /dev/null
+++ b/keyboards/dztech/dz60v2/info.json
@@ -0,0 +1,2441 @@
+{
+    "manufacturer": "DZTECH",
+    "keyboard_name": "DZ60v2",
+    "maintainer": "DZTECH",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "indicators": {
+        "caps_lock": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "C7", "C6", "B6", "B5"],
+        "rows": ["F0", "B3", "F6", "F4", "F5"]
+    },
+    "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": 10,
+        "hue_steps": 10,
+        "led_count": 16,
+        "saturation_steps": 10
+    },
+    "ws2812": {
+        "pin": "B2"
+    },
+    "usb": {
+        "device_version": "0.0.2",
+        "pid": "0x2261",
+        "vid": "0x445A"
+    },
+    "community_layouts": [
+        "60_abnt2",
+        "60_ansi",
+        "60_ansi_arrow",
+        "60_ansi_arrow_split_bs_7u_spc",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan",
+        "60_tsangan_hhkb",
+        "64_ansi",
+        "64_iso"
+    ],
+    "layouts": {
+        "LAYOUT": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k44", "matrix": [4, 4], "w": 2.25, "x": 3.75, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 1.25, "x": 6, "y": 4 },
+                { "label": "k48", "matrix": [4, 8], "w": 2.75, "x": 7.25, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_2_function": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "w": 1.5, "x": 10, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "w": 1.5, "x": 11.5, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_abnt2": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k1e", "matrix": [1, 14], "x": 12.75, "y": 2 },
+                { "h": 2, "label": "k2d", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 },
+                { "label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3c", "matrix": [3, 12], "x": 12.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 1.75, "x": 13.25, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_ansi_arrow": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3c", "matrix": [3, 12], "w": 1.75, "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "x": 13, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_ansi_arrow_split_bs_7u_spc": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3c", "matrix": [3, 12], "w": 1.75, "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "x": 13, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_ansi_split": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k44", "matrix": [4, 4], "w": 2.25, "x": 3.75, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 1.25, "x": 6, "y": 4 },
+                { "label": "k48", "matrix": [4, 8], "w": 2.75, "x": 7.25, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_ansi_split_space_rshift": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k44", "matrix": [4, 4], "w": 2.25, "x": 3.75, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 1.25, "x": 6, "y": 4 },
+                { "label": "k48", "matrix": [4, 8], "w": 2.75, "x": 7.25, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 12.5, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_b_ansi": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3c", "matrix": [3, 12], "w": 1.75, "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "x": 13, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k44", "matrix": [4, 4], "w": 2.25, "x": 3.75, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 1.25, "x": 6, "y": 4 },
+                { "label": "k48", "matrix": [4, 8], "w": 2.75, "x": 7.25, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_b_iso": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k1e", "matrix": [1, 14], "x": 12.75, "y": 2 },
+                { "h": 2, "label": "k2d", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 },
+                { "label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3c", "matrix": [3, 12], "w": 1.75, "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "x": 13, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k44", "matrix": [4, 4], "w": 2.25, "x": 3.75, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 1.25, "x": 6, "y": 4 },
+                { "label": "k48", "matrix": [4, 8], "w": 2.75, "x": 7.25, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_calbatr0ss": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k44", "matrix": [4, 4], "w": 2.25, "x": 3.75, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 1.25, "x": 6, "y": 4 },
+                { "label": "k48", "matrix": [4, 8], "w": 2.75, "x": 7.25, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k41", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 12.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k1e", "matrix": [1, 14], "x": 12.75, "y": 2 },
+                { "h": 2, "label": "k2d", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 },
+                { "label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso_4th_row_all_1u": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k1e", "matrix": [1, 14], "x": 12.75, "y": 2 },
+                { "h": 2, "label": "k2d", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 },
+                { "label": "k30", "matrix": [3, 0], "x": 0, "y": 3 },
+                { "label": "k31", "matrix": [3, 1], "x": 1, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11, "y": 3 },
+                { "label": "k3c", "matrix": [3, 12], "x": 12, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "x": 13, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso_5x1u": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k1e", "matrix": [1, 14], "x": 12.75, "y": 2 },
+                { "h": 2, "label": "k2d", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 },
+                { "label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso_5x1u_split_bs_rshift_spc": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k1e", "matrix": [1, 14], "x": 12.75, "y": 2 },
+                { "h": 2, "label": "k2d", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 },
+                { "label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k44", "matrix": [4, 4], "w": 2.25, "x": 3.75, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 1.25, "x": 6, "y": 4 },
+                { "label": "k48", "matrix": [4, 8], "w": 2.75, "x": 7.25, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso_5x1u_split_rshift": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "h": 2, "label": "k20", "matrix": [2, 0], "w": 1.25, "x": 13.75, "y": 1 },
+                { "label": "k22", "matrix": [2, 2], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 1.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 2.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 3.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 4.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 5.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 6.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 7.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 8.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 9.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 10.75, "y": 2 },
+                { "label": "k1e", "matrix": [1, 14], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso_arrow_one_bksp": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k1e", "matrix": [1, 14], "x": 12.75, "y": 2 },
+                { "h": 2, "label": "k2d", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 },
+                { "label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3c", "matrix": [3, 12], "w": 1.75, "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "x": 13, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso_split": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k1e", "matrix": [1, 14], "x": 12.75, "y": 2 },
+                { "h": 2, "label": "k2d", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 },
+                { "label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k44", "matrix": [4, 4], "w": 2.25, "x": 3.75, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 1.25, "x": 6, "y": 4 },
+                { "label": "k48", "matrix": [4, 8], "w": 2.75, "x": 7.25, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k1e", "matrix": [1, 14], "x": 12.75, "y": 2 },
+                { "h": 2, "label": "k2d", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 },
+                { "label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso_split_space_bs_rshift": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k1e", "matrix": [1, 14], "x": 12.75, "y": 2 },
+                { "h": 2, "label": "k2d", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 },
+                { "label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k44", "matrix": [4, 4], "w": 2.25, "x": 3.75, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 1.25, "x": 6, "y": 4 },
+                { "label": "k48", "matrix": [4, 8], "w": 2.75, "x": 7.25, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k1e", "matrix": [1, 14], "x": 12.75, "y": 2 },
+                { "h": 2, "label": "k2d", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 },
+                { "label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 12.5, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k1e", "matrix": [1, 14], "x": 12.75, "y": 2 },
+                { "h": 2, "label": "k2d", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 },
+                { "label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 12.5, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_tsangan": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 12.5, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 12.5, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_64_ansi": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 2, "x": 0, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11, "y": 3 },
+                { "label": "k3c", "matrix": [3, 12], "x": 12, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "x": 13, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_64_ansi_split_bs": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 2, "x": 0, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11, "y": 3 },
+                { "label": "k3c", "matrix": [3, 12], "x": 12, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "x": 13, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_64_iso": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "w": 2, "x": 13, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k1e", "matrix": [1, 14], "x": 12.75, "y": 2 },
+                { "h": 2, "label": "k2d", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 },
+                { "label": "k30", "matrix": [3, 0], "x": 0, "y": 3 },
+                { "label": "k30", "matrix": [3, 1], "x": 1, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11, "y": 3 },
+                { "label": "k3c", "matrix": [3, 12], "x": 12, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "x": 13, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_64_iso_split_bs": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k1e", "matrix": [1, 14], "x": 12.75, "y": 2 },
+                { "h": 2, "label": "k2d", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1 },
+                { "label": "k30", "matrix": [3, 0], "x": 0, "y": 3 },
+                { "label": "k30", "matrix": [3, 1], "x": 1, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11, "y": 3 },
+                { "label": "k3c", "matrix": [3, 12], "x": 12, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "x": 13, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_all": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "x": 0, "y": 3 },
+                { "label": "k31", "matrix": [3, 1], "x": 1, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11, "y": 3 },
+                { "label": "k3c", "matrix": [3, 12], "x": 12, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "x": 13, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k44", "matrix": [4, 4], "w": 2.25, "x": 3.75, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 1.25, "x": 6, "y": 4 },
+                { "label": "k48", "matrix": [4, 8], "w": 2.75, "x": 7.25, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_directional": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 2, "x": 0, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11, "y": 3 },
+                { "label": "k3c", "matrix": [3, 12], "x": 12, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "x": 13, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k44", "matrix": [4, 4], "w": 2.25, "x": 3.75, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 1.25, "x": 6, "y": 4 },
+                { "label": "k48", "matrix": [4, 8], "w": 2.75, "x": 7.25, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_olivierko": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 2, "x": 0, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11, "y": 3 },
+                { "label": "k3c", "matrix": [3, 12], "x": 12, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 2, "x": 13, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11, "y": 4 },
+                { "label": "k4c", "matrix": [4, 12], "x": 12, "y": 4 },
+                { "label": "k4d", "matrix": [4, 13], "x": 13, "y": 4 },
+                { "label": "k4e", "matrix": [4, 14], "x": 14, "y": 4 }
+            ]
+        },
+        "LAYOUT_true_hhkb": {
+            "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": "k03", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "k0a", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "k0b", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "k0c", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "k0d", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "k0e", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "label": "k1a", "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "label": "k1b", "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "label": "k1c", "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "label": "k1d", "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "label": "k1e", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "x": 1.75, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "x": 2.75, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "x": 3.75, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "x": 4.75, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "x": 5.75, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "x": 6.75, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "x": 7.75, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "x": 8.75, "y": 2 },
+                { "label": "k2a", "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "label": "k2b", "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "label": "k2c", "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "label": "k2d", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": "k3a", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "k3b", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "k3d", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "k3e", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "k41", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 6, "x": 4, "y": 4 },
+                { "label": "k4a", "matrix": [4, 10], "w": 1.5, "x": 10, "y": 4 },
+                { "label": "k4b", "matrix": [4, 11], "x": 11.5, "y": 4 }
+            ]
+        }
+    }
+}
+
diff --git a/keyboards/dztech/dz60v2/keymaps/default/keymap.c b/keyboards/dztech/dz60v2/keymaps/default/keymap.c
new file mode 100644
index 000000000000..f3372b151ca6
--- /dev/null
+++ b/keyboards/dztech/dz60v2/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2023 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/>.
+ */
+#include QMK_KEYBOARD_H
+
+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,  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_UP, MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN,   KC_RGHT
+    ),
+
+    LAYOUT_all(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+        _______, 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/via/keymap.c b/keyboards/dztech/dz60v2/keymaps/via/keymap.c
new file mode 100644
index 000000000000..f3372b151ca6
--- /dev/null
+++ b/keyboards/dztech/dz60v2/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2023 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/>.
+ */
+#include QMK_KEYBOARD_H
+
+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,  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_UP, MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN,   KC_RGHT
+    ),
+
+    LAYOUT_all(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+        _______, 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/via/rules.mk b/keyboards/dztech/dz60v2/keymaps/via/rules.mk
new file mode 100644
index 000000000000..ca9fed0e6b53
--- /dev/null
+++ b/keyboards/dztech/dz60v2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+LTO_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/dztech/dz60v2/readme.md b/keyboards/dztech/dz60v2/readme.md
new file mode 100644
index 000000000000..51ccd9a12bb2
--- /dev/null
+++ b/keyboards/dztech/dz60v2/readme.md
@@ -0,0 +1,26 @@
+# DZ60 60% Mechanical Keyboard PCB
+
+## A Customizable 60% Mechanical Keyboard PCB
+
+* Keyboard Maintainer: QMK Community
+* Hardware Supported: DZ60 60% Mechanical Keyboard PCB
+* Hardware Availability: [KBDfans](https://kbdfans.com/collections/60/products/dz60-60-pcb)
+
+There are two versions of the DZ60 PCB. Please use the appropriate firmware for your board.
+
+* V1: 1.6mm thickness PCB;
+* V2: 1.2mm thickness PCB
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix
+* **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
+
+Make example for this keyboard (after setting up your build environment):
+
+    make dztech/dz60v2: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/dztech/dz60v2/rules.mk b/keyboards/dztech/dz60v2/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/dztech/dz60v2/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/dztech/dz64rgb/info.json b/keyboards/dztech/dz64rgb/info.json
index aa69238191d7..ca2dd46bd2e4 100644
--- a/keyboards/dztech/dz64rgb/info.json
+++ b/keyboards/dztech/dz64rgb/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.2"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
index d4e1851f68cb..7b4e9ab72884 100644
--- a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/keymap.c
@@ -166,10 +166,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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), X(UC_GRINNING_FACE), X(UC_BEAMING_FACE), X(UC_GRINNING_FACE_WITH_SWEAT), X(UC_ROLLING_LAUGHING), X(UC_FACE_TEARS_JOY), X(UC_WINKING_FACE), X(UC_SMILING_FACE_HALO), X(UC_SMILING_FACE_HEARTS), X(UC_SMILING_FACE_HEART_EYES), X(UC_FACE_BLOWING_KISS), X(UC_FACE_SAVORING_FOOD), X(UC_ZANY_FACE), KC_BSPC, KC_HOME,
-        KC_TAB, X(UC_HUGGING_FACE), X(UC_SHUSHING_FACE), X(UC_THINKING_FACE), X(UC_FACE_RAISED_EYEBROW), X(UC_NEUTRAL_FACE), X(UC_SMIRKING_FACE), X(UC_FACE_ROLLING_EYES), X(UC_PENSIVE_FACE), X(UC_FACE_VOMITING), X(UC_WOOZY_FACE), X(UC_PLEADING_FACE), X(UC_LOUDLY_CRYING_FACE), X(UC_THUMBSUP), KC_END,
-        KC_APP, X(UC_DISAPPOINTED_FACE), X(UC_FACE_SYMBOLS_MOUTH), X(UC_SMILING_FACE_HORNS), X(UC_SKULL), X(UC_PILE_POO), X(UC_GHOST), X(UC_ALIEN_MONSTER), X(UC_RED_HEART), X(UC_BOMB), X(UC_WAVING_HAND), X(UC_OK_HAND), KC_ENT, KC_PGUP,
-        KC_LSFT, X(UC_CLAPPING_HANDS), X(UC_EYES), X(UC_MAN_FACEPALMING), X(UC_TURTLE), X(UC_SNAKE), X(UC_SPOUTING_WHALE), X(UC_DRAGON), X(UC_TREX), X(UC_ARGENTINA_A), X(UC_ARGENTINA_R), X(UC_THUMBSDOWN), KC_UP, KC_PGDN,
+        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(
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
index d283d0ba1e82..7936aaff75e2 100644
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
+++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/keymap.c
@@ -25,7 +25,6 @@ enum dz65rgb_keycodes {
 #define TG_NKRO MAGIC_TOGGLE_NKRO
 #define _V_V_V_ KC_TRNS
 #define LT_CAPS LT(_NAV, KC_CAPS)
-extern bool autoshift_enabled;
 #define MT_APP  RALT_T(KC_APP)
 #define LM_LALT LM(_FNM, MOD_LALT)
 
@@ -87,12 +86,12 @@ bool rgb_matrix_indicators_user(void) {
 		rgb_matrix_set_color(8, 0xFF, 0xFF, 0xFF);
 	}
 
-	uint8_t this_led = host_keyboard_leds();
+	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 (IS_LED_ON(this_led, USB_LED_NUM_LOCK)) {
+			if (led_state.num_lock) {
 				rgb_matrix_set_color(17, 0xFF, 0x00, 0x00);
 				rgb_matrix_set_color(26, 0xFF, 0xFF, 0x00);
 			} else {
@@ -171,12 +170,6 @@ bool rgb_matrix_indicators_user(void) {
 			rgb_matrix_set_color(24, 0xFF, 0x40, 0x00); // KC_MPRV
 			rgb_matrix_set_color(25, 0xFF, 0x40, 0x00);
 
-			if (this_led & (1 << !autoshift_enabled)) {
-				rgb_matrix_set_color(15, 0xFF, 0x00, 0x00); // AS_TOGG
-			} else {
-				rgb_matrix_set_color(15, 0xFF, 0xFF, 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
diff --git a/keyboards/dztech/dz65rgb/v1/info.json b/keyboards/dztech/dz65rgb/v1/info.json
index 19279921a441..6b418b8cd67d 100644
--- a/keyboards/dztech/dz65rgb/v1/info.json
+++ b/keyboards/dztech/dz65rgb/v1/info.json
@@ -4,7 +4,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "matrix_pins": {
         "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15"],
diff --git a/keyboards/dztech/dz65rgb/v2/info.json b/keyboards/dztech/dz65rgb/v2/info.json
index b449f4979a18..e52584f724c6 100644
--- a/keyboards/dztech/dz65rgb/v2/info.json
+++ b/keyboards/dztech/dz65rgb/v2/info.json
@@ -4,7 +4,7 @@
         "device_version": "2.0.0"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "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/info.json b/keyboards/dztech/dz65rgb/v3/info.json
index e4e4dd65812f..ccc24b724ea2 100644
--- a/keyboards/dztech/dz65rgb/v3/info.json
+++ b/keyboards/dztech/dz65rgb/v3/info.json
@@ -4,7 +4,7 @@
         "device_version": "3.0.0"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
diff --git a/keyboards/dztech/dz96/info.json b/keyboards/dztech/dz96/info.json
index 47ceaebcd285..c1d3b84623ea 100644
--- a/keyboards/dztech/dz96/info.json
+++ b/keyboards/dztech/dz96/info.json
@@ -25,8 +25,13 @@
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
+  "layout_aliases": {
+    "LAYOUT_default": "LAYOUT_96_ansi",
+    "LAYOUT_iso": "LAYOUT_96_iso"
+  },
+  "community_layouts": ["96_ansi", "96_iso"],
   "layouts": {
-        "LAYOUT_default": {
+        "LAYOUT_96_ansi": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -357,7 +362,7 @@
                 {"matrix": [5, 12], "x": 18, "y": 5}
             ]
         },
-        "LAYOUT_iso": {
+        "LAYOUT_96_iso": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/dztech/dz96/matrix_diagram.md b/keyboards/dztech/dz96/matrix_diagram.md
new file mode 100644
index 000000000000..e54cceee76d3
--- /dev/null
+++ b/keyboards/dztech/dz96/matrix_diagram.md
@@ -0,0 +1,23 @@
+# Matrix Diagram for Dztech Dz96
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │60 │61 │62 │63 │05 │06 │07 │08 │72 │09 │0A │0B │0C │7C │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤    ┌───────┐
+│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 │ Numpad "+" 2u
+│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    │74 │49 │4A │4B │4C │                              │   │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┼───┼───┼───┤                              │4C │ Numpad Enter 2U
+│50  │51  │52  │59                      │55 │56 │57 │58 │53 │54 │5A │5B │5C │                              │   │
+└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┴───┴───┴───┘                              └───┘
+┌────────┐
+│40      │ 2.25u LShift
+└────────┘
+┌─────┬─────┬───────────────────────────┬─────┬─────┐
+│50   │51   │59                         │55   │57   │ 2 Mod
+└─────┴─────┴───────────────────────────┴─────┴─────┘
+```
diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h
index d02f83716911..a8851d89138f 100644
--- a/keyboards/dztech/endless80/config.h
+++ b/keyboards/dztech/endless80/config.h
@@ -15,19 +15,5 @@
  */
 #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_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) 
 #define RGBLIGHT_DEFAULT_SPD 10
-#define RGBLED_NUM 30
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/dztech/endless80/info.json b/keyboards/dztech/endless80/info.json
index 9fb8bc22ed1e..2391faf4955f 100644
--- a/keyboards/dztech/endless80/info.json
+++ b/keyboards/dztech/endless80/info.json
@@ -21,7 +21,23 @@
         "pin": "F7"
     },
     "rgblight": {
-        "max_brightness": 130
+        "hue_steps": 10,
+        "saturation_steps": 10,
+        "brightness_steps": 10,
+        "led_count": 30,
+        "max_brightness": 130,
+        "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",
diff --git a/keyboards/dztech/pluto/info.json b/keyboards/dztech/pluto/info.json
index ab201befa314..d64e941346e0 100644
--- a/keyboards/dztech/pluto/info.json
+++ b/keyboards/dztech/pluto/info.json
@@ -1,191 +1,1142 @@
 {
-  "manufacturer": "DZTECH",
-  "keyboard_name": "PLUTO",
-  "maintainer": "moyi4681",
-  "bootloader": "rp2040",
-  "diode_direction": "COL2ROW",
-  "features": {
-      "bootmagic": true,
-      "command": false,
-      "console": false,
-      "extrakey": true,
-      "mousekey": true,
-      "nkro": true
-  },
-  "matrix_pins": {
-      "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP16", "GP15", "GP14", "GP13", "GP0"],
-      "rows": ["GP1", "GP18", "GP17", "GP12", "GP11"]
-  },
-  "processor": "RP2040",
-  "usb": {
-      "device_version": "1.0.0",
-      "pid": "0x0006",
-      "vid": "0x445A"
-  },
-  "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.25, "y": 0 },
-              { "matrix": [2, 12], "x": 16.25, "y": 0 },
-              { "matrix": [2, 13], "x": 17.25, "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], "x": 12.75, "y": 2 },
-              { "matrix": [1, 15], "x": 15.25, "y": 1 },
-              { "matrix": [2, 14], "x": 16.25, "y": 1 },
-              { "matrix": [2, 15], "x": 17.25, "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": [1, 14], "w": 1.25, "x": 12.75, "y": 1 },
-
-              { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-              { "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], "w": 1.75, "x": 12.25, "y": 3 },
-              { "matrix": [3, 13], "x": 15.25, "y": 3 },
-              { "matrix": [3, 14], "x": 16.25, "y": 3 },
-
-              { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-              { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
-              { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-              { "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
-              { "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
-              { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
-              { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
-              { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 },
-              { "matrix": [3, 15], "x": 15.25, "y": 4 },
-              { "matrix": [4, 14], "x": 16.25, "y": 4 },
-              { "matrix": [4, 15], "x": 17.25, "y": 4 }
-          ]
-      },
-      "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 },
-            { "matrix": [0, 14], "x": 14, "y": 0 },
-            { "matrix": [0, 15], "x": 15.25, "y": 0 },
-            { "matrix": [2, 12], "x": 16.25, "y": 0 },
-            { "matrix": [2, 13], "x": 17.25, "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 },
-            { "h": 2, "matrix": [1, 14], "w": 1.25, "x": 13.75, "y": 1 },
-            { "matrix": [1, 15], "x": 15.25, "y": 1 },
-            { "matrix": [2, 14], "x": 16.25, "y": 1 },
-            { "matrix": [2, 15], "x": 17.25, "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": [1, 13], "x": 12.75, "y": 2 },
-
-            { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-            { "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], "w": 1.75, "x": 12.25, "y": 3 },
-            { "matrix": [3, 13], "x": 15.25, "y": 3 },
-            { "matrix": [3, 14], "x": 16.25, "y": 3 },
-
-            { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-            { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
-            { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-            { "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
-            { "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
-            { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
-            { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
-            { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 },
-            { "matrix": [3, 15], "x": 15.25, "y": 4 },
-            { "matrix": [4, 14], "x": 16.25, "y": 4 },
-            { "matrix": [4, 15], "x": 17.25, "y": 4 }
-        ]
+    "manufacturer": "DZTECH",
+    "keyboard_name": "PLUTO",
+    "maintainer": "moyi4681",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP16", "GP15", "GP14", "GP13", "GP0"],
+        "rows": ["GP1", "GP18", "GP17", "GP12", "GP11"]
+    },
+    "processor": "RP2040",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0006",
+        "vid": "0x445A"
+    },
+    "community_layouts": ["tkl_nofrow_ansi", "tkl_nofrow_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.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [2, 13], "x": 17.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": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [2, 14], "x": 16.25, "y": 1},
+                {"matrix": [2, 15], "x": 17.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, 14], "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": [3, 14], "x": 16.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, 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": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [3, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4},
+                {"matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [2, 13], "x": 17.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": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [2, 14], "x": 16.25, "y": 1},
+                {"matrix": [2, 15], "x": 17.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, 14], "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": [3, 14], "x": 16.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, 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": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [3, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4},
+                {"matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [2, 13], "x": 17.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": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [2, 14], "x": 16.25, "y": 1},
+                {"matrix": [2, 15], "x": 17.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, 14], "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": [3, 14], "x": 16.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, 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": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [3, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4},
+                {"matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [2, 13], "x": 17.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": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [2, 14], "x": 16.25, "y": 1},
+                {"matrix": [2, 15], "x": 17.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, 14], "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": [3, 14], "x": 16.25, "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": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4},
+                {"matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_ansi_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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [2, 13], "x": 17.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": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [2, 14], "x": 16.25, "y": 1},
+                {"matrix": [2, 15], "x": 17.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, 14], "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": [3, 14], "x": 16.25, "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": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4},
+                {"matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [2, 13], "x": 17.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": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [2, 14], "x": 16.25, "y": 1},
+                {"matrix": [2, 15], "x": 17.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, 14], "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": [3, 14], "x": 16.25, "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, 7], "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},
+                {"matrix": [3, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4},
+                {"matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [2, 13], "x": 17.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": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [2, 14], "x": 16.25, "y": 1},
+                {"matrix": [2, 15], "x": 17.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, 14], "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": [3, 14], "x": 16.25, "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, 7], "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},
+                {"matrix": [3, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4},
+                {"matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [2, 13], "x": 17.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, 15], "x": 15.25, "y": 1},
+                {"matrix": [2, 14], "x": 16.25, "y": 1},
+                {"matrix": [2, 15], "x": 17.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": [1, 14], "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": [3, 14], "x": 16.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, 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": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [3, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4},
+                {"matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [2, 13], "x": 17.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, 15], "x": 15.25, "y": 1},
+                {"matrix": [2, 14], "x": 16.25, "y": 1},
+                {"matrix": [2, 15], "x": 17.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": [1, 14], "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": [3, 14], "x": 16.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, 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": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [3, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4},
+                {"matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [2, 13], "x": 17.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, 15], "x": 15.25, "y": 1},
+                {"matrix": [2, 14], "x": 16.25, "y": 1},
+                {"matrix": [2, 15], "x": 17.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": [1, 14], "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": [3, 14], "x": 16.25, "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": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4},
+                {"matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [2, 13], "x": 17.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, 15], "x": 15.25, "y": 1},
+                {"matrix": [2, 14], "x": 16.25, "y": 1},
+                {"matrix": [2, 15], "x": 17.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": [1, 14], "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": [3, 14], "x": 16.25, "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": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [3, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4},
+                {"matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [2, 13], "x": 17.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, 15], "x": 15.25, "y": 1},
+                {"matrix": [2, 14], "x": 16.25, "y": 1},
+                {"matrix": [2, 15], "x": 17.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": [1, 14], "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": [3, 14], "x": 16.25, "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, 7], "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},
+                {"matrix": [3, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4},
+                {"matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [2, 13], "x": 17.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, 15], "x": 15.25, "y": 1},
+                {"matrix": [2, 14], "x": 16.25, "y": 1},
+                {"matrix": [2, 15], "x": 17.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": [1, 14], "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": [3, 14], "x": 16.25, "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, 7], "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},
+                {"matrix": [3, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4},
+                {"matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        },
+        "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},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [2, 13], "x": 17.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.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [2, 14], "x": 16.25, "y": 1},
+                {"matrix": [2, 15], "x": 17.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": [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": 16.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, 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": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [3, 15], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4},
+                {"matrix": [4, 15], "x": 17.25, "y": 4}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/dztech/pluto/keymaps/default/keymap.c b/keyboards/dztech/pluto/keymaps/default/keymap.c
index 9edd2f178f05..4824a87a4831 100644
--- a/keyboards/dztech/pluto/keymaps/default/keymap.c
+++ b/keyboards/dztech/pluto/keymaps/default/keymap.c
@@ -18,10 +18,10 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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_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_NUHS,           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, MO(1),             KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,           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_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_NUHS,             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, MO(1),                        KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     )
 };
diff --git a/keyboards/dztech/pluto/keymaps/via/keymap.c b/keyboards/dztech/pluto/keymaps/via/keymap.c
index 9edd2f178f05..4824a87a4831 100644
--- a/keyboards/dztech/pluto/keymaps/via/keymap.c
+++ b/keyboards/dztech/pluto/keymaps/via/keymap.c
@@ -18,10 +18,10 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [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_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_NUHS,           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, MO(1),             KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,           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_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_NUHS,             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, MO(1),                        KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     )
 };
diff --git a/keyboards/dztech/pluto/matrix_diagram.md b/keyboards/dztech/pluto/matrix_diagram.md
new file mode 100644
index 000000000000..576dea9578c4
--- /dev/null
+++ b/keyboards/dztech/pluto/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for DZTECH PLUTO
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E ││0F │2C │2D │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤      ┌─────┐
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   ││1F │2E │2F │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘   ┌──┴┐1E  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │1E      │                │1D │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐       └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │    │3E │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+│40  │41  │42  │47                      │4A  │4B  │4C  │4D  ││3F │4E │4F │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+┌────────┐                                       ┌──────────┐
+│30      │ 2.25u LShift             2.75u RShift │3C        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40   │41 │42   │47                         │4B   │4C │4D   │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```
diff --git a/keyboards/dztech/tofu/ii/v1/info.json b/keyboards/dztech/tofu/ii/v1/info.json
index d8216891cd12..2eac06f6fd41 100644
--- a/keyboards/dztech/tofu/ii/v1/info.json
+++ b/keyboards/dztech/tofu/ii/v1/info.json
@@ -16,7 +16,7 @@
     },
     "processor": "RP2040",
     "rgb_matrix": {
-        "driver": "IS31FL3737",
+        "driver": "is31fl3737",
         "layout": [
             {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
             {"flags": 4, "matrix": [0, 1], "x": 15, "y": 0},
diff --git a/keyboards/dztech/tofu/jr/v1/info.json b/keyboards/dztech/tofu/jr/v1/info.json
index ef9bc6b9033c..1460350d73e1 100644
--- a/keyboards/dztech/tofu/jr/v1/info.json
+++ b/keyboards/dztech/tofu/jr/v1/info.json
@@ -16,7 +16,7 @@
         "rows": ["GP29", "GP28", "GP27", "GP26", "GP22"]
     },
     "rgb_matrix": {
-        "driver": "IS31FL3737",
+        "driver": "is31fl3737",
         "layout": [
             {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
             {"flags": 4, "matrix": [0, 1], "x": 15, "y": 0},
diff --git a/keyboards/ealdin/quadrant/config.h b/keyboards/ealdin/quadrant/config.h
index f5d4e037d9f9..bce1fbc662e7 100644
--- a/keyboards/ealdin/quadrant/config.h
+++ b/keyboards/ealdin/quadrant/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-   #define RGBLED_NUM 7
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #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
-
 /* 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/ealdin/quadrant/info.json b/keyboards/ealdin/quadrant/info.json
index be9249cca487..75b36063a671 100644
--- a/keyboards/ealdin/quadrant/info.json
+++ b/keyboards/ealdin/quadrant/info.json
@@ -18,6 +18,24 @@
             {"pin_a": "D5", "pin_b": "F1"}
         ]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 7,
+        "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": "C7"
     },
diff --git a/keyboards/eason/aeroboard/config.h b/keyboards/eason/aeroboard/config.h
index 5ba690ee955a..ff00df878f20 100644
--- a/keyboards/eason/aeroboard/config.h
+++ b/keyboards/eason/aeroboard/config.h
@@ -3,17 +3,6 @@
 
 #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 RGBLED_NUM 20
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 5
 
diff --git a/keyboards/eason/aeroboard/info.json b/keyboards/eason/aeroboard/info.json
index c7383aa160c3..c8046d40e4f3 100644
--- a/keyboards/eason/aeroboard/info.json
+++ b/keyboards/eason/aeroboard/info.json
@@ -2,13 +2,28 @@
     "keyboard_name": "AeroBoard",
     "manufacturer": "Eason",
     "url": "",
-    "maintainer": "Eason",
+    "maintainer": "EasonQian1",
     "usb": {
         "vid": "0x8954",
         "pid": "0x8870",
         "device_version": "0.0.1",
         "force_nkro": true
     },
+    "rgblight": {
+        "led_count": 20,
+        "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"
@@ -19,14 +34,99 @@
     },
     "diode_direction": "COL2ROW",
     "processor": "STM32F103",
-    "bootloader": "stm32duino",
+    "bootloader": "uf2boot",
+    "board": "STM32_F103_STM32DUINO"
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_7u_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"matrix": [0, 4], "x": 4.75, "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": 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": 13.75, "y": 0},
+                {"matrix": [0, 14], "x": 14.75, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 16.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 2], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.25, "y": 1},
+                {"matrix": [1, 4], "x": 5.25, "y": 1},
+                {"matrix": [1, 5], "x": 6.25, "y": 1},
+                {"matrix": [1, 6], "x": 7.25, "y": 1},
+                {"matrix": [1, 7], "x": 8.25, "y": 1},
+                {"matrix": [1, 8], "x": 9.25, "y": 1},
+                {"matrix": [1, 9], "x": 10.25, "y": 1},
+                {"matrix": [1, 10], "x": 11.25, "y": 1},
+                {"matrix": [1, 11], "x": 12.25, "y": 1},
+                {"matrix": [1, 12], "x": 13.25, "y": 1},
+                {"matrix": [1, 13], "x": 14.25, "y": 1},
+                {"matrix": [1, 14], "x": 15.25, "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.75, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 3], "x": 4.5, "y": 2},
+                {"matrix": [2, 4], "x": 5.5, "y": 2},
+                {"matrix": [2, 5], "x": 6.5, "y": 2},
+                {"matrix": [2, 6], "x": 7.5, "y": 2},
+                {"matrix": [2, 7], "x": 8.5, "y": 2},
+                {"matrix": [2, 8], "x": 9.5, "y": 2},
+                {"matrix": [2, 9], "x": 10.5, "y": 2},
+                {"matrix": [2, 10], "x": 11.5, "y": 2},
+                {"matrix": [2, 11], "x": 12.5, "y": 2},
+                {"matrix": [2, 12], "x": 13.5, "y": 2},
+                {"matrix": [2, 14], "x": 14.5, "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.75, "y": 3, "w": 2.25},
+                {"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, "w": 1.75},
+                {"matrix": [3, 14], "x": 15.75, "y": 3},
+                {"matrix": [3, 15], "x": 16.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 5.5, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 13], "x": 14.75, "y": 4},
+                {"matrix": [4, 14], "x": 15.75, "y": 4},
+                {"matrix": [4, 15], "x": 16.75, "y": 4}
+            ]
+        },
+        "LAYOUT_split_space": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
 
-                {"matrix": [0, 1], "x": 1.75, "y": 0},
-                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
                 {"matrix": [0, 3], "x": 3.75, "y": 0},
                 {"matrix": [0, 4], "x": 4.75, "y": 0},
                 {"matrix": [0, 5], "x": 5.75, "y": 0},
@@ -43,8 +143,8 @@
 
                 {"matrix": [1, 0], "x": 0, "y": 1},
 
-                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 2], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3.25, "y": 1},
                 {"matrix": [1, 3], "x": 4.25, "y": 1},
                 {"matrix": [1, 4], "x": 5.25, "y": 1},
                 {"matrix": [1, 5], "x": 6.25, "y": 1},
diff --git a/keyboards/eason/aeroboard/keymaps/default/keymap.c b/keyboards/eason/aeroboard/keymaps/default/keymap.c
index 61f2a9036413..2e6d012fba99 100644
--- a/keyboards/eason/aeroboard/keymaps/default/keymap.c
+++ b/keyboards/eason/aeroboard/keymaps/default/keymap.c
@@ -5,19 +5,19 @@
 
  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-   [0] = LAYOUT(
-       KC_ESC,  KC_1,    KC_GRV,  KC_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_MINS, KC_Q,    KC_TAB,  KC_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_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_PGDN,
-       MO(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,   MO(1),
-       KC_LGUI, KC_LCTL,         KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,            KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT
-   ),
-   [1] = LAYOUT(
-       KC_HOME,   KC_F1,  _______,   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,  _______, _______, _______,  _______, _______, _______, _______, _______, _______,_______,QK_BOOT,  KC_PAUS,
-       _______, _______,  KC_LEFT, KC_DOWN,  KC_RGHT, _______, _______,  _______, _______, _______, _______, _______, _______,        _______,  KC_INS,
-       _______, _______,           _______,  _______, _______, _______,  _______, _______, _______, _______, _______, KC_MUTE,_______, KC_VOLU, _______,
-       _______, _______,           _______,           _______,           _______,          _______,          _______,         KC_MPRV, KC_VOLD, KC_MNXT
-   ),
+    [0] = LAYOUT_split_space(
+        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_DEL,
+        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_PGUP,
+        KC_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_PGDN,
+        MO(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,   MO(1),
+        KC_LGUI,    KC_LCTL,          KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_split_space(
+        KC_HOME,    _______, KC_F1,   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,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_PAUS,
+        _______,    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_INS,
+        _______,    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, KC_VOLU, _______,
+        _______,    _______,          _______,          _______,          _______,          _______,          _______,          KC_MPRV, KC_VOLD, KC_MNXT
+    ),
 
  };
diff --git a/keyboards/eason/aeroboard/keymaps/via/keymap.c b/keyboards/eason/aeroboard/keymaps/via/keymap.c
index 614c3daa025a..0c410242ef8e 100644
--- a/keyboards/eason/aeroboard/keymaps/via/keymap.c
+++ b/keyboards/eason/aeroboard/keymaps/via/keymap.c
@@ -5,32 +5,33 @@
 
  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-   [0] = LAYOUT(
-       KC_ESC,  KC_1,    KC_GRV,  KC_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_MINS, KC_Q,    KC_TAB,  KC_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_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_PGDN,
-       MO(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,   MO(1),
-       KC_LGUI, KC_LCTL,         KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,            KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT
-   ),
-   [1] = LAYOUT(
-       KC_HOME,   KC_F1,  _______,   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,  _______, _______, _______,  _______, _______, _______, _______, _______, _______,_______,QK_BOOT,  KC_PAUS,
-       _______, _______,  KC_LEFT, KC_DOWN,  KC_RGHT, _______, _______,  _______, _______, _______, _______, _______, _______,        _______,  KC_INS,
-       _______, _______,           _______,  _______, _______, _______,  _______, _______, _______, _______, _______, KC_MUTE,_______, KC_VOLU, _______,
-       _______, _______,           _______,           _______,           _______,          _______,          _______,         KC_MPRV, KC_VOLD, KC_MNXT
-   ),
-   [2] = LAYOUT(
-       _______, _______,  _______, _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______,_______,_______,  _______,
-       _______, _______,  _______, _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______,_______,_______,  _______,
-       _______, _______,  _______, _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______,        _______,  _______,
-       _______, _______,           _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______,_______, _______, _______,
-       _______, _______,           _______,           _______,           _______,          _______,          _______,         _______, _______, _______
-   ),
-   [3] = LAYOUT(
-       _______, _______,  _______, _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______,_______,_______,  _______,
-       _______, _______,  _______, _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______,_______,_______,  _______,
-       _______, _______,  _______, _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______,        _______,  _______,
-       _______, _______,           _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______,_______, _______, _______,
-       _______, _______,           _______,           _______,           _______,          _______,          _______,         _______, _______, _______
-   ),
+    [0] = LAYOUT_split_space(
+        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_DEL,
+        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_PGUP,
+        KC_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_PGDN,
+        MO(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,   MO(1),
+        KC_LGUI,    KC_LCTL,          KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_split_space(
+        KC_HOME,    _______, KC_F1,   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,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_PAUS,
+        _______,    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_INS,
+        _______,    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, KC_VOLU, _______,
+        _______,    _______,          _______,          _______,          _______,          _______,          _______,          KC_MPRV, KC_VOLD, KC_MNXT
+    ),
+    [2] = LAYOUT_split_space(
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,    _______,          _______,          _______,          _______,          _______,          _______,          _______, _______, _______
+    ),
+    [3] = LAYOUT_split_space(
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,    _______,          _______,          _______,          _______,          _______,          _______,          _______, _______, _______
+    ),
+
  };
diff --git a/keyboards/eason/aeroboard/rules.mk b/keyboards/eason/aeroboard/rules.mk
index 9f38d0d71b44..f8a65f43e912 100644
--- a/keyboards/eason/aeroboard/rules.mk
+++ b/keyboards/eason/aeroboard/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SLEEP_LED_ENABLE = yes
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/eason/capsule65/config.h b/keyboards/eason/capsule65/config.h
deleted file mode 100644
index cfe3e84fda05..000000000000
--- a/keyboards/eason/capsule65/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2022 EASON XIAOXUXK@YEAH.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
-
-#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
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/eason/capsule65/info.json b/keyboards/eason/capsule65/info.json
index 6496a6be7190..1ad66fdd653e 100644
--- a/keyboards/eason/capsule65/info.json
+++ b/keyboards/eason/capsule65/info.json
@@ -16,6 +16,23 @@
     "indicators": {
         "caps_lock": "F6"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "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": "F7"
     },
diff --git a/keyboards/eason/greatsword80/config.h b/keyboards/eason/greatsword80/config.h
deleted file mode 100644
index 9a0ee7ab72f5..000000000000
--- a/keyboards/eason/greatsword80/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2023 Eason <xiaoxuxk@yeah.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
-
-#define LED_CAPS_LOCK_PIN  F0
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/eason/greatsword80/info.json b/keyboards/eason/greatsword80/info.json
index d198d65f2aad..74c469f7ced6 100644
--- a/keyboards/eason/greatsword80/info.json
+++ b/keyboards/eason/greatsword80/info.json
@@ -8,6 +8,10 @@
         "pid": "0x998F",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "F0",
+        "on_state": 0
+    },
     "matrix_pins": {
         "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "C7", "E2", "F7", "F6", "F5", "F4", "B0", "B1", "B2", "B3"],
         "rows": ["D0", "D1", "D2", "D3", "D5", "D4"]
diff --git a/keyboards/ebastler/e80_1800/config.h b/keyboards/ebastler/e80_1800/config.h
index b0726f908a79..baa707317687 100644
--- a/keyboards/ebastler/e80_1800/config.h
+++ b/keyboards/ebastler/e80_1800/config.h
@@ -16,8 +16,6 @@
 
 #define BACKLIGHT_PWM_DRIVER PWMD1
 #define BACKLIGHT_PWM_CHANNEL 2
-#define BACKLIGHT_PAL_MODE 2
-
 
 #ifdef OLED_ENABLE
 
diff --git a/keyboards/ebastler/e80_1800/keymaps/via_oled/rules.mk b/keyboards/ebastler/e80_1800/keymaps/via_oled/rules.mk
index 63e79e2da902..98ca45243dbf 100644
--- a/keyboards/ebastler/e80_1800/keymaps/via_oled/rules.mk
+++ b/keyboards/ebastler/e80_1800/keymaps/via_oled/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
 
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
-WPM_ENABLE = yes
\ No newline at end of file
+WPM_ENABLE = yes
diff --git a/keyboards/ebastler/isometria_75/rev1/config.h b/keyboards/ebastler/isometria_75/rev1/config.h
index 68f54a8014d1..0fc8019a1dd2 100644
--- a/keyboards/ebastler/isometria_75/rev1/config.h
+++ b/keyboards/ebastler/isometria_75/rev1/config.h
@@ -20,22 +20,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Backlight */
 #define BACKLIGHT_PWM_DRIVER PWMD1
 #define BACKLIGHT_PWM_CHANNEL 2
-#define BACKLIGHT_PAL_MODE 2
 #define BACKLIGHT_PWM_OUTPUT_FREQUENCY 1000 // Increases backlight PWM freq if compiled with an unmerged PR. Does no harm without it.
 
 /* Underglow */
-#define RGBLED_NUM 17
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 2
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM2
 #define WS2812_DMA_CHANNEL 2
-#define RGBLIGHT_SLEEP
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-
-#define TAP_CODE_DELAY 10
 
 /* ADC - will be used for battery monitoring once BT support is added */
 /* #define ADC_PIN B0 */
diff --git a/keyboards/ebastler/isometria_75/rev1/info.json b/keyboards/ebastler/isometria_75/rev1/info.json
index 8151451a32b4..ad53a34525b9 100644
--- a/keyboards/ebastler/isometria_75/rev1/info.json
+++ b/keyboards/ebastler/isometria_75/rev1/info.json
@@ -8,6 +8,15 @@
         "pid": "0x1337",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 17,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true
+        }
+    },
     "ws2812": {
         "pin": "B3",
         "driver": "pwm"
@@ -22,6 +31,9 @@
             {"pin_a": "C15", "pin_b": "C14", "resolution": 2}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "backlight": {
         "pin": "A9",
         "levels": 5,
diff --git a/keyboards/ebastler/isometria_75/rev1/rules.mk b/keyboards/ebastler/isometria_75/rev1/rules.mk
index 2fd78a13f177..76b31f0a0a05 100644
--- a/keyboards/ebastler/isometria_75/rev1/rules.mk
+++ b/keyboards/ebastler/isometria_75/rev1/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h
index 6677c4587e8c..89b008296bcd 100644
--- a/keyboards/edi/hardlight/mk1/config.h
+++ b/keyboards/edi/hardlight/mk1/config.h
@@ -22,26 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/*
- * Enable RGB Underlighting
- */
-#define RGBLED_NUM 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_EFFECT_RAINBOW_SWIRL
-//#define RGBLIGHT_EFFECT_KNIGHT
-//#define RGBLIGHT_EFFECT_TWINKLE
-//#define RGBLIGHT_EFFECT_BREATHING
-
-
 /*
  * Enable Audio Subsystem with two voices
  */
diff --git a/keyboards/edi/hardlight/mk1/info.json b/keyboards/edi/hardlight/mk1/info.json
index d7275dfa707c..dc8bcd01c66d 100644
--- a/keyboards/edi/hardlight/mk1/info.json
+++ b/keyboards/edi/hardlight/mk1/info.json
@@ -11,6 +11,21 @@
         "rows": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 15,
+        "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": "C7"
     },
diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h
index b9b6b86c9880..73f4b2baaed1 100644
--- a/keyboards/edi/hardlight/mk2/config.h
+++ b/keyboards/edi/hardlight/mk2/config.h
@@ -22,18 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* RGB Underglow */
-#define RGBLED_NUM 32
-#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_KNIGHT_LENGTH 5
 
 /* PWM RGB Underglow Defines */
diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json
index 63ca3aa15dd3..2be212702ac1 100644
--- a/keyboards/edi/hardlight/mk2/info.json
+++ b/keyboards/edi/hardlight/mk2/info.json
@@ -6,6 +6,21 @@
         "pid": "0x2408",
         "device_version": "0.0.7"
     },
+    "rgblight": {
+        "led_count": 32,
+        "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": "A10",
         "driver": "pwm"
diff --git a/keyboards/edi/hardlight/mk2/rules.mk b/keyboards/edi/hardlight/mk2/rules.mk
index 69c4b26a9e4a..b7b67ba5b2b1 100644
--- a/keyboards/edi/hardlight/mk2/rules.mk
+++ b/keyboards/edi/hardlight/mk2/rules.mk
@@ -16,5 +16,3 @@ AUDIO_ENABLE = no           # Audio output
 VELOCIKEY_ENABLE = yes
 KEY_LOCK_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/edi/standaside/config.h b/keyboards/edi/standaside/config.h
index e59dbc15e655..7caa265c1a1f 100644
--- a/keyboards/edi/standaside/config.h
+++ b/keyboards/edi/standaside/config.h
@@ -7,21 +7,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/*
- * Enable RGB Underlighting
- */
-#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
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/edi/standaside/info.json b/keyboards/edi/standaside/info.json
index 0c8bb289b065..69f94729fb85 100644
--- a/keyboards/edi/standaside/info.json
+++ b/keyboards/edi/standaside/info.json
@@ -13,6 +13,21 @@
         "rows": ["D1", "F4", "F6", "F7", "B1", "B3", "B2", "B6"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 12,
+        "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": "C7"
     },
diff --git a/keyboards/edinburgh41/config.h b/keyboards/edinburgh41/config.h
index f37d43dd2f62..1958d0a9320c 100644
--- a/keyboards/edinburgh41/config.h
+++ b/keyboards/edinburgh41/config.h
@@ -3,10 +3,6 @@
 
 #pragma once
 
-// Underglow LED settings
-
-#define RGBLED_NUM 10
-
 // Thumbstick settings
 #define ANALOG_JOYSTICK_X_AXIS_PIN B5
 #define ANALOG_JOYSTICK_Y_AXIS_PIN B6
diff --git a/keyboards/edinburgh41/info.json b/keyboards/edinburgh41/info.json
index 14e4950c4ab9..745710f92f34 100644
--- a/keyboards/edinburgh41/info.json
+++ b/keyboards/edinburgh41/info.json
@@ -10,6 +10,9 @@
         "pid": "0x0000",
         "vid": "0xFEED"
     },
+    "rgblight": {
+        "led_count": 10
+    },
     "ws2812": {
         "pin": "D0"
     },
diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h
index 37beac094b2e..66b91b7c4e25 100644
--- a/keyboards/eek/config.h
+++ b/keyboards/eek/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 36
-  #define RGBLIGHT_HUE_STEP 4
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
  #ifdef RGB_MATRIX_ENABLE
   #define RGB_MATRIX_LED_COUNT 36
   #define RGB_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/keyboards/eek/info.json b/keyboards/eek/info.json
index dde20e49dc5d..27441a293ea8 100644
--- a/keyboards/eek/info.json
+++ b/keyboards/eek/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.4"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
@@ -20,58 +20,26 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 200
+        "hue_steps": 4,
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 36,
+        "max_brightness": 200,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
-    "community_layouts": ["split_3x5_3"],
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"x": 0, "y": 0.88},
-                {"x": 1, "y": 0.38},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0.38},
-                {"x": 4, "y": 0.5},
-
-                {"x": 6, "y": 0.5},
-                {"x": 7, "y": 0.38},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0.38},
-                {"x": 10, "y": 0.88},
-
-                {"x": 0, "y": 1.88},
-                {"x": 1, "y": 1.38},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1.38},
-                {"x": 4, "y": 1.5},
-
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.38},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1.38},
-                {"x": 10, "y": 1.88},
-
-                {"x": 0, "y": 2.88},
-                {"x": 1, "y": 2.38},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2.38},
-                {"x": 4, "y": 2.5},
-
-                {"x": 6, "y": 2.5},
-                {"x": 7, "y": 2.38},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2.38},
-                {"x": 10, "y": 2.88},
-
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 3.38},
-                {"x": 4, "y": 3.5},
-
-                {"x": 6, "y": 3.5},
-                {"x": 7, "y": 3.38},
-                {"x": 8, "y": 3.25}
-            ]
-        }
-    }
+    "community_layouts": ["split_3x5_3"]
 }
diff --git a/keyboards/efreet/info.json b/keyboards/efreet/info.json
index ea2a48be25bc..b7749ed3419e 100644
--- a/keyboards/efreet/info.json
+++ b/keyboards/efreet/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "D0",
         "breathing": true
     },
diff --git a/keyboards/eggsworks/egg58/info.json b/keyboards/eggsworks/egg58/info.json
index 14e62cdf59d1..6f3fa04a6778 100644
--- a/keyboards/eggsworks/egg58/info.json
+++ b/keyboards/eggsworks/egg58/info.json
@@ -33,7 +33,7 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "split": true,
         "split_count": [29, 29],
         "max_brightness": 160,
diff --git a/keyboards/ein_60/config.h b/keyboards/ein_60/config.h
index e3df68481d60..94592a01eb32 100644
--- a/keyboards/ein_60/config.h
+++ b/keyboards/ein_60/config.h
@@ -29,22 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define AUDIO_DAC_SAMPLE_MAX 4095U
 #endif
 
-#    define RGBLED_NUM         38
-#    define RGBLIGHT_HUE_STEP  4
-#    define RGBLIGHT_SAT_STEP  8
-#    define RGBLIGHT_VAL_STEP  8
-#    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
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_COUNT              38
 #    define RGB_MATRIX_LED_FLUSH_LIMIT    16
diff --git a/keyboards/ein_60/info.json b/keyboards/ein_60/info.json
index 9af00830e0df..bc208afcecdc 100644
--- a/keyboards/ein_60/info.json
+++ b/keyboards/ein_60/info.json
@@ -9,10 +9,27 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "rgblight": {
-        "max_brightness": 200
+        "hue_steps": 4,
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 38,
+        "max_brightness": 200,
+        "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": ["A3", "A2", "A1", "A0", "F6", "F5", "F0", "E0", "E1", "C0", "C1", "C2", "C3"],
diff --git a/keyboards/ein_60/rules.mk b/keyboards/ein_60/rules.mk
index 648a0c38ff2c..541e00aa4426 100644
--- a/keyboards/ein_60/rules.mk
+++ b/keyboards/ein_60/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no      # Enable for pretty RGB matrix effects
 ENCODER_ENABLE = yes        # Enables the use of one or more encoders
 OLED_ENABLE = yes           # Enables the use of OLED displays
-OLED_DRIVER = SSD1306
diff --git a/keyboards/elephant42/config.h b/keyboards/elephant42/config.h
index dc1f568fc4c5..b62d75af3c44 100644
--- a/keyboards/elephant42/config.h
+++ b/keyboards/elephant42/config.h
@@ -17,31 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_SPLIT { 27, 27 }
-#    define RGBLED_NUM 54 // backlight x42 + underglow x12
-#    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
-
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    define RGB_MATRIX_LED_COUNT 54
+#    define RGB_MATRIX_SPLIT { 27, 27 }
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
-#    define RGB_MATRIX_HUE_STEP RGBLIGHT_HUE_STEP
-#    define RGB_MATRIX_SAT_STEP RGBLIGHT_SAT_STEP
-#    define RGB_MATRIX_VAL_STEP RGBLIGHT_VAL_STEP
-#    define RGB_MATRIX_SPD_STEP 8
 #endif
 
 #ifndef OLED_FONT_H
diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/info.json
index 8c4440805506..742640619e13 100644
--- a/keyboards/elephant42/info.json
+++ b/keyboards/elephant42/info.json
@@ -9,10 +9,29 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812",
+        "sat_steps": 8,
+        "val_steps": 8,
+        "speed_steps": 8
     },
     "rgblight": {
-        "max_brightness": 170
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 54,
+        "max_brightness": 170,
+        "split_count": [27, 27],
+        "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": ["F4", "F5", "F6", "F7", "B1", "B3"],
diff --git a/keyboards/emery65/rules.mk b/keyboards/emery65/rules.mk
index 7000bb65710c..7c0709f41e6c 100644
--- a/keyboards/emery65/rules.mk
+++ b/keyboards/emery65/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/enter67/info.json b/keyboards/enter67/info.json
new file mode 100644
index 000000000000..df1d7f6b5b33
--- /dev/null
+++ b/keyboards/enter67/info.json
@@ -0,0 +1,106 @@
+{
+    "manufacturer": "KipperSun",
+    "keyboard_name": "enter67",
+    "maintainer": "KipperSun",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B15",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["A7", "B0", "B1", "B2", "B10", "B11", "B12", "B14", "A9", "A10", "A8", "B6", "B7", "B5", "B4"],
+        "rows": ["A1", "A2", "A3", "A4", "A5"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0xAA66",
+        "vid": "0x4040"
+    },
+    "community_layouts": ["65_ansi_blocker"],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label": "ESC", "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Delete", "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": "Home", "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": "k90", "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, 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": "Shift", "matrix": [3, 11], "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": "K91", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K92", "matrix": [4, 10], "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/enter67/keymaps/default/keymap.c b/keyboards/enter67/keymaps/default/keymap.c
new file mode 100644
index 000000000000..1f3d16c0953d
--- /dev/null
+++ b/keyboards/enter67/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_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_LGUI, KC_LALT,                            KC_SPC,                    MO(1),   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_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/enter67/keymaps/via/keymap.c b/keyboards/enter67/keymaps/via/keymap.c
new file mode 100644
index 000000000000..1f3d16c0953d
--- /dev/null
+++ b/keyboards/enter67/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_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_LGUI, KC_LALT,                            KC_SPC,                    MO(1),   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_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/enter67/keymaps/via/rules.mk b/keyboards/enter67/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/enter67/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/enter67/readme.md b/keyboards/enter67/readme.md
new file mode 100644
index 000000000000..8a4890ff1d5b
--- /dev/null
+++ b/keyboards/enter67/readme.md
@@ -0,0 +1,26 @@
+# 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/enter67/rules.mk b/keyboards/enter67/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/enter67/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/enviousdesign/60f/info.json b/keyboards/enviousdesign/60f/info.json
new file mode 100644
index 000000000000..20876aa0b846
--- /dev/null
+++ b/keyboards/enviousdesign/60f/info.json
@@ -0,0 +1,227 @@
+{
+    "manufacturer": "Envious.Design",
+    "keyboard_name": "EnvKB 60F V1",
+    "maintainer": "Envious.Design",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP16", "GP17", "GP18", "GP19", "GP20", "GP21", "GP22", "GP26", "GP27"],
+        "rows": ["GP11", "GP12", "GP13", "GP14", "GP15"]
+    },
+    "processor": "RP2040",
+    "url": "http://envious.design",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xA400",
+        "vid": "0xE739"
+    },
+    "community_layouts": ["60_ansi", "60_iso"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 2.5, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 3.5, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 4.5, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 6.5, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 7.5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 8.5, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 9.5, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 10.5, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 11.5, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 12.5, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 13.5, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 14.5, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 15.5, "y": 0, "w": 2},
+                {"label": "1,0", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "1,2", "matrix": [1, 2], "x": 4, "y": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 5, "y": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 6, "y": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 7, "y": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 8, "y": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 9, "y": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 10, "y": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 11, "y": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 12, "y": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 13, "y": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 14, "y": 1},
+                {"label": "1,13", "matrix": [1, 13], "x": 15, "y": 1},
+                {"label": "1,14", "matrix": [1, 14], "x": 16, "y": 1, "w": 1.5},
+                {"label": "2,0", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "2,2", "matrix": [2, 2], "x": 4.25, "y": 2},
+                {"label": "2,3", "matrix": [2, 3], "x": 5.25, "y": 2},
+                {"label": "2,4", "matrix": [2, 4], "x": 6.25, "y": 2},
+                {"label": "2,5", "matrix": [2, 5], "x": 7.25, "y": 2},
+                {"label": "2,6", "matrix": [2, 6], "x": 8.25, "y": 2},
+                {"label": "2,7", "matrix": [2, 7], "x": 9.25, "y": 2},
+                {"label": "2,8", "matrix": [2, 8], "x": 10.25, "y": 2},
+                {"label": "2,9", "matrix": [2, 9], "x": 11.25, "y": 2},
+                {"label": "2,10", "matrix": [2, 10], "x": 12.25, "y": 2},
+                {"label": "2,11", "matrix": [2, 11], "x": 13.25, "y": 2},
+                {"label": "2,12", "matrix": [2, 12], "x": 14.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25},
+                {"label": "3,0", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 2.25},
+                {"label": "3,2", "matrix": [3, 2], "x": 4.75, "y": 3},
+                {"label": "3,3", "matrix": [3, 3], "x": 5.75, "y": 3},
+                {"label": "3,4", "matrix": [3, 4], "x": 6.75, "y": 3},
+                {"label": "3,5", "matrix": [3, 5], "x": 7.75, "y": 3},
+                {"label": "3,6", "matrix": [3, 6], "x": 8.75, "y": 3},
+                {"label": "3,7", "matrix": [3, 7], "x": 9.75, "y": 3},
+                {"label": "3,8", "matrix": [3, 8], "x": 10.75, "y": 3},
+                {"label": "3,9", "matrix": [3, 9], "x": 11.75, "y": 3},
+                {"label": "3,10", "matrix": [3, 10], "x": 12.75, "y": 3},
+                {"label": "3,11", "matrix": [3, 11], "x": 13.75, "y": 3},
+                {"label": "3,13", "matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.75},
+                {"label": "4,0", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "4,1", "matrix": [4, 1], "x": 3.75, "y": 4, "w": 1.25},
+                {"label": "4,3", "matrix": [4, 3], "x": 5, "y": 4, "w": 1.25},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4, "w": 6.25},
+                {"label": "4,10", "matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "4,11", "matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25},
+                {"label": "4,13", "matrix": [4, 13], "x": 15, "y": 4, "w": 1.25},
+                {"label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 2.5, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 3.5, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 4.5, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 6.5, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 7.5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 8.5, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 9.5, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 10.5, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 11.5, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 12.5, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 13.5, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 14.5, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 15.5, "y": 0, "w": 2},
+                {"label": "1,0", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "1,2", "matrix": [1, 2], "x": 4, "y": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 5, "y": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 6, "y": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 7, "y": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 8, "y": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 9, "y": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 10, "y": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 11, "y": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 12, "y": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 13, "y": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 14, "y": 1},
+                {"label": "1,13", "matrix": [1, 13], "x": 15, "y": 1},
+                {"label": "2,0", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "2,2", "matrix": [2, 2], "x": 4.25, "y": 2},
+                {"label": "2,3", "matrix": [2, 3], "x": 5.25, "y": 2},
+                {"label": "2,4", "matrix": [2, 4], "x": 6.25, "y": 2},
+                {"label": "2,5", "matrix": [2, 5], "x": 7.25, "y": 2},
+                {"label": "2,6", "matrix": [2, 6], "x": 8.25, "y": 2},
+                {"label": "2,7", "matrix": [2, 7], "x": 9.25, "y": 2},
+                {"label": "2,8", "matrix": [2, 8], "x": 10.25, "y": 2},
+                {"label": "2,9", "matrix": [2, 9], "x": 11.25, "y": 2},
+                {"label": "2,10", "matrix": [2, 10], "x": 12.25, "y": 2},
+                {"label": "2,11", "matrix": [2, 11], "x": 13.25, "y": 2},
+                {"label": "2,12", "matrix": [2, 12], "x": 14.25, "y": 2},
+                {"label": "2,13", "matrix": [2, 13], "x": 15.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 16.25, "y": 1, "w": 1.25, "h": 2},
+                {"label": "3,0", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 1.25},
+                {"label": "3,1", "matrix": [3, 1], "x": 3.75, "y": 3},
+                {"label": "3,2", "matrix": [3, 2], "x": 4.75, "y": 3},
+                {"label": "3,3", "matrix": [3, 3], "x": 5.75, "y": 3},
+                {"label": "3,4", "matrix": [3, 4], "x": 6.75, "y": 3},
+                {"label": "3,5", "matrix": [3, 5], "x": 7.75, "y": 3},
+                {"label": "3,6", "matrix": [3, 6], "x": 8.75, "y": 3},
+                {"label": "3,7", "matrix": [3, 7], "x": 9.75, "y": 3},
+                {"label": "3,8", "matrix": [3, 8], "x": 10.75, "y": 3},
+                {"label": "3,9", "matrix": [3, 9], "x": 11.75, "y": 3},
+                {"label": "3,10", "matrix": [3, 10], "x": 12.75, "y": 3},
+                {"label": "3,11", "matrix": [3, 11], "x": 13.75, "y": 3},
+                {"label": "3,13", "matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.75},
+                {"label": "4,0", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "4,1", "matrix": [4, 1], "x": 3.75, "y": 4, "w": 1.25},
+                {"label": "4,3", "matrix": [4, 3], "x": 5, "y": 4, "w": 1.25},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4, "w": 6.25},
+                {"label": "4,10", "matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "4,11", "matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25},
+                {"label": "4,13", "matrix": [4, 13], "x": 15, "y": 4, "w": 1.25},
+                {"label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 2.5, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 3.5, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 4.5, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 6.5, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 7.5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 8.5, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 9.5, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 10.5, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 11.5, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 12.5, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 13.5, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 14.5, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 15.5, "y": 0, "w": 2},
+                {"label": "1,0", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "1,2", "matrix": [1, 2], "x": 4, "y": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 5, "y": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 6, "y": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 7, "y": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 8, "y": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 9, "y": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 10, "y": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 11, "y": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 12, "y": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 13, "y": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 14, "y": 1},
+                {"label": "1,13", "matrix": [1, 13], "x": 15, "y": 1},
+                {"label": "1,14", "matrix": [1, 14], "x": 16, "y": 1, "w": 1.5},
+                {"label": "2,0", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "2,2", "matrix": [2, 2], "x": 4.25, "y": 2},
+                {"label": "2,3", "matrix": [2, 3], "x": 5.25, "y": 2},
+                {"label": "2,4", "matrix": [2, 4], "x": 6.25, "y": 2},
+                {"label": "2,5", "matrix": [2, 5], "x": 7.25, "y": 2},
+                {"label": "2,6", "matrix": [2, 6], "x": 8.25, "y": 2},
+                {"label": "2,7", "matrix": [2, 7], "x": 9.25, "y": 2},
+                {"label": "2,8", "matrix": [2, 8], "x": 10.25, "y": 2},
+                {"label": "2,9", "matrix": [2, 9], "x": 11.25, "y": 2},
+                {"label": "2,10", "matrix": [2, 10], "x": 12.25, "y": 2},
+                {"label": "2,11", "matrix": [2, 11], "x": 13.25, "y": 2},
+                {"label": "2,12", "matrix": [2, 12], "x": 14.25, "y": 2},
+                {"label": "2,13", "matrix": [2, 13], "x": 15.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 16.25, "y": 2, "w": 1.25},
+                {"label": "3,0", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 1.25},
+                {"label": "3,1", "matrix": [3, 1], "x": 3.75, "y": 3},
+                {"label": "3,2", "matrix": [3, 2], "x": 4.75, "y": 3},
+                {"label": "3,3", "matrix": [3, 3], "x": 5.75, "y": 3},
+                {"label": "3,4", "matrix": [3, 4], "x": 6.75, "y": 3},
+                {"label": "3,5", "matrix": [3, 5], "x": 7.75, "y": 3},
+                {"label": "3,6", "matrix": [3, 6], "x": 8.75, "y": 3},
+                {"label": "3,7", "matrix": [3, 7], "x": 9.75, "y": 3},
+                {"label": "3,8", "matrix": [3, 8], "x": 10.75, "y": 3},
+                {"label": "3,9", "matrix": [3, 9], "x": 11.75, "y": 3},
+                {"label": "3,10", "matrix": [3, 10], "x": 12.75, "y": 3},
+                {"label": "3,11", "matrix": [3, 11], "x": 13.75, "y": 3},
+                {"label": "3,13", "matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.75},
+                {"label": "4,0", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "4,1", "matrix": [4, 1], "x": 3.75, "y": 4, "w": 1.25},
+                {"label": "4,3", "matrix": [4, 3], "x": 5, "y": 4, "w": 1.25},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4, "w": 6.25},
+                {"label": "4,10", "matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "4,11", "matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25},
+                {"label": "4,13", "matrix": [4, 13], "x": 15, "y": 4, "w": 1.25},
+                {"label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/enviousdesign/60f/keymaps/default/keymap.c b/keyboards/enviousdesign/60f/keymaps/default/keymap.c
new file mode 100644
index 000000000000..42f84afed7e3
--- /dev/null
+++ b/keyboards/enviousdesign/60f/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_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_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_LWIN, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RWIN,          MO(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_PSCR,  
+        QK_BOOT, KC_VOLU, KC_UP,   KC_MYCM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INSERT,KC_HOME,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_DEL,  KC_END,  KC_PGDN, KC_TRNS,
+        KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_CALCULATOR,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,          KC_TRNS,  
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_APP,           KC_TRNS, KC_TRNS
+    )
+};
+
diff --git a/keyboards/enviousdesign/60f/keymaps/via/keymap.c b/keyboards/enviousdesign/60f/keymaps/via/keymap.c
new file mode 100644
index 000000000000..42f84afed7e3
--- /dev/null
+++ b/keyboards/enviousdesign/60f/keymaps/via/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_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_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_LWIN, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RWIN,          MO(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_PSCR,  
+        QK_BOOT, KC_VOLU, KC_UP,   KC_MYCM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INSERT,KC_HOME,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_DEL,  KC_END,  KC_PGDN, KC_TRNS,
+        KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_CALCULATOR,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,          KC_TRNS,  
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_APP,           KC_TRNS, KC_TRNS
+    )
+};
+
diff --git a/keyboards/enviousdesign/60f/keymaps/via/rules.mk b/keyboards/enviousdesign/60f/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/enviousdesign/60f/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/enviousdesign/60f/readme.md b/keyboards/enviousdesign/60f/readme.md
new file mode 100644
index 000000000000..5098f22327d6
--- /dev/null
+++ b/keyboards/enviousdesign/60f/readme.md
@@ -0,0 +1,31 @@
+# EnvKB 60F
+
+![Image of the EnvKB 60F PCB](https://i.imgur.com/c5xMEg0h.png)
+
+
+A low cost Standard 60% Design which takes inspiration from the CFTKB Mysterium.
+
+* Keyboard Maintainer: [Envious-Data](https://github.com/envious-data)
+* Hardware Supported: EnvKB 60F (Pi Pico)
+* Hardware Availability: [GitHub](https://github.com/Envious-Data/Env-KB60F)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make enviousdesign/60f:default
+
+Flashing example for this keyboard:
+
+    make enviousdesign/60f: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. This will also clear the emulated EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Physical reset**: Hold down the `BOOTSEL` button on the Pi Pico, then either plug the board in or press the `RESET` button.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT`. In the pre-supplied keymaps it is on the second layer, replacing the Tab key.
+
+After entering the bootloader through one of the three methods above, the keyboard will appear as a USB mass storage device named `RPI-RP2`. If the CLI is unable to find this device, the compiled `.uf2` file can be manually copied to it. The keyboard will reboot on completion with the new firmware loaded.
+
diff --git a/keyboards/enviousdesign/60f/rules.mk b/keyboards/enviousdesign/60f/rules.mk
new file mode 100644
index 000000000000..837f4bffb53e
--- /dev/null
+++ b/keyboards/enviousdesign/60f/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally left blank
diff --git a/keyboards/enviousdesign/65m/info.json b/keyboards/enviousdesign/65m/info.json
new file mode 100644
index 000000000000..232893246261
--- /dev/null
+++ b/keyboards/enviousdesign/65m/info.json
@@ -0,0 +1,393 @@
+{
+    "manufacturer": "Envious.Design",
+    "keyboard_name": "EnvKB 65M",
+    "maintainer": "Envious.Design",
+    "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", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16"],
+        "rows": ["GP21", "GP20", "GP19", "GP18", "GP17"]
+    },
+    "processor": "RP2040",
+    "url": "http://envious.design",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0xA279",
+        "vid": "0xE739"
+    },
+    "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, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "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, 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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.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, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "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, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.75},
+                {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
+                {"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, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 16], "x": 16, "y": 4}
+            ]
+        },
+        "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": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "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, 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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "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, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "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, 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},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 16], "x": 16, "y": 4}
+            ]
+        },
+        "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": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "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, 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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "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, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "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, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.75},
+                {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
+                {"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, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 16], "x": 16, "y": 4}
+            ]
+        },
+        "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": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "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, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "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, 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},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 16], "x": 16, "y": 4}
+            ]
+        },
+        "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": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "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, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "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, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.75},
+                {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
+                {"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, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 16], "x": 16, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/enviousdesign/65m/keymaps/default/keymap.c b/keyboards/enviousdesign/65m/keymaps/default/keymap.c
new file mode 100644
index 000000000000..4efa8abf9232
--- /dev/null
+++ b/keyboards/enviousdesign/65m/keymaps/default/keymap.c
@@ -0,0 +1,21 @@
+/* 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_GRV,  KC_1,    KC_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_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_HOME,  KC_PGUP,
+        KC_LCTL, KC_LWIN,          KC_LALT, KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, MO(2),   MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN
+    ),
+    [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_TRNS, 
+        KC_TRNS, 		  KC_TRNS, KC_TRNS, KC_MYCM, 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_CALC, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_VOLU, KC_END,  KC_INS, 
+        QK_BOOTLOADER, KC_TRNS,    KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_DEL
+    )
+};
+
diff --git a/keyboards/enviousdesign/65m/keymaps/via/keymap.c b/keyboards/enviousdesign/65m/keymaps/via/keymap.c
new file mode 100644
index 000000000000..4efa8abf9232
--- /dev/null
+++ b/keyboards/enviousdesign/65m/keymaps/via/keymap.c
@@ -0,0 +1,21 @@
+/* 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_GRV,  KC_1,    KC_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_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_HOME,  KC_PGUP,
+        KC_LCTL, KC_LWIN,          KC_LALT, KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, MO(2),   MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN
+    ),
+    [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_TRNS, 
+        KC_TRNS, 		  KC_TRNS, KC_TRNS, KC_MYCM, 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_CALC, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_VOLU, KC_END,  KC_INS, 
+        QK_BOOTLOADER, KC_TRNS,    KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_DEL
+    )
+};
+
diff --git a/keyboards/enviousdesign/65m/keymaps/via/rules.mk b/keyboards/enviousdesign/65m/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/enviousdesign/65m/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/enviousdesign/65m/readme.md b/keyboards/enviousdesign/65m/readme.md
new file mode 100644
index 000000000000..76180843f329
--- /dev/null
+++ b/keyboards/enviousdesign/65m/readme.md
@@ -0,0 +1,30 @@
+# EnvKB 65M
+
+![image of EnvKB 65M PCB](https://i.imgur.com/3d76sz9h.png)
+
+A low cost 65% kit featuring split space and an attempt at fitting a standard keycap set.
+
+* Keyboard Maintainer: [Envious-Data](https://github.com/envious-data)
+* Hardware Supported: EnvKB 65M (Pi Pico)
+* Hardware Availability: [Mechboards](https://mechboards.co.uk/products/envkb-65-kit), [GitHub](https://github.com/Envious-Data/Env-KB65M)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make enviousdesign/65m:default
+
+Flashing example for this keyboard:
+
+    make enviousdesign/65m: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. This will also clear the emulated EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Physical reset**: Hold down the `BOOTSEL` button on the Pi Pico, then either plug the board in or press the `RESET` button.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT`. In the pre-supplied keymaps it is on the second layer, replacing the Control key in the bottom-left.
+
+After entering the bootloader through one of the three methods above, the keyboard will appear as a USB mass storage device named `RPI-RP2`. If the CLI is unable to find this device, the compiled `.uf2` file can be manually copied to it. The keyboard will reboot on completion with the new firmware loaded.
+
diff --git a/keyboards/enviousdesign/65m/rules.mk b/keyboards/enviousdesign/65m/rules.mk
new file mode 100644
index 000000000000..837f4bffb53e
--- /dev/null
+++ b/keyboards/enviousdesign/65m/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally left blank
diff --git a/keyboards/enviousdesign/commissions/mini1800/info.json b/keyboards/enviousdesign/commissions/mini1800/info.json
new file mode 100644
index 000000000000..9303e7af2346
--- /dev/null
+++ b/keyboards/enviousdesign/commissions/mini1800/info.json
@@ -0,0 +1,110 @@
+{
+    "manufacturer": "Envious.Design",
+    "keyboard_name": "Mini1800",
+    "maintainer": "Envious.Design",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "usb": {
+        "vid": "0xE739",
+        "pid": "0xC001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "num_lock": "GP8",
+        "caps_lock": "GP10",
+    }
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        "rows": ["GP4", "GP3", "GP2", "GP1", "GP0"],
+        "cols": ["GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP15", "GP27", "GP28", "GP5", "GP6", "GP7"]
+    },
+    "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.5, "y": 0 },
+                { "matrix": [0, 15], "x": 15.5, "y": 0 },
+                { "matrix": [0, 16], "x": 16.5, "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], "w": 1.5, "x": 12.5, "y": 1 },
+                { "matrix": [1, 14], "x": 14.5, "y": 1 },
+                { "matrix": [1, 15], "x": 15.5, "y": 1 },
+                { "matrix": [1, 16], "x": 16.5, "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], "w": 1.75, "x": 11.75, "y": 2 },
+                { "matrix": [2, 14], "x": 14.5, "y": 2 },
+                { "matrix": [2, 15], "x": 15.5, "y": 2 },
+                { "matrix": [2, 16], "x": 16.5, "y": 2 },
+                { "matrix": [3, 0], "w": 2, "x": 0, "y": 3 },
+                { "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, 11], "w": 1.75, "x": 11, "y": 3 },
+                { "matrix": [3, 12], "x": 13, "y": 3.25 },
+                { "matrix": [3, 14], "x": 14.5, "y": 3 },
+                { "matrix": [3, 15], "x": 15.5, "y": 3 },
+                { "matrix": [3, 16], "x": 16.5, "y": 3 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 4], "w": 2.75, "x": 3.75, "y": 4 },
+                { "matrix": [4, 6], "w": 2.75, "x": 6.5, "y": 4 },
+                { "matrix": [4, 8], "w": 1.25, "x": 9.25, "y": 4 },
+                { "matrix": [4, 10], "w": 1.25, "x": 10.5, "y": 4 },
+                { "matrix": [4, 11], "x": 12, "y": 4.25 },
+                { "matrix": [4, 12], "x": 13, "y": 4.25 },
+                { "matrix": [4, 13], "x": 14, "y": 4.25 },
+                { "matrix": [4, 15], "x": 15.5, "y": 4 },
+                { "matrix": [4, 16], "x": 16.5, "y": 4 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/enviousdesign/commissions/mini1800/keymaps/default/keymap.c b/keyboards/enviousdesign/commissions/mini1800/keymaps/default/keymap.c
new file mode 100644
index 000000000000..c095531fe6a1
--- /dev/null
+++ b/keyboards/enviousdesign/commissions/mini1800/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#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_PGUP, KC_PGDN, 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_BSPC,             KC_7,    KC_8,    KC_9,
+        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_4,    KC_5,    KC_6,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_SLSH, KC_RSFT,               KC_UP,          KC_1,    KC_2,    KC_3,
+        KC_LCTL, KC_LGUI, KC_LALT,          LT(1,KC_SPC),     KC_SPC,           KC_RALT, KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT,        KC_0,    LT(1,KC_DOT)
+    ),
+
+    [1] = 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_MUTE,    KC_HOME, KC_END,  KC_MSTP,
+        KC_CAPS, MO(2),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_PAUS, KC_PSCR, KC_RBRC, KC_SLEP,             KC_P7,   KC_P8,   KC_P9,
+        KC_TRNS, KC_TRNS, KC_SCRL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,                      KC_P4,   KC_P5,   KC_P6,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUM,  KC_TRNS, KC_TRNS, KC_DOT,  KC_TRNS,               KC_VOLU,        KC_P1,   KC_P2,   KC_P3,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_MPLY,          KC_TRNS, KC_TRNS,               KC_MPRV, KC_VOLD, KC_MNXT,        KC_P0,   KC_PDOT
+    ),
+
+    [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, 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
+    ),
+};
+
diff --git a/keyboards/enviousdesign/commissions/mini1800/keymaps/via/keymap.c b/keyboards/enviousdesign/commissions/mini1800/keymaps/via/keymap.c
new file mode 100644
index 000000000000..c095531fe6a1
--- /dev/null
+++ b/keyboards/enviousdesign/commissions/mini1800/keymaps/via/keymap.c
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#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_PGUP, KC_PGDN, 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_BSPC,             KC_7,    KC_8,    KC_9,
+        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_4,    KC_5,    KC_6,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_SLSH, KC_RSFT,               KC_UP,          KC_1,    KC_2,    KC_3,
+        KC_LCTL, KC_LGUI, KC_LALT,          LT(1,KC_SPC),     KC_SPC,           KC_RALT, KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT,        KC_0,    LT(1,KC_DOT)
+    ),
+
+    [1] = 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_MUTE,    KC_HOME, KC_END,  KC_MSTP,
+        KC_CAPS, MO(2),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_PAUS, KC_PSCR, KC_RBRC, KC_SLEP,             KC_P7,   KC_P8,   KC_P9,
+        KC_TRNS, KC_TRNS, KC_SCRL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,                      KC_P4,   KC_P5,   KC_P6,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUM,  KC_TRNS, KC_TRNS, KC_DOT,  KC_TRNS,               KC_VOLU,        KC_P1,   KC_P2,   KC_P3,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_MPLY,          KC_TRNS, KC_TRNS,               KC_MPRV, KC_VOLD, KC_MNXT,        KC_P0,   KC_PDOT
+    ),
+
+    [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, 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
+    ),
+};
+
diff --git a/keyboards/enviousdesign/commissions/mini1800/keymaps/via/rules.mk b/keyboards/enviousdesign/commissions/mini1800/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/enviousdesign/commissions/mini1800/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/enviousdesign/commissions/mini1800/mini1800.c b/keyboards/enviousdesign/commissions/mini1800/mini1800.c
new file mode 100644
index 000000000000..f35be22d1342
--- /dev/null
+++ b/keyboards/enviousdesign/commissions/mini1800/mini1800.c
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include "quantum.h"
+
+void matrix_init_user(void) {
+  setPinOutput(GP9); //init gpio
+  writePinLow(GP9);
+  setPinOutput(GP11); //init and turn off inverted power led
+  writePinHigh(GP11);
+}
+
+//layer, capslock and numlock
+layer_state_t layer_state_set_user(layer_state_t state) {
+	writePin(GP9, layer_state_cmp(state, 1));
+    return state;
+}
+
+bool led_update_user(led_t led_state) {
+    led_state.num_lock = !led_state.num_lock;
+    led_update_ports(led_state);
+    return false;
+}
+
diff --git a/keyboards/enviousdesign/commissions/mini1800/readme.md b/keyboards/enviousdesign/commissions/mini1800/readme.md
new file mode 100644
index 000000000000..874cbcec6093
--- /dev/null
+++ b/keyboards/enviousdesign/commissions/mini1800/readme.md
@@ -0,0 +1,27 @@
+# mini1800
+
+![mini1800](https://i.imgur.com/t55hjq8.jpeg)
+
+*A mini1800 layout commission keyboard for LASERman71 utilising the RP2040 MCU*
+
+* Keyboard Maintainer: [Adam](https://github.com/envious-data)
+* Hardware Supported: *Onboard RP2040 MCU*
+* Hardware Availability: *None Yet*
+
+Make example for this keyboard (after setting up your build environment):
+
+    make enviousdesign/commissions/mini1800:default
+
+Flashing example for this keyboard:
+
+    make enviousdesign/commissions/mini1800: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/enviousdesign/commissions/mini1800/rules.mk b/keyboards/enviousdesign/commissions/mini1800/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/enviousdesign/commissions/mini1800/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/enviousdesign/delirium/readme.md b/keyboards/enviousdesign/delirium/readme.md
new file mode 100644
index 000000000000..157a960303e7
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/readme.md
@@ -0,0 +1,32 @@
+# EnvKB DELIRIUM
+
+![Image of EnvKB TKL PCB](https://i.imgur.com/a7UaS4mh.png)
+
+A low cost standard TKL design which takes inspiration from the CFTKB Mysterium. All versions are designed for reference Pi Picos.
+
+* Keyboard Maintainer: [Envious-Data](https://github.com/envious-data)
+* Hardware Supported: 
+  * Delirium Prototype (`tkl/rev0`)
+  * Delirium (`tkl/rev1`)
+  * Delirium RGB (`tkl/rgb`)
+* Hardware Availability: [Mechboards](https://mechboards.co.uk/products/envkb-delirium-tkl-kit), [GitHub](https://github.com/Envious-Data/Env-KB)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make enviousdesign/tkl/rgb:default
+
+Flashing example for this keyboard:
+
+    make enviousdesign/tkl/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 top left key and plug in the keyboard. This will also clear the emulated EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Physical reset**: Hold down the `BOOTSEL` button on the Pi Pico, then either plug the board in or press the `RESET` button.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT`. In the pre-supplied keymaps it is on the second layer, replacing the Esc key.
+
+After entering the bootloader through one of the three methods above, the keyboard will appear as a USB mass storage device named `RPI-RP2`. If the CLI is unable to find this device, the compiled `.uf2` file can be manually copied to it. The keyboard will reboot on completion with the new firmware loaded.
diff --git a/keyboards/enviousdesign/delirium/rev0/info.json b/keyboards/enviousdesign/delirium/rev0/info.json
new file mode 100644
index 000000000000..f1eb3dc59b04
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rev0/info.json
@@ -0,0 +1,121 @@
+{
+    "manufacturer": "Envious.Design",
+    "keyboard_name": "Delirium Prototype",
+    "maintainer": "Envious.Design",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP19", "GP18", "GP17", "GP16"],
+        "rows": ["GP20", "GP21", "GP22", "GP26", "GP27", "GP28"]
+    },
+    "processor": "RP2040",
+    "url": "http://envious.design",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0xA100",
+        "vid": "0xE739"
+    },
+    "community_layouts": ["tkl_iso"],
+    "layouts": {
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "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,7", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 8.5, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 9.5, "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": "0,14", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "0,15", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "0,16", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "0,17", "matrix": [0, 17], "x": 17.25, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "1,14", "matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+                {"label": "1,15", "matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"label": "1,16", "matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"label": "1,17", "matrix": [1, 17], "x": 17.25, "y": 1.5},
+                {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "2,2", "matrix": [2, 2], "x": 1.5, "y": 2.5},
+                {"label": "2,3", "matrix": [2, 3], "x": 2.5, "y": 2.5},
+                {"label": "2,4", "matrix": [2, 4], "x": 3.5, "y": 2.5},
+                {"label": "2,5", "matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"label": "2,6", "matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"label": "2,7", "matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"label": "2,8", "matrix": [2, 8], "x": 7.5, "y": 2.5},
+                {"label": "2,9", "matrix": [2, 9], "x": 8.5, "y": 2.5},
+                {"label": "2,10", "matrix": [2, 10], "x": 9.5, "y": 2.5},
+                {"label": "2,11", "matrix": [2, 11], "x": 10.5, "y": 2.5},
+                {"label": "2,12", "matrix": [2, 12], "x": 11.5, "y": 2.5},
+                {"label": "2,13", "matrix": [2, 13], "x": 12.5, "y": 2.5},
+                {"label": "2,15", "matrix": [2, 15], "x": 15.25, "y": 2.5},
+                {"label": "2,16", "matrix": [2, 16], "x": 16.25, "y": 2.5},
+                {"label": "2,17", "matrix": [2, 17], "x": 17.25, "y": 2.5},
+                {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "3,2", "matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"label": "3,3", "matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"label": "3,4", "matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"label": "3,5", "matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"label": "3,6", "matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"label": "3,7", "matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"label": "3,8", "matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"label": "3,9", "matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"label": "3,10", "matrix": [3, 10], "x": 9.75, "y": 3.5},
+                {"label": "3,11", "matrix": [3, 11], "x": 10.75, "y": 3.5},
+                {"label": "3,12", "matrix": [3, 12], "x": 11.75, "y": 3.5},
+                {"label": "3,13", "matrix": [3, 13], "x": 12.75, "y": 3.5},
+                {"label": "3,14", "matrix": [2, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"label": "4,13", "matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"label": "4,16", "matrix": [4, 16], "x": 16.25, "y": 4.5},
+                {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"label": "5,1", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"label": "5,3", "matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "5,6", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "5,10", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "5,11", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"label": "5,13", "matrix": [5, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"label": "5,14", "matrix": [5, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"label": "5,15", "matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"label": "5,16", "matrix": [5, 16], "x": 16.25, "y": 5.5},
+                {"label": "5,17", "matrix": [5, 17], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/enviousdesign/delirium/rev0/keymaps/default/keymap.c b/keyboards/enviousdesign/delirium/rev0/keymaps/default/keymap.c
new file mode 100644
index 000000000000..1e0e273fa42a
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rev0/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_tkl_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_TAB,  KC_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_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_LWIN, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RWIN,          MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_tkl_iso(
+        QK_BOOTLOADER,    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_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_MYCM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,           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/enviousdesign/delirium/rev0/rules.mk b/keyboards/enviousdesign/delirium/rev0/rules.mk
new file mode 100644
index 000000000000..837f4bffb53e
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rev0/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally left blank
diff --git a/keyboards/enviousdesign/delirium/rev1/info.json b/keyboards/enviousdesign/delirium/rev1/info.json
new file mode 100644
index 000000000000..e548d0281417
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rev1/info.json
@@ -0,0 +1,305 @@
+{
+    "manufacturer": "Envious.Design",
+    "keyboard_name": "Delirium",
+    "maintainer": "Envious.Design",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP19", "GP18", "GP17", "GP16"],
+        "rows": ["GP20", "GP21", "GP22", "GP26", "GP27", "GP28"]
+    },
+    "processor": "RP2040",
+    "url": "http://envious.design",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xA500",
+        "vid": "0xE739"
+    },
+    "community_layouts": ["tkl_ansi", "tkl_iso"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 9], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 10], "x": 9.5, "y": 0},
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0},
+                {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": ")", "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, 14], "x": 13, "y": 1.5, "w": 2},
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.5},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2.5},
+                {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2.5},
+                {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2.5},
+                {"label": "|", "matrix": [2, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.5},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.5},
+                {"label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.5},
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3.5},
+                {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3.5},
+                {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3.5},
+                {"label": "~", "matrix": [3, 13], "x": 12.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 14], "x": 13.75, "y": 3.5, "w": 1.25},
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "|", "matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"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, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.5},
+                {"label": "Ctrl", "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, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "AltGr", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 9], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 10], "x": 9.5, "y": 0},
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0},
+                {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": ")", "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, 14], "x": 13, "y": 1.5, "w": 2},
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.5},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2.5},
+                {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2.5},
+                {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2.5},
+                {"label": "|", "matrix": [2, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.5},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.5},
+                {"label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.5},
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3.5},
+                {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3.5},
+                {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"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, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.5},
+                {"label": "Ctrl", "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, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "AltGr", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 9], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 10], "x": 9.5, "y": 0},
+                {"label": "F9", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0},
+                {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": ")", "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, 14], "x": 13, "y": 1.5, "w": 2},
+                {"label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.5},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2.5},
+                {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2.5},
+                {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2.5},
+                {"label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.5},
+                {"label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.5},
+                {"label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.5},
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3.5},
+                {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3.5},
+                {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3.5},
+                {"label": "~", "matrix": [3, 13], "x": 12.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "|", "matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"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, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"label": "\u2191", "matrix": [4, 16], "x": 16.25, "y": 4.5},
+                {"label": "Ctrl", "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, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "AltGr", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"label": "Menu", "matrix": [5, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [5, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"label": "\u2190", "matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 16], "x": 16.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/enviousdesign/delirium/rev1/keymaps/default/keymap.c b/keyboards/enviousdesign/delirium/rev1/keymaps/default/keymap.c
new file mode 100644
index 000000000000..02a2b616efba
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rev1/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_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_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_LWIN, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RWIN,          MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        QK_BOOTLOADER,    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_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_MYCM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                             KC_TRNS, KC_APP,           KC_TRNS, KC_EXEC,  KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/enviousdesign/delirium/rev1/keymaps/via/keymap.c b/keyboards/enviousdesign/delirium/rev1/keymaps/via/keymap.c
new file mode 100644
index 000000000000..02a2b616efba
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rev1/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_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_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_LWIN, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RWIN,          MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        QK_BOOTLOADER,    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_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_MYCM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                             KC_TRNS, KC_APP,           KC_TRNS, KC_EXEC,  KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/enviousdesign/delirium/rev1/keymaps/via/rules.mk b/keyboards/enviousdesign/delirium/rev1/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rev1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/enviousdesign/delirium/rev1/rules.mk b/keyboards/enviousdesign/delirium/rev1/rules.mk
new file mode 100644
index 000000000000..837f4bffb53e
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rev1/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally left blank
diff --git a/keyboards/enviousdesign/delirium/rgb/info.json b/keyboards/enviousdesign/delirium/rgb/info.json
new file mode 100644
index 000000000000..ad7d45d3cf75
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rgb/info.json
@@ -0,0 +1,239 @@
+{
+    "manufacturer": "Envious.Design",
+    "keyboard_name": "Delirium RGB",
+    "maintainer": "Envious.Design",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP19", "GP18", "GP17", "GP16"],
+        "rows": ["GP20", "GP21", "GP22", "GP26", "GP27", "GP28"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 64,
+        "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,
+            "solid_reactive_cross": true,
+            "multisplash": true
+        },
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 26, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 39, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 52, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 84, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 97, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 110, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 123, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 143, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 156, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 169, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 182, "y": 0, "flags": 4},
+            {"matrix": [0, 15], "x": 198, "y": 0, "flags": 4},
+            {"matrix": [0, 16], "x": 211, "y": 0, "flags": 4},
+            {"matrix": [0, 17], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 17, "flags": 4},
+            {"matrix": [1, 1], "x": 13, "y": 17, "flags": 4},
+            {"matrix": [1, 2], "x": 26, "y": 17, "flags": 4},
+            {"matrix": [1, 3], "x": 39, "y": 17, "flags": 4},
+            {"matrix": [1, 4], "x": 52, "y": 17, "flags": 4},
+            {"matrix": [1, 5], "x": 65, "y": 17, "flags": 4},
+            {"matrix": [1, 6], "x": 78, "y": 17, "flags": 4},
+            {"matrix": [1, 7], "x": 91, "y": 17, "flags": 4},
+            {"matrix": [1, 8], "x": 104, "y": 17, "flags": 4},
+            {"matrix": [1, 9], "x": 117, "y": 17, "flags": 4},
+            {"matrix": [1, 10], "x": 130, "y": 17, "flags": 4},
+            {"matrix": [1, 11], "x": 143, "y": 17, "flags": 4},
+            {"matrix": [1, 12], "x": 156, "y": 17, "flags": 4},
+            {"matrix": [1, 14], "x": 175, "y": 17, "flags": 4},
+            {"matrix": [1, 15], "x": 198, "y": 17, "flags": 4},
+            {"matrix": [1, 16], "x": 211, "y": 17, "flags": 4},
+            {"matrix": [1, 17], "x": 224, "y": 17, "flags": 4},
+            {"matrix": [2, 0], "x": 3, "y": 29, "flags": 4},
+            {"matrix": [2, 2], "x": 19, "y": 29, "flags": 4},
+            {"matrix": [2, 3], "x": 32, "y": 29, "flags": 4},
+            {"matrix": [2, 4], "x": 45, "y": 29, "flags": 4},
+            {"matrix": [2, 5], "x": 58, "y": 29, "flags": 4},
+            {"matrix": [2, 6], "x": 71, "y": 29, "flags": 4},
+            {"matrix": [2, 7], "x": 84, "y": 29, "flags": 4},
+            {"matrix": [2, 8], "x": 97, "y": 29, "flags": 4},
+            {"matrix": [2, 9], "x": 110, "y": 29, "flags": 4},
+            {"matrix": [2, 10], "x": 123, "y": 29, "flags": 4},
+            {"matrix": [2, 11], "x": 136, "y": 29, "flags": 4},
+            {"matrix": [2, 12], "x": 149, "y": 29, "flags": 4},
+            {"matrix": [2, 13], "x": 162, "y": 29, "flags": 4},
+            {"matrix": [3, 14], "x": 175, "y": 29, "flags": 4},
+            {"matrix": [2, 15], "x": 198, "y": 29, "flags": 4},
+            {"matrix": [2, 16], "x": 211, "y": 29, "flags": 4},
+            {"matrix": [2, 17], "x": 224, "y": 29, "flags": 4},
+            {"matrix": [3, 0], "x": 5, "y": 41, "flags": 8},
+            {"matrix": [3, 2], "x": 23, "y": 41, "flags": 4},
+            {"matrix": [3, 3], "x": 36, "y": 41, "flags": 4},
+            {"matrix": [3, 4], "x": 49, "y": 41, "flags": 4},
+            {"matrix": [3, 5], "x": 62, "y": 41, "flags": 4},
+            {"matrix": [3, 6], "x": 75, "y": 41, "flags": 4},
+            {"matrix": [3, 7], "x": 88, "y": 41, "flags": 4},
+            {"matrix": [3, 8], "x": 101, "y": 41, "flags": 4},
+            {"matrix": [3, 9], "x": 114, "y": 41, "flags": 4},
+            {"matrix": [3, 10], "x": 127, "y": 41, "flags": 4},
+            {"matrix": [3, 11], "x": 140, "y": 41, "flags": 4},
+            {"matrix": [3, 12], "x": 153, "y": 41, "flags": 4},
+            {"matrix": [3, 13], "x": 166, "y": 41, "flags": 4},
+            {"matrix": [4, 0], "x": 2, "y": 52, "flags": 4},
+            {"matrix": [4, 1], "x": 16, "y": 52, "flags": 4},
+            {"matrix": [4, 2], "x": 29, "y": 52, "flags": 4},
+            {"matrix": [4, 3], "x": 42, "y": 52, "flags": 4},
+            {"matrix": [4, 4], "x": 55, "y": 52, "flags": 4},
+            {"matrix": [4, 5], "x": 68, "y": 52, "flags": 4},
+            {"matrix": [4, 6], "x": 81, "y": 52, "flags": 4},
+            {"matrix": [4, 7], "x": 94, "y": 52, "flags": 4},
+            {"matrix": [4, 8], "x": 107, "y": 52, "flags": 4},
+            {"matrix": [4, 9], "x": 120, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 133, "y": 52, "flags": 4},
+            {"matrix": [4, 11], "x": 146, "y": 52, "flags": 4},
+            {"matrix": [4, 13], "x": 170, "y": 52, "flags": 4},
+            {"matrix": [4, 16], "x": 211, "y": 52, "flags": 4},
+            {"matrix": [5, 0], "x": 2, "y": 64, "flags": 4},
+            {"matrix": [5, 1], "x": 18, "y": 64, "flags": 4},
+            {"matrix": [5, 3], "x": 34, "y": 64, "flags": 4},
+            {"matrix": [5, 6], "x": 83, "y": 64, "flags": 4},
+            {"matrix": [5, 10], "x": 131, "y": 64, "flags": 4},
+            {"matrix": [5, 11], "x": 148, "y": 64, "flags": 4},
+            {"matrix": [5, 13], "x": 164, "y": 64, "flags": 4},
+            {"matrix": [5, 14], "x": 180, "y": 64, "flags": 4},
+            {"matrix": [5, 15], "x": 198, "y": 64, "flags": 4},
+            {"matrix": [5, 16], "x": 211, "y": 64, "flags": 4},
+            {"matrix": [5, 17], "x": 224, "y": 64, "flags": 4}
+        ]
+    },
+    "url": "http://envious.design",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xA400",
+        "vid": "0xE739"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP0"
+    },
+    "community_layouts": ["tkl_iso"],
+    "layouts": {
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0, "w": 1},
+                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0, "w": 1},
+                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0, "w": 1},
+                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0, "w": 1},
+                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0, "w": 1},
+                {"label": "0,7", "matrix": [0, 7], "x": 6.5, "y": 0, "w": 1},
+                {"label": "0,8", "matrix": [0, 8], "x": 7.5, "y": 0, "w": 1},
+                {"label": "0,9", "matrix": [0, 9], "x": 8.5, "y": 0, "w": 1},
+                {"label": "0,10", "matrix": [0, 10], "x": 9.5, "y": 0, "w": 1},
+                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0, "w": 1},
+                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0, "w": 1},
+                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0, "w": 1},
+                {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0, "w": 1},
+                {"label": "0,15", "matrix": [0, 15], "x": 15.25, "y": 0, "w": 1},
+                {"label": "0,16", "matrix": [0, 16], "x": 16.25, "y": 0, "w": 1},
+                {"label": "0,17", "matrix": [0, 17], "x": 17.25, "y": 0, "w": 1},
+                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.5, "w": 1},
+                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.5, "w": 1},
+                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.5, "w": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.5, "w": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.5, "w": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.5, "w": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.5, "w": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.5, "w": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.5, "w": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.5, "w": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.5, "w": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.5, "w": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.5, "w": 1},
+                {"label": "1,14", "matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+                {"label": "1,15", "matrix": [1, 15], "x": 15.25, "y": 1.5, "w": 1},
+                {"label": "1,16", "matrix": [1, 16], "x": 16.25, "y": 1.5, "w": 1},
+                {"label": "1,17", "matrix": [1, 17], "x": 17.25, "y": 1.5, "w": 1},
+                {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "2,2", "matrix": [2, 2], "x": 1.5, "y": 2.5, "w": 1},
+                {"label": "2,3", "matrix": [2, 3], "x": 2.5, "y": 2.5, "w": 1},
+                {"label": "2,4", "matrix": [2, 4], "x": 3.5, "y": 2.5, "w": 1},
+                {"label": "2,5", "matrix": [2, 5], "x": 4.5, "y": 2.5, "w": 1},
+                {"label": "2,6", "matrix": [2, 6], "x": 5.5, "y": 2.5, "w": 1},
+                {"label": "2,7", "matrix": [2, 7], "x": 6.5, "y": 2.5, "w": 1},
+                {"label": "2,8", "matrix": [2, 8], "x": 7.5, "y": 2.5, "w": 1},
+                {"label": "2,9", "matrix": [2, 9], "x": 8.5, "y": 2.5, "w": 1},
+                {"label": "2,10", "matrix": [2, 10], "x": 9.5, "y": 2.5, "w": 1},
+                {"label": "2,11", "matrix": [2, 11], "x": 10.5, "y": 2.5, "w": 1},
+                {"label": "2,12", "matrix": [2, 12], "x": 11.5, "y": 2.5, "w": 1},
+                {"label": "2,13", "matrix": [2, 13], "x": 12.5, "y": 2.5, "w": 1},
+                {"label": "2,15", "matrix": [2, 15], "x": 15.25, "y": 2.5, "w": 1},
+                {"label": "2,16", "matrix": [2, 16], "x": 16.25, "y": 2.5, "w": 1},
+                {"label": "2,17", "matrix": [2, 17], "x": 17.25, "y": 2.5, "w": 1},
+                {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "3,2", "matrix": [3, 2], "x": 1.75, "y": 3.5, "w": 1},
+                {"label": "3,3", "matrix": [3, 3], "x": 2.75, "y": 3.5, "w": 1},
+                {"label": "3,4", "matrix": [3, 4], "x": 3.75, "y": 3.5, "w": 1},
+                {"label": "3,5", "matrix": [3, 5], "x": 4.75, "y": 3.5, "w": 1},
+                {"label": "3,6", "matrix": [3, 6], "x": 5.75, "y": 3.5, "w": 1},
+                {"label": "3,7", "matrix": [3, 7], "x": 6.75, "y": 3.5, "w": 1},
+                {"label": "3,8", "matrix": [3, 8], "x": 7.75, "y": 3.5, "w": 1},
+                {"label": "3,9", "matrix": [3, 9], "x": 8.75, "y": 3.5, "w": 1},
+                {"label": "3,10", "matrix": [3, 10], "x": 9.75, "y": 3.5, "w": 1},
+                {"label": "3,11", "matrix": [3, 11], "x": 10.75, "y": 3.5, "w": 1},
+                {"label": "3,12", "matrix": [3, 12], "x": 11.75, "y": 3.5, "w": 1},
+                {"label": "3,13", "matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 1},
+                {"label": "3,14", "matrix": [3, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 1},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.5, "w": 1},
+                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.5, "w": 1},
+                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.5, "w": 1},
+                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.5, "w": 1},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.5, "w": 1},
+                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.5, "w": 1},
+                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.5, "w": 1},
+                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.5, "w": 1},
+                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.5, "w": 1},
+                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.5, "w": 1},
+                {"label": "4,13", "matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"label": "4,16", "matrix": [4, 16], "x": 16.25, "y": 4.5, "w": 1},
+                {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"label": "5,1", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"label": "5,3", "matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "5,6", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "5,10", "matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "5,11", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"label": "5,13", "matrix": [5, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"label": "5,14", "matrix": [5, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"label": "5,15", "matrix": [5, 15], "x": 15.25, "y": 5.5, "w": 1},
+                {"label": "5,16", "matrix": [5, 16], "x": 16.25, "y": 5.5, "w": 1},
+                {"label": "5,17", "matrix": [5, 17], "x": 17.25, "y": 5.5, "w": 1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/enviousdesign/delirium/rgb/keymaps/default/keymap.c b/keyboards/enviousdesign/delirium/rgb/keymaps/default/keymap.c
new file mode 100644
index 000000000000..d791874aff03
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rgb/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_tkl_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_TAB,  KC_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_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_LWIN, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RWIN,          MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_tkl_iso(
+        QK_BOOTLOADER,    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_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, RGB_MOD, RGB_SAI, RGB_VAI,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_MYCM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RGB_RMOD,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_TOG,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          RGB_SPI,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                             KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, RGB_HUI, RGB_SPD, RGB_HUD
+    )
+};
+
diff --git a/keyboards/enviousdesign/delirium/rgb/rgb.c b/keyboards/enviousdesign/delirium/rgb/rgb.c
new file mode 100644
index 000000000000..e6a3354b299e
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rgb/rgb.c
@@ -0,0 +1,35 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You 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_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) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(50, 16, 16, 16); // assuming caps lock is at led #50
+    } 
+    if (host_keyboard_led_state().scroll_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(14, 16, 16, 16); // assuming scroll lock is at led #14
+    }
+    if (get_highest_layer(layer_state) == 1) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(83, 16, 16 ,16);
+    }
+    return true;
+}
+#endif
\ No newline at end of file
diff --git a/keyboards/enviousdesign/delirium/rgb/rules.mk b/keyboards/enviousdesign/delirium/rgb/rules.mk
new file mode 100644
index 000000000000..837f4bffb53e
--- /dev/null
+++ b/keyboards/enviousdesign/delirium/rgb/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally left blank
diff --git a/keyboards/enviousdesign/mcro/readme.md b/keyboards/enviousdesign/mcro/readme.md
new file mode 100644
index 000000000000..378fab8c3efa
--- /dev/null
+++ b/keyboards/enviousdesign/mcro/readme.md
@@ -0,0 +1,30 @@
+# EnvKB MCRO
+
+![Image of EnvKB MCRO PCB](https://i.imgur.com/QnANWnBh.png)
+
+A small 12 Key macro pad for various uses
+
+* Keyboard Maintainer: [Envious-Data](https://github.com/envious-data)
+* Hardware Supported: EnvKB MCRO (Pi Pico)
+* Hardware Availability: [GitHub](https://github.com/Envious-Data/Env-MCRO)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make enviousdesign/mcro:default
+
+Flashing example for this keyboard:
+
+    make enviousdesign/mcro: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. This will also clear the emulated EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Physical reset**: Hold down the `BOOTSEL` button on the Pi Pico, then either plug the board in or press the `RESET` button.
+* **Keycode in layout**: There is no key mapped to `QK_BOOT` in the pre-created keymaps, but you may assign this key in any keymaps you create.
+
+After entering the bootloader through one of the three methods above, the keyboard will appear as a USB mass storage device named `RPI-RP2`. If the CLI is unable to find this device, the compiled `.uf2` file can be manually copied to it. The keyboard will reboot on completion with the new firmware loaded.
+
diff --git a/keyboards/enviousdesign/mcro/rev1/info.json b/keyboards/enviousdesign/mcro/rev1/info.json
new file mode 100644
index 000000000000..fe6a4ffe77c8
--- /dev/null
+++ b/keyboards/enviousdesign/mcro/rev1/info.json
@@ -0,0 +1,44 @@
+{
+    "manufacturer": "Envious.Design",
+    "keyboard_name": "MCRO",
+    "maintainer": "Envious.Design",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP18", "GP19", "GP20", "GP21"],
+        "rows": ["GP4", "GP11", "GP15"]
+    },
+    "processor": "RP2040",
+    "url": "http://envious.design",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xA300",
+        "vid": "0xE739"
+    },
+    "layouts": {
+        "LAYOUT_ortho_3x4": {
+            "layout": [
+                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0, "w": 1},
+                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0, "w": 1},
+                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0, "w": 1},
+                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0, "w": 1},
+                {"label": "F17", "matrix": [1, 0], "x": 0, "y": 1.25, "w": 1},
+                {"label": "F18", "matrix": [1, 1], "x": 1, "y": 1.25, "w": 1},
+                {"label": "F19", "matrix": [1, 2], "x": 2, "y": 1.25, "w": 1},
+                {"label": "F20", "matrix": [1, 3], "x": 3, "y": 1.25, "w": 1},
+                {"label": "F21", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1},
+                {"label": "F22", "matrix": [2, 1], "x": 1, "y": 2.5, "w": 1},
+                {"label": "F23", "matrix": [2, 2], "x": 2, "y": 2.5, "w": 1},
+                {"label": "F24", "matrix": [2, 3], "x": 3, "y": 2.5, "w": 1}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/enviousdesign/mcro/rev1/keymaps/default/keymap.c b/keyboards/enviousdesign/mcro/rev1/keymaps/default/keymap.c
new file mode 100644
index 000000000000..e9def4a38fcf
--- /dev/null
+++ b/keyboards/enviousdesign/mcro/rev1/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_ortho_3x4(
+         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/enviousdesign/mcro/rev1/keymaps/via/keymap.c b/keyboards/enviousdesign/mcro/rev1/keymaps/via/keymap.c
new file mode 100644
index 000000000000..35b46697c141
--- /dev/null
+++ b/keyboards/enviousdesign/mcro/rev1/keymaps/via/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2022 Adam K (@Envious-Data)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_ortho_3x4(
+        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/enviousdesign/mcro/rev1/keymaps/via/rules.mk b/keyboards/enviousdesign/mcro/rev1/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/enviousdesign/mcro/rev1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/enviousdesign/mcro/rev1/rules.mk b/keyboards/enviousdesign/mcro/rev1/rules.mk
new file mode 100644
index 000000000000..837f4bffb53e
--- /dev/null
+++ b/keyboards/enviousdesign/mcro/rev1/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally left blank
diff --git a/keyboards/ep/comsn/mollydooker/config.h b/keyboards/ep/comsn/mollydooker/config.h
index bf53058d5237..d5971524a69e 100644
--- a/keyboards/ep/comsn/mollydooker/config.h
+++ b/keyboards/ep/comsn/mollydooker/config.h
@@ -22,21 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 84
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/ep/comsn/mollydooker/info.json b/keyboards/ep/comsn/mollydooker/info.json
index 6c8825c915e8..868a418403d1 100644
--- a/keyboards/ep/comsn/mollydooker/info.json
+++ b/keyboards/ep/comsn/mollydooker/info.json
@@ -16,7 +16,21 @@
         "pin": "B0"
     },
     "rgblight": {
-        "max_brightness": 35
+        "hue_steps": 10,
+        "led_count": 84,
+        "max_brightness": 35,
+        "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",
diff --git a/keyboards/era/era65/config.h b/keyboards/era/era65/config.h
index 41dbe2178a09..bd42a703f801 100644
--- a/keyboards/era/era65/config.h
+++ b/keyboards/era/era65/config.h
@@ -19,8 +19,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define DYNAMIC_KEYMAP_LAYER_COUNT 6
-
 #define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
 
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET // Activates the double-tap behavior
diff --git a/keyboards/era/era65/info.json b/keyboards/era/era65/info.json
index 5c545a6fa8ed..d5fd61276782 100644
--- a/keyboards/era/era65/info.json
+++ b/keyboards/era/era65/info.json
@@ -2,16 +2,30 @@
     "manufacturer": "ERA",
     "keyboard_name": "ERA65 1.0.4",
     "maintainer": "eerraa",
+    "backlight": {
+        "breathing": true,
+        "levels": 15,
+        "pin": "GP0"
+    },
     "bootloader": "rp2040",
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
     "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 6
+    },
     "features": {
+        "backlight": true,
         "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true,
-        "backlight": true
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "GP12"
     },
     "matrix_pins": {
         "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP22", "GP23", "GP3"],
@@ -24,14 +38,6 @@
         "pid": "0x0001",
         "vid": "0x4552"
     },
-    "backlight": {
-        "breathing": true,
-        "levels": 15,
-        "pin": "GP0"
-    },
-    "indicators": {
-        "caps_lock": "GP12"
-    },
     "layouts": {
         "LAYOUT_65_combo": {
             "layout": [
@@ -48,9 +54,9 @@
                 {"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, 13], "x": 13, "y": 0, "w": 2},
                 {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"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},
@@ -63,9 +69,9 @@
                 {"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, 13], "x": 13.5, "y": 1, "w": 1.5},
                 {"matrix": [1, 14], "x": 15.5, "y": 1},
-                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"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},
@@ -78,9 +84,9 @@
                 {"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], "w": 1.25, "x": 13.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
                 {"matrix": [2, 14], "x": 15.5, "y": 2},
-                {"matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
+                {"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},
@@ -92,13 +98,13 @@
                 {"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, 12], "x": 12.25, "y": 3, "w": 1.75},
                 {"matrix": [3, 13], "x": 14.25, "y": 3.25},
                 {"matrix": [3, 14], "x": 15.5, "y": 3},
-                {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-                {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
-                {"matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4},
+                {"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},
@@ -108,4 +114,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/era/klein/config.h b/keyboards/era/klein/config.h
new file mode 100644
index 000000000000..1033bc738e70
--- /dev/null
+++ b/keyboards/era/klein/config.h
@@ -0,0 +1,27 @@
+/* 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
new file mode 100644
index 000000000000..f57e86df018d
--- /dev/null
+++ b/keyboards/era/klein/halconf.h
@@ -0,0 +1,21 @@
+/* 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
new file mode 100644
index 000000000000..ac08cbb8a2bc
--- /dev/null
+++ b/keyboards/era/klein/info.json
@@ -0,0 +1,590 @@
+{
+    "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
new file mode 100644
index 000000000000..88878bbcd936
--- /dev/null
+++ b/keyboards/era/klein/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// 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
new file mode 100644
index 000000000000..88878bbcd936
--- /dev/null
+++ b/keyboards/era/klein/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+// 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/rules.mk b/keyboards/era/klein/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/era/klein/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/era/klein/mcuconf.h b/keyboards/era/klein/mcuconf.h
new file mode 100644
index 000000000000..b82cc49d7d07
--- /dev/null
+++ b/keyboards/era/klein/mcuconf.h
@@ -0,0 +1,22 @@
+/* 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
new file mode 100644
index 000000000000..1efeafe45127
--- /dev/null
+++ b/keyboards/era/klein/readme.md
@@ -0,0 +1,23 @@
+# 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/klein/rules.mk b/keyboards/era/klein/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/era/sirind/klein_hs/config.h b/keyboards/era/sirind/klein_hs/config.h
new file mode 100644
index 000000000000..bbd438736357
--- /dev/null
+++ b/keyboards/era/sirind/klein_hs/config.h
@@ -0,0 +1,21 @@
+/* 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
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_hs/halconf.h b/keyboards/era/sirind/klein_hs/halconf.h
new file mode 100644
index 000000000000..f57e86df018d
--- /dev/null
+++ b/keyboards/era/sirind/klein_hs/halconf.h
@@ -0,0 +1,21 @@
+/* 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/sirind/klein_hs/info.json b/keyboards/era/sirind/klein_hs/info.json
new file mode 100644
index 000000000000..6d677f6748d1
--- /dev/null
+++ b/keyboards/era/sirind/klein_hs/info.json
@@ -0,0 +1,467 @@
+{
+    "manufacturer": "SIRIND",
+    "keyboard_name": "Klein_HS",
+    "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,
+    },
+    "indicators": {
+        "caps_lock": "GP16",
+        "on_state": 0,
+        "scroll_lock": "GP17"
+    },
+    "matrix_pins": {
+        "cols": ["GP22", "GP23", "GP24", "GP25", "GP26", "GP27", "GP28", "GP29", "GP11", "GP10", "GP9", "GP8", "GP7", "GP1", "GP2", "GP3"],
+        "rows": ["GP18", "GP19", "GP20", "GP21", "GP14", "GP5", "GP6", "GP4", "GP13", "GP12"]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0004",
+        "vid": "0x4552"
+    },
+    "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, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 14], "x": 16.75, "y": 0},
+                {"matrix": [5, 15], "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, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "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, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "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, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [8, 15], "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, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 13], "x": 15, "y": 4},
+                {"matrix": [9, 14], "x": 16, "y": 4},
+                {"matrix": [9, 15], "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, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 15], "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, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "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, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "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, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "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, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 15], "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, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 15], "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, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "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, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "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, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3},
+                {"matrix": [8, 15], "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, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 13], "x": 15, "y": 4},
+                {"matrix": [9, 14], "x": 16, "y": 4},
+                {"matrix": [9, 15], "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, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 14], "x": 16.75, "y": 0},
+                {"matrix": [5, 15], "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, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "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, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "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, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "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, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 15], "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, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 14], "x": 16.75, "y": 0},
+                {"matrix": [5, 15], "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, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "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, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "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, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [8, 15], "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, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 15], "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, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 14], "x": 16.75, "y": 0},
+                {"matrix": [5, 15], "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, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "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, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "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, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3},
+                {"matrix": [8, 15], "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, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 13], "x": 15, "y": 4},
+                {"matrix": [9, 14], "x": 16, "y": 4},
+                {"matrix": [9, 15], "x": 17, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_hs/keymaps/default/keymap.c b/keyboards/era/sirind/klein_hs/keymaps/default/keymap.c
new file mode 100644
index 000000000000..88878bbcd936
--- /dev/null
+++ b/keyboards/era/sirind/klein_hs/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// 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/sirind/klein_hs/keymaps/via/keymap.c b/keyboards/era/sirind/klein_hs/keymaps/via/keymap.c
new file mode 100644
index 000000000000..88878bbcd936
--- /dev/null
+++ b/keyboards/era/sirind/klein_hs/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+// 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/sirind/klein_hs/keymaps/via/rules.mk b/keyboards/era/sirind/klein_hs/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/era/sirind/klein_hs/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_hs/mcuconf.h b/keyboards/era/sirind/klein_hs/mcuconf.h
new file mode 100644
index 000000000000..b82cc49d7d07
--- /dev/null
+++ b/keyboards/era/sirind/klein_hs/mcuconf.h
@@ -0,0 +1,22 @@
+/* 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/sirind/klein_hs/readme.md b/keyboards/era/sirind/klein_hs/readme.md
new file mode 100644
index 000000000000..86343271bbd2
--- /dev/null
+++ b/keyboards/era/sirind/klein_hs/readme.md
@@ -0,0 +1,23 @@
+# Mont Cervin Klein
+
+* Keyboard Maintainer: [ERA](https://github.com/eerraa)
+* Hardware supported: SIRIND Klein_HS
+* Hardware availability: [Syryan](https://srind.mysoho.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make era/sirind/klein_hs:default
+
+Flashing example for this keyboard:
+
+    make era/sirind/klein_hs: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/sirind/klein_hs/rules.mk b/keyboards/era/sirind/klein_hs/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/era/sirind/klein_sd/config.h b/keyboards/era/sirind/klein_sd/config.h
new file mode 100644
index 000000000000..ae1d4a9e1d0f
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/config.h
@@ -0,0 +1,25 @@
+/* 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_DISABLE_WHEN_USB_SUSPENDED
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_sd/halconf.h b/keyboards/era/sirind/klein_sd/halconf.h
new file mode 100644
index 000000000000..f57e86df018d
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/halconf.h
@@ -0,0 +1,21 @@
+/* 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/sirind/klein_sd/info.json b/keyboards/era/sirind/klein_sd/info.json
new file mode 100644
index 000000000000..53f89f2cb704
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/info.json
@@ -0,0 +1,588 @@
+{
+    "manufacturer": "SIRIND",
+    "keyboard_name": "Klein_SD",
+    "maintainer": "eerraa",
+    "backlight": {
+        "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", "GP9", "GP7", "GP6", "GP5", "GP4", "GP3"],
+        "rows": ["GP18", "GP19", "GP20", "GP21", "GP14", "GP2", "GP1", "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
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 7], "x": 97, "y": 10, "flags": 4},
+            {"matrix": [0, 6], "x": 84, "y": 8, "flags": 4},
+            {"matrix": [0, 5], "x": 72, "y": 5, "flags": 4},
+            {"matrix": [0, 4], "x": 59, "y": 3, "flags": 4},
+            {"matrix": [0, 3], "x": 46, "y": 1, "flags": 4},
+            {"matrix": [0, 2], "x": 33, "y": 2, "flags": 4},
+            {"matrix": [0, 1], "x": 20, "y": 2, "flags": 4},
+            {"matrix": [0, 0], "x": 4, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 1, "y": 13, "flags": 1},
+            {"matrix": [1, 1], "x": 21, "y": 15, "flags": 1},
+            {"matrix": [1, 2], "x": 37, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 50, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 63, "y": 17, "flags": 4},
+            {"matrix": [1, 5], "x": 76, "y": 20, "flags": 4},
+            {"matrix": [1, 6], "x": 88, "y": 22, "flags": 4},
+            {"matrix": [1, 7], "x": 101, "y": 24, "flags": 4},
+            {"matrix": [2, 6], "x": 90, "y": 36, "flags": 4},
+            {"matrix": [2, 5], "x": 78, "y": 33, "flags": 4},
+            {"matrix": [2, 4], "x": 65, "y": 31, "flags": 4},
+            {"matrix": [2, 3], "x": 52, "y": 29, "flags": 4},
+            {"matrix": [2, 2], "x": 39, "y": 29, "flags": 4},
+            {"matrix": [2, 1], "x": 18, "y": 29, "flags": 1},
+            {"matrix": [2, 0], "x": 0, "y": 27, "flags": 1},
+            {"matrix": [3, 1], "x": 21, "y": 42, "flags": 1},
+            {"matrix": [3, 2], "x": 42, "y": 42, "flags": 4},
+            {"matrix": [3, 3], "x": 55, "y": 43, "flags": 4},
+            {"matrix": [3, 4], "x": 68, "y": 45, "flags": 4},
+            {"matrix": [3, 5], "x": 81, "y": 47, "flags": 4},
+            {"matrix": [3, 6], "x": 93, "y": 50, "flags": 4},
+            {"matrix": [4, 6], "x": 97, "y": 64, "flags": 1},
+            {"matrix": [4, 5], "x": 77, "y": 60, "flags": 4},
+            {"matrix": [4, 3], "x": 53, "y": 57, "flags": 1},
+            {"matrix": [4, 1], "x": 16, "y": 55, "flags": 1},
+            {"matrix": [0, 8], "x": 130, "y": 9, "flags": 4},
+            {"matrix": [0, 9], "x": 143, "y": 7, "flags": 4},
+            {"matrix": [0, 10], "x": 156, "y": 4, "flags": 4},
+            {"matrix": [0, 11], "x": 168, "y": 2, "flags": 4},
+            {"matrix": [0, 12], "x": 182, "y": 1, "flags": 4},
+            {"matrix": [0, 13], "x": 195, "y": 2, "flags": 4},
+            {"matrix": [0, 15], "x": 214, "y": 2, "flags": 1},
+            {"matrix": [1, 15], "x": 220, "y": 15, "flags": 4},
+            {"matrix": [1, 14], "x": 203, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 191, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 178, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 164, "y": 16, "flags": 4},
+            {"matrix": [1, 10], "x": 152, "y": 18, "flags": 4},
+            {"matrix": [1, 9], "x": 139, "y": 21, "flags": 4},
+            {"matrix": [1, 8], "x": 126, "y": 23, "flags": 4},
+            {"matrix": [2, 8], "x": 131, "y": 36, "flags": 4},
+            {"matrix": [2, 9], "x": 144, "y": 33, "flags": 4},
+            {"matrix": [2, 10], "x": 156, "y": 31, "flags": 4},
+            {"matrix": [2, 11], "x": 169, "y": 29, "flags": 4},
+            {"matrix": [2, 12], "x": 182, "y": 29, "flags": 4},
+            {"matrix": [2, 13], "x": 195, "y": 29, "flags": 4},
+            {"matrix": [2, 15], "x": 216, "y": 29, "flags": 1},
+            {"matrix": [3, 15], "x": 216, "y": 42, "flags": 1},
+            {"matrix": [3, 13], "x": 192, "y": 42, "flags": 4},
+            {"matrix": [3, 12], "x": 179, "y": 42, "flags": 4},
+            {"matrix": [3, 11], "x": 166, "y": 43, "flags": 4},
+            {"matrix": [3, 10], "x": 153, "y": 45, "flags": 4},
+            {"matrix": [3, 9], "x": 140, "y": 48, "flags": 4},
+            {"matrix": [3, 8], "x": 128, "y": 50, "flags": 4},
+            {"matrix": [4, 9], "x": 141, "y": 61, "flags": 4},
+            {"matrix": [4, 11], "x": 168, "y": 57, "flags": 1},
+            {"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}
+        ]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0005",
+        "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, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 14], "x": 16.75, "y": 0},
+                {"matrix": [5, 15], "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, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "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, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "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, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [8, 15], "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, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 13], "x": 15, "y": 4},
+                {"matrix": [9, 14], "x": 16, "y": 4},
+                {"matrix": [9, 15], "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, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 15], "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, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "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, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "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, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "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, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 15], "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, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 15], "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, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "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, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "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, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3},
+                {"matrix": [8, 15], "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, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 13], "x": 15, "y": 4},
+                {"matrix": [9, 14], "x": 16, "y": 4},
+                {"matrix": [9, 15], "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, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 14], "x": 16.75, "y": 0},
+                {"matrix": [5, 15], "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, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "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, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "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, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "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, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 15], "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, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 14], "x": 16.75, "y": 0},
+                {"matrix": [5, 15], "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, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "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, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "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, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [8, 15], "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, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 15], "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, 8], "x": 10.75, "y": 0},
+                {"matrix": [5, 9], "x": 11.75, "y": 0},
+                {"matrix": [5, 10], "x": 12.75, "y": 0},
+                {"matrix": [5, 11], "x": 13.75, "y": 0},
+                {"matrix": [5, 12], "x": 14.75, "y": 0},
+                {"matrix": [5, 13], "x": 15.75, "y": 0},
+                {"matrix": [5, 14], "x": 16.75, "y": 0},
+                {"matrix": [5, 15], "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, 8], "x": 10.25, "y": 1},
+                {"matrix": [6, 9], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [6, 12], "x": 14.25, "y": 1},
+                {"matrix": [6, 13], "x": 15.25, "y": 1},
+                {"matrix": [6, 14], "x": 16.25, "y": 1},
+                {"matrix": [6, 15], "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, 8], "x": 10.5, "y": 2},
+                {"matrix": [7, 9], "x": 11.5, "y": 2},
+                {"matrix": [7, 10], "x": 12.5, "y": 2},
+                {"matrix": [7, 11], "x": 13.5, "y": 2},
+                {"matrix": [7, 12], "x": 14.5, "y": 2},
+                {"matrix": [7, 13], "x": 15.5, "y": 2},
+                {"matrix": [7, 15], "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, 8], "x": 10, "y": 3},
+                {"matrix": [8, 9], "x": 11, "y": 3},
+                {"matrix": [8, 10], "x": 12, "y": 3},
+                {"matrix": [8, 11], "x": 13, "y": 3},
+                {"matrix": [8, 12], "x": 14, "y": 3},
+                {"matrix": [8, 13], "x": 15, "y": 3},
+                {"matrix": [8, 14], "x": 16, "y": 3},
+                {"matrix": [8, 15], "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, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+                {"matrix": [9, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [9, 11], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 13], "x": 15, "y": 4},
+                {"matrix": [9, 14], "x": 16, "y": 4},
+                {"matrix": [9, 15], "x": 17, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_sd/keymaps/default/keymap.c b/keyboards/era/sirind/klein_sd/keymaps/default/keymap.c
new file mode 100644
index 000000000000..88878bbcd936
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// 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/sirind/klein_sd/keymaps/via/keymap.c b/keyboards/era/sirind/klein_sd/keymaps/via/keymap.c
new file mode 100644
index 000000000000..88878bbcd936
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+// 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/sirind/klein_sd/keymaps/via/rules.mk b/keyboards/era/sirind/klein_sd/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_sd/mcuconf.h b/keyboards/era/sirind/klein_sd/mcuconf.h
new file mode 100644
index 000000000000..b82cc49d7d07
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/mcuconf.h
@@ -0,0 +1,22 @@
+/* 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/sirind/klein_sd/readme.md b/keyboards/era/sirind/klein_sd/readme.md
new file mode 100644
index 000000000000..a021b843d787
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/readme.md
@@ -0,0 +1,23 @@
+# Mont Cervin Klein
+
+* Keyboard Maintainer: [ERA](https://github.com/eerraa)
+* Hardware supported: SIRIND Klein_SD
+* Hardware availability: [Syryan](https://srind.mysoho.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make era/sirind/klein_sd:default
+
+Flashing example for this keyboard:
+
+    make era/sirind/klein_sd: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/sirind/klein_sd/rules.mk b/keyboards/era/sirind/klein_sd/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/era/sirind/klein_sd/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index 3adcd0198bf1..de850a054829 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -44,10 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_WHEEL_MAX_SPEED    MOUSEKEY_MAX_SPEED
 #define MOUSEKEY_WHEEL_TIME_TO_MAX  MOUSEKEY_TIME_TO_MAX
 
-#define TAPPING_TOGGLE  1
-
-#define TAPPING_TERM    200
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -67,21 +63,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #define LED_BRIGHTNESS_DEFAULT (LED_BRIGHTNESS_HI)
 
-/* ws2812 RGB LED */
-#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 12
-#define RGBLIGHT_SAT_STEP 255
-#define RGBLIGHT_VAL_STEP 12
-
 // Pick one of the modes
 // Defaults to 15 mirror, for legacy behavior
 
@@ -94,8 +75,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBW
 
-#define RGBLIGHT_SLEEP
-
 /*
  * The debounce filtering reports a key/switch change directly,
  * without any extra delay. After that the debounce logic will filter
@@ -156,21 +135,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
+// #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 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.h b/keyboards/ergodox_ez/ergodox_ez.h
index 0c23a1296901..befc1146177e 100644
--- a/keyboards/ergodox_ez/ergodox_ez.h
+++ b/keyboards/ergodox_ez/ergodox_ez.h
@@ -139,25 +139,3 @@ typedef union {
 } keyboard_config_t;
 
 extern keyboard_config_t keyboard_config;
-
-/*  ---- LEFT HAND ----     ---- RIGHT HAND ---- */
-#define LED_LAYOUT_ergodox_pretty(                \
-    L01,L02,L03,L04,L05,    R01,R02,R03,R04,R05,  \
-    L11,L12,L13,L14,L15,    R11,R12,R13,R14,R15,  \
-    L21,L22,L23,L24,L25,    R21,R22,R23,R24,R25,  \
-    L31,L32,L33,L34,L35,    R31,R32,R33,R34,R35,  \
-    L41,L42,L43,L44,            R42,R43,R44,R45 ) \
-                                                  \
-   /* matrix positions */                         \
-    { R01, R02, R03, R04, R05,                    \
-      R11, R12, R13, R14, R15,                    \
-      R21, R22, R23, R24, R25,                    \
-      R31, R32, R33, R34, R35,                    \
-           R42, R43, R44, R45,                    \
-                                                  \
-      L05, L04, L03, L02, L01,                    \
-      L15, L14, L13, L12, L11,                    \
-      L25, L24, L23, L22, L21,                    \
-      L35, L34, L33, L32, L31,                    \
-           L44, L43, L42, L41                     \
-    }
diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json
index 5727d1118475..1b2942cd4288 100644
--- a/keyboards/ergodox_ez/info.json
+++ b/keyboards/ergodox_ez/info.json
@@ -6,15 +6,38 @@
         "vid": "0x3297",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "brightness_steps": 12,
+        "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
+        }
+    },
+    "build": {
+        "debounce_type": "sym_eager_pr"
+    },
     "ws2812": {
         "pin": "D7"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "processor": "atmega32u4",
     "bootloader": "halfkay",
     "debounce": 30,
+    "tapping": {
+        "toggle": 1
+    },
     "community_layouts": ["ergodox"],
     "layouts": {
         "LAYOUT_ergodox": {
diff --git a/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c b/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
index 45a101ec81ec..99d10e9a1267 100755
--- a/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
@@ -253,12 +253,7 @@ void matrix_scan_user(void) {
 };
 
 // The state of the LEDs requested by the system, as a bitmask.
-static uint8_t sys_led_state = 0;
-
-// Use these masks to read the system LEDs state.
-static const uint8_t sys_led_mask_num_lock = 1 << USB_LED_NUM_LOCK;
-static const uint8_t sys_led_mask_caps_lock = 1 << USB_LED_CAPS_LOCK;
-static const uint8_t sys_led_mask_scroll_lock = 1 << USB_LED_SCROLL_LOCK;
+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;
@@ -294,25 +289,26 @@ void led_3_off(void) {
 }
 
 // Called when the computer wants to change the state of the keyboard LEDs.
-void led_set_user(uint8_t usb_led) {
-  sys_led_state = usb_led;
+bool led_update_user(led_t led_state) {
+  sys_led_state = led_state;
   if (LAYER_ON(SYSLEDS)) {
-    if (sys_led_state & sys_led_mask_caps_lock) {
+    if (sys_led_state.caps_lock) {
       led_1_on();
     } else {
       led_1_off();
     }
-    if (sys_led_state & sys_led_mask_num_lock) {
+    if (sys_led_state.num_lock) {
       led_2_on();
     } else {
       led_2_off();
     }
-    if (sys_led_state & sys_led_mask_scroll_lock) {
+    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) {
@@ -327,7 +323,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
   }
 
   if (LAYER_ON(SYSLEDS)) {
-    led_set_user(sys_led_state);
+    led_update_user(sys_led_state);
     return state;
   }
 
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
index 34284e146d23..f8fce23ce5a0 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
@@ -296,12 +296,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         ergodox_right_led_1_on();
     } else {
         ergodox_right_led_1_off();
     }
+    return false;
 }
 
 
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
index bd4fd10ad110..5ce5f5298f61 100644
--- 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
@@ -4,7 +4,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 
     switch (layer) {
         case DVORAK:
-            rgblight_sethsv_noeeprom(GREEN);
+            rgblight_sethsv_noeeprom(HSV_GREEN);
             rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
 
             if (PLOVER_MODE) {
diff --git a/keyboards/ergodox_ez/keymaps/smurmann/keymap.c b/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
index 0d60e46bfc24..65a7a08ec71d 100644
--- a/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
@@ -194,11 +194,12 @@ void matrix_scan_user(void) {
   }
 };
 
-void led_set_user(uint8_t usb_led){
- if (usb_led & (1 << USB_LED_CAPS_LOCK))
+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/rules.mk b/keyboards/ergodox_ez/rules.mk
index b51e93061b94..dc72f6385c7e 100644
--- a/keyboards/ergodox_ez/rules.mk
+++ b/keyboards/ergodox_ez/rules.mk
@@ -17,7 +17,6 @@ UNICODE_ENABLE   = no  # Unicode
 SWAP_HANDS_ENABLE= no   # Allow swapping hands of keyboard
 
 RGB_MATRIX_ENABLE = no # enable later
-DEBOUNCE_TYPE = sym_eager_pr
 
 # project specific files
 SRC += matrix.c \
diff --git a/keyboards/ergodox_stm32/rules.mk b/keyboards/ergodox_stm32/rules.mk
index e730df82aa91..5b86324f9a2c 100644
--- a/keyboards/ergodox_stm32/rules.mk
+++ b/keyboards/ergodox_stm32/rules.mk
@@ -15,8 +15,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 CUSTOM_MATRIX = yes # Custom matrix file
 UNICODE_ENABLE   = yes # Unicode
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 SRC += matrix.c
 QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/ergoslab/rev1/config.h b/keyboards/ergoslab/rev1/config.h
deleted file mode 100644
index 414de0ed1580..000000000000
--- a/keyboards/ergoslab/rev1/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2019 Tom Saleeba <ergoslab@techotom.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGBLED_NUM 2    // Number of LEDs
-// FIXME this following line should enable our layer status LEDs to work on both
-// sides without need to wire them into a chain. It doesn't though. Uncommenting
-// means the slave side of the keyboard stops working (and the LEDs don't work).
-// #define RGBLED_SPLIT {1,1}
-
-/*
- * 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/ergoslab/rev1/info.json b/keyboards/ergoslab/rev1/info.json
index d786799810d5..e92dd4dccc86 100644
--- a/keyboards/ergoslab/rev1/info.json
+++ b/keyboards/ergoslab/rev1/info.json
@@ -16,6 +16,9 @@
   "split": {
     "soft_serial_pin": "D2"
   },
+  "rgblight": {
+    "led_count": 2
+  },
   "ws2812": {
     "pin": "D3"
   },
diff --git a/keyboards/ergotravel/rev1/config.h b/keyboards/ergotravel/rev1/config.h
index 326a8f8ffe77..790a2696fbe1 100644
--- a/keyboards/ergotravel/rev1/config.h
+++ b/keyboards/ergotravel/rev1/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 RGBLED_NUM 12    // Number of LEDs
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/ergotravel/rev1/info.json b/keyboards/ergotravel/rev1/info.json
index 01fd3265e941..77aecec0ed14 100644
--- a/keyboards/ergotravel/rev1/info.json
+++ b/keyboards/ergotravel/rev1/info.json
@@ -16,6 +16,9 @@
   "split": {
     "soft_serial_pin": "D0"
   },
+  "rgblight": {
+    "led_count": 12
+  },
   "ws2812": {
     "pin": "D3"
   },
diff --git a/keyboards/esca/getawayvan/config.h b/keyboards/esca/getawayvan/config.h
index 01118712d2d4..3dae9f6603fa 100644
--- a/keyboards/esca/getawayvan/config.h
+++ b/keyboards/esca/getawayvan/config.h
@@ -19,21 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define GRAVE_ESC_CTRL_OVERRIDE
 
-#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 51
-#define RGBLIGHT_HUE_STEP 20
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/esca/getawayvan/info.json b/keyboards/esca/getawayvan/info.json
index ba31f9c260bd..2a473d0c11b5 100644
--- a/keyboards/esca/getawayvan/info.json
+++ b/keyboards/esca/getawayvan/info.json
@@ -17,7 +17,21 @@
         "pin": "B15"
     },
     "rgblight": {
-        "max_brightness": 128
+        "hue_steps": 20,
+        "led_count": 51,
+        "max_brightness": 128,
+        "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": "STM32F072",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/esca/getawayvan_f042/config.h b/keyboards/esca/getawayvan_f042/config.h
index 01118712d2d4..3dae9f6603fa 100644
--- a/keyboards/esca/getawayvan_f042/config.h
+++ b/keyboards/esca/getawayvan_f042/config.h
@@ -19,21 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define GRAVE_ESC_CTRL_OVERRIDE
 
-#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 51
-#define RGBLIGHT_HUE_STEP 20
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/esca/getawayvan_f042/info.json b/keyboards/esca/getawayvan_f042/info.json
index e39d2b4c22dd..08a18b5f0a1d 100644
--- a/keyboards/esca/getawayvan_f042/info.json
+++ b/keyboards/esca/getawayvan_f042/info.json
@@ -17,7 +17,21 @@
         "pin": "B15"
     },
     "rgblight": {
-        "max_brightness": 128
+        "hue_steps": 20,
+        "led_count": 51,
+        "max_brightness": 128,
+        "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": "STM32F042",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/eternal_keypad/config.h b/keyboards/eternal_keypad/config.h
index 6eaf9220c73e..e2e4c258cc45 100644
--- a/keyboards/eternal_keypad/config.h
+++ b/keyboards/eternal_keypad/config.h
@@ -17,19 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 8
-#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
-
 /* 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/eternal_keypad/info.json b/keyboards/eternal_keypad/info.json
index f10b4ab8a4d3..d17b501909c1 100644
--- a/keyboards/eternal_keypad/info.json
+++ b/keyboards/eternal_keypad/info.json
@@ -16,6 +16,22 @@
     "bootmagic": {
         "matrix": [0, 1]
     },
+    "rgblight": {
+        "led_count": 8,
+        "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": "D3"
     },
diff --git a/keyboards/etiennecollin/wave/info.json b/keyboards/etiennecollin/wave/info.json
new file mode 100644
index 000000000000..5e31a1ca2afd
--- /dev/null
+++ b/keyboards/etiennecollin/wave/info.json
@@ -0,0 +1,104 @@
+{
+    "keyboard_name": "Wave",
+    "maintainer": "etiennecollin",
+    "manufacturer": "Etienne Collin",
+    "url": "https://github.com/etiennecollin/wave",
+    "bootloader_instructions": "Press the button marked RESET on the PCB or bridge the pins marked RST and GND on the Elite-C",
+    "tags": ["ortho", "split"],
+
+    "build": {
+        "lto": true
+    },
+    "development_board": "elite_c",
+    "pin_compatible": "elite_c",
+    "usb": {
+        "device_version": "0.0.1",
+        "vid": "0x6967",
+        "pid": "0x0000"
+    },
+
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+
+    "matrix_pins": {
+        "direct": [
+            ["C6", "D4", "D0", "D1", "D3"],
+            ["B6", "B5", "B4", "E6", "D7"],
+            ["F6", "F7", "B1", "B3", "B2"],
+            ["NO_PIN", "NO_PIN", "F5", "F4", "B0"]
+        ]
+    },
+    "community_layouts": ["split_3x5_3"],
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "usb_detect": {
+            "enabled": true
+        },
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["D3", "D1", "D0", "D4", "C6"],
+                    ["D7", "E6", "B4", "B5", "B6"],
+                    ["B2", "B3", "B1", "F7", "F6"],
+                    ["B0", "F4", "F5", "NO_PIN", "NO_PIN"]
+                ]
+            }
+        }
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0.93 },
+                { "matrix": [0, 1], "x": 1, "y": 0.31 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0.28 },
+                { "matrix": [0, 4], "x": 4, "y": 0.42 },
+
+                { "matrix": [4, 0], "x": 7, "y": 0.42 },
+                { "matrix": [4, 1], "x": 8, "y": 0.28 },
+                { "matrix": [4, 2], "x": 9, "y": 0 },
+                { "matrix": [4, 3], "x": 10, "y": 0.31 },
+                { "matrix": [4, 4], "x": 11, "y": 0.93 },
+
+                { "matrix": [1, 0], "x": 0, "y": 1.93 },
+                { "matrix": [1, 1], "x": 1, "y": 1.31 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1.28 },
+                { "matrix": [1, 4], "x": 4, "y": 1.42 },
+
+                { "matrix": [5, 0], "x": 7, "y": 1.42 },
+                { "matrix": [5, 1], "x": 8, "y": 1.28 },
+                { "matrix": [5, 2], "x": 9, "y": 1 },
+                { "matrix": [5, 3], "x": 10, "y": 1.31 },
+                { "matrix": [5, 4], "x": 11, "y": 1.93 },
+
+                { "matrix": [2, 0], "x": 0, "y": 2.93 },
+                { "matrix": [2, 1], "x": 1, "y": 2.31 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2.28 },
+                { "matrix": [2, 4], "x": 4, "y": 2.42 },
+
+                { "matrix": [6, 0], "x": 7, "y": 2.42 },
+                { "matrix": [6, 1], "x": 8, "y": 2.28 },
+                { "matrix": [6, 2], "x": 9, "y": 2 },
+                { "matrix": [6, 3], "x": 10, "y": 2.31 },
+                { "matrix": [6, 4], "x": 11, "y": 2.93 },
+
+                { "matrix": [3, 2], "x": 2.8, "y": 3.5 },
+                { "matrix": [3, 3], "x": 3.8, "y": 3.75 },
+                { "matrix": [3, 4], "x": 4.8, "y": 3.5, "h": 1.5 },
+
+                { "matrix": [7, 0], "x": 6.2, "y": 3.5, "h": 1.5 },
+                { "matrix": [7, 1], "x": 7.2, "y": 3.75 },
+                { "matrix": [7, 2], "x": 8.2, "y": 3.5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/etiennecollin/wave/keymaps/default/config.h b/keyboards/etiennecollin/wave/keymaps/default/config.h
new file mode 100644
index 000000000000..8d60295560f3
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/default/config.h
@@ -0,0 +1,34 @@
+/* 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
+
+// Enable rapid switch from tap to hold, disables double tap hold auto-repeat
+#define QUICK_TAP_TERM 0
+
+// Maximum time between taps of tap dances
+#define TAPPING_TERM 175
+
+// Perform hold action if pressing a dual-role key, tapping another key and
+// releasing the dual-role key withing tapping term
+#define PERMISSIVE_HOLD
+
+// Perform hold action if pressing a dual-role key, pressing another key,
+// releasing the dual-role key and releasing the other key withing tapping term
+#define HOLD_ON_OTHER_KEY_PRESS
\ No newline at end of file
diff --git a/keyboards/etiennecollin/wave/keymaps/default/keymap.json b/keyboards/etiennecollin/wave/keymaps/default/keymap.json
new file mode 100644
index 000000000000..993a1b854c12
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/default/keymap.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "author": "etiennecollin",
+    "keyboard": "etiennecollin/wave",
+    "notes": "This is a keymap file for etiennecollin/wave",
+    "keymap": "default",
+    "layout": "LAYOUT_split_3x5_3",
+    "config": {
+        "features": {
+            "caps_word": true
+        }
+    },
+    "layers": [
+        [
+            "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_SCLN)",
+            "KC_Z",         "KC_X",         "KC_C",         "KC_V",         "KC_B",     "KC_N",    "KC_M",          "KC_COMM",      "KC_DOT",       "KC_SLSH",
+                            "KC_ESC",       "KC_SPC",       "KC_TAB",       "KC_ENT",   "KC_BSPC", "MO(1)"
+        ],
+        [
+            "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",
+            "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/etiennecollin/wave/keymaps/default/readme.md b/keyboards/etiennecollin/wave/keymaps/default/readme.md
new file mode 100644
index 000000000000..16586cc1f7eb
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/default/readme.md
@@ -0,0 +1,6 @@
+# Default keymap
+
+This is a really simple QWERTY keymap with a single number/symbol layer.
+It uses home row modifiers and the caps word feature because of the limited number of keys.
+
+For a more complete layout, see the `feature` layout.
diff --git a/keyboards/etiennecollin/wave/keymaps/feature/config.h b/keyboards/etiennecollin/wave/keymaps/feature/config.h
new file mode 100644
index 000000000000..42421b33d396
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/feature/config.h
@@ -0,0 +1,42 @@
+/* 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
new file mode 100644
index 000000000000..24bc85d5b499
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/feature/keymap.c
@@ -0,0 +1,191 @@
+/* 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
new file mode 100644
index 000000000000..d9971b352b14
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/feature/readme.md
@@ -0,0 +1,11 @@
+# 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
new file mode 100644
index 000000000000..96093b82013e
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/feature/rules.mk
@@ -0,0 +1,2 @@
+CAPS_WORD_ENABLE = yes
+COMBO_ENABLE = yes
diff --git a/keyboards/etiennecollin/wave/keymaps/test/keymap.json b/keyboards/etiennecollin/wave/keymaps/test/keymap.json
new file mode 100644
index 000000000000..e73c86727309
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/test/keymap.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "author": "etiennecollin",
+    "keyboard": "etiennecollin/wave",
+    "notes": "This is a keymap file for etiennecollin/wave",
+    "keymap": "test",
+    "layout": "LAYOUT_split_3x5_3",
+    "config": {
+        "features": {
+            "console": true,
+            "debug": true
+        }
+    },
+    "layers": [
+        [
+            "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_SPC",   "KC_TAB",       "KC_ENT",   "KC_BSPC",  "KC_DEL"
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/keyboards/etiennecollin/wave/keymaps/test/readme.md b/keyboards/etiennecollin/wave/keymaps/test/readme.md
new file mode 100644
index 000000000000..3d3400b8f68e
--- /dev/null
+++ b/keyboards/etiennecollin/wave/keymaps/test/readme.md
@@ -0,0 +1,4 @@
+# Test keymap
+
+Inspired by the [ferris sweep test keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/ferris/keymaps/test).
+A simple QWERTY keymap used to test the keyboard. As such, it should not be used for other purposes than testing.
diff --git a/keyboards/etiennecollin/wave/readme.md b/keyboards/etiennecollin/wave/readme.md
new file mode 100644
index 000000000000..a66c6f71d3c2
--- /dev/null
+++ b/keyboards/etiennecollin/wave/readme.md
@@ -0,0 +1,37 @@
+# Wave
+
+![Wave pcb](https://i.imgur.com/oWF1Fnr.png)
+
+_The Wave is a small, reversible keyboard inspired by the [Ferris](https://github.com/pierrechevalier83/ferris), the [Ferris Sweep](https://github.com/davidphilipbarr/Sweep), the [Swoop](https://github.com/jimmerricks/swoop) and the [Sweep36](https://github.com/sadekbaroudi/sweep36). It aims to solve a few issues I found with the keyboards._
+
+-   Keyboard Maintainer: [Etienne Collin](https://github.com/etiennecollin)
+-   Hardware Supported: [Wave](https://github.com/etiennecollin/wave)
+-   Hardware Availability: Print the PCB with gerber files from [latest release in the repository](https://github.com/etiennecollin/wave/releases/latest)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make etiennecollin/wave:default
+
+Flashing example for this keyboard:
+
+    make etiennecollin/wave: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).
+
+## Recommended Keymap
+
+For an everyday keyboard, it is recommended to use the `feature` keymap, as the default keymap is extremely barebone. Here is a make example:
+
+    make etiennecollin/wave:feature
+
+Flashing example:
+
+    make etiennecollin/wave:feature:flash
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+-   **Bootmagic reset**: Hold down the top left key of the left half of the keyboard and plug in the keyboard
+-   **Physical reset button**: Briefly press the reset button on the front of the PCB or short the GND and RST pins on the controller
+-   **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/etiennecollin/wave/rules.mk b/keyboards/etiennecollin/wave/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/etiennecollin/wave/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/evolv/config.h b/keyboards/evolv/config.h
index ee7e07977276..f962b74196e7 100644
--- a/keyboards/evolv/config.h
+++ b/keyboards/evolv/config.h
@@ -22,21 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 16
-#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 TAPPING_TERM 200
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/evolv/info.json b/keyboards/evolv/info.json
index d4b51621269d..dc00260cf374 100644
--- a/keyboards/evolv/info.json
+++ b/keyboards/evolv/info.json
@@ -22,7 +22,21 @@
         "pin": "B15"
     },
     "rgblight": {
-        "max_brightness": 200
+        "led_count": 16,
+        "max_brightness": 200,
+        "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
+        }
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/evolv/rules.mk b/keyboards/evolv/rules.mk
index e6378f4a599f..87802fbd6f55 100644
--- a/keyboards/evolv/rules.mk
+++ b/keyboards/evolv/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/evyd13/atom47/rev2/config.h b/keyboards/evyd13/atom47/rev2/config.h
index 352b89dad95d..e14ecadbf091 100644
--- a/keyboards/evyd13/atom47/rev2/config.h
+++ b/keyboards/evyd13/atom47/rev2/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 RGBLED_NUM 1     // Number of LEDs in your strip
diff --git a/keyboards/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/info.json
index b1642612eacb..8c5720d0c487 100644
--- a/keyboards/evyd13/atom47/rev2/info.json
+++ b/keyboards/evyd13/atom47/rev2/info.json
@@ -18,6 +18,9 @@
         "levels": 4,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 1
+    },
     "ws2812": {
         "pin": "D0"
     },
diff --git a/keyboards/evyd13/atom47/rev3/config.h b/keyboards/evyd13/atom47/rev3/config.h
deleted file mode 100644
index 5f37dc519b04..000000000000
--- a/keyboards/evyd13/atom47/rev3/config.h
+++ /dev/null
@@ -1,30 +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/>.
-*/
-
-#pragma once
-
-#define RGBLED_NUM 6     // 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
diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json
index dc9b13961f2b..fc4046d3fc3a 100644
--- a/keyboards/evyd13/atom47/rev3/info.json
+++ b/keyboards/evyd13/atom47/rev3/info.json
@@ -18,6 +18,21 @@
         "levels": 5,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 6,
+        "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": "F5"
     },
diff --git a/keyboards/evyd13/atom47/rev5/config.h b/keyboards/evyd13/atom47/rev5/config.h
index ae0151d512d8..f50975beb3fa 100644
--- a/keyboards/evyd13/atom47/rev5/config.h
+++ b/keyboards/evyd13/atom47/rev5/config.h
@@ -85,18 +85,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
+// #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 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 c442c74549cc..bb068b1536d2 100644
--- a/keyboards/evyd13/atom47/rev5/info.json
+++ b/keyboards/evyd13/atom47/rev5/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "D7", "B4", "B5", "B6", "C6", "C7"],
diff --git a/keyboards/evyd13/eon65/config.h b/keyboards/evyd13/eon65/config.h
index abfa0fe63d02..230ff5e311e8 100644
--- a/keyboards/evyd13/eon65/config.h
+++ b/keyboards/evyd13/eon65/config.h
@@ -16,18 +16,6 @@
 
 #pragma once
 
-   #define RGBLED_NUM 10
-#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
-
 /* 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/evyd13/eon65/info.json b/keyboards/evyd13/eon65/info.json
index a58c3a523300..7d0f3ab2e00f 100644
--- a/keyboards/evyd13/eon65/info.json
+++ b/keyboards/evyd13/eon65/info.json
@@ -13,6 +13,21 @@
         "rows": ["D3", "D5", "B1", "B2", "B3"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 10,
+        "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": "E6"
     },
diff --git a/keyboards/evyd13/eon87/config.h b/keyboards/evyd13/eon87/config.h
index 04247c7e73c6..230ff5e311e8 100644
--- a/keyboards/evyd13/eon87/config.h
+++ b/keyboards/evyd13/eon87/config.h
@@ -16,18 +16,6 @@
 
 #pragma once
 
-   #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
-
 /* 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/evyd13/eon87/info.json b/keyboards/evyd13/eon87/info.json
index fc134b502fb1..bc9dcec1286e 100644
--- a/keyboards/evyd13/eon87/info.json
+++ b/keyboards/evyd13/eon87/info.json
@@ -13,6 +13,21 @@
         "rows": ["B1", "B2", "B3", "D4", "D1", "D5"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 12,
+        "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": "D0"
     },
diff --git a/keyboards/evyd13/solheim68/info.json b/keyboards/evyd13/solheim68/info.json
index a08f7860274d..f348b9855681 100644
--- a/keyboards/evyd13/solheim68/info.json
+++ b/keyboards/evyd13/solheim68/info.json
@@ -15,6 +15,7 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "community_layouts": ["68_ansi", "68_iso"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -261,6 +262,88 @@
                 {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         },
+        "LAYOUT_68_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": [2, 14], "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": [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.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, 13], "x": 14, "y": 3},
+
+                {"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, 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": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
         "LAYOUT_68_ansi_split_rshift": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
@@ -342,6 +425,89 @@
                 {"matrix": [4, 15], "x": 16.25, "y": 4}
             ]
         },
+        "LAYOUT_68_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": [2, 14], "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": [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": [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},
+                {"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": [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, 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": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
         "LAYOUT_68_iso_split_rshift": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/evyd13/solheim68/matrix_diagram.md b/keyboards/evyd13/solheim68/matrix_diagram.md
new file mode 100644
index 000000000000..aa2026434519
--- /dev/null
+++ b/keyboards/evyd13/solheim68/matrix_diagram.md
@@ -0,0 +1,18 @@
+# Matrix diagram for Evyd13 solheim68
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┐     ┌───────┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │2E │0D ││0E │0F │     │0D     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┤     └─┬─────┤
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   ││1E │1F │       │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┘    ┌──┴┐2D  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │             │2C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤┌───┐        └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D ││3E │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴┬──┴┼───┼───┐
+│40  │41  │42  │46                      │4A  │4B  │4C  │ │4D │4E │4F │
+└────┴────┴────┴────────────────────────┴────┴────┴────┘ └───┴───┴───┘
+┌────────┐                                       ┌──────────┐
+│30      │ 2.25u LShift             2.75u RShift │3C        │
+└────────┘                                       └──────────┘
+```
diff --git a/keyboards/evyd13/ta65/config.h b/keyboards/evyd13/ta65/config.h
index e17b637a1eeb..28be4f1a5b44 100644
--- a/keyboards/evyd13/ta65/config.h
+++ b/keyboards/evyd13/ta65/config.h
@@ -21,17 +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 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/evyd13/ta65/info.json b/keyboards/evyd13/ta65/info.json
index d1195a597be8..38da22f40679 100644
--- a/keyboards/evyd13/ta65/info.json
+++ b/keyboards/evyd13/ta65/info.json
@@ -18,6 +18,21 @@
             {"pin_a": "B2", "pin_b": "B1"}
         ]
     },
+    "rgblight": {
+        "led_count": 8,
+        "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": "E6"
     },
diff --git a/keyboards/evyd13/wonderland/config.h b/keyboards/evyd13/wonderland/config.h
deleted file mode 100644
index 1f7440aa2017..000000000000
--- a/keyboards/evyd13/wonderland/config.h
+++ /dev/null
@@ -1,32 +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
-
-/* Backlight configuration
- */
-#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/evyd13/wonderland/info.json b/keyboards/evyd13/wonderland/info.json
index 621be9423253..1609c9697184 100644
--- a/keyboards/evyd13/wonderland/info.json
+++ b/keyboards/evyd13/wonderland/info.json
@@ -18,6 +18,21 @@
         "esc_output": "F0",
         "led": "B1"
     },
+    "rgblight": {
+        "led_count": 12,
+        "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"
     },
diff --git a/keyboards/exclusive/e65/config.h b/keyboards/exclusive/e65/config.h
index 9d31e13dcb9e..b7e8690b3cc7 100644
--- a/keyboards/exclusive/e65/config.h
+++ b/keyboards/exclusive/e65/config.h
@@ -21,18 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 20
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/exclusive/e65/info.json b/keyboards/exclusive/e65/info.json
index 3fab8ca8abdb..76f37e9883ba 100644
--- a/keyboards/exclusive/e65/info.json
+++ b/keyboards/exclusive/e65/info.json
@@ -21,6 +21,23 @@
         "caps_lock": "B6",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "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": "E6"
     },
diff --git a/keyboards/exclusive/e6_rgb/config.h b/keyboards/exclusive/e6_rgb/config.h
index c6acec265872..7f820b2cadff 100644
--- a/keyboards/exclusive/e6_rgb/config.h
+++ b/keyboards/exclusive/e6_rgb/config.h
@@ -4,22 +4,6 @@
  */
 #pragma once
 
-//rgb light setting
-#define RGBLED_NUM      6
-#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 DRIVER_ADDR_1 0b1010000
 
 #define DRIVER_COUNT 1
diff --git a/keyboards/exclusive/e6_rgb/info.json b/keyboards/exclusive/e6_rgb/info.json
index 0381b209a8f4..3b833c3a97f7 100644
--- a/keyboards/exclusive/e6_rgb/info.json
+++ b/keyboards/exclusive/e6_rgb/info.json
@@ -9,13 +9,30 @@
         "device_version": "0.6.2"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["D7", "B4", "B5", "B6", "C6", "C7", "F7", "F0", "B0", "B1", "D2", "D3", "B3", "B2"],
         "rows": ["F1", "F4", "F5", "F6", "D6"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "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"
     },
diff --git a/keyboards/exclusive/e6v2/le/config.h b/keyboards/exclusive/e6v2/le/config.h
deleted file mode 100644
index 8c0ffda30b53..000000000000
--- a/keyboards/exclusive/e6v2/le/config.h
+++ /dev/null
@@ -1,33 +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 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 12
-#define RGBLIGHT_SAT_STEP 12
-#define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/exclusive/e6v2/le/info.json b/keyboards/exclusive/e6v2/le/info.json
index 8fbbcbfea3fc..551efa299c14 100644
--- a/keyboards/exclusive/e6v2/le/info.json
+++ b/keyboards/exclusive/e6v2/le/info.json
@@ -23,6 +23,24 @@
         "caps_lock": "B7",
         "on_state": 0
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 12,
+        "brightness_steps": 12,
+        "led_count": 12,
+        "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": "E6"
     },
diff --git a/keyboards/exclusive/e6v2/le_bmc/config.h b/keyboards/exclusive/e6v2/le_bmc/config.h
deleted file mode 100644
index bb3f00287eb0..000000000000
--- a/keyboards/exclusive/e6v2/le_bmc/config.h
+++ /dev/null
@@ -1,30 +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
-
-#define RGBLED_NUM 6
-#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/exclusive/e6v2/le_bmc/info.json b/keyboards/exclusive/e6v2/le_bmc/info.json
index c0d2ffa868bb..123ab8f7bb3e 100644
--- a/keyboards/exclusive/e6v2/le_bmc/info.json
+++ b/keyboards/exclusive/e6v2/le_bmc/info.json
@@ -15,6 +15,21 @@
     "backlight": {
         "pin": "D4"
     },
+    "rgblight": {
+        "led_count": 6,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/exclusive/e6v2/oe/config.h b/keyboards/exclusive/e6v2/oe/config.h
deleted file mode 100644
index 6e9255bebb0a..000000000000
--- a/keyboards/exclusive/e6v2/oe/config.h
+++ /dev/null
@@ -1,33 +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 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 12
-#define RGBLIGHT_SAT_STEP 12
-#define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/exclusive/e6v2/oe/info.json b/keyboards/exclusive/e6v2/oe/info.json
index eef3f67847eb..90a9a8b40b05 100644
--- a/keyboards/exclusive/e6v2/oe/info.json
+++ b/keyboards/exclusive/e6v2/oe/info.json
@@ -19,6 +19,24 @@
         "breathing": true,
         "breathing_period": 3
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 12,
+        "brightness_steps": 12,
+        "led_count": 8,
+        "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": "E2"
     },
diff --git a/keyboards/exclusive/e6v2/oe_bmc/config.h b/keyboards/exclusive/e6v2/oe_bmc/config.h
deleted file mode 100644
index bb3f00287eb0..000000000000
--- a/keyboards/exclusive/e6v2/oe_bmc/config.h
+++ /dev/null
@@ -1,30 +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
-
-#define RGBLED_NUM 6
-#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/exclusive/e6v2/oe_bmc/info.json b/keyboards/exclusive/e6v2/oe_bmc/info.json
index 622d7db56445..65be093b4930 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/info.json
+++ b/keyboards/exclusive/e6v2/oe_bmc/info.json
@@ -15,6 +15,21 @@
     "backlight": {
         "pin": "D4"
     },
+    "rgblight": {
+        "led_count": 6,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/exclusive/e7v1/config.h b/keyboards/exclusive/e7v1/config.h
index 896eb97b2556..5f360813239b 100644
--- a/keyboards/exclusive/e7v1/config.h
+++ b/keyboards/exclusive/e7v1/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 20
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/exclusive/e7v1/info.json b/keyboards/exclusive/e7v1/info.json
index 42ec77a9fb6f..ed94f9805e5d 100644
--- a/keyboards/exclusive/e7v1/info.json
+++ b/keyboards/exclusive/e7v1/info.json
@@ -17,6 +17,23 @@
         "pin": "B7",
         "levels": 6
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "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": "E6"
     },
diff --git a/keyboards/exclusive/e7v1se/config.h b/keyboards/exclusive/e7v1se/config.h
index f4f04f2bbeee..f6e1e895abda 100644
--- a/keyboards/exclusive/e7v1se/config.h
+++ b/keyboards/exclusive/e7v1se/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 16
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/exclusive/e7v1se/info.json b/keyboards/exclusive/e7v1se/info.json
index 3244831b4db1..33e17f14b585 100644
--- a/keyboards/exclusive/e7v1se/info.json
+++ b/keyboards/exclusive/e7v1se/info.json
@@ -17,6 +17,24 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "E2"
     },
diff --git a/keyboards/exclusive/e85/config.h b/keyboards/exclusive/e85/config.h
index 730536b513ea..0ccb642711a1 100644
--- a/keyboards/exclusive/e85/config.h
+++ b/keyboards/exclusive/e85/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 18
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/exclusive/e85/hotswap/info.json b/keyboards/exclusive/e85/hotswap/info.json
index 60dc68eaf78b..779a717ec55e 100644
--- a/keyboards/exclusive/e85/hotswap/info.json
+++ b/keyboards/exclusive/e85/hotswap/info.json
@@ -18,6 +18,24 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "E2"
     },
diff --git a/keyboards/exclusive/e85/soldered/info.json b/keyboards/exclusive/e85/soldered/info.json
index c0f9128b5240..d34440389a65 100644
--- a/keyboards/exclusive/e85/soldered/info.json
+++ b/keyboards/exclusive/e85/soldered/info.json
@@ -18,6 +18,24 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "E2"
     },
diff --git a/keyboards/exent/config.h b/keyboards/exent/config.h
deleted file mode 100644
index b062e20b682f..000000000000
--- a/keyboards/exent/config.h
+++ /dev/null
@@ -1,47 +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
-
-#define RGBLED_NUM 18
-
-#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
-
-
-/*
- * 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/exent/info.json b/keyboards/exent/info.json
index 9f0f3e394505..54d54f08978b 100644
--- a/keyboards/exent/info.json
+++ b/keyboards/exent/info.json
@@ -16,6 +16,21 @@
     "backlight": {
         "pin": "D4"
     },
+    "rgblight": {
+        "led_count": 18,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/eyeohdesigns/babyv/config.h b/keyboards/eyeohdesigns/babyv/config.h
deleted file mode 100644
index 4bfabf0e8a34..000000000000
--- a/keyboards/eyeohdesigns/babyv/config.h
+++ /dev/null
@@ -1,34 +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
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
diff --git a/keyboards/eyeohdesigns/babyv/info.json b/keyboards/eyeohdesigns/babyv/info.json
index f2d0ea53e6bf..453cdf2c819c 100644
--- a/keyboards/eyeohdesigns/babyv/info.json
+++ b/keyboards/eyeohdesigns/babyv/info.json
@@ -16,6 +16,24 @@
     "backlight": {
         "pin": "B6"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "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"
     },
diff --git a/keyboards/eyeohdesigns/theboulevard/config.h b/keyboards/eyeohdesigns/theboulevard/config.h
deleted file mode 100644
index e2f7092f9821..000000000000
--- a/keyboards/eyeohdesigns/theboulevard/config.h
+++ /dev/null
@@ -1,25 +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/>.
-*/
-
-#pragma once
-
-#define RGBLED_NUM 2
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/eyeohdesigns/theboulevard/info.json b/keyboards/eyeohdesigns/theboulevard/info.json
index a94968a989eb..afec9c4419da 100644
--- a/keyboards/eyeohdesigns/theboulevard/info.json
+++ b/keyboards/eyeohdesigns/theboulevard/info.json
@@ -18,6 +18,15 @@
             {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
         ]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 2,
+        "sleep": true,
+        "animations": {
+            "breathing": true
+        }
+    },
     "ws2812": {
         "pin": "F6"
     },
diff --git a/keyboards/ez_maker/directpins/teensy_32/rules.mk b/keyboards/ez_maker/directpins/teensy_32/rules.mk
index 9803d8cc7039..abd2f7fce976 100644
--- a/keyboards/ez_maker/directpins/teensy_32/rules.mk
+++ b/keyboards/ez_maker/directpins/teensy_32/rules.mk
@@ -1,4 +1,2 @@
 USE_CHIBIOS_CONTRIB = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/ez_maker/directpins/teensy_lc/rules.mk b/keyboards/ez_maker/directpins/teensy_lc/rules.mk
index 9803d8cc7039..abd2f7fce976 100644
--- a/keyboards/ez_maker/directpins/teensy_lc/rules.mk
+++ b/keyboards/ez_maker/directpins/teensy_lc/rules.mk
@@ -1,4 +1,2 @@
 USE_CHIBIOS_CONTRIB = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/facew/config.h b/keyboards/facew/config.h
deleted file mode 100644
index ddc21dae3085..000000000000
--- a/keyboards/facew/config.h
+++ /dev/null
@@ -1,32 +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
-
-
-#define RGBLED_NUM 16
-
-#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/facew/info.json b/keyboards/facew/info.json
index 514c64f2c386..1f7844a8ef7c 100644
--- a/keyboards/facew/info.json
+++ b/keyboards/facew/info.json
@@ -16,6 +16,21 @@
   "backlight": {
     "pin": "D4"
   },
+  "rgblight": {
+    "led_count": 16,
+    "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": {
     "driver": "i2c"
   },
diff --git a/keyboards/fallacy/config.h b/keyboards/fallacy/config.h
index 4e5ad265833a..21231c7c574a 100755
--- a/keyboards/fallacy/config.h
+++ b/keyboards/fallacy/config.h
@@ -29,15 +29,3 @@
 /* Locking resynchronize hack
  */
 #define LOCKING_RESYNC_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 RGBLED_NUM 14
diff --git a/keyboards/fallacy/indicators.c b/keyboards/fallacy/indicators.c
index 8686f292fc6c..b9a4a8705651 100755
--- a/keyboards/fallacy/indicators.c
+++ b/keyboards/fallacy/indicators.c
@@ -23,20 +23,20 @@
  */
 void init_fallacy_leds(void) {
     i2c_init();
-    IS31FL3731_init(LED_DRIVER_ADDR_1);
+    is31fl3731_init(LED_DRIVER_ADDR_1);
 
     for (int i = 0; i < LED_MATRIX_LED_COUNT; i++) {
-        IS31FL3731_set_led_control_register(i, true);
+        is31fl3731_set_led_control_register(i, true);
     }
 
-    IS31FL3731_update_led_control_registers(LED_DRIVER_ADDR_1, 0);
+    is31fl3731_update_led_control_registers(LED_DRIVER_ADDR_1, 0);
 }
 
 
 /* update the buffer
  */
 void update_fallacy_leds(void) {
-    IS31FL3731_update_pwm_buffers(LED_DRIVER_ADDR_1, 0);    
+    is31fl3731_update_pwm_buffers(LED_DRIVER_ADDR_1, 0);    
 }
 
 
@@ -44,10 +44,10 @@ void update_fallacy_leds(void) {
  */
 void set_fallacy_led(int index, bool state) {
     if (state) {
-        IS31FL3731_set_value(index, 128);
+        is31fl3731_set_value(index, 128);
     } 
     else {
-        IS31FL3731_set_value(index, 0);
+        is31fl3731_set_value(index, 0);
     }
 }
 
diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/info.json
index e51283eb192d..9489463a4cd4 100644
--- a/keyboards/fallacy/info.json
+++ b/keyboards/fallacy/info.json
@@ -12,6 +12,21 @@
         "rows": ["B1", "B2", "B3", "C6", "C7"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 14,
+        "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": "D2"
     },
diff --git a/keyboards/fancytech/fancyalice66/config.h b/keyboards/fancytech/fancyalice66/config.h
index b6fcea0c6bc3..9f56bd3a203d 100644
--- a/keyboards/fancytech/fancyalice66/config.h
+++ b/keyboards/fancytech/fancyalice66/config.h
@@ -4,8 +4,6 @@
 #pragma once
 
 #ifdef RGB_MATRIX_ENABLE
-#    define WS2812_DI_PIN B0
-#    define RGB_DI_PIN B0
 #    define RGB_MATRIX_LED_COUNT 82
 
     /* RGB Matrix effect */
diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json
index 1be7f3763941..21c89849fdea 100644
--- a/keyboards/fancytech/fancyalice66/info.json
+++ b/keyboards/fancytech/fancyalice66/info.json
@@ -66,7 +66,7 @@
             "solid_splash": true,
             "splash": true
         },
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
             {"flags": 4, "matrix": [0, 1], "x": 15, "y": 0},
@@ -165,6 +165,9 @@
         "pid": "0x3663",
         "vid": "0xECED"
     },
+    "ws2812": {
+        "pin": "B0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/fc660c/config.h b/keyboards/fc660c/config.h
index 670b0f8e3866..cd23bdb2b82c 100644
--- a/keyboards/fc660c/config.h
+++ b/keyboards/fc660c/config.h
@@ -22,10 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
 
-//#define DIODE_DIRECTION
-
-#define TAPPING_TERM      175
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/fc660c/info.json b/keyboards/fc660c/info.json
index 8250619bdc83..e65ed35dae70 100644
--- a/keyboards/fc660c/info.json
+++ b/keyboards/fc660c/info.json
@@ -8,6 +8,9 @@
         "pid": "0x660C",
         "device_version": "1.0.0"
     },
+    "tapping": {
+        "term": 175
+    },
     "indicators": {
         "caps_lock": "B6",
         "on_state": 0
diff --git a/keyboards/fearherbs1/blue_team_pad/rules.mk b/keyboards/fearherbs1/blue_team_pad/rules.mk
index d34d066ded93..dd68e9d3b090 100644
--- a/keyboards/fearherbs1/blue_team_pad/rules.mk
+++ b/keyboards/fearherbs1/blue_team_pad/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/feker/ik75/info.json b/keyboards/feker/ik75/info.json
index 339a5cde505e..0da1ff08ea77 100644
--- a/keyboards/feker/ik75/info.json
+++ b/keyboards/feker/ik75/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "E2"],
diff --git a/keyboards/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/info.json
index 28ed4f90e3c2..1e9703f5994e 100644
--- a/keyboards/ferris/0_2/bling/info.json
+++ b/keyboards/ferris/0_2/bling/info.json
@@ -4,6 +4,6 @@
         "pid": "0x0002"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     }
 }
diff --git a/keyboards/ferris/keymaps/test/keymap.c b/keyboards/ferris/keymaps/test/keymap.c
index 3706886a2410..ba5e31e2cb90 100644
--- a/keyboards/ferris/keymaps/test/keymap.c
+++ b/keyboards/ferris/keymaps/test/keymap.c
@@ -7,7 +7,13 @@ void matrix_init_user(void) {
   //debug_mouse=true;
 }
 
+// clang-format off
 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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_P0, DB_TOGG, KC_P2, KC_P3)
+	[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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
+                          KC_1, KC_2, KC_3, KC_4
+    )
 };
-
+// clang-format on
diff --git a/keyboards/ffkeebs/puca/config.h b/keyboards/ffkeebs/puca/config.h
index 23a2f15d9947..19b030cdc1a8 100644
--- a/keyboards/ffkeebs/puca/config.h
+++ b/keyboards/ffkeebs/puca/config.h
@@ -17,20 +17,7 @@ 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_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT  
-    #define RGBLED_NUM 8
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ffkeebs/puca/info.json b/keyboards/ffkeebs/puca/info.json
index 356c148d8e56..dbfc2f432068 100644
--- a/keyboards/ffkeebs/puca/info.json
+++ b/keyboards/ffkeebs/puca/info.json
@@ -18,6 +18,21 @@
             {"pin_a": "F4", "pin_b": "F5"}
         ]
     },
+    "rgblight": {
+        "led_count": 8,
+        "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": "D4"
     },
diff --git a/keyboards/fjlabs/7vhotswap/config.h b/keyboards/fjlabs/7vhotswap/config.h
index 4aa0cd52ea48..2b28e8a484dc 100644
--- a/keyboards/fjlabs/7vhotswap/config.h
+++ b/keyboards/fjlabs/7vhotswap/config.h
@@ -22,20 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE 
 
-/* Define RGB */
-#define RGBLED_NUM 4
-#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_VAL_STEP 12
-
 /* Define less important options */
 
 /*
diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/info.json
index 6e026ecc5891..8244960e45a7 100644
--- a/keyboards/fjlabs/7vhotswap/info.json
+++ b/keyboards/fjlabs/7vhotswap/info.json
@@ -13,6 +13,21 @@
         "rows": ["B0", "F4", "F1", "F7", "F6", "F5"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 4,
+        "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": "C7"
     },
diff --git a/keyboards/fjlabs/avalon/config.h b/keyboards/fjlabs/avalon/config.h
index 4204f1d1290e..d1875f650f69 100644
--- a/keyboards/fjlabs/avalon/config.h
+++ b/keyboards/fjlabs/avalon/config.h
@@ -22,19 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Define RGB Underglow */
-#define RGBLED_NUM 6
-#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_VAL_STEP 12
 #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 ba9239629ccb..96f969146fdc 100644
--- a/keyboards/fjlabs/avalon/info.json
+++ b/keyboards/fjlabs/avalon/info.json
@@ -16,6 +16,22 @@
     "indicators": {
         "caps_lock": "C7"
     },
+    "rgblight": {
+        "led_count": 6,
+        "brightness_steps": 12,
+        "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": "D6"
     },
diff --git a/keyboards/fjlabs/bks65/config.h b/keyboards/fjlabs/bks65/config.h
index 3b205ce76faf..990e5335c311 100644
--- a/keyboards/fjlabs/bks65/config.h
+++ b/keyboards/fjlabs/bks65/config.h
@@ -22,20 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Define RGB Underglow */
-#define RGBLED_NUM 24
-#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_LAYER_BLINK*/
-
 /* Define less important options */
 
 /*
diff --git a/keyboards/fjlabs/bks65/info.json b/keyboards/fjlabs/bks65/info.json
index 7b468da941c3..5e0d9d5fb9b9 100644
--- a/keyboards/fjlabs/bks65/info.json
+++ b/keyboards/fjlabs/bks65/info.json
@@ -16,6 +16,21 @@
     "indicators": {
         "caps_lock": "C7"
     },
+    "rgblight": {
+        "led_count": 24,
+        "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": "B0"
     },
diff --git a/keyboards/fjlabs/bks65solder/config.h b/keyboards/fjlabs/bks65solder/config.h
index 3b205ce76faf..990e5335c311 100644
--- a/keyboards/fjlabs/bks65solder/config.h
+++ b/keyboards/fjlabs/bks65solder/config.h
@@ -22,20 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Define RGB Underglow */
-#define RGBLED_NUM 24
-#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_LAYER_BLINK*/
-
 /* Define less important options */
 
 /*
diff --git a/keyboards/fjlabs/bks65solder/info.json b/keyboards/fjlabs/bks65solder/info.json
index 27c3ece3ba26..dae926d08c99 100644
--- a/keyboards/fjlabs/bks65solder/info.json
+++ b/keyboards/fjlabs/bks65solder/info.json
@@ -13,6 +13,21 @@
         "rows": ["F4", "F1", "F7", "F6", "F5"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 24,
+        "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": "B0"
     },
diff --git a/keyboards/fjlabs/kf87/config.h b/keyboards/fjlabs/kf87/config.h
index 4131a8842920..9f4595856496 100644
--- a/keyboards/fjlabs/kf87/config.h
+++ b/keyboards/fjlabs/kf87/config.h
@@ -22,20 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Define RGB */
-#define RGBLED_NUM 87
-#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_VAL_STEP 12
-
 /* Define less important options */
 
 /*
diff --git a/keyboards/fjlabs/kf87/info.json b/keyboards/fjlabs/kf87/info.json
index 415405a9e82e..cd2f6a7ac2f5 100644
--- a/keyboards/fjlabs/kf87/info.json
+++ b/keyboards/fjlabs/kf87/info.json
@@ -21,7 +21,20 @@
         "pin": "C2"
     },
     "rgblight": {
-        "max_brightness": 86
+        "led_count": 87,
+        "max_brightness": 86,
+        "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": "at90usb646",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/fjlabs/kyuu/config.h b/keyboards/fjlabs/kyuu/config.h
index 5fa5e84acd35..9bee3167926f 100644
--- a/keyboards/fjlabs/kyuu/config.h
+++ b/keyboards/fjlabs/kyuu/config.h
@@ -22,22 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Define Badge RGB */
-#define RGBLED_NUM 16
-#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_VAL_STEP 12
 #define RGBLIGHT_DEFAULT_SPD 144
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-/* #define RGBLIGHT_LAYER_BLINK*/
 
 /* Define less important options */
 
diff --git a/keyboards/fjlabs/kyuu/info.json b/keyboards/fjlabs/kyuu/info.json
index 058cb4ea23ba..9028c3dc8d9b 100644
--- a/keyboards/fjlabs/kyuu/info.json
+++ b/keyboards/fjlabs/kyuu/info.json
@@ -13,6 +13,21 @@
         "rows": ["F4", "F1", "F7", "F6", "F5"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 16,
+        "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": "C7"
     },
diff --git a/keyboards/fjlabs/mk61rgbansi/config.h b/keyboards/fjlabs/mk61rgbansi/config.h
index 89e8c6c22138..afdacdd0803e 100644
--- a/keyboards/fjlabs/mk61rgbansi/config.h
+++ b/keyboards/fjlabs/mk61rgbansi/config.h
@@ -22,22 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Define RGB Underglow */
-#define RGBLED_NUM 64
-#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_VAL_STEP 12
 #define RGBLIGHT_DEFAULT_SPD 144
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-/* #define RGBLIGHT_LAYER_BLINK*/
 
 /* Define less important options */
 
diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/info.json
index 7e99f1bd1061..01a859e0ba9d 100644
--- a/keyboards/fjlabs/mk61rgbansi/info.json
+++ b/keyboards/fjlabs/mk61rgbansi/info.json
@@ -17,7 +17,20 @@
         "pin": "F7"
     },
     "rgblight": {
-        "max_brightness": 108
+        "led_count": 64,
+        "max_brightness": 108,
+        "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",
diff --git a/keyboards/fjlabs/ready100/config.h b/keyboards/fjlabs/ready100/config.h
index 1292feb117b1..b352868d2d44 100644
--- a/keyboards/fjlabs/ready100/config.h
+++ b/keyboards/fjlabs/ready100/config.h
@@ -22,21 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Define RGB Underglow */
-#define RGBLED_NUM 64
-#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_VAL_STEP 12
-/* #define RGBLIGHT_LAYER_BLINK*/
-
 /* Define less important options */
 
 /*
diff --git a/keyboards/fjlabs/ready100/info.json b/keyboards/fjlabs/ready100/info.json
index 689f396b3edf..dd717bb68a87 100644
--- a/keyboards/fjlabs/ready100/info.json
+++ b/keyboards/fjlabs/ready100/info.json
@@ -17,7 +17,20 @@
         "pin": "F7"
     },
     "rgblight": {
-        "max_brightness": 108
+        "led_count": 64,
+        "max_brightness": 108,
+        "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",
diff --git a/keyboards/fjlabs/solanis/config.h b/keyboards/fjlabs/solanis/config.h
index 569d563e4509..68becd07670b 100644
--- a/keyboards/fjlabs/solanis/config.h
+++ b/keyboards/fjlabs/solanis/config.h
@@ -22,20 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Define RGB */
-#define RGBLED_NUM 24
-#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_VAL_STEP 12
-
 /* Define less important options */
 
 /*
diff --git a/keyboards/fjlabs/solanis/info.json b/keyboards/fjlabs/solanis/info.json
index 2f1bea8698a4..ecc495d59a97 100644
--- a/keyboards/fjlabs/solanis/info.json
+++ b/keyboards/fjlabs/solanis/info.json
@@ -17,7 +17,20 @@
         "pin": "B7"
     },
     "rgblight": {
-        "max_brightness": 172
+        "led_count": 24,
+        "max_brightness": 172,
+        "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": "at90usb646",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/fjlabs/swordfish/config.h b/keyboards/fjlabs/swordfish/config.h
index be5bee6e440b..ea4c7011e141 100644
--- a/keyboards/fjlabs/swordfish/config.h
+++ b/keyboards/fjlabs/swordfish/config.h
@@ -22,20 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE 
 
-/* Define RGB */
-#define RGBLED_NUM 1
-#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_VAL_STEP 12
-
 /* Define less important options */
 
 /*
diff --git a/keyboards/fjlabs/swordfish/info.json b/keyboards/fjlabs/swordfish/info.json
index 98fb7f6f493c..822d9662d42d 100644
--- a/keyboards/fjlabs/swordfish/info.json
+++ b/keyboards/fjlabs/swordfish/info.json
@@ -13,88 +13,180 @@
         "rows": ["B0", "B1", "C7", "C6", "B6"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "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
+        }
+    },
     "ws2812": {
         "pin": "D3"
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
-        "LAYOUT_alice_all": {
+        "LAYOUT_2u_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": [1, 5], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 9, "y": 0},
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 17.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": [2, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 8.5, "y": 1},
+                {"matrix": [1, 7], "x": 9.5, "y": 1},
+                {"matrix": [1, 8], "x": 10.5, "y": 1},
+                {"matrix": [1, 9], "x": 11.5, "y": 1},
+                {"matrix": [1, 10], "x": 12.5, "y": 1},
+                {"matrix": [1, 11], "x": 13.5, "y": 1},
+                {"matrix": [1, 12], "x": 14.5, "y": 1},
+                {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 17.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": [3, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 8.75, "y": 2},
+                {"matrix": [2, 7], "x": 9.75, "y": 2},
+                {"matrix": [2, 8], "x": 10.75, "y": 2},
+                {"matrix": [2, 9], "x": 11.75, "y": 2},
+                {"matrix": [2, 10], "x": 12.75, "y": 2},
+                {"matrix": [2, 11], "x": 13.75, "y": 2},
+                {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 17.25, "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": [4, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 8.25, "y": 3},
+                {"matrix": [3, 7], "x": 9.25, "y": 3},
+                {"matrix": [3, 8], "x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 12.25, "y": 3},
+                {"matrix": [3, 11], "x": 13.25, "y": 3},
+                {"matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 16.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": 3.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_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": 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": 12.5, "y": 0},
-                {"matrix": [0, 12], "x": 13.5, "y": 0},
-                {"matrix": [0, 13], "x": 14.5, "y": 0},
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [1, 0], "x": 16.75, "y": 0},
+                {"matrix": [1, 5], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 9, "y": 0},
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
 
-                {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 1},
-                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"matrix": [1, 6], "x": 5.5, "y": 1},
-                {"matrix": [1, 7], "x": 8, "y": 1},
-                {"matrix": [1, 8], "x": 9, "y": 1},
-                {"matrix": [1, 9], "x": 10, "y": 1},
-                {"matrix": [1, 10], "x": 11, "y": 1},
-                {"matrix": [1, 11], "x": 12, "y": 1},
-                {"matrix": [1, 12], "x": 13, "y": 1},
-                {"matrix": [1, 13], "x": 14, "y": 1},
-                {"matrix": [1, 14], "x": 15, "y": 1, "w": 1.5},
-                {"matrix": [2, 0], "x": 16.75, "y": 1},
+                {"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": [2, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 8.5, "y": 1},
+                {"matrix": [1, 7], "x": 9.5, "y": 1},
+                {"matrix": [1, 8], "x": 10.5, "y": 1},
+                {"matrix": [1, 9], "x": 11.5, "y": 1},
+                {"matrix": [1, 10], "x": 12.5, "y": 1},
+                {"matrix": [1, 11], "x": 13.5, "y": 1},
+                {"matrix": [1, 12], "x": 14.5, "y": 1},
+                {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 17.25, "y": 1},
 
-                {"matrix": [2, 1], "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": 8.25, "y": 2},
-                {"matrix": [2, 8], "x": 9.25, "y": 2},
-                {"matrix": [2, 9], "x": 10.25, "y": 2},
-                {"matrix": [2, 10], "x": 11.25, "y": 2},
-                {"matrix": [2, 11], "x": 12.25, "y": 2},
-                {"matrix": [2, 13], "x": 13.25, "y": 2},
-                {"matrix": [2, 14], "x": 14.25, "y": 2, "w": 2.25},
-                {"matrix": [3, 0], "x": 16.75, "y": 2},
+                {"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": [3, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 8.75, "y": 2},
+                {"matrix": [2, 7], "x": 9.75, "y": 2},
+                {"matrix": [2, 8], "x": 10.75, "y": 2},
+                {"matrix": [2, 9], "x": 11.75, "y": 2},
+                {"matrix": [2, 10], "x": 12.75, "y": 2},
+                {"matrix": [2, 11], "x": 13.75, "y": 2},
+                {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 17.25, "y": 2},
 
-                {"matrix": [3, 1], "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, "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, "w": 1.5},
-                {"matrix": [4, 0], "x": 15.75, "y": 3.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": [4, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 8.25, "y": 3},
+                {"matrix": [3, 7], "x": 9.25, "y": 3},
+                {"matrix": [3, 8], "x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 12.25, "y": 3},
+                {"matrix": [3, 11], "x": 13.25, "y": 3},
+                {"matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 16.25, "y": 3.25},
 
-                {"matrix": [4, 1], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 3.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 4.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 7], "x": 8, "y": 4, "w": 2.25},
-                {"matrix": [4, 8], "x": 10.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 13.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 14.75, "y": 4.25},
-                {"matrix": [4, 13], "x": 15.75, "y": 4.25},
-                {"matrix": [4, 14], "x": 16.75, "y": 4.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": 3.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 8], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/fjlabs/swordfish/keymaps/default/keymap.c b/keyboards/fjlabs/swordfish/keymaps/default/keymap.c
index ecce4f1a7bfb..2b2c8cf19f78 100644
--- a/keyboards/fjlabs/swordfish/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/swordfish/keymaps/default/keymap.c
@@ -21,19 +21,19 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT_alice_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_MPLY,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_5,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, KC_VOLU,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_T,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_VOLD,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_G,    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_B,             KC_SPC,   KC_RALT,          MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    [_LAYER0] = 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_BSLS, KC_GRV,     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_BSPC,             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_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_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    KC_SPC,  KC_RALT,          MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT_alice_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, RGB_MOD, RGB_RMOD, RGB_TOG,
-        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,  RGB_VAI,
-        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,  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_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
+    [_LAYER1] = 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, RGB_MOD, RGB_RMOD,   RGB_TOG,
+        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,             RGB_VAI,
+        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,             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_PGUP,
+        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/fjlabs/swordfish/keymaps/via/keymap.c b/keyboards/fjlabs/swordfish/keymaps/via/keymap.c
index 50ade4767ec1..7428985841b7 100644
--- a/keyboards/fjlabs/swordfish/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/swordfish/keymaps/via/keymap.c
@@ -23,35 +23,35 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT_alice_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_MPLY,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_5,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, KC_VOLU,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_T,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_VOLD,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_G,    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_B,             KC_SPC,   KC_RALT,          MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    [_LAYER0] = 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_BSLS, KC_GRV,     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_BSPC,             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_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_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    KC_SPC,  KC_RALT,          MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT_alice_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, RGB_MOD, RGB_RMOD, RGB_TOG,
-        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,  RGB_VAI,
-        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,  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_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
+    [_LAYER1] = 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, RGB_MOD, RGB_RMOD,   RGB_TOG,
+        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,             RGB_VAI,
+        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,             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_PGUP,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,             KC_HOME, KC_PGDN, KC_END
     ),
 
-    [_LAYER2] = LAYOUT_alice_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
+    [_LAYER2] = 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
     ),
 
-    [_LAYER3] = LAYOUT_alice_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
+    [_LAYER3] = 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
     )
 };
diff --git a/keyboards/fjlabs/tf60ansi/config.h b/keyboards/fjlabs/tf60ansi/config.h
index 89e8c6c22138..afdacdd0803e 100644
--- a/keyboards/fjlabs/tf60ansi/config.h
+++ b/keyboards/fjlabs/tf60ansi/config.h
@@ -22,22 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Define RGB Underglow */
-#define RGBLED_NUM 64
-#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_VAL_STEP 12
 #define RGBLIGHT_DEFAULT_SPD 144
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-/* #define RGBLIGHT_LAYER_BLINK*/
 
 /* Define less important options */
 
diff --git a/keyboards/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/info.json
index b07464ad364a..b45f7258b6a6 100644
--- a/keyboards/fjlabs/tf60ansi/info.json
+++ b/keyboards/fjlabs/tf60ansi/info.json
@@ -17,7 +17,20 @@
         "pin": "F7"
     },
     "rgblight": {
-        "max_brightness": 108
+        "led_count": 64,
+        "max_brightness": 108,
+        "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",
diff --git a/keyboards/fjlabs/tf60v2/config.h b/keyboards/fjlabs/tf60v2/config.h
index 89e8c6c22138..afdacdd0803e 100644
--- a/keyboards/fjlabs/tf60v2/config.h
+++ b/keyboards/fjlabs/tf60v2/config.h
@@ -22,22 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Define RGB Underglow */
-#define RGBLED_NUM 64
-#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_VAL_STEP 12
 #define RGBLIGHT_DEFAULT_SPD 144
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-/* #define RGBLIGHT_LAYER_BLINK*/
 
 /* Define less important options */
 
diff --git a/keyboards/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/info.json
index 6e9a5bf8219c..7f6b3ce970e6 100644
--- a/keyboards/fjlabs/tf60v2/info.json
+++ b/keyboards/fjlabs/tf60v2/info.json
@@ -17,7 +17,20 @@
         "pin": "F7"
     },
     "rgblight": {
-        "max_brightness": 108
+        "led_count": 64,
+        "max_brightness": 108,
+        "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",
diff --git a/keyboards/fjlabs/tf65rgbv2/config.h b/keyboards/fjlabs/tf65rgbv2/config.h
index 5932113c9475..afdacdd0803e 100644
--- a/keyboards/fjlabs/tf65rgbv2/config.h
+++ b/keyboards/fjlabs/tf65rgbv2/config.h
@@ -22,22 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Define RGB Underglow */
-#define RGBLED_NUM 68
-#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_VAL_STEP 12
 #define RGBLIGHT_DEFAULT_SPD 144
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-/* #define RGBLIGHT_LAYER_BLINK*/
 
 /* Define less important options */
 
diff --git a/keyboards/fjlabs/tf65rgbv2/info.json b/keyboards/fjlabs/tf65rgbv2/info.json
index 098bad3fcf7c..2101e17f0327 100644
--- a/keyboards/fjlabs/tf65rgbv2/info.json
+++ b/keyboards/fjlabs/tf65rgbv2/info.json
@@ -17,7 +17,20 @@
         "pin": "F7"
     },
     "rgblight": {
-        "max_brightness": 96
+        "led_count": 68,
+        "max_brightness": 96,
+        "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",
diff --git a/keyboards/flashquark/horizon_z/info.json b/keyboards/flashquark/horizon_z/info.json
index 3e299442c542..9127042f7140 100755
--- a/keyboards/flashquark/horizon_z/info.json
+++ b/keyboards/flashquark/horizon_z/info.json
@@ -20,7 +20,7 @@
     },
     "processor": "atmega32u4",
     "rgb_matrix": {
-        "driver": "IS31FL3733",
+        "driver": "is31fl3733",
         "layout": [
             { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
             { "flags": 4, "matrix": [0, 1], "x": 16, "y": 0 },
diff --git a/keyboards/flehrad/bigswitch/config.h b/keyboards/flehrad/bigswitch/config.h
index ddf4546bbb24..441639324724 100644
--- a/keyboards/flehrad/bigswitch/config.h
+++ b/keyboards/flehrad/bigswitch/config.h
@@ -21,18 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define IS_COMMAND() ( \
     false \
 )
-
-
-#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 RGBLED_NUM 8
-#endif
diff --git a/keyboards/flehrad/bigswitch/info.json b/keyboards/flehrad/bigswitch/info.json
index 095f8284e4fb..cf981b0d90e5 100644
--- a/keyboards/flehrad/bigswitch/info.json
+++ b/keyboards/flehrad/bigswitch/info.json
@@ -7,6 +7,21 @@
         "pid": "0xB195",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 8,
+        "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": "D3"
     },
diff --git a/keyboards/fleuron/config.h b/keyboards/fleuron/config.h
index 34197c8578de..60f42fbcda9a 100644
--- a/keyboards/fleuron/config.h
+++ b/keyboards/fleuron/config.h
@@ -37,15 +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 RGBLED_NUM 18     // 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
diff --git a/keyboards/fleuron/info.json b/keyboards/fleuron/info.json
index c2ff091acec4..70be63d3c204 100644
--- a/keyboards/fleuron/info.json
+++ b/keyboards/fleuron/info.json
@@ -12,6 +12,21 @@
         "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 18,
+        "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": "E6"
     },
diff --git a/keyboards/fleuron/keymaps/dollartacos/keymap.c b/keyboards/fleuron/keymaps/dollartacos/keymap.c
index e2bef353ef2f..90490bb02f6f 100644
--- a/keyboards/fleuron/keymaps/dollartacos/keymap.c
+++ b/keyboards/fleuron/keymaps/dollartacos/keymap.c
@@ -145,15 +145,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
   return true;
 }
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/flx/virgo/config.h b/keyboards/flx/virgo/config.h
deleted file mode 100644
index 84306f36a07e..000000000000
--- a/keyboards/flx/virgo/config.h
+++ /dev/null
@@ -1,33 +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
-
-    #define RGBLED_NUM 0
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/flx/virgo/info.json b/keyboards/flx/virgo/info.json
index f7ce7724825e..d1e40b9ecec8 100644
--- a/keyboards/flx/virgo/info.json
+++ b/keyboards/flx/virgo/info.json
@@ -17,6 +17,22 @@
         "pin": "B7",
         "levels": 5
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 0,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        }
+    },
     "ws2812": {
         "pin": "B3"
     },
diff --git a/keyboards/flxlb/zplit/config.h b/keyboards/flxlb/zplit/config.h
index 55edfade8275..6bde2711c237 100644
--- a/keyboards/flxlb/zplit/config.h
+++ b/keyboards/flxlb/zplit/config.h
@@ -28,23 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGBLED_NUM 16
-#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8}
-#define RGBLED_SPLIT { 8, 8 }
-#define RGBLIGHT_SPLIT
-#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
-
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/flxlb/zplit/info.json b/keyboards/flxlb/zplit/info.json
index a2c27492cf49..6d2aadcb4379 100644
--- a/keyboards/flxlb/zplit/info.json
+++ b/keyboards/flxlb/zplit/info.json
@@ -18,6 +18,23 @@
             {"pin_a": "B0", "pin_b": "D2"}
         ]
     },
+    "rgblight": {
+        "led_count": 16,
+        "led_map": [0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8],
+        "split_count": [8, 8],
+        "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": "D3"
     },
diff --git a/keyboards/fortitude60/rev1/config.h b/keyboards/fortitude60/rev1/config.h
index d13ea1c84501..5dec5df1f129 100644
--- a/keyboards/fortitude60/rev1/config.h
+++ b/keyboards/fortitude60/rev1/config.h
@@ -27,10 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#ifdef RGBLIGHT_ENABLE
-  #define RGBLED_NUM 18    // Number of LEDs */
-#endif
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/fortitude60/rev1/info.json b/keyboards/fortitude60/rev1/info.json
index 175e621e230d..0ae02161cd5a 100644
--- a/keyboards/fortitude60/rev1/info.json
+++ b/keyboards/fortitude60/rev1/info.json
@@ -17,6 +17,9 @@
     "pin": "B5",
     "levels": 9
   },
+  "rgblight": {
+    "led_count": 18
+  },
   "ws2812": {
     "pin": "B5"
   },
diff --git a/keyboards/foxlab/key65/hotswap/config.h b/keyboards/foxlab/key65/hotswap/config.h
index 8ee5b2a14a88..43bd4ee57169 100644
--- a/keyboards/foxlab/key65/hotswap/config.h
+++ b/keyboards/foxlab/key65/hotswap/config.h
@@ -16,22 +16,6 @@
 
 #pragma once
 
-  #define RGBLED_NUM 8
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/foxlab/key65/hotswap/info.json b/keyboards/foxlab/key65/hotswap/info.json
index 619f59671d2f..20f5c06ecd15 100644
--- a/keyboards/foxlab/key65/hotswap/info.json
+++ b/keyboards/foxlab/key65/hotswap/info.json
@@ -17,6 +17,24 @@
         "pin": "B7",
         "levels": 5
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "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": "E2"
     },
diff --git a/keyboards/foxlab/key65/universal/config.h b/keyboards/foxlab/key65/universal/config.h
index 003eb0a72cfe..43bd4ee57169 100644
--- a/keyboards/foxlab/key65/universal/config.h
+++ b/keyboards/foxlab/key65/universal/config.h
@@ -16,22 +16,6 @@
 
 #pragma once
 
-  #define RGBLED_NUM 6
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/foxlab/key65/universal/info.json b/keyboards/foxlab/key65/universal/info.json
index ef7c4386c839..e2e526303d0d 100644
--- a/keyboards/foxlab/key65/universal/info.json
+++ b/keyboards/foxlab/key65/universal/info.json
@@ -17,6 +17,24 @@
         "pin": "B7",
         "levels": 5
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "E2"
     },
diff --git a/keyboards/foxlab/leaf60/hotswap/config.h b/keyboards/foxlab/leaf60/hotswap/config.h
index a7b28ae1db59..d4515ef219db 100644
--- a/keyboards/foxlab/leaf60/hotswap/config.h
+++ b/keyboards/foxlab/leaf60/hotswap/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 8
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/foxlab/leaf60/hotswap/info.json b/keyboards/foxlab/leaf60/hotswap/info.json
index f8b3c35edd53..f7f3d202ff6e 100644
--- a/keyboards/foxlab/leaf60/hotswap/info.json
+++ b/keyboards/foxlab/leaf60/hotswap/info.json
@@ -22,6 +22,24 @@
         "caps_lock": "E6",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "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": "E2"
     },
diff --git a/keyboards/foxlab/leaf60/universal/config.h b/keyboards/foxlab/leaf60/universal/config.h
index a7b28ae1db59..d4515ef219db 100644
--- a/keyboards/foxlab/leaf60/universal/config.h
+++ b/keyboards/foxlab/leaf60/universal/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 8
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/foxlab/leaf60/universal/info.json b/keyboards/foxlab/leaf60/universal/info.json
index a277830d9db6..f4b9c704f748 100644
--- a/keyboards/foxlab/leaf60/universal/info.json
+++ b/keyboards/foxlab/leaf60/universal/info.json
@@ -21,6 +21,24 @@
         "caps_lock": "E6",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "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": "E2"
     },
diff --git a/keyboards/foxlab/time80/config.h b/keyboards/foxlab/time80/config.h
index f68ee9bd551a..0b0ee839718f 100644
--- a/keyboards/foxlab/time80/config.h
+++ b/keyboards/foxlab/time80/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 16
-//#define RGBLIGHT_HUE_STEP 8
-//#define RGBLIGHT_SAT_STEP 8
-//#define RGBLIGHT_VAL_STEP 8
-//#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
 /* 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/foxlab/time80/info.json b/keyboards/foxlab/time80/info.json
index f5b8a7eb0c0f..b19e3c31041a 100644
--- a/keyboards/foxlab/time80/info.json
+++ b/keyboards/foxlab/time80/info.json
@@ -16,6 +16,9 @@
     "backlight": {
         "pin": "D4"
     },
+    "rgblight": {
+        "led_count": 16
+    },
     "ws2812": {
         "driver": "i2c"
     },
diff --git a/keyboards/foxlab/time_re/hotswap/config.h b/keyboards/foxlab/time_re/hotswap/config.h
deleted file mode 100644
index 03e8b6b3d46e..000000000000
--- a/keyboards/foxlab/time_re/hotswap/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2021 DongXing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-    #define RGBLED_NUM 5
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/foxlab/time_re/hotswap/info.json b/keyboards/foxlab/time_re/hotswap/info.json
index 1253771b5c32..d210a854377d 100644
--- a/keyboards/foxlab/time_re/hotswap/info.json
+++ b/keyboards/foxlab/time_re/hotswap/info.json
@@ -24,7 +24,23 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 5,
+        "max_brightness": 200,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/foxlab/time_re/universal/config.h b/keyboards/foxlab/time_re/universal/config.h
deleted file mode 100644
index 03e8b6b3d46e..000000000000
--- a/keyboards/foxlab/time_re/universal/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2021 DongXing
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-    #define RGBLED_NUM 5
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/foxlab/time_re/universal/info.json b/keyboards/foxlab/time_re/universal/info.json
index 8bb9a58ee27d..a7c9bbc7e62f 100644
--- a/keyboards/foxlab/time_re/universal/info.json
+++ b/keyboards/foxlab/time_re/universal/info.json
@@ -20,7 +20,23 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 5,
+        "max_brightness": 200,
+        "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
+        }
     },
     "indicators": {
         "caps_lock": "E6",
diff --git a/keyboards/frooastboard/nano/config.h b/keyboards/frooastboard/nano/config.h
index 32d34ead4287..d28c057500a4 100644
--- a/keyboards/frooastboard/nano/config.h
+++ b/keyboards/frooastboard/nano/config.h
@@ -16,22 +16,8 @@
 
 #pragma once
 
-#define RGBLED_NUM 8
-
-#define RGBLIGHT_SLEEP
-
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 #define RGBLIGHT_DEFAULT_HUE 234
 
 #define RGBLIGHT_DEFAULT_VAL 190
 
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_SNAKE
-
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD + 2
diff --git a/keyboards/frooastboard/nano/info.json b/keyboards/frooastboard/nano/info.json
index d1a77d256d0e..6112c4832c1e 100644
--- a/keyboards/frooastboard/nano/info.json
+++ b/keyboards/frooastboard/nano/info.json
@@ -24,6 +24,19 @@
         "pid": "0x6F21",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
       "pin": "B4"
     },
diff --git a/keyboards/frooastboard/walnut/info.json b/keyboards/frooastboard/walnut/info.json
index ee18003f57e8..fc8ca2130fdd 100644
--- a/keyboards/frooastboard/walnut/info.json
+++ b/keyboards/frooastboard/walnut/info.json
@@ -15,7 +15,7 @@
         "nkro": true
     },
     "rgb_matrix": {
-        "driver": "IS31FL3737"
+        "driver": "is31fl3737"
     },
     "build": {
         "lto": true
diff --git a/keyboards/ft/mars65/config.h b/keyboards/ft/mars65/config.h
deleted file mode 100644
index bfe825dcc933..000000000000
--- a/keyboards/ft/mars65/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2022 wonderbeel (https://github.com/wonderbeel)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-    #define RGBLED_NUM 24
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
-
diff --git a/keyboards/ft/mars65/info.json b/keyboards/ft/mars65/info.json
index 2160ae9be66b..4e3b3b8ee9d4 100644
--- a/keyboards/ft/mars65/info.json
+++ b/keyboards/ft/mars65/info.json
@@ -20,7 +20,23 @@
     "pin": "E6"
   },
   "rgblight": {
-    "max_brightness": 130
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 24,
+    "max_brightness": 130,
+    "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
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
diff --git a/keyboards/ft/mars80/config.h b/keyboards/ft/mars80/config.h
deleted file mode 100644
index 116c09d6ac78..000000000000
--- a/keyboards/ft/mars80/config.h
+++ /dev/null
@@ -1,32 +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
-
-
-#define RGBLED_NUM 20
-
-#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/ft/mars80/info.json b/keyboards/ft/mars80/info.json
index 5801c63a237c..82727ffd3e77 100644
--- a/keyboards/ft/mars80/info.json
+++ b/keyboards/ft/mars80/info.json
@@ -16,6 +16,21 @@
     "backlight": {
         "pin": "D4"
     },
+    "rgblight": {
+        "led_count": 20,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/fungo/rev1/config.h b/keyboards/fungo/rev1/config.h
index 187a7809bcf0..bebed352e22e 100644
--- a/keyboards/fungo/rev1/config.h
+++ b/keyboards/fungo/rev1/config.h
@@ -23,16 +23,8 @@
 /**       public parameter       **/
 /*************************************/
 
-#define MATRIX_IO_DELAY 15  // default  30
-#define TAP_CODE_DELAY  50   // default 0, disabled
-
 /* 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 TAPPING_TOGGLE 3
-
-
diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json
index 2874f3d5e4a3..d153f9f834a8 100644
--- a/keyboards/fungo/rev1/info.json
+++ b/keyboards/fungo/rev1/info.json
@@ -10,7 +10,8 @@
   },
   "matrix_pins": {
     "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-    "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    "rows": ["D4", "C6", "D7", "E6", "B4", "B5"],
+    "io_delay": 15
   },
   "diode_direction": "COL2ROW",
   "split": {
@@ -22,9 +23,15 @@
       }
     }
   },
+  "qmk": {
+    "tap_keycode_delay": 50
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "debounce": 3,
+  "tapping": {
+    "toggle": 3
+  },
   "layout_aliases": {
     "LAYOUT_fungo_split_num": "LAYOUT"
   },
diff --git a/keyboards/fungo/rev1/rules.mk b/keyboards/fungo/rev1/rules.mk
index 731941b437ae..e8d7a7aed531 100644
--- a/keyboards/fungo/rev1/rules.mk
+++ b/keyboards/fungo/rev1/rules.mk
@@ -14,6 +14,4 @@ KEY_LOCK_ENABLE = yes       # kc_lock use
 
 
 OLED_ENABLE = no
-OLED_DRIVER = SSD1306      # OLED display
 SPLIT_KEYBOARD = yes       # split type
-
diff --git a/keyboards/gami_studio/lex60/config.h b/keyboards/gami_studio/lex60/config.h
deleted file mode 100644
index ba2a34504558..000000000000
--- a/keyboards/gami_studio/lex60/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2019 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
-
-#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
diff --git a/keyboards/gami_studio/lex60/info.json b/keyboards/gami_studio/lex60/info.json
index b5b59df7aacd..871d1f77fc43 100644
--- a/keyboards/gami_studio/lex60/info.json
+++ b/keyboards/gami_studio/lex60/info.json
@@ -8,6 +8,21 @@
         "pid": "0x0160",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 12,
+        "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": "D1"
     },
diff --git a/keyboards/gboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h
index 456eb3f9d91c..0ab992eac30b 100644
--- a/keyboards/gboards/ergotaco/config.h
+++ b/keyboards/gboards/ergotaco/config.h
@@ -32,9 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_TIME_TO_MAX    60
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY 0
-#define TAPPING_TOGGLE  1
-
-#define TAPPING_TERM    200
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
index 1de1f3ab85d7..80558ad69295 100644
--- a/keyboards/gboards/ergotaco/info.json
+++ b/keyboards/gboards/ergotaco/info.json
@@ -10,6 +10,9 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "tapping": {
+        "toggle": 1
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h
index db2ff42a1e8c..f0785f24bc6e 100644
--- a/keyboards/gboards/georgi/config.h
+++ b/keyboards/gboards/georgi/config.h
@@ -37,9 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_TIME_TO_MAX    60
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY 0
-#define TAPPING_TOGGLE  2
-
-#define TAPPING_TERM    200
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json
index 0a654eaa4aca..51737f75af8f 100644
--- a/keyboards/gboards/georgi/info.json
+++ b/keyboards/gboards/georgi/info.json
@@ -11,6 +11,9 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "tapping": {
+        "toggle": 2
+    },
     "layout_aliases": {
         "LAYOUT_georgi": "LAYOUT"
     },
diff --git a/keyboards/gboards/gergo/config.h b/keyboards/gboards/gergo/config.h
index dbff6ccf6f1a..44cb5a4304a4 100644
--- a/keyboards/gboards/gergo/config.h
+++ b/keyboards/gboards/gergo/config.h
@@ -41,9 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_TIME_TO_MAX    60
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY 0
-#define TAPPING_TOGGLE  1
-
-#define TAPPING_TERM    200
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json
index 53711cb27151..bc53f2db5f05 100644
--- a/keyboards/gboards/gergo/info.json
+++ b/keyboards/gboards/gergo/info.json
@@ -8,11 +8,17 @@
         "pid": "0x1307",
         "device_version": "0.0.1"
     },
+    "build": {
+        "debounce_type": "sym_eager_pr"
+    },
     "bootmagic": {
         "matrix": [13, 2]
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "tapping": {
+        "toggle": 1
+    },
     "layout_aliases": {
         "LAYOUT_gergo": "LAYOUT"
     },
diff --git a/keyboards/gboards/gergo/keymaps/oled/rules.mk b/keyboards/gboards/gergo/keymaps/oled/rules.mk
index 788041671962..e1bd70f65642 100644
--- a/keyboards/gboards/gergo/keymaps/oled/rules.mk
+++ b/keyboards/gboards/gergo/keymaps/oled/rules.mk
@@ -8,7 +8,6 @@ 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
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LOCAL_GLCDFONT = yes
 
 #Debug options
diff --git a/keyboards/gboards/gergo/rules.mk b/keyboards/gboards/gergo/rules.mk
index 95e12cc36c19..195915e43142 100644
--- a/keyboards/gboards/gergo/rules.mk
+++ b/keyboards/gboards/gergo/rules.mk
@@ -7,6 +7,5 @@ CONSOLE_ENABLE  	= yes
 COMMAND_ENABLE		= yes
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 
-DEBOUNCE_TYPE = sym_eager_pr
 SRC += matrix.c
 QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json
index 061f8ff86958..c5f6be475098 100644
--- a/keyboards/gboards/gergoplex/info.json
+++ b/keyboards/gboards/gergoplex/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "build": {
+        "debounce_type": "sym_eager_pr"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["split_3x5_3"],
diff --git a/keyboards/gboards/gergoplex/rules.mk b/keyboards/gboards/gergoplex/rules.mk
index 6887c869b9af..adf5cfd2e7d7 100644
--- a/keyboards/gboards/gergoplex/rules.mk
+++ b/keyboards/gboards/gergoplex/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = yes
 
-DEBOUNCE_TYPE = sym_eager_pr
 SRC += matrix.c
 QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index 344ccf3fffc6..47f9064e451f 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define RGBLED_NUM 42
 #define RGB_MATRIX_LED_COUNT 42
 
 // PWM RGB Underglow Defines
@@ -86,5 +85,3 @@
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define WAIT_FOR_USB
-
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json
index 504238b21c74..95b1ca94d7d8 100644
--- a/keyboards/geekboards/macropad_v2/info.json
+++ b/keyboards/geekboards/macropad_v2/info.json
@@ -8,12 +8,15 @@
     "pid": "0xA372",
     "device_version": "0.0.2"
   },
+  "qmk": {
+    "tap_keycode_delay": 10
+  },
   "ws2812": {
     "pin": "A7",
     "driver": "pwm"
   },
   "rgb_matrix": {
-    "driver": "WS2812"
+    "driver": "ws2812"
   },
   "processor": "STM32F072",
   "bootloader": "stm32-dfu",
diff --git a/keyboards/geekboards/macropad_v2/rules.mk b/keyboards/geekboards/macropad_v2/rules.mk
index b7807ae4185d..c49a369dd025 100644
--- a/keyboards/geekboards/macropad_v2/rules.mk
+++ b/keyboards/geekboards/macropad_v2/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/info.json
index 16f3496a13e2..363ab895a5fe 100644
--- a/keyboards/geekboards/tester/info.json
+++ b/keyboards/geekboards/tester/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "matrix_pins": {
         "cols": ["F7", "F6", "D2", "D3"],
diff --git a/keyboards/geistmaschine/macropod/config.h b/keyboards/geistmaschine/macropod/config.h
index f6dad6ebe034..e12d3b94fa4c 100644
--- a/keyboards/geistmaschine/macropod/config.h
+++ b/keyboards/geistmaschine/macropod/config.h
@@ -19,3 +19,6 @@
    IO expander setup would allow up to 1x16 + 1 from the MCU */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 17
+
+/* Fix for Apple Silicon Macs struggling to detect board after suspend/sleep */
+#define USB_SUSPEND_WAKEUP_DELAY 200
\ No newline at end of file
diff --git a/keyboards/geistmaschine/macropod/info.json b/keyboards/geistmaschine/macropod/info.json
index 886ed5acaf09..333e7c0a509e 100644
--- a/keyboards/geistmaschine/macropod/info.json
+++ b/keyboards/geistmaschine/macropod/info.json
@@ -15,7 +15,7 @@
         "command": false,
         "console": false,
         "extrakey": true,
-        "mousekey": false,
+        "mousekey": true,
         "nkro": false,
         "encoder": true
     },
diff --git a/keyboards/geonworks/frogmini/fmh/rules.mk b/keyboards/geonworks/frogmini/fmh/rules.mk
index 683a20e5c054..1f63f8feef57 100644
--- a/keyboards/geonworks/frogmini/fmh/rules.mk
+++ b/keyboards/geonworks/frogmini/fmh/rules.mk
@@ -16,5 +16,3 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 
 EEPROM_DRIVER = i2c
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/geonworks/frogmini/fms/config.h b/keyboards/geonworks/frogmini/fms/config.h
index 6576ee9efe93..ddeaa2abff0b 100644
--- a/keyboards/geonworks/frogmini/fms/config.h
+++ b/keyboards/geonworks/frogmini/fms/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define BACKLIGHT_PWM_DRIVER    PWMD1
-#define BACKLIGHT_PWM_CHANNEL   3
 #define BACKLIGHT_PAL_MODE      1
 
 #define I2C_DRIVER I2CD1
diff --git a/keyboards/geonworks/frogmini/fms/rules.mk b/keyboards/geonworks/frogmini/fms/rules.mk
index d847becc1a7c..dfd36d0f82bf 100644
--- a/keyboards/geonworks/frogmini/fms/rules.mk
+++ b/keyboards/geonworks/frogmini/fms/rules.mk
@@ -16,5 +16,3 @@ BACKLIGHT_ENABLE = yes     # Enable keyboard backlight functionality
 
 EEPROM_DRIVER = i2c
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/gh60/satan/config.h b/keyboards/gh60/satan/config.h
index 1fbb35b3a239..b9449c4714bf 100644
--- a/keyboards/gh60/satan/config.h
+++ b/keyboards/gh60/satan/config.h
@@ -22,23 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Underglow configuration
- */
-#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 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/gh60/satan/info.json b/keyboards/gh60/satan/info.json
index 6432d8eb45b3..53e2b04df65c 100644
--- a/keyboards/gh60/satan/info.json
+++ b/keyboards/gh60/satan/info.json
@@ -17,6 +17,22 @@
     "pin": "B6",
     "levels": 4
   },
+  "rgblight": {
+    "hue_steps": 10,
+    "led_count": 8,
+    "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": "E2"
   },
diff --git a/keyboards/gh60/satan/keymaps/addcninblue/rules.mk b/keyboards/gh60/satan/keymaps/addcninblue/rules.mk
index b8c05a5984ca..fe07e497f9c2 100644
--- a/keyboards/gh60/satan/keymaps/addcninblue/rules.mk
+++ b/keyboards/gh60/satan/keymaps/addcninblue/rules.mk
@@ -12,7 +12,7 @@ NKRO_ENABLE = yes          # Nkey Rollover - if this doesn't work, see here: htt
 BACKLIGHT_ENABLE = yes     # Enable keyboard backlight functionality
 MIDI_ENABLE = no           # MIDI controls
 AUDIO_ENABLE = no          # Audio output on port C6
-UNICODEMAP_ENABLE = no     # This allows sending unicode symbols using X(<unicode>) in your keymap.
+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
diff --git a/keyboards/gh60/v1p3/config.h b/keyboards/gh60/v1p3/config.h
deleted file mode 100644
index c294394ecab7..000000000000
--- a/keyboards/gh60/v1p3/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 noroadsleft
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-    #define RGBLED_NUM 10
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/gh60/v1p3/info.json b/keyboards/gh60/v1p3/info.json
index 191cca4f57fc..0597c2e7a079 100644
--- a/keyboards/gh60/v1p3/info.json
+++ b/keyboards/gh60/v1p3/info.json
@@ -17,6 +17,24 @@
         "pin": "B6",
         "levels": 15
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "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": "F0"
     },
diff --git a/keyboards/gh80_3000/keymaps/ansi_std/keymap.c b/keyboards/gh80_3000/keymaps/ansi_std/keymap.c
index f33767ca641a..f99d522ead4d 100644
--- a/keyboards/gh80_3000/keymaps/ansi_std/keymap.c
+++ b/keyboards/gh80_3000/keymaps/ansi_std/keymap.c
@@ -12,23 +12,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-void led_set_user(uint8_t usb_led) {
-
-    if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-        DDRB |= (1 << 5); PORTB &= ~(1 << 5);
+bool led_update_user(led_t led_state) {
+    if (led_state.num_lock) {
+        DDRB |= (1 << 5);
+        PORTB &= ~(1 << 5);
     } else {
-        DDRB &= ~(1 << 5); PORTB &= ~(1 << 5);
+        DDRB &= ~(1 << 5);
+        PORTB &= ~(1 << 5);
     }
 
-    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-        DDRB |= (1 << 6); PORTB &= ~(1 << 6);
+    if (led_state.caps_lock) {
+        DDRB |= (1 << 6);
+        PORTB &= ~(1 << 6);
     } else {
-        DDRB &= ~(1 << 6); PORTB &= ~(1 << 6);
+        DDRB &= ~(1 << 6);
+        PORTB &= ~(1 << 6);
     }
 
-    if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-        DDRB |= (1 << 7); PORTB &= ~(1 << 7);
+    if (led_state.scroll_lock) {
+        DDRB |= (1 << 7);
+        PORTB &= ~(1 << 7);
     } else {
-        DDRB &= ~(1 << 7); PORTB &= ~(1 << 7);
+        DDRB &= ~(1 << 7);
+        PORTB &= ~(1 << 7);
     }
+    return false;
 }
diff --git a/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c b/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c
index 28a34c4269eb..b3f2426e88a4 100644
--- a/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c
+++ b/keyboards/gh80_3000/keymaps/ansi_wkl/keymap.c
@@ -12,23 +12,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-void led_set_user(uint8_t usb_led) {
+bool led_update_user(led_t led_state) {
+    if (led_state.num_lock) {
+        DDRB |= (1 << 5);
+        PORTB &= ~(1 << 5);
+    } else {
+        DDRB &= ~(1 << 5);
+        PORTB &= ~(1 << 5);
+    }
 
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-    DDRB |= (1 << 5); PORTB &= ~(1 << 5);
-  } else {
-    DDRB &= ~(1 << 5); PORTB &= ~(1 << 5);
-  }
+    if (led_state.caps_lock) {
+        DDRB |= (1 << 6);
+        PORTB &= ~(1 << 6);
+    } else {
+        DDRB &= ~(1 << 6);
+        PORTB &= ~(1 << 6);
+    }
 
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-    DDRB |= (1 << 6); PORTB &= ~(1 << 6);
-  } else {
-    DDRB &= ~(1 << 6); PORTB &= ~(1 << 6);
-  }
-
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-    DDRB |= (1 << 7); PORTB &= ~(1 << 7);
-  } else {
-    DDRB &= ~(1 << 7); PORTB &= ~(1 << 7);
-  }
+    if (led_state.scroll_lock) {
+        DDRB |= (1 << 7);
+        PORTB &= ~(1 << 7);
+    } else {
+        DDRB &= ~(1 << 7);
+        PORTB &= ~(1 << 7);
+    }
+    return false;
 }
diff --git a/keyboards/gh80_3000/keymaps/default/keymap.c b/keyboards/gh80_3000/keymaps/default/keymap.c
index 264f20fbcaea..b74127fc5e10 100644
--- a/keyboards/gh80_3000/keymaps/default/keymap.c
+++ b/keyboards/gh80_3000/keymaps/default/keymap.c
@@ -12,23 +12,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-void led_set_user(uint8_t usb_led) {
-
-    if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-        DDRB |= (1 << 5); PORTB &= ~(1 << 5);
+bool led_update_user(led_t led_state) {
+    if (led_state.num_lock) {
+        DDRB |= (1 << 5);
+        PORTB &= ~(1 << 5);
     } else {
-        DDRB &= ~(1 << 5); PORTB &= ~(1 << 5);
+        DDRB &= ~(1 << 5);
+        PORTB &= ~(1 << 5);
     }
 
-    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-        DDRB |= (1 << 6); PORTB &= ~(1 << 6);
+    if (led_state.caps_lock) {
+        DDRB |= (1 << 6);
+        PORTB &= ~(1 << 6);
     } else {
-        DDRB &= ~(1 << 6); PORTB &= ~(1 << 6);
+        DDRB &= ~(1 << 6);
+        PORTB &= ~(1 << 6);
     }
 
-    if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-        DDRB |= (1 << 7); PORTB &= ~(1 << 7);
+    if (led_state.scroll_lock) {
+        DDRB |= (1 << 7);
+        PORTB &= ~(1 << 7);
     } else {
-        DDRB &= ~(1 << 7); PORTB &= ~(1 << 7);
+        DDRB &= ~(1 << 7);
+        PORTB &= ~(1 << 7);
     }
+    return false;
 }
diff --git a/keyboards/gh80_3000/keymaps/iso_default/keymap.c b/keyboards/gh80_3000/keymaps/iso_default/keymap.c
index 137a6513b64a..4c4b10f458a6 100644
--- a/keyboards/gh80_3000/keymaps/iso_default/keymap.c
+++ b/keyboards/gh80_3000/keymaps/iso_default/keymap.c
@@ -12,23 +12,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-void led_set_user(uint8_t usb_led) {
-
-    if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-        DDRB |= (1 << 5); PORTB &= ~(1 << 5);
+bool led_update_user(led_t led_state) {
+    if (led_state.num_lock) {
+        DDRB |= (1 << 5);
+        PORTB &= ~(1 << 5);
     } else {
-        DDRB &= ~(1 << 5); PORTB &= ~(1 << 5);
+        DDRB &= ~(1 << 5);
+        PORTB &= ~(1 << 5);
     }
 
-    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-        DDRB |= (1 << 6); PORTB &= ~(1 << 6);
+    if (led_state.caps_lock) {
+        DDRB |= (1 << 6);
+        PORTB &= ~(1 << 6);
     } else {
-        DDRB &= ~(1 << 6); PORTB &= ~(1 << 6);
+        DDRB &= ~(1 << 6);
+        PORTB &= ~(1 << 6);
     }
 
-    if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-        DDRB |= (1 << 7); PORTB &= ~(1 << 7);
+    if (led_state.scroll_lock) {
+        DDRB |= (1 << 7);
+        PORTB &= ~(1 << 7);
     } else {
-        DDRB &= ~(1 << 7); PORTB &= ~(1 << 7);
+        DDRB &= ~(1 << 7);
+        PORTB &= ~(1 << 7);
     }
+    return false;
 }
diff --git a/keyboards/gh80_3000/keymaps/iso_std/keymap.c b/keyboards/gh80_3000/keymaps/iso_std/keymap.c
index 434abf68f5cc..9559bde1194b 100644
--- a/keyboards/gh80_3000/keymaps/iso_std/keymap.c
+++ b/keyboards/gh80_3000/keymaps/iso_std/keymap.c
@@ -12,23 +12,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-void led_set_user(uint8_t usb_led) {
+bool led_update_user(led_t led_state) {
+    if (led_state.num_lock) {
+        DDRB |= (1 << 5);
+        PORTB &= ~(1 << 5);
+    } else {
+        DDRB &= ~(1 << 5);
+        PORTB &= ~(1 << 5);
+    }
 
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-    DDRB |= (1 << 5); PORTB &= ~(1 << 5);
-  } else {
-    DDRB &= ~(1 << 5); PORTB &= ~(1 << 5);
-  }
+    if (led_state.caps_lock) {
+        DDRB |= (1 << 6);
+        PORTB &= ~(1 << 6);
+    } else {
+        DDRB &= ~(1 << 6);
+        PORTB &= ~(1 << 6);
+    }
 
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-    DDRB |= (1 << 6); PORTB &= ~(1 << 6);
-  } else {
-    DDRB &= ~(1 << 6); PORTB &= ~(1 << 6);
-  }
-
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-    DDRB |= (1 << 7); PORTB &= ~(1 << 7);
-  } else {
-    DDRB &= ~(1 << 7); PORTB &= ~(1 << 7);
-  }
+    if (led_state.scroll_lock) {
+        DDRB |= (1 << 7);
+        PORTB &= ~(1 << 7);
+    } else {
+        DDRB &= ~(1 << 7);
+        PORTB &= ~(1 << 7);
+    }
+    return false;
 }
diff --git a/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c b/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c
index f275a3e78928..86054ba1fd52 100644
--- a/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c
+++ b/keyboards/gh80_3000/keymaps/iso_wkl/keymap.c
@@ -12,23 +12,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	)
 };
 
-void led_set_user(uint8_t usb_led) {
+bool led_update_user(led_t led_state) {
+    if (led_state.num_lock) {
+        DDRB |= (1 << 5);
+        PORTB &= ~(1 << 5);
+    } else {
+        DDRB &= ~(1 << 5);
+        PORTB &= ~(1 << 5);
+    }
 
-	if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-		DDRB |= (1 << 5); PORTB &= ~(1 << 5);
-	} else {
-		DDRB &= ~(1 << 5); PORTB &= ~(1 << 5);
-	}
+    if (led_state.caps_lock) {
+        DDRB |= (1 << 6);
+        PORTB &= ~(1 << 6);
+    } else {
+        DDRB &= ~(1 << 6);
+        PORTB &= ~(1 << 6);
+    }
 
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-		DDRB |= (1 << 6); PORTB &= ~(1 << 6);
-	} else {
-		DDRB &= ~(1 << 6); PORTB &= ~(1 << 6);
-	}
-
-	if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-		DDRB |= (1 << 7); PORTB &= ~(1 << 7);
-	} else {
-		DDRB &= ~(1 << 7); PORTB &= ~(1 << 7);
-	}
+    if (led_state.scroll_lock) {
+        DDRB |= (1 << 7);
+        PORTB &= ~(1 << 7);
+    } else {
+        DDRB &= ~(1 << 7);
+        PORTB &= ~(1 << 7);
+    }
+    return false;
 }
diff --git a/keyboards/ghs/rar/config.h b/keyboards/ghs/rar/config.h
index 9cd6e7be5a0a..13265701b04a 100644
--- a/keyboards/ghs/rar/config.h
+++ b/keyboards/ghs/rar/config.h
@@ -17,18 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-    #define RGBLED_NUM 17
-#    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
-
 /* 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/ghs/rar/info.json b/keyboards/ghs/rar/info.json
index 9a684c2840ff..6bf890b3f8dc 100644
--- a/keyboards/ghs/rar/info.json
+++ b/keyboards/ghs/rar/info.json
@@ -8,6 +8,21 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 17,
+        "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": "D0"
     },
diff --git a/keyboards/ghs/xls/rules.mk b/keyboards/ghs/xls/rules.mk
index a92b0993283e..8b137891791f 100644
--- a/keyboards/ghs/xls/rules.mk
+++ b/keyboards/ghs/xls/rules.mk
@@ -1,2 +1 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
diff --git a/keyboards/giabalanai/config.h b/keyboards/giabalanai/config.h
index aa0095aebd49..e4946a3bb397 100644
--- a/keyboards/giabalanai/config.h
+++ b/keyboards/giabalanai/config.h
@@ -33,43 +33,8 @@ 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
 
-#ifdef RGBLIGHT_ENABLE
-#   define RGBLED_NUM 123
-
-// Do not define "RGBLED_SPLIT" since somehow it doesn't work well yet.
-// Even thhough "#define RGBLED_SPLIT { 60, 63 }" was set, LEDs on the sub keyboad side didn't turn on.
-// Not sure but rgblight_sethsv_at() might not support RGBLED_SPLIT yet.
-// Instead, LED data is tranferred from right side to the left via TRRS cable.
-
 #   define RGBLIGHT_LAYERS
 
-// By default, LEDs of the buttons which are pressed turn on.
-// #    define RGBLIGHT_EFFECT_TWINKLE
-// #    define RGBLIGHT_EFFECT_KNIGHT
-
-
-// RGBLIGHT LED MAP
-//     Right 1st row (12 LEDs)
-//     ENCODER
-//     Right 2nd .. 5th row(13, 12, 13, 12 LEDs)
-//     Left 1st .. 5th row (12 LEDs x 5 rows)
-
-#   define RGBLIGHT_LED_MAP { \
-    60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71, \
-    97, \
-    84,  83,  82,  81,  80,  79,  78,  77,  76,  75,  74,  73,  72, \
-    85,  86,  87,  88,  89,  90,  91,  92,  93,  94,  95,  96, \
-    110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99,  98, \
-    111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, \
-    \
-    11,  10,  9,   8,   7,   6,   5,   4,   3,   2,   1,   0,  \
-    12,  13,  14,  15,  16,  17,  18,  19,  20,  21,  22,  23, \
-    35,  34,  33,  32,  31,  30,  29,  28,  27,  26,  25,  24, \
-    36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47, \
-    59,  58,  57,  56,  55,  54,  53,  52,  51,  50,  49,  48  \
-    }
-#endif
-
 #ifdef RGB_MATRIX_ENABLE
 /* ws2812 RGB MATRIX */
 #   define RGB_MATRIX_LED_COUNT 123
@@ -197,8 +162,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   define MIDI_INITIAL_VELOCITY 117
 #endif  //  MIDI_ENABLE
 
-#define TAP_CODE_DELAY 10
-
 /* 2021/01/22 added to shrink firmware size */
 // NO_ACTION_TAPPING -1964 bytes, however, this disables Layer mods...
 // #define NO_ACTION_TAPPING
diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json
index 7c2fa72047e7..592d7a6966f8 100644
--- a/keyboards/giabalanai/info.json
+++ b/keyboards/giabalanai/info.json
@@ -9,10 +9,12 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "rgblight": {
-        "max_brightness": 80
+        "led_count": 123,
+        "max_brightness": 80,
+        "led_map": [60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 97, 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48]
     },
     "matrix_pins": {
         "cols": ["B1", "F7", "F6", "F5", "F4", "B3", "B2", "B6", "D0", "D1"],
@@ -53,6 +55,9 @@
             }
         }
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/giabalanai/keymaps/2firmware/keymap.c b/keyboards/giabalanai/keymaps/2firmware/keymap.c
index 8e95b89a91d7..338d5d8e0ff2 100644
--- a/keyboards/giabalanai/keymaps/2firmware/keymap.c
+++ b/keyboards/giabalanai/keymaps/2firmware/keymap.c
@@ -332,9 +332,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             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, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EE_CLR, _______,
+      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, XXXXXXX, XXXXXXX, XXXXXXX, MI_VELD, MI_VELU, XXXXXXX, RGB_TOG,
-      XXXXXXX,   TGLBASS,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, TGLUVEL, MELDYAL, MELODYS, MELDYAH
+      XXXXXXX,   TGLBASS,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, MI_TRSD, MI_TRSU, TGLUVEL, MELDYAL, MELODYS, MELDYAH
   )
 };
 
diff --git a/keyboards/giabalanai/keymaps/3araht/keymap.c b/keyboards/giabalanai/keymaps/3araht/keymap.c
index daa31ffa7b0d..fb68c02c7087 100644
--- a/keyboards/giabalanai/keymaps/3araht/keymap.c
+++ b/keyboards/giabalanai/keymaps/3araht/keymap.c
@@ -363,9 +363,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             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, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EE_CLR, _______,
+      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, XXXXXXX, RGB_TOG,
-      XXXXXXX,   TGLBASS,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, TGLUVEL, MELDYAL, MELODYS, MELDYAH
+      XXXXXXX,   TGLBASS,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, MI_TRSD, MI_TRSU, TGLUVEL, MELDYAL, MELODYS, MELDYAH
   )
 };
 
diff --git a/keyboards/giabalanai/keymaps/party/keymap.c b/keyboards/giabalanai/keymaps/party/keymap.c
index ea3000c0103c..e4ff33693059 100644
--- a/keyboards/giabalanai/keymaps/party/keymap.c
+++ b/keyboards/giabalanai/keymaps/party/keymap.c
@@ -363,9 +363,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             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, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EE_CLR, _______,
+      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, XXXXXXX, XXXXXXX, TGLUVEL, MELDYAL, MELODYS, MELDYAH
+      XXXXXXX,   TGLBASS,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, MI_TRSD, MI_TRSU, TGLUVEL, MELDYAL, MELODYS, MELDYAH
   )
 };
 
diff --git a/keyboards/gizmo_engineering/gk6/info.json b/keyboards/gizmo_engineering/gk6/info.json
index d738d31d3d60..c9581479711d 100644
--- a/keyboards/gizmo_engineering/gk6/info.json
+++ b/keyboards/gizmo_engineering/gk6/info.json
@@ -9,7 +9,7 @@
         "device_version": "30.3.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "matrix_pins": {
         "cols": ["B5", "C6", "C7", "F7", "F6", "D5", "D3", "D2", "F1", "F4", "B7", "F5"],
diff --git a/keyboards/gkeyboard/gkb_m16/config.h b/keyboards/gkeyboard/gkb_m16/config.h
index 1f278e6e3198..a8deb9de2aa0 100644
--- a/keyboards/gkeyboard/gkb_m16/config.h
+++ b/keyboards/gkeyboard/gkb_m16/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-    #define RGBLED_NUM 4
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-
 /* 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/gkb_m16/info.json b/keyboards/gkeyboard/gkb_m16/info.json
index ebf5ee88459d..9d80eba885c6 100644
--- a/keyboards/gkeyboard/gkb_m16/info.json
+++ b/keyboards/gkeyboard/gkb_m16/info.json
@@ -8,6 +8,24 @@
         "pid": "0x4201",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "F1"
     },
diff --git a/keyboards/gkeyboard/gpad8_2r/info.json b/keyboards/gkeyboard/gpad8_2r/info.json
index 81ac15251f0f..2111d58cc4b1 100644
--- a/keyboards/gkeyboard/gpad8_2r/info.json
+++ b/keyboards/gkeyboard/gpad8_2r/info.json
@@ -33,7 +33,7 @@
         ]
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [1, 0], "x": 28, "y": 12},
             {"flags": 4, "matrix": [1, 1], "x": 84, "y": 12},
diff --git a/keyboards/gl516/j73gl/config.h b/keyboards/gl516/j73gl/config.h
index 49205e59d155..16d7526f814e 100644
--- a/keyboards/gl516/j73gl/config.h
+++ b/keyboards/gl516/j73gl/config.h
@@ -30,19 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifndef RGBLED_NUM
-  #define RGBLED_NUM 73
-#endif
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json
index a34c1e6c4cb0..fa78788e6662 100644
--- a/keyboards/gl516/j73gl/info.json
+++ b/keyboards/gl516/j73gl/info.json
@@ -8,6 +8,21 @@
         "pid": "0xE8D0",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 73,
+        "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": "D3"
     },
diff --git a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/rules.mk b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/rules.mk
index 294015d80b86..d93c7282132f 100644
--- a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/rules.mk
+++ b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/rules.mk
@@ -1,6 +1,6 @@
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
+RGB_MATRIX_DRIVER = ws2812
 VIA_ENABLE = yes
 LTO_ENABLE = yes
 SPACE_CADET_ENABLE = no
diff --git a/keyboards/gl516/n51gl/config.h b/keyboards/gl516/n51gl/config.h
index cd919a72c472..a4114e1ca6e2 100644
--- a/keyboards/gl516/n51gl/config.h
+++ b/keyboards/gl516/n51gl/config.h
@@ -30,19 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifndef RGBLED_NUM
-  #define RGBLED_NUM 15
-#endif
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json
index 9da8930c60b7..c5abdd45428c 100644
--- a/keyboards/gl516/n51gl/info.json
+++ b/keyboards/gl516/n51gl/info.json
@@ -8,6 +8,21 @@
         "pid": "0xE8CF",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 15,
+        "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": "D3"
     },
@@ -83,64 +98,6 @@
                 {"matrix": [7, 5], "x": 14.75, "y": 3},
                 {"matrix": [7, 6], "x": 15.75, "y": 3}
             ]
-        },
-        "LAYOUT_rotary_layer": {
-            "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": [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": [4, 6], "x": 13, "y": 0},
-                {"matrix": [1, 1], "x": 14, "y": 0},
-                {"matrix": [1, 2], "x": 15, "y": 0},
-                {"matrix": [1, 3], "x": 16, "y": 0},
-                {"matrix": [1, 4], "x": 17, "y": 0},
-                {"matrix": [1, 5], "x": 18, "y": 0},
-                {"matrix": [1, 6], "x": 19, "y": 0},
-                {"matrix": [1, 0], "x": 20, "y": 0},
-                {"matrix": [5, 0], "x": 21, "y": 0},
-                {"matrix": [5, 1], "x": 22, "y": 0},
-                {"matrix": [5, 2], "x": 23, "y": 0},
-                {"matrix": [5, 3], "x": 24, "y": 0},
-                {"matrix": [5, 4], "x": 25, "y": 0},
-                {"matrix": [5, 5], "x": 26, "y": 0},
-                {"matrix": [5, 6], "x": 27, "y": 0},
-                {"matrix": [2, 1], "x": 28, "y": 0},
-                {"matrix": [2, 2], "x": 29, "y": 0},
-                {"matrix": [2, 3], "x": 30, "y": 0},
-                {"matrix": [2, 4], "x": 31, "y": 0},
-                {"matrix": [2, 5], "x": 32, "y": 0},
-                {"matrix": [2, 6], "x": 33, "y": 0},
-                {"matrix": [2, 0], "x": 34, "y": 0},
-                {"matrix": [6, 0], "x": 35, "y": 0},
-                {"matrix": [6, 1], "x": 36, "y": 0},
-                {"matrix": [6, 2], "x": 37, "y": 0},
-                {"matrix": [6, 3], "x": 38, "y": 0},
-                {"matrix": [6, 4], "x": 39, "y": 0},
-                {"matrix": [6, 5], "x": 40, "y": 0},
-                {"matrix": [6, 6], "x": 41, "y": 0},
-                {"matrix": [3, 1], "x": 42, "y": 0},
-                {"matrix": [3, 2], "x": 43, "y": 0},
-                {"matrix": [3, 4], "x": 44, "y": 0},
-                {"matrix": [3, 5], "x": 45, "y": 0},
-                {"matrix": [3, 6], "x": 46, "y": 0},
-                {"matrix": [3, 0], "x": 47, "y": 0},
-                {"matrix": [7, 0], "x": 48, "y": 0},
-                {"matrix": [7, 1], "x": 49, "y": 0},
-                {"matrix": [7, 2], "x": 50, "y": 0},
-                {"matrix": [7, 4], "x": 51, "y": 0},
-                {"matrix": [7, 5], "x": 52, "y": 0},
-                {"matrix": [7, 6], "x": 53, "y": 0}
-            ]
         }
     }
 }
diff --git a/keyboards/gl516/n51gl/keymaps/salicylic/config.h b/keyboards/gl516/n51gl/keymaps/salicylic/config.h
deleted file mode 100644
index 0e221d844d5a..000000000000
--- a/keyboards/gl516/n51gl/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/n51gl/keymaps/salicylic/keymap.c b/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c
deleted file mode 100644
index 81f7b8665f58..000000000000
--- a/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c
+++ /dev/null
@@ -1,117 +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_rotary_layer(
-  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
-       KC_ESC,  KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
-              KC_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_VOLU,    KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,  KC_ENT,
-  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
-               KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,    KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH,   KC_UP, KC_RSFT,
-  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
-         JP_ZKHK, KC_LALT,LGUI_T(JP_MHEN),LT(_LOWER,KC_ENT),KC_BSPC, KC_VOLD, KC_DEL,LT(_RAISE,KC_SPC),ALT_T(JP_HENK),KC_LEFT, KC_DOWN, KC_RGHT
-  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
-  ),
-  [_LOWER] = LAYOUT_rotary_layer(
-  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
-      _______, _______, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,             KC_6,    KC_7,    KC_8,    KC_9, JP_ASTR, JP_SLSH, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
-               JP_QUOT, JP_HASH,  JP_DQT, JP_LPRN, JP_RPRN,   JP_AT, KC_WH_U, XXXXXXX,    KC_4,    KC_5,    KC_6, JP_MINS,  JP_EQL, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
-               JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE, KC_BTN3,    KC_0,    KC_1,    KC_2,    KC_3, JP_PLUS, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
-               _______, _______,       JP_MHEN, MO(_LOWER), _______, KC_WH_D, _______, MO(_RAISE), JP_DOT,        _______, _______, _______
-  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
-  ),
-
-  [_RAISE] = LAYOUT_rotary_layer(
-  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
-      _______, _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP,LALT(KC_PSCR),KC_PSCR,
-  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
-        LCTL_T(KC_F11),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_WH_L, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
-               KC_LSFT,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
-               _______, _______,          _______, _______, _______, KC_WH_R, _______, _______, JP_HENK,          _______, _______, _______
-  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT_rotary_layer(
-  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
-        QK_BOOT,  KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LALT(KC_PSCR),KC_PSCR,
-  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
-              KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_TOG, RGB_MOD, RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
-         SFT_T(KC_F12), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, XXXXXXX, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
-               _______, _______,          _______, _______, _______,RGB_RMOD, _______, _______, _______,          _______, _______, _______
-  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
-  )
-};
-
-//A description for expressing the layer position in LED mode.
-layer_state_t layer_state_set_user(layer_state_t state) {
-  state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
-#ifdef RGBLIGHT_ENABLE
-    switch (get_highest_layer(state)) {
-    case _LOWER:
-      rgblight_sethsv_at(HSV_BLUE, 0);
-      break;
-    case _RAISE:
-      rgblight_sethsv_at(HSV_RED, 0);
-      break;
-    case _ADJUST:
-      rgblight_sethsv_at(HSV_PURPLE, 0);
-      break;
-    default: //  for any other layers, or the default layer
-      rgblight_sethsv_at( 0, 0, 0, 0);
-      break;
-    }
-    rgblight_set_effect_range( 1, 14);
-#endif
-return state;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    keypos_t key;
-    if (clockwise) {
-        key.row = 3;
-        key.col = 0;
-    } else {
-        key.row = 1;
-        key.col = 0;
-    }
-    action_exec(MAKE_KEYEVENT(key.row, key.col, true));
-    action_exec(MAKE_KEYEVENT(key.row, key.col, false));
-    return true;
-}
diff --git a/keyboards/gl516/n51gl/keymaps/via/keymap.c b/keyboards/gl516/n51gl/keymaps/via/keymap.c
index cf1aa7d595f0..10980c6ad0c7 100644
--- a/keyboards/gl516/n51gl/keymaps/via/keymap.c
+++ b/keyboards/gl516/n51gl/keymaps/via/keymap.c
@@ -18,48 +18,48 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_rotary_layer(
+  [0] = LAYOUT(
   //,--------------------------------------------------------------|        |--------------------------------------------------------------.
        KC_ESC,  KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_BSPC,
   //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
-         LT(1,KC_CAPS),    KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_VOLU,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,  KC_ENT,
+         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_MUTE,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_UP, KC_RSFT,
   //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
-              KC_LCTL, KC_LGUI,          KC_LALT,  KC_SPC,  KC_SPC, KC_VOLD,  KC_SPC,  KC_SPC, KC_LALT,          KC_LEFT, KC_DOWN, KC_RGHT
+              KC_LCTL, KC_LGUI,          KC_LALT,  KC_SPC,  KC_SPC,              KC_SPC,  KC_SPC, KC_LALT,          KC_LEFT, KC_DOWN, KC_RGHT
   //|--------------------------------------------------------------|        |--------------------------------------------------------------'
   ),
-  [1] = LAYOUT_rotary_layer(
+  [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_1,    KC_2,    KC_3,    KC_4,    KC_5, _______,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______, _______, 
+               _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,              KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______, _______,
   //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
-               _______, _______,          _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______
+               _______, _______,          _______, _______, _______,              _______, _______, _______,          _______, _______, _______
   //|--------------------------------------------------------------|        |--------------------------------------------------------------'
   ),
-  [2] = LAYOUT_rotary_layer(
+  [2] = 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,          XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX
   //|--------------------------------------------------------------|        |--------------------------------------------------------------'
   ),
-  [3] = LAYOUT_rotary_layer(
+  [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, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+               XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
                XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
-               XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX
+               XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX
   //|--------------------------------------------------------------|        |--------------------------------------------------------------'
   )
 };
@@ -87,16 +87,11 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 return state;
 }
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    keypos_t key;
-    if (clockwise) {
-        key.row = 3;
-        key.col = 0;
-    } else {
-        key.row = 1;
-        key.col = 0;
-    }
-    action_exec(MAKE_KEYEVENT(key.row, key.col, true));
-    action_exec(MAKE_KEYEVENT(key.row, key.col, false));
-    return true;
-}
+#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(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/gl516/n51gl/keymaps/via/rules.mk b/keyboards/gl516/n51gl/keymaps/via/rules.mk
index 036bd6d1c3ec..f1adcab005e8 100644
--- a/keyboards/gl516/n51gl/keymaps/via/rules.mk
+++ b/keyboards/gl516/n51gl/keymaps/via/rules.mk
@@ -1 +1,2 @@
-VIA_ENABLE = yes
\ No newline at end of file
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/info.json b/keyboards/gmmk/gmmk2/p65/ansi/info.json
index fbf5d78b5546..902d1b6b5dd3 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/info.json
+++ b/keyboards/gmmk/gmmk2/p65/ansi/info.json
@@ -8,8 +8,11 @@
         "pid": "0x5045",
         "device_version": "0.0.1"
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "rgb_matrix": {
-        "driver": "AW20216"
+        "driver": "aw20216"
     },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
diff --git a/keyboards/gmmk/gmmk2/p65/config.h b/keyboards/gmmk/gmmk2/p65/config.h
index 64febeb948aa..3c6a2fd906ed 100644
--- a/keyboards/gmmk/gmmk2/p65/config.h
+++ b/keyboards/gmmk/gmmk2/p65/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
 /* 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/gmmk/gmmk2/p65/iso/info.json b/keyboards/gmmk/gmmk2/p65/iso/info.json
index de078864cea4..90609dc91110 100644
--- a/keyboards/gmmk/gmmk2/p65/iso/info.json
+++ b/keyboards/gmmk/gmmk2/p65/iso/info.json
@@ -8,8 +8,11 @@
         "pid": "0x504A",
         "device_version": "0.0.1"
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "rgb_matrix": {
-        "driver": "AW20216"
+        "driver": "aw20216"
     },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
@@ -37,8 +40,8 @@
                 {"matrix": [8, 7], "x": 10, "y": 0},
                 {"matrix": [8, 6], "x": 11, "y": 0},
                 {"matrix": [6, 6], "x": 12, "y": 0},
-                {"matrix": [7, 1], "x": 13, "y": 0, "w": 2.25},
-                {"matrix": [2, 5], "x": 15.25, "y": 0},
+                {"matrix": [7, 1], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 5], "x": 15, "y": 0},
 
                 {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 0], "x": 1.5, "y": 1},
@@ -53,8 +56,8 @@
                 {"matrix": [8, 0], "x": 10.5, "y": 1},
                 {"matrix": [8, 1], "x": 11.5, "y": 1},
                 {"matrix": [6, 1], "x": 12.5, "y": 1},
-                {"matrix": [8, 4], "x": 13.5, "y": 1, "w": 1.75, "h": 2},
-                {"matrix": [2, 6], "x": 15.25, "y": 1},
+                {"matrix": [8, 4], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 6], "x": 15, "y": 1},
 
                 {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [1, 2], "x": 1.75, "y": 2},
@@ -69,7 +72,7 @@
                 {"matrix": [8, 2], "x": 10.75, "y": 2},
                 {"matrix": [8, 3], "x": 11.75, "y": 2},
                 {"matrix": [7, 5], "x": 12.75, "y": 2},
-                {"matrix": [6, 5], "x": 15.25, "y": 2},
+                {"matrix": [6, 5], "x": 15, "y": 2},
 
                 {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.25},
                 {"matrix": [0, 2], "x": 1.25, "y": 3},
@@ -84,8 +87,8 @@
                 {"matrix": [7, 4], "x": 10.25, "y": 3},
                 {"matrix": [8, 5], "x": 11.25, "y": 3},
                 {"matrix": [0, 7], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 5], "x": 14.25, "y": 3},
-                {"matrix": [0, 1], "x": 15.25, "y": 3},
+                {"matrix": [3, 5], "x": 14, "y": 3},
+                {"matrix": [0, 1], "x": 15, "y": 3},
 
                 {"matrix": [0, 6], "x": 0, "y": 4, "w": 1.25},
                 {"matrix": [1, 5], "x": 1.25, "y": 4, "w": 1.25},
@@ -94,9 +97,9 @@
                 {"matrix": [3, 6], "x": 10, "y": 4, "w": 1.25},
                 {"matrix": [3, 3], "x": 11.25, "y": 4, "w": 1.25},
 
-                {"matrix": [0, 3], "x": 13.25, "y": 4},
-                {"matrix": [7, 3], "x": 14.25, "y": 4},
-                {"matrix": [0, 5], "x": 15.25, "y": 4}
+                {"matrix": [0, 3], "x": 13, "y": 4},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [0, 5], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/info.json
index 482e52f5044a..cb0ecf94452a 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/info.json
+++ b/keyboards/gmmk/gmmk2/p96/ansi/info.json
@@ -8,8 +8,11 @@
         "pid": "0x504B",
         "device_version": "0.0.1"
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "rgb_matrix": {
-        "driver": "AW20216"
+        "driver": "aw20216"
     },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
@@ -40,103 +43,103 @@
 
                 {"matrix": [13, 0], "x": 14, "y": 0},
 
-                {"matrix": [0, 6], "x": 15.5, "y": 0},
-                {"matrix": [1, 6], "x": 16.5, "y": 0},
-                {"matrix": [2, 6], "x": 17.5, "y": 0},
-                {"matrix": [3, 6], "x": 18.5, "y": 0},
-
-                {"matrix": [0, 1], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [2, 1], "x": 2, "y": 1},
-                {"matrix": [3, 1], "x": 3, "y": 1},
-                {"matrix": [4, 1], "x": 4, "y": 1},
-                {"matrix": [5, 1], "x": 5, "y": 1},
-                {"matrix": [6, 1], "x": 6, "y": 1},
-                {"matrix": [7, 1], "x": 7, "y": 1},
-                {"matrix": [8, 1], "x": 8, "y": 1},
-                {"matrix": [9, 1], "x": 9, "y": 1},
-                {"matrix": [10, 1], "x": 10, "y": 1},
-                {"matrix": [11, 1], "x": 11, "y": 1},
-                {"matrix": [12, 1], "x": 12, "y": 1},
-                {"matrix": [13, 1], "x": 13, "y": 1, "w": 2},
-
-                {"matrix": [4, 6], "x": 15.5, "y": 1},
-                {"matrix": [5, 6], "x": 16.5, "y": 1},
-                {"matrix": [6, 6], "x": 17.5, "y": 1},
-                {"matrix": [7, 6], "x": 18.5, "y": 1},
-
-                {"matrix": [0, 2], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [3, 2], "x": 3.5, "y": 2},
-                {"matrix": [4, 2], "x": 4.5, "y": 2},
-                {"matrix": [5, 2], "x": 5.5, "y": 2},
-                {"matrix": [6, 2], "x": 6.5, "y": 2},
-                {"matrix": [7, 2], "x": 7.5, "y": 2},
-                {"matrix": [8, 2], "x": 8.5, "y": 2},
-                {"matrix": [9, 2], "x": 9.5, "y": 2},
-                {"matrix": [10, 2], "x": 10.5, "y": 2},
-                {"matrix": [11, 2], "x": 11.5, "y": 2},
-                {"matrix": [12, 2], "x": 12.5, "y": 2},
-                {"matrix": [13, 2], "x": 13.5, "y": 2, "w": 1.25},
-
-                {"matrix": [8, 6], "x": 15.5, "y": 2},
-                {"matrix": [9, 6], "x": 16.5, "y": 2},
-                {"matrix": [10, 6], "x": 17.5, "y": 2, "w": 1.5},
-                {"matrix": [11, 6], "x": 18.5, "y": 2, "h": 2},
-
-                {"matrix": [0, 3], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [1, 3], "x": 1.75, "y": 3},
-                {"matrix": [2, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [4, 3], "x": 4.75, "y": 3},
-                {"matrix": [5, 3], "x": 5.75, "y": 3},
-                {"matrix": [6, 3], "x": 6.75, "y": 3},
-                {"matrix": [7, 3], "x": 7.75, "y": 3},
-                {"matrix": [8, 3], "x": 8.75, "y": 3},
-                {"matrix": [9, 3], "x": 9.75, "y": 3},
-                {"matrix": [10, 3], "x": 10.75, "y": 3},
-                {"matrix": [11, 3], "x": 11.75, "y": 3},
-                {"matrix": [13, 3], "x": 12.75, "y": 3, "w": 2.25},
-
-                {"matrix": [10, 7], "x": 15.5, "y": 3},
-                {"matrix": [11, 7], "x": 16.5, "y": 3},
-                {"matrix": [12, 7], "x": 17.5, "y": 3},
-
-                {"matrix": [0, 4], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [2, 4], "x": 2.25, "y": 4},
-                {"matrix": [3, 4], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [5, 4], "x": 5.25, "y": 4},
-                {"matrix": [6, 4], "x": 6.25, "y": 4},
-                {"matrix": [7, 4], "x": 7.25, "y": 4},
-                {"matrix": [8, 4], "x": 8.25, "y": 4},
-                {"matrix": [9, 4], "x": 9.25, "y": 4},
-                {"matrix": [10, 4], "x": 10.25, "y": 4},
-                {"matrix": [11, 4], "x": 11.25, "y": 4},
-                {"matrix": [13, 4], "x": 12.25, "y": 4, "w": 1.75},
-
-                {"matrix": [1, 7], "x": 14.25, "y": 4},
-
-                {"matrix": [6, 7], "x": 15.5, "y": 4},
-                {"matrix": [7, 7], "x": 16.5, "y": 4},
-                {"matrix": [8, 7], "x": 17.5, "y": 4},
-                {"matrix": [9, 7], "x": 18.5, "y": 4, "h": 2},
-
-                {"matrix": [0, 5], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [1, 5], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [2, 5], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [9, 5], "x": 10, "y": 5},
-                {"matrix": [10, 5], "x": 11, "y": 5},
-                {"matrix": [12, 5], "x": 12, "y": 5},
-
-                {"matrix": [0, 7], "x": 13.25, "y": 5},
-                {"matrix": [2, 7], "x": 14.25, "y": 5},
-                {"matrix": [3, 7], "x": 15.25, "y": 5},
-
-                {"matrix": [4, 7], "x": 16.5, "y": 5},
-                {"matrix": [5, 7], "x": 17.5, "y": 5}
+                {"matrix": [0, 6], "x": 15.25, "y": 0},
+                {"matrix": [1, 6], "x": 16.25, "y": 0},
+                {"matrix": [2, 6], "x": 17.25, "y": 0},
+                {"matrix": [3, 6], "x": 18.25, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.125},
+                {"matrix": [1, 1], "x": 1, "y": 1.125},
+                {"matrix": [2, 1], "x": 2, "y": 1.125},
+                {"matrix": [3, 1], "x": 3, "y": 1.125},
+                {"matrix": [4, 1], "x": 4, "y": 1.125},
+                {"matrix": [5, 1], "x": 5, "y": 1.125},
+                {"matrix": [6, 1], "x": 6, "y": 1.125},
+                {"matrix": [7, 1], "x": 7, "y": 1.125},
+                {"matrix": [8, 1], "x": 8, "y": 1.125},
+                {"matrix": [9, 1], "x": 9, "y": 1.125},
+                {"matrix": [10, 1], "x": 10, "y": 1.125},
+                {"matrix": [11, 1], "x": 11, "y": 1.125},
+                {"matrix": [12, 1], "x": 12, "y": 1.125},
+                {"matrix": [13, 1], "x": 13, "y": 1.125, "w": 2},
+
+                {"matrix": [4, 6], "x": 15.25, "y": 1.125},
+                {"matrix": [5, 6], "x": 16.25, "y": 1.125},
+                {"matrix": [6, 6], "x": 17.25, "y": 1.125},
+                {"matrix": [7, 6], "x": 18.25, "y": 1.125},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.125, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.125},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 2.125},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.125},
+                {"matrix": [6, 2], "x": 6.5, "y": 2.125},
+                {"matrix": [7, 2], "x": 7.5, "y": 2.125},
+                {"matrix": [8, 2], "x": 8.5, "y": 2.125},
+                {"matrix": [9, 2], "x": 9.5, "y": 2.125},
+                {"matrix": [10, 2], "x": 10.5, "y": 2.125},
+                {"matrix": [11, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [12, 2], "x": 12.5, "y": 2.125},
+                {"matrix": [13, 2], "x": 13.5, "y": 2.125, "w": 1.5},
+
+                {"matrix": [8, 6], "x": 15.25, "y": 2.125},
+                {"matrix": [9, 6], "x": 16.25, "y": 2.125},
+                {"matrix": [10, 6], "x": 17.25, "y": 2.125},
+                {"matrix": [11, 6], "x": 18.25, "y": 2.125, "h": 2},
+
+                {"matrix": [0, 3], "x": 0, "y": 3.125, "w": 1.75},
+                {"matrix": [1, 3], "x": 1.75, "y": 3.125},
+                {"matrix": [2, 3], "x": 2.75, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.125},
+                {"matrix": [4, 3], "x": 4.75, "y": 3.125},
+                {"matrix": [5, 3], "x": 5.75, "y": 3.125},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.125},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.125},
+                {"matrix": [8, 3], "x": 8.75, "y": 3.125},
+                {"matrix": [9, 3], "x": 9.75, "y": 3.125},
+                {"matrix": [10, 3], "x": 10.75, "y": 3.125},
+                {"matrix": [11, 3], "x": 11.75, "y": 3.125},
+                {"matrix": [13, 3], "x": 12.75, "y": 3.125, "w": 2.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 3.125},
+                {"matrix": [11, 7], "x": 16.25, "y": 3.125},
+                {"matrix": [12, 7], "x": 17.25, "y": 3.125},
+
+                {"matrix": [0, 4], "x": 0, "y": 4.125, "w": 2.25},
+                {"matrix": [2, 4], "x": 2.25, "y": 4.125},
+                {"matrix": [3, 4], "x": 3.25, "y": 4.125},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.125},
+                {"matrix": [5, 4], "x": 5.25, "y": 4.125},
+                {"matrix": [6, 4], "x": 6.25, "y": 4.125},
+                {"matrix": [7, 4], "x": 7.25, "y": 4.125},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.125},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.125},
+                {"matrix": [10, 4], "x": 10.25, "y": 4.125},
+                {"matrix": [11, 4], "x": 11.25, "y": 4.125},
+                {"matrix": [13, 4], "x": 12.25, "y": 4.125, "w": 1.75},
+
+                {"matrix": [1, 7], "x": 14.125, "y": 4.25},
+
+                {"matrix": [6, 7], "x": 15.25, "y": 4.125},
+                {"matrix": [7, 7], "x": 16.25, "y": 4.125},
+                {"matrix": [8, 7], "x": 17.25, "y": 4.125},
+                {"matrix": [9, 7], "x": 18.25, "y": 4.125, "h": 2},
+
+                {"matrix": [0, 5], "x": 0, "y": 5.125, "w": 1.25},
+                {"matrix": [1, 5], "x": 1.25, "y": 5.125, "w": 1.25},
+                {"matrix": [2, 5], "x": 2.5, "y": 5.125, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5.125, "w": 6.25},
+                {"matrix": [9, 5], "x": 10, "y": 5.125},
+                {"matrix": [10, 5], "x": 11, "y": 5.125},
+                {"matrix": [12, 5], "x": 12, "y": 5.125},
+
+                {"matrix": [0, 7], "x": 13.125, "y": 5.25},
+                {"matrix": [2, 7], "x": 14.125, "y": 5.25},
+                {"matrix": [3, 7], "x": 15.125, "y": 5.25},
+
+                {"matrix": [4, 7], "x": 16.25, "y": 5.125},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.125}
             ]
         }
     }
diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h
index 16aae9b33037..e3b5cdcfa1d6 100644
--- a/keyboards/gmmk/gmmk2/p96/config.h
+++ b/keyboards/gmmk/gmmk2/p96/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
 /* 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/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/info.json
index de9eb07edcf8..788aa7393bde 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/info.json
+++ b/keyboards/gmmk/gmmk2/p96/iso/info.json
@@ -8,8 +8,11 @@
         "pid": "0x505A",
         "device_version": "0.0.1"
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "rgb_matrix": {
-        "driver": "AW20216"
+        "driver": "aw20216"
     },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
@@ -40,104 +43,104 @@
 
                 {"matrix": [13, 0], "x": 14, "y": 0},
 
-                {"matrix": [0, 6], "x": 15.5, "y": 0},
-                {"matrix": [1, 6], "x": 16.5, "y": 0},
-                {"matrix": [2, 6], "x": 17.5, "y": 0},
-                {"matrix": [3, 6], "x": 18.5, "y": 0},
-
-                {"matrix": [0, 1], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [2, 1], "x": 2, "y": 1},
-                {"matrix": [3, 1], "x": 3, "y": 1},
-                {"matrix": [4, 1], "x": 4, "y": 1},
-                {"matrix": [5, 1], "x": 5, "y": 1},
-                {"matrix": [6, 1], "x": 6, "y": 1},
-                {"matrix": [7, 1], "x": 7, "y": 1},
-                {"matrix": [8, 1], "x": 8, "y": 1},
-                {"matrix": [9, 1], "x": 9, "y": 1},
-                {"matrix": [10, 1], "x": 10, "y": 1},
-                {"matrix": [11, 1], "x": 11, "y": 1},
-                {"matrix": [12, 1], "x": 12, "y": 1},
-                {"matrix": [13, 1], "x": 13, "y": 1, "w": 2},
-
-                {"matrix": [4, 6], "x": 15.5, "y": 1},
-                {"matrix": [5, 6], "x": 16.5, "y": 1},
-                {"matrix": [6, 6], "x": 17.5, "y": 1},
-                {"matrix": [7, 6], "x": 18.5, "y": 1},
-
-                {"matrix": [0, 2], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [3, 2], "x": 3.5, "y": 2},
-                {"matrix": [4, 2], "x": 4.5, "y": 2},
-                {"matrix": [5, 2], "x": 5.5, "y": 2},
-                {"matrix": [6, 2], "x": 6.5, "y": 2},
-                {"matrix": [7, 2], "x": 7.5, "y": 2},
-                {"matrix": [8, 2], "x": 8.5, "y": 2},
-                {"matrix": [9, 2], "x": 9.5, "y": 2},
-                {"matrix": [10, 2], "x": 10.5, "y": 2},
-                {"matrix": [11, 2], "x": 11.5, "y": 2},
-                {"matrix": [12, 2], "x": 12.5, "y": 2},
-                {"matrix": [13, 3], "x": 13.5, "y": 2, "w": 1.25, "h": 2},
-
-                {"matrix": [8, 6], "x": 15.5, "y": 2},
-                {"matrix": [9, 6], "x": 16.5, "y": 2},
-                {"matrix": [10, 6], "x": 17.5, "y": 2, "w": 1.5},
-                {"matrix": [11, 6], "x": 18.5, "y": 2, "h": 2},
-
-                {"matrix": [0, 3], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [1, 3], "x": 1.75, "y": 3},
-                {"matrix": [2, 3], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [4, 3], "x": 4.75, "y": 3},
-                {"matrix": [5, 3], "x": 5.75, "y": 3},
-                {"matrix": [6, 3], "x": 6.75, "y": 3},
-                {"matrix": [7, 3], "x": 7.75, "y": 3},
-                {"matrix": [8, 3], "x": 8.75, "y": 3},
-                {"matrix": [9, 3], "x": 9.75, "y": 3},
-                {"matrix": [10, 3], "x": 10.75, "y": 3},
-                {"matrix": [11, 3], "x": 11.75, "y": 3},
-                {"matrix": [12, 3], "x": 12.75, "y": 3},
-
-                {"matrix": [10, 7], "x": 15.5, "y": 3},
-                {"matrix": [11, 7], "x": 16.5, "y": 3},
-                {"matrix": [12, 7], "x": 17.5, "y": 3},
-
-                {"matrix": [0, 4], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [1, 4], "x": 1.25, "y": 4},
-                {"matrix": [2, 4], "x": 2.25, "y": 4},
-                {"matrix": [3, 4], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [5, 4], "x": 5.25, "y": 4},
-                {"matrix": [6, 4], "x": 6.25, "y": 4},
-                {"matrix": [7, 4], "x": 7.25, "y": 4},
-                {"matrix": [8, 4], "x": 8.25, "y": 4},
-                {"matrix": [9, 4], "x": 9.25, "y": 4},
-                {"matrix": [10, 4], "x": 10.25, "y": 4},
-                {"matrix": [11, 4], "x": 11.25, "y": 4},
-                {"matrix": [13, 4], "x": 12.25, "y": 4, "w": 1.75},
-
-                {"matrix": [1, 7], "x": 14.25, "y": 4},
-
-                {"matrix": [6, 7], "x": 15.5, "y": 4},
-                {"matrix": [7, 7], "x": 16.5, "y": 4},
-                {"matrix": [8, 7], "x": 17.5, "y": 4},
-                {"matrix": [9, 7], "x": 18.5, "y": 4, "h": 2},
-
-                {"matrix": [0, 5], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [1, 5], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [2, 5], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [9, 5], "x": 10, "y": 5},
-                {"matrix": [10, 5], "x": 11, "y": 5},
-                {"matrix": [12, 5], "x": 12, "y": 5},
-
-                {"matrix": [0, 7], "x": 13.25, "y": 5},
-                {"matrix": [2, 7], "x": 14.25, "y": 5},
-                {"matrix": [3, 7], "x": 15.25, "y": 5},
-
-                {"matrix": [4, 7], "x": 16.5, "y": 5},
-                {"matrix": [5, 7], "x": 17.5, "y": 5}
+                {"matrix": [0, 6], "x": 15.25, "y": 0},
+                {"matrix": [1, 6], "x": 16.25, "y": 0},
+                {"matrix": [2, 6], "x": 17.25, "y": 0},
+                {"matrix": [3, 6], "x": 18.25, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.125},
+                {"matrix": [1, 1], "x": 1, "y": 1.125},
+                {"matrix": [2, 1], "x": 2, "y": 1.125},
+                {"matrix": [3, 1], "x": 3, "y": 1.125},
+                {"matrix": [4, 1], "x": 4, "y": 1.125},
+                {"matrix": [5, 1], "x": 5, "y": 1.125},
+                {"matrix": [6, 1], "x": 6, "y": 1.125},
+                {"matrix": [7, 1], "x": 7, "y": 1.125},
+                {"matrix": [8, 1], "x": 8, "y": 1.125},
+                {"matrix": [9, 1], "x": 9, "y": 1.125},
+                {"matrix": [10, 1], "x": 10, "y": 1.125},
+                {"matrix": [11, 1], "x": 11, "y": 1.125},
+                {"matrix": [12, 1], "x": 12, "y": 1.125},
+                {"matrix": [13, 1], "x": 13, "y": 1.125, "w": 2},
+
+                {"matrix": [4, 6], "x": 15.25, "y": 1.125},
+                {"matrix": [5, 6], "x": 16.25, "y": 1.125},
+                {"matrix": [6, 6], "x": 17.25, "y": 1.125},
+                {"matrix": [7, 6], "x": 18.25, "y": 1.125},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.125, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.125},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 2.125},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.125},
+                {"matrix": [6, 2], "x": 6.5, "y": 2.125},
+                {"matrix": [7, 2], "x": 7.5, "y": 2.125},
+                {"matrix": [8, 2], "x": 8.5, "y": 2.125},
+                {"matrix": [9, 2], "x": 9.5, "y": 2.125},
+                {"matrix": [10, 2], "x": 10.5, "y": 2.125},
+                {"matrix": [11, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [12, 2], "x": 12.5, "y": 2.125},
+                {"matrix": [13, 3], "x": 13.75, "y": 2.125, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 6], "x": 15.25, "y": 2.125},
+                {"matrix": [9, 6], "x": 16.25, "y": 2.125},
+                {"matrix": [10, 6], "x": 17.25, "y": 2.125},
+                {"matrix": [11, 6], "x": 18.25, "y": 2.125, "h": 2},
+
+                {"matrix": [0, 3], "x": 0, "y": 3.125, "w": 1.75},
+                {"matrix": [1, 3], "x": 1.75, "y": 3.125},
+                {"matrix": [2, 3], "x": 2.75, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.125},
+                {"matrix": [4, 3], "x": 4.75, "y": 3.125},
+                {"matrix": [5, 3], "x": 5.75, "y": 3.125},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.125},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.125},
+                {"matrix": [8, 3], "x": 8.75, "y": 3.125},
+                {"matrix": [9, 3], "x": 9.75, "y": 3.125},
+                {"matrix": [10, 3], "x": 10.75, "y": 3.125},
+                {"matrix": [11, 3], "x": 11.75, "y": 3.125},
+                {"matrix": [12, 3], "x": 12.75, "y": 3.125},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 3.125},
+                {"matrix": [11, 7], "x": 16.25, "y": 3.125},
+                {"matrix": [12, 7], "x": 17.25, "y": 3.125},
+
+                {"matrix": [0, 4], "x": 0, "y": 4.125, "w": 1.25},
+                {"matrix": [1, 4], "x": 1.25, "y": 4.125},
+                {"matrix": [2, 4], "x": 2.25, "y": 4.125},
+                {"matrix": [3, 4], "x": 3.25, "y": 4.125},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.125},
+                {"matrix": [5, 4], "x": 5.25, "y": 4.125},
+                {"matrix": [6, 4], "x": 6.25, "y": 4.125},
+                {"matrix": [7, 4], "x": 7.25, "y": 4.125},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.125},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.125},
+                {"matrix": [10, 4], "x": 10.25, "y": 4.125},
+                {"matrix": [11, 4], "x": 11.25, "y": 4.125},
+                {"matrix": [13, 4], "x": 12.25, "y": 4.125, "w": 1.75},
+
+                {"matrix": [1, 7], "x": 14.125, "y": 4.25},
+
+                {"matrix": [6, 7], "x": 15.25, "y": 4.125},
+                {"matrix": [7, 7], "x": 16.25, "y": 4.125},
+                {"matrix": [8, 7], "x": 17.25, "y": 4.125},
+                {"matrix": [9, 7], "x": 18.25, "y": 4.125, "h": 2},
+
+                {"matrix": [0, 5], "x": 0, "y": 5.125, "w": 1.25},
+                {"matrix": [1, 5], "x": 1.25, "y": 5.125, "w": 1.25},
+                {"matrix": [2, 5], "x": 2.5, "y": 5.125, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5.125, "w": 6.25},
+                {"matrix": [9, 5], "x": 10, "y": 5.125},
+                {"matrix": [10, 5], "x": 11, "y": 5.125},
+                {"matrix": [12, 5], "x": 12, "y": 5.125},
+
+                {"matrix": [0, 7], "x": 13.125, "y": 5.25},
+                {"matrix": [2, 7], "x": 14.125, "y": 5.25},
+                {"matrix": [3, 7], "x": 15.125, "y": 5.25},
+
+                {"matrix": [4, 7], "x": 16.25, "y": 5.125},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.125}
             ]
         }
     }
diff --git a/keyboards/gmmk/numpad/info.json b/keyboards/gmmk/numpad/info.json
index 195d4fa71020..604a49b5038c 100644
--- a/keyboards/gmmk/numpad/info.json
+++ b/keyboards/gmmk/numpad/info.json
@@ -14,7 +14,7 @@
         ]
     },
     "rgb_matrix": {
-        "driver": "AW20216"
+        "driver": "aw20216"
     },
     "processor": "WB32F3G71",
     "bootloader": "wb32-dfu",
diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h
index 8188418469e3..069823663eeb 100644
--- a/keyboards/gmmk/pro/config.h
+++ b/keyboards/gmmk/pro/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -35,6 +33,8 @@
 
 #define DRIVER_COUNT 2
 
+#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
diff --git a/keyboards/gmmk/pro/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json
index 7a1532424bde..7e0adbdb0577 100644
--- a/keyboards/gmmk/pro/rev1/ansi/info.json
+++ b/keyboards/gmmk/pro/rev1/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "AW20216"
+        "driver": "aw20216"
     },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
@@ -21,6 +21,9 @@
             {"pin_a": "C15", "pin_b": "C14"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "bootmagic": {
         "matrix": [1, 3]
     },
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
index d3c00ad364f2..80fa199cf832 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
@@ -13,11 +13,9 @@ GNU General Public License for more details.
 You should have received 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
@@ -34,35 +32,66 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //
     // 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.
+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
+        KC_ESC,  KC_F1,   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_RIGHT
     ),
 
     [1] = LAYOUT(
-        _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          _______,
-        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,            _______,
-        _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
+        KC_WFAV, KC_MYCM, KC_WHOM, KC_MAIL, KC_MSEL, KC_WBAK, KC_WFWD, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_FIND, KC_CALC, _______,          KC_WREF,
+        BL_TOGG, 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_TOG, PB_1,    PB_2,    PB_3,    PB_4,    PB_5,    PB_6,    PB_7,    PB_8,    PB_9,    PB_10,   PB_11,   PB_12,   RESET,            KC_PSCR,
+        GUI_ON,  PB_13,   PB_14,   PB_15,   PB_16,   PB_18,   PB_19,   PB_20,   PB_21,   PB_22,   PB_23,   PB_24,            _______,          KC_SCRL,
+        GUI_OFF,          PB_25,   PB_26,   PB_27,   PB_28,   PB_29,   PB_30,   PB_31,   PB_32,   DM_REC1, DM_RSTP,          DM_PLY1, _______, KC_PAUS,
+        KC_WAKE, OSL(2),  KC_LOCK,                            _______,                            KC_UNDO,  KC_TRNS, KC_AGIN, _______, _______, _______
+    ),
+    [2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_VAI, _______,
+        _______, _______, _______,                            _______,                            _______, KC_TRNS, _______, NK_TOGG, RGB_SPI, RGB_MOD
     ),
-
-
 };
-// clang-format on
+bool encoder_update_user(uint8_t index, bool clockwise) {
 
-#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
+  if (index == 0) {
+    switch(biton32(layer_state)){
+        case 1:
+            if (clockwise){
+                tap_code16(KC_MS_WH_UP);
+            } else{
+                tap_code16(KC_MS_WH_DOWN);
+            }
+            break;
+        default:
+            if (clockwise) {
+                tap_code16(KC_VOLU);
+            } else {
+                tap_code16(KC_VOLD);
+            }
+            break;
+        }
+    }
+    return true;
+}
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+
+if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(3, 255, 255, 255); //capslock key
+    }
+    if (IS_HOST_LED_ON(USB_LED_SCROLL_LOCK)) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(67, 0, 0, 255); //side led 01
+        RGB_MATRIX_INDICATOR_SET_COLOR(70, 0, 0, 255); //side led 02
+        RGB_MATRIX_INDICATOR_SET_COLOR(73, 0, 0, 255); //side led 03
+        RGB_MATRIX_INDICATOR_SET_COLOR(83, 255, 0, 255); //side led 06
+	    RGB_MATRIX_INDICATOR_SET_COLOR(87, 255, 0, 255); //side led 07
+        RGB_MATRIX_INDICATOR_SET_COLOR(91, 255, 0, 255); //side led 08
+    }
+}
diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json
index 7b78ca57163a..52ea4538c8f4 100644
--- a/keyboards/gmmk/pro/rev1/iso/info.json
+++ b/keyboards/gmmk/pro/rev1/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "AW20216"
+        "driver": "aw20216"
     },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
@@ -21,6 +21,9 @@
             {"pin_a": "C15", "pin_b": "C14"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "bootmagic": {
         "matrix": [1, 3]
     },
diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json
index ff693e35739b..082b5f865686 100644
--- a/keyboards/gmmk/pro/rev2/ansi/info.json
+++ b/keyboards/gmmk/pro/rev2/ansi/info.json
@@ -9,7 +9,7 @@
        "device_version": "0.0.2"
     },
     "rgb_matrix": {
-        "driver": "AW20216"
+        "driver": "aw20216"
     },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
@@ -21,6 +21,9 @@
             {"pin_a": "C15", "pin_b": "C14"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "bootmagic": {
         "matrix": [1, 3]
     },
diff --git a/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c
index cbea58716e6d..80fa199cf832 100644
--- a/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c
+++ b/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c
@@ -13,11 +13,9 @@ GNU General Public License for more details.
 You should have received 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
@@ -34,35 +32,66 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     //
     // 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.
+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
+        KC_ESC,  KC_F1,   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_RIGHT
     ),
 
     [1] = LAYOUT(
-        _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          _______,
-        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
-        _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
+        KC_WFAV, KC_MYCM, KC_WHOM, KC_MAIL, KC_MSEL, KC_WBAK, KC_WFWD, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_FIND, KC_CALC, _______,          KC_WREF,
+        BL_TOGG, 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_TOG, PB_1,    PB_2,    PB_3,    PB_4,    PB_5,    PB_6,    PB_7,    PB_8,    PB_9,    PB_10,   PB_11,   PB_12,   RESET,            KC_PSCR,
+        GUI_ON,  PB_13,   PB_14,   PB_15,   PB_16,   PB_18,   PB_19,   PB_20,   PB_21,   PB_22,   PB_23,   PB_24,            _______,          KC_SCRL,
+        GUI_OFF,          PB_25,   PB_26,   PB_27,   PB_28,   PB_29,   PB_30,   PB_31,   PB_32,   DM_REC1, DM_RSTP,          DM_PLY1, _______, KC_PAUS,
+        KC_WAKE, OSL(2),  KC_LOCK,                            _______,                            KC_UNDO,  KC_TRNS, KC_AGIN, _______, _______, _______
+    ),
+    [2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_VAI, _______,
+        _______, _______, _______,                            _______,                            _______, KC_TRNS, _______, NK_TOGG, RGB_SPI, RGB_MOD
     ),
-
-
 };
-// clang-format on
+bool encoder_update_user(uint8_t index, bool clockwise) {
 
-#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
\ No newline at end of file
+  if (index == 0) {
+    switch(biton32(layer_state)){
+        case 1:
+            if (clockwise){
+                tap_code16(KC_MS_WH_UP);
+            } else{
+                tap_code16(KC_MS_WH_DOWN);
+            }
+            break;
+        default:
+            if (clockwise) {
+                tap_code16(KC_VOLU);
+            } else {
+                tap_code16(KC_VOLD);
+            }
+            break;
+        }
+    }
+    return true;
+}
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+
+if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(3, 255, 255, 255); //capslock key
+    }
+    if (IS_HOST_LED_ON(USB_LED_SCROLL_LOCK)) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(67, 0, 0, 255); //side led 01
+        RGB_MATRIX_INDICATOR_SET_COLOR(70, 0, 0, 255); //side led 02
+        RGB_MATRIX_INDICATOR_SET_COLOR(73, 0, 0, 255); //side led 03
+        RGB_MATRIX_INDICATOR_SET_COLOR(83, 255, 0, 255); //side led 06
+	    RGB_MATRIX_INDICATOR_SET_COLOR(87, 255, 0, 255); //side led 07
+        RGB_MATRIX_INDICATOR_SET_COLOR(91, 255, 0, 255); //side led 08
+    }
+}
diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json
index 972551ec4138..a4aef24e6581 100644
--- a/keyboards/gmmk/pro/rev2/iso/info.json
+++ b/keyboards/gmmk/pro/rev2/iso/info.json
@@ -9,7 +9,7 @@
        "device_version": "0.0.2"
     },
     "rgb_matrix": {
-        "driver": "AW20216"
+        "driver": "aw20216"
     },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
@@ -21,6 +21,9 @@
             {"pin_a": "C15", "pin_b": "C14"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "bootmagic": {
         "matrix": [1, 3]
     },
diff --git a/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c b/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
index d551f4cb504a..065cf3eddc09 100644
--- a/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
+++ b/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
@@ -236,10 +236,6 @@ void matrix_init_user(void) {
     #endif
 }
 
-void matrix_scan_user(void) {
-
-}
-
 layer_state_t layer_state_set_user(layer_state_t state) {
     switch (get_highest_layer(state)) {
         case _BL:
@@ -263,7 +259,3 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     }
     return state;
 }
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json
index dbdf673f3eb1..470709ca7525 100644
--- a/keyboards/gopolar/gg86/info.json
+++ b/keyboards/gopolar/gg86/info.json
@@ -13,7 +13,7 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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/rules.mk b/keyboards/gopolar/gg86/rules.mk
index 9eef6b6cc41a..acdf49b47da0 100644
--- a/keyboards/gopolar/gg86/rules.mk
+++ b/keyboards/gopolar/gg86/rules.mk
@@ -22,4 +22,3 @@ RGB_MATRIX_ENABLE = yes
 
 # OLED enabled
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306       # OLED display
diff --git a/keyboards/gray_studio/aero75/config.h b/keyboards/gray_studio/aero75/config.h
index a55a587467e2..d00df8f11f6e 100644
--- a/keyboards/gray_studio/aero75/config.h
+++ b/keyboards/gray_studio/aero75/config.h
@@ -5,22 +5,6 @@
 
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLED_NUM 1
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations 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_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/gray_studio/aero75/info.json b/keyboards/gray_studio/aero75/info.json
index e8a08e79e4e0..476ee33d6170 100644
--- a/keyboards/gray_studio/aero75/info.json
+++ b/keyboards/gray_studio/aero75/info.json
@@ -12,7 +12,23 @@
         "pin": "B10"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 1,
+        "max_brightness": 200,
+        "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": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B1", "A8", "B15", "B14", "B13"],
diff --git a/keyboards/gray_studio/aero75/rules.mk b/keyboards/gray_studio/aero75/rules.mk
index ecfd4b5b959f..4a5444486747 100644
--- a/keyboards/gray_studio/aero75/rules.mk
+++ b/keyboards/gray_studio/aero75/rules.mk
@@ -1,5 +1,3 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/gray_studio/apollo80/config.h b/keyboards/gray_studio/apollo80/config.h
index 362574dea832..d8a6abbc38ca 100644
--- a/keyboards/gray_studio/apollo80/config.h
+++ b/keyboards/gray_studio/apollo80/config.h
@@ -16,21 +16,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-    #define RGBLED_NUM 22
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
     #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-    /*== or choose animations ==*/
-    #define RGBLIGHT_EFFECT_BREATHING
-    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-    #define RGBLIGHT_EFFECT_SNAKE
-    #define RGBLIGHT_EFFECT_KNIGHT
-    #define RGBLIGHT_EFFECT_CHRISTMAS
-    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-    #define RGBLIGHT_EFFECT_RGB_TEST
-    #define RGBLIGHT_EFFECT_ALTERNATING
-    #define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/gray_studio/apollo80/info.json b/keyboards/gray_studio/apollo80/info.json
index 1dfa43bfe1ed..bbaa577c9231 100644
--- a/keyboards/gray_studio/apollo80/info.json
+++ b/keyboards/gray_studio/apollo80/info.json
@@ -12,7 +12,23 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 180
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 22,
+        "max_brightness": 180,
+        "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": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "D2", "D3", "D5"],
diff --git a/keyboards/gray_studio/cod67/config.h b/keyboards/gray_studio/cod67/config.h
index 7a2d573aaf71..578f469599aa 100644
--- a/keyboards/gray_studio/cod67/config.h
+++ b/keyboards/gray_studio/cod67/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 20
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/cod67/info.json b/keyboards/gray_studio/cod67/info.json
index fe6f1b186709..653885f963e2 100644
--- a/keyboards/gray_studio/cod67/info.json
+++ b/keyboards/gray_studio/cod67/info.json
@@ -8,6 +8,24 @@
     "pid": "0x1000",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 20,
+    "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": "B2"
   },
@@ -17,6 +35,7 @@
   },
   "diode_direction": "COL2ROW",
   "backlight": {
+    "driver": "timer",
     "pin": "D4",
     "on_state": 0
   },
diff --git a/keyboards/gray_studio/hb85/config.h b/keyboards/gray_studio/hb85/config.h
deleted file mode 100644
index 41df8a357d2b..000000000000
--- a/keyboards/gray_studio/hb85/config.h
+++ /dev/null
@@ -1,30 +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
-
-#define RGBLED_NUM 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_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/gray_studio/hb85/info.json b/keyboards/gray_studio/hb85/info.json
index 138b1bfe5c91..c0bd4749c14f 100644
--- a/keyboards/gray_studio/hb85/info.json
+++ b/keyboards/gray_studio/hb85/info.json
@@ -16,6 +16,21 @@
     "backlight": {
         "pin": "D4"
     },
+    "rgblight": {
+        "led_count": 5,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/gray_studio/space65/config.h b/keyboards/gray_studio/space65/config.h
index b1c76459fcfb..b5b661bef2ab 100644
--- a/keyboards/gray_studio/space65/config.h
+++ b/keyboards/gray_studio/space65/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 6
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/space65/info.json b/keyboards/gray_studio/space65/info.json
index 8bcd90705aca..db7c2f3b68b5 100644
--- a/keyboards/gray_studio/space65/info.json
+++ b/keyboards/gray_studio/space65/info.json
@@ -18,6 +18,24 @@
         "levels": 5,
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "E2"
     },
diff --git a/keyboards/gray_studio/space65r3/config.h b/keyboards/gray_studio/space65r3/config.h
index 88824052b260..27d4b4a6e568 100644
--- a/keyboards/gray_studio/space65r3/config.h
+++ b/keyboards/gray_studio/space65r3/config.h
@@ -4,22 +4,6 @@
 
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLED_NUM 5
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations 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_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/gray_studio/space65r3/info.json b/keyboards/gray_studio/space65r3/info.json
index 7caa7cdd6034..85e0978a5986 100644
--- a/keyboards/gray_studio/space65r3/info.json
+++ b/keyboards/gray_studio/space65r3/info.json
@@ -12,7 +12,23 @@
         "pin": "B10"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 5,
+        "max_brightness": 200,
+        "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": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B0", "A8", "B15", "B14", "B13"],
diff --git a/keyboards/gray_studio/space65r3/rules.mk b/keyboards/gray_studio/space65r3/rules.mk
index 703a4ac4e133..edf9d72c6e6d 100644
--- a/keyboards/gray_studio/space65r3/rules.mk
+++ b/keyboards/gray_studio/space65r3/rules.mk
@@ -1,5 +1,3 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/gray_studio/think65/hotswap/config.h b/keyboards/gray_studio/think65/hotswap/config.h
deleted file mode 100644
index 7a2cc1f03c8f..000000000000
--- a/keyboards/gray_studio/think65/hotswap/config.h
+++ /dev/null
@@ -1,37 +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
-
-    #define RGBLED_NUM 22
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/gray_studio/think65/hotswap/info.json b/keyboards/gray_studio/think65/hotswap/info.json
index 1912e10989be..382ef80517b2 100644
--- a/keyboards/gray_studio/think65/hotswap/info.json
+++ b/keyboards/gray_studio/think65/hotswap/info.json
@@ -8,6 +8,24 @@
         "pid": "0x4001",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 22,
+        "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": "E2"
     },
diff --git a/keyboards/gray_studio/think65/solder/config.h b/keyboards/gray_studio/think65/solder/config.h
deleted file mode 100644
index 7a2cc1f03c8f..000000000000
--- a/keyboards/gray_studio/think65/solder/config.h
+++ /dev/null
@@ -1,37 +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
-
-    #define RGBLED_NUM 22
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/gray_studio/think65/solder/info.json b/keyboards/gray_studio/think65/solder/info.json
index 7bc54a5bc5b0..e6c0b972b85e 100644
--- a/keyboards/gray_studio/think65/solder/info.json
+++ b/keyboards/gray_studio/think65/solder/info.json
@@ -8,6 +8,24 @@
         "pid": "0x4000",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 22,
+        "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": "E2"
     },
diff --git a/keyboards/gray_studio/think65v3/info.json b/keyboards/gray_studio/think65v3/info.json
index 0fbab667d443..8fba691fa483 100644
--- a/keyboards/gray_studio/think65v3/info.json
+++ b/keyboards/gray_studio/think65v3/info.json
@@ -2,13 +2,13 @@
     "keyboard_name": "think65v3",
     "url": "https://graystudio.club/products/testthink6-5-v3",
     "maintainer": "edwardslau",
-    "manufacturer":"GrayStudio",
+    "manufacturer": "GrayStudio",
     "processor": "STM32F072",
     "diode_direction": "COL2ROW",
     "bootloader": "stm32-dfu",
-       "usb": {
-        "vid":"0x4753",
-        "pid":"0x4003",
+    "usb": {
+        "vid": "0x4753",
+        "pid": "0x4003",
         "device_version": "0.0.3"
     },
     "features": {
@@ -22,19 +22,19 @@
     },
     "ws2812": {
         "pin": "B10"
-    }
+    },
     "matrix_pins": {
         "cols": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B0", "A8", "B15", "B14", "B13"],
         "rows": ["A6", "B12", "A2", "A0", "A1"]
     },
-"rgblight": {
-    "led_count": 6,
-      "sleep": true,
-      "max_brightness": 150,
-      "layers": {
-          "enabled": true
-          "override_rgb": true
-      },
+    "rgblight": {
+        "led_count": 6,
+        "sleep": true,
+        "max_brightness": 150,
+        "layers": {
+            "enabled": true,
+            "override_rgb": true
+        },
         "animations": {
             "alternating": true,
             "breathing": true,
@@ -47,228 +47,749 @@
             "static_gradient": true,
             "twinkle": true
         }
- },
+    },
+    "layout_aliases": {
+        "LAYOUT_65_blocker": "LAYOUT_ansi_blocker",
+        "LAYOUT_65_iso_blocker": "LAYOUT_iso_blocker"
+    },
     "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, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "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, 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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 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, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
         "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, "y": 0},
-
-                {"matrix": [1,0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1,2], "x": 1.5, "y": 1},
-                {"matrix": [1,3], "x": 2.5, "y": 1},
-                {"matrix": [1,4], "x": 3.5, "y": 1},
-                {"matrix": [1,5], "x": 4.5, "y": 1},
-                {"matrix": [1,6], "x": 5.5, "y": 1},
-                {"matrix": [1,7], "x": 6.5, "y": 1},
-                {"matrix": [1,8], "x": 7.5, "y": 1},
-                {"matrix": [1,9], "x": 8.5, "y": 1},
-                {"matrix": [1,10],"x": 9.5, "y": 1},
-                {"matrix": [1,11],"x": 10.5, "y": 1},
-                {"matrix": [1,12],"x": 11.5, "y": 1},
-                {"matrix": [1,13],"x": 12.5, "y": 1},
-                {"matrix": [1,14],"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,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},
-                {"matrix": [2,10],"x": 9.75, "y": 2},
-                {"matrix": [2,11],"x": 10.75, "y": 2},
-                {"matrix": [2,12],"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,13],"x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3,14],"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,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,13],"x": 13, "y": 4},
-                {"matrix": [4,14],"x": 14, "y": 4},
-                {"matrix": [4,15],"x": 15, "y": 4}
+                {"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, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "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, 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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 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, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_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, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "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, 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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 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, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_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, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "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, 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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 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, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_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, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "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, 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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "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_blocker": {
+        "LAYOUT_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, "w": 2},
-                {"matrix": [0,15],"x": 15, "y": 0},
-
-                {"matrix": [1,0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1,2], "x": 1.5, "y": 1},
-                {"matrix": [1,3], "x": 2.5, "y": 1},
-                {"matrix": [1,4], "x": 3.5, "y": 1},
-                {"matrix": [1,5], "x": 4.5, "y": 1},
-                {"matrix": [1,6], "x": 5.5, "y": 1},
-                {"matrix": [1,7], "x": 6.5, "y": 1},
-                {"matrix": [1,8], "x": 7.5, "y": 1},
-                {"matrix": [1,9], "x": 8.5, "y": 1},
-                {"matrix": [1,10],"x": 9.5, "y": 1},
-                {"matrix": [1,11],"x": 10.5, "y": 1},
-                {"matrix": [1,12],"x": 11.5, "y": 1},
-                {"matrix": [1,13],"x": 12.5, "y": 1},
-                {"matrix": [1,14],"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,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},
-                {"matrix": [2,10],"x": 9.75, "y": 2},
-                {"matrix": [2,11],"x": 10.75, "y": 2},
-                {"matrix": [2,12],"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,13],"x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3,14],"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,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,13],"x": 13, "y": 4},
-                {"matrix": [4,14],"x": 14, "y": 4},
-                {"matrix": [4,15],"x": 15, "y": 4}
+                {"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, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "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, 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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "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_iso_blocker": {
+        "LAYOUT_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,2], "x": 1.5, "y": 1},
-                {"matrix": [1,3], "x": 2.5, "y": 1},
-                {"matrix": [1,4], "x": 3.5, "y": 1},
-                {"matrix": [1,5], "x": 4.5, "y": 1},
-                {"matrix": [1,6], "x": 5.5, "y": 1},
-                {"matrix": [1,7], "x": 6.5, "y": 1},
-                {"matrix": [1,8], "x": 7.5, "y": 1},
-                {"matrix": [1,9], "x": 8.5, "y": 1},
-                {"matrix": [1,10],"x": 9.5, "y": 1},
-                {"matrix": [1,11],"x": 10.5, "y": 1},
-                {"matrix": [1,12],"x": 11.5, "y": 1},
-                {"matrix": [1,13],"x": 12.5, "y": 1},
-                {"matrix": [1,15],"x": 15, "y": 1},
-
-                {"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},
-                {"matrix": [2,10],"x": 9.75, "y": 2},
-                {"matrix": [2,11],"x": 10.75, "y": 2},
-                {"matrix": [1,14],"x": 11.75, "y": 2},
-                {"matrix": [2,13],"x": 12.75, "y": 2},
-                {"matrix": [2,14],"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,13],"x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3,14],"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,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,13],"x": 13, "y": 4},
-                {"matrix": [4,14],"x": 14, "y": 4},
-                {"matrix": [4,15],"x": 15, "y": 4}
+                {"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, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 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, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_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, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 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, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_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, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "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_iso_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": [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, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "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/gray_studio/think65v3/keymaps/default/keymap.c b/keyboards/gray_studio/think65v3/keymaps/default/keymap.c
index 82ff711808ed..a3c2e873c177 100644
--- a/keyboards/gray_studio/think65v3/keymaps/default/keymap.c
+++ b/keyboards/gray_studio/think65v3/keymaps/default/keymap.c
@@ -3,18 +3,18 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [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_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_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_TAB,  KC_Q,    KC_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_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),                     KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
+    [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,  _______, _______, QK_BOOT,
-        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          
-        _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,          _______, 
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______,                            _______,                   _______, _______,                   _______, _______, _______
     ),
 };
diff --git a/keyboards/gray_studio/think65v3/keymaps/via/keymap.c b/keyboards/gray_studio/think65v3/keymaps/via/keymap.c
index 82ff711808ed..a3c2e873c177 100644
--- a/keyboards/gray_studio/think65v3/keymaps/via/keymap.c
+++ b/keyboards/gray_studio/think65v3/keymaps/via/keymap.c
@@ -3,18 +3,18 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [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_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_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_TAB,  KC_Q,    KC_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_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),                     KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
+    [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,  _______, _______, QK_BOOT,
-        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          
-        _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,          _______, 
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______,                            _______,                   _______, _______,                   _______, _______, _______
     ),
 };
diff --git a/keyboards/gray_studio/think65v3/matrix_diagram.md b/keyboards/gray_studio/think65v3/matrix_diagram.md
new file mode 100644
index 000000000000..e2bbb127b68b
--- /dev/null
+++ b/keyboards/gray_studio/think65v3/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for GrayStudio think65v3
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      ┌─────┐
+│10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │1F │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┘   ┌──┴┐2E  │ ISO Enter
+│20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │       │2D │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤       └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┐
+│40  │41  │42  │47                      │4A  │4B  │ │4D │4E │4F │
+└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+┌────────┐
+│30      │ 2.25u LShift
+└────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┐
+│40   │41 │42   │47                         │4B   │ Blocker Tsangan
+└─────┴───┴─────┴───────────────────────────┴─────┘
+```
diff --git a/keyboards/gregandcin/teaqueen/info.json b/keyboards/gregandcin/teaqueen/info.json
new file mode 100644
index 000000000000..841c524e62d3
--- /dev/null
+++ b/keyboards/gregandcin/teaqueen/info.json
@@ -0,0 +1,115 @@
+{
+    "manufacturer": "gregandcin",
+    "keyboard_name": "gregandcin/teaqueen",
+    "maintainer": "gregandcin",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP26", "GP22", "GP20", "GP23", "NO_PIN"],
+        "rows": ["GP5", "GP6", "GP7", "GP8", "GP9"]
+    },
+    "processor": "RP2040",
+    "split": {
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "cols": ["GP29", "GP28", "GP27", "GP26", "GP22", "GP20", "GP23", "GP21"],
+                "rows": ["GP5", "GP6", "GP7", "GP8", "GP9"]
+            }
+        },
+        "soft_serial_pin": "GP3"
+    },
+    "url": "https://github.com/gregandcin/teaqueen",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0x4743"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.6, "y": 0},
+                {"matrix": [0, 1], "x": 1.6, "y": 0},
+                {"matrix": [0, 2], "x": 2.6, "y": 0},
+                {"matrix": [0, 3], "x": 3.6, "y": 0},
+                {"matrix": [0, 4], "x": 4.6, "y": 0},
+                {"matrix": [0, 5], "x": 5.6, "y": 0},
+                {"matrix": [0, 6], "x": 6.6, "y": 0},
+
+                {"matrix": [5, 0], "x": 8.5, "y": 0},
+                {"matrix": [5, 1], "x": 9.5, "y": 0},
+                {"matrix": [5, 2], "x": 10.5, "y": 0},
+                {"matrix": [5, 3], "x": 11.5, "y": 0},
+                {"matrix": [5, 4], "x": 12.5, "y": 0},
+                {"matrix": [5, 5], "x": 13.5, "y": 0},
+                {"matrix": [5, 6], "x": 14.5, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.35, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.85, "y": 1},
+                {"matrix": [1, 3], "x": 2.85, "y": 1},
+                {"matrix": [1, 4], "x": 3.85, "y": 1},
+                {"matrix": [1, 5], "x": 4.85, "y": 1},
+                {"matrix": [1, 6], "x": 5.85, "y": 1},
+
+                {"matrix": [6, 0], "x": 8.25, "y": 1},
+                {"matrix": [6, 1], "x": 9.25, "y": 1},
+                {"matrix": [6, 2], "x": 10.25, "y": 1},
+                {"matrix": [6, 3], "x": 11.25, "y": 1},
+                {"matrix": [6, 4], "x": 12.25, "y": 1},
+                {"matrix": [6, 5], "x": 13.25, "y": 1},
+                {"matrix": [6, 6], "x": 14.25, "y": 1},
+                {"matrix": [6, 7], "x": 15.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.2, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.95, "y": 2},
+                {"matrix": [2, 3], "x": 2.95, "y": 2},
+                {"matrix": [2, 4], "x": 3.95, "y": 2},
+                {"matrix": [2, 5], "x": 4.95, "y": 2},
+                {"matrix": [2, 6], "x": 5.95, "y": 2},
+
+                {"matrix": [7, 0], "x": 8.75, "y": 2},
+                {"matrix": [7, 1], "x": 9.75, "y": 2},
+                {"matrix": [7, 2], "x": 10.75, "y": 2},
+                {"matrix": [7, 3], "x": 11.75, "y": 2},
+                {"matrix": [7, 4], "x": 12.75, "y": 2},
+                {"matrix": [7, 5], "x": 13.75, "y": 2},
+                {"matrix": [7, 7], "x": 14.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": [8, 0], "x": 8.45, "y": 3},
+                {"matrix": [8, 1], "x": 9.45, "y": 3},
+                {"matrix": [8, 2], "x": 10.45, "y": 3},
+                {"matrix": [8, 3], "x": 11.45, "y": 3},
+                {"matrix": [8, 4], "x": 12.45, "y": 3},
+                {"matrix": [8, 5], "x": 13.45, "y": 3},
+                {"matrix": [8, 6], "x": 14.45, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 16.20, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.2, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.7, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 6.75, "y": 4},
+
+                {"matrix": [9, 1], "x": 8.45, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 11.20, "y": 4, "w": 1.5},
+                {"matrix": [9, 6], "x": 14.5, "y": 4},
+                {"matrix": [9, 7], "x": 15.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gregandcin/teaqueen/keymaps/default/keymap.c b/keyboards/gregandcin/teaqueen/keymaps/default/keymap.c
new file mode 100644
index 000000000000..2bcc085b7775
--- /dev/null
+++ b/keyboards/gregandcin/teaqueen/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+// Copyright 2018-2023 Mattia Dal Ben <matthewdibi@gmail.com> gregandcin <gregandcinbusiness@gmail.com>
+// 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 {
+    _QWERTY,
+    _SYMB,
+    _NAV
+};
+
+
+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_TAB,           KC_Q,  KC_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,                    MO(1), KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),
+		KC_LCTL, KC_LGUI,        KC_LALT,        KC_SPC, MO(1),                          KC_SPC,        KC_RALT,                   KC_RGUI, KC_RCTL),
+
+	[_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_F11,  KC_F12,  KC_TRNS,
+		KC_TRNS,         KC_TRNS, KC_UP,   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_LEFT, KC_DOWN, KC_RGHT, 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,
+		QK_BOOT,  KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,                      KC_TRNS,          KC_TRNS,                    KC_TRNS, QK_BOOT),
+
+	 [_NAV] = 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_BTN2, KC_MS_U,  KC_BTN1, KC_WH_U, 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_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_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/gregandcin/teaqueen/keymaps/via/keymap.c b/keyboards/gregandcin/teaqueen/keymaps/via/keymap.c
new file mode 100644
index 000000000000..2bcc085b7775
--- /dev/null
+++ b/keyboards/gregandcin/teaqueen/keymaps/via/keymap.c
@@ -0,0 +1,40 @@
+// Copyright 2018-2023 Mattia Dal Ben <matthewdibi@gmail.com> gregandcin <gregandcinbusiness@gmail.com>
+// 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 {
+    _QWERTY,
+    _SYMB,
+    _NAV
+};
+
+
+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_TAB,           KC_Q,  KC_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,                    MO(1), KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),
+		KC_LCTL, KC_LGUI,        KC_LALT,        KC_SPC, MO(1),                          KC_SPC,        KC_RALT,                   KC_RGUI, KC_RCTL),
+
+	[_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_F11,  KC_F12,  KC_TRNS,
+		KC_TRNS,         KC_TRNS, KC_UP,   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_LEFT, KC_DOWN, KC_RGHT, 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,
+		QK_BOOT,  KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,                      KC_TRNS,          KC_TRNS,                    KC_TRNS, QK_BOOT),
+
+	 [_NAV] = 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_BTN2, KC_MS_U,  KC_BTN1, KC_WH_U, 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_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_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/gregandcin/teaqueen/keymaps/via/rules.mk b/keyboards/gregandcin/teaqueen/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/gregandcin/teaqueen/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/gregandcin/teaqueen/readme.md b/keyboards/gregandcin/teaqueen/readme.md
new file mode 100644
index 000000000000..2d259e644d2d
--- /dev/null
+++ b/keyboards/gregandcin/teaqueen/readme.md
@@ -0,0 +1,26 @@
+# gregandcin/teaqueen
+
+![gregandcin/teaqueen](https://i.imgur.com/Wf1EIqwh.png)
+
+An Alice inspired, split layout keyboar featuring Kailh hotswap sockets.
+
+* Keyboard Maintainer: [gregandcin](https://github.com/gregandcin)
+* Hardware Supported: Elite-Pi, other RP2040 Community Edition Boards
+
+Make example for this keyboard (after setting up your build environment):
+
+    make gregandcin/teaqueen:default
+
+Flashing example for this keyboard:
+
+    make gregandcin/teaqueen: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/gregandcin/teaqueen/rules.mk b/keyboards/gregandcin/teaqueen/rules.mk
new file mode 100644
index 000000000000..161ec22b16e2
--- /dev/null
+++ b/keyboards/gregandcin/teaqueen/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
diff --git a/keyboards/grid600/press/config.h b/keyboards/grid600/press/config.h
index 81bccd015b40..a7f362f47b71 100644
--- a/keyboards/grid600/press/config.h
+++ b/keyboards/grid600/press/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 4
-  #define RGBLIGHT_HUE_STEP 10
-  #define RGBLIGHT_SAT_STEP 17
-  #define RGBLIGHT_VAL_STEP 17
-  #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
-
 /* 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/grid600/press/info.json b/keyboards/grid600/press/info.json
index 6a5d86e0c735..e808036385d3 100644
--- a/keyboards/grid600/press/info.json
+++ b/keyboards/grid600/press/info.json
@@ -12,6 +12,23 @@
         "cols": ["F1", "F4", "F5", "F6"],
         "rows": ["F0"]
     },
+    "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": "B6"
     },
diff --git a/keyboards/h0oni/deskpad/config.h b/keyboards/h0oni/deskpad/config.h
index ddcf0ebe4af5..441e3b8c1a66 100644
--- a/keyboards/h0oni/deskpad/config.h
+++ b/keyboards/h0oni/deskpad/config.h
@@ -20,6 +20,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Defining tapping term */
-#define TAPPING_TERM 250
\ No newline at end of file
diff --git a/keyboards/h0oni/deskpad/info.json b/keyboards/h0oni/deskpad/info.json
index 96a23f7f615f..e51aa7e7dfc3 100644
--- a/keyboards/h0oni/deskpad/info.json
+++ b/keyboards/h0oni/deskpad/info.json
@@ -8,6 +8,9 @@
         "pid": "0x4450",
         "device_version": "0.0.1"
     },
+    "tapping": {
+        "term": 250
+    },
     "matrix_pins": {
         "cols": ["D0", "D4", "D1"],
         "rows": ["D7", "C6"]
diff --git a/keyboards/h0oni/hotduck/config.h b/keyboards/h0oni/hotduck/config.h
index 9891423e3fec..4c8c95e41ec1 100644
--- a/keyboards/h0oni/hotduck/config.h
+++ b/keyboards/h0oni/hotduck/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-/* RGB Underglow
- */
-#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 10
-#define RGBLIGHT_SAT_STEP 15
-#define RGBLIGHT_VAL_STEP 15
-
 /* 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/h0oni/hotduck/info.json b/keyboards/h0oni/hotduck/info.json
index 6e8e2e61448c..939d1ec262b0 100644
--- a/keyboards/h0oni/hotduck/info.json
+++ b/keyboards/h0oni/hotduck/info.json
@@ -13,6 +13,24 @@
         "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "hue_steps": 10,
+        "saturation_steps": 15,
+        "brightness_steps": 15,
+        "led_count": 20,
+        "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": "F4"
     },
diff --git a/keyboards/hackpad/info.json b/keyboards/hackpad/info.json
new file mode 100644
index 000000000000..0a77c9320c5f
--- /dev/null
+++ b/keyboards/hackpad/info.json
@@ -0,0 +1,78 @@
+{
+    "manufacturer": "Nico Stuhlmueller",
+    "keyboard_name": "hackpad",
+    "maintainer": "ThePurox",
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F4"}
+        ]
+    },
+    "url": "https://git.imaginaerraum.de/Purox/Hackpad",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "ws2812": {
+        "pin": "D4"
+    },
+    "rgblight": {
+        "led_count": 16,
+        "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": {
+            "layout": [
+                {"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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hackpad/keymaps/default/keymap.c b/keyboards/hackpad/keymaps/default/keymap.c
new file mode 100644
index 000000000000..43489484ae4d
--- /dev/null
+++ b/keyboards/hackpad/keymaps/default/keymap.c
@@ -0,0 +1,30 @@
+// Copyright 2023 Nico Stuhlmueller (@ThePurox)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+#include "keymap_german.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*             ┌───┐
+     *             │MUT│
+     * ┌───┬───┬───┼───┤
+     * │ 7 │ 8 │ 9 │ + │
+     * ├───┼───┼───┼───┤
+     * │ 4 │ 5 │ 6 │ - │
+     * ├───┼───┼───┼───┤
+     * │ 1 │ 2 │ 3 │ * │
+     * ├───┼───┼───┼───┤
+     * │ 0 │ . │Ent│ / │
+     * └───┴───┴───┴───┘
+     */
+    [0] = LAYOUT(                                 LT(1, KC_MUTE),
+                            KC_7, KC_8,   KC_9,   DE_PLUS,
+                            KC_4, KC_5,   KC_6,   DE_MINS,
+                            KC_1, KC_2,   KC_3,   DE_ASTR,
+                            KC_0, KC_DOT, KC_ENT, DE_SLSH),
+
+    [1] = LAYOUT(                                         _______,
+                            RGB_M_P,  RGB_M_B,  RGB_M_R,  RGB_HUI,
+                            RGB_M_SW, RGB_M_SN, RGB_M_K,  RGB_HUD,
+                            RGB_M_X,  RGB_M_G,  RGB_M_TW, RGB_VAI,
+                            RGB_TOG,  RGB_SAI,  RGB_SAD,  RGB_VAD)};
diff --git a/keyboards/hackpad/readme.md b/keyboards/hackpad/readme.md
new file mode 100644
index 000000000000..f992e55b39cc
--- /dev/null
+++ b/keyboards/hackpad/readme.md
@@ -0,0 +1,31 @@
+# hackpad
+
+![hackpad](https://git.imaginaerraum.de/Purox/Hackpad/raw/branch/main/assets/pic.jpg)
+
+
+The `Hackpad` is a 4x4 numpad/macropad designed for the Arduino Day 2023 in Bayreuth in cooperation with the hackspace [Imaginärraum e.V.](imaginaerraum.de) and [Fablab-Bayreuth e.V.](fablab-bayreuth.de).
+It supports 16 MX-style switches, an EC-11 rotary encoder, and per key RGB LEDs based on SK6812.
+
+In v0.2 all necessary components are through hole components (except for an optional reset switch and RGB-LEDs), but the ProMicro protrudes out of the case.
+In v0.3 this is fixed by moving some diodes to the bottom side. The bottom diodes however are SMD only.
+
+* Keyboard Maintainer: [Nico Stuhlmueller](https://github.com/ThePurox)
+* Hardware Supported: ProMicro is supported in v0.2 and v0.3 of the PCBs
+* Hardware Availability: PCBs can be found [here](https://git.imaginaerraum.de/Purox/Hackpad)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make hackpad:default
+
+Flashing example for this keyboard:
+
+    make hackpad:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the top 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/hackpad/rules.mk b/keyboards/hackpad/rules.mk
new file mode 100644
index 000000000000..7114cc329583
--- /dev/null
+++ b/keyboards/hackpad/rules.mk
@@ -0,0 +1 @@
+# this file is intentionally left blank
diff --git a/keyboards/hadron/ver2/config.h b/keyboards/hadron/ver2/config.h
index 7b7acf32b640..ca2798c9076a 100644
--- a/keyboards/hadron/ver2/config.h
+++ b/keyboards/hadron/ver2/config.h
@@ -18,18 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // configure oled driver for the 128x32 oled
 #define OLED_UPDATE_INTERVAL 33 // ~30fps
-
-/* ws2812 RGB LED*/
-#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     // Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/hadron/ver2/info.json b/keyboards/hadron/ver2/info.json
index 612d3af50aa3..fb1dc102b7e3 100644
--- a/keyboards/hadron/ver2/info.json
+++ b/keyboards/hadron/ver2/info.json
@@ -7,6 +7,22 @@
         "rows": ["D7", "E6", "B4", "B5", "B6"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 14,
+        "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": "D4"
     },
diff --git a/keyboards/hadron/ver2/rules.mk b/keyboards/hadron/ver2/rules.mk
index d07da3fca08d..188b4696f185 100644
--- a/keyboards/hadron/ver2/rules.mk
+++ b/keyboards/hadron/ver2/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/hadron/ver3/config.h b/keyboards/hadron/ver3/config.h
index 02e4116bb609..c9fc1028f823 100644
--- a/keyboards/hadron/ver3/config.h
+++ b/keyboards/hadron/ver3/config.h
@@ -60,66 +60,54 @@
 
 /* Haptic Driver initialization settings
  * Feedback Control Settings */
-#define FB_ERM_LRA 1 /* For ERM:0 or LRA:1*/
-#define FB_BRAKEFACTOR 6 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
-#define FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
+#define DRV2605L_FB_ERM_LRA 1 /* For ERM:0 or LRA:1*/
+#define DRV2605L_FB_BRAKEFACTOR 6 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
+#define DRV2605L_FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
 
 /* default 3V ERM vibration motor voltage and library*/
-#if FB_ERM_LRA == 0
-#define RATED_VOLTAGE 3
-#define V_RMS 2.3
-#define V_PEAK 3.30
+#if DRV2605L_FB_ERM_LRA == 0
+#define DRV2605L_RATED_VOLTAGE 3
+#define DRV2605L_V_RMS 2.3
+#define DRV2605L_V_PEAK 3.30
 /* Library Selection */
-#define LIB_SELECTION 4 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
+#define DRV2605L_LIBRARY 4 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
 
 /* default 2V LRA voltage and library */
-#elif FB_ERM_LRA == 1
-#define RATED_VOLTAGE 2
-#define V_RMS 2.0
-#define V_PEAK 2.85
-#define F_LRA 200
+#elif DRV2605L_FB_ERM_LRA == 1
+#define DRV2605L_RATED_VOLTAGE 2
+#define DRV2605L_V_RMS 2.0
+#define DRV2605L_V_PEAK 2.85
+#define DRV2605L_F_LRA 200
 /* Library Selection */
-#define LIB_SELECTION 6 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
+#define DRV2605L_LIBRARY 6 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
 
 #endif
 
 /* Control 1 register settings */
-#define DRIVE_TIME 25
-#define AC_COUPLE 0
-#define STARTUP_BOOST 1
+#define DRV2605L_DRIVE_TIME 25
+#define DRV2605L_AC_COUPLE 0
+#define DRV2605L_STARTUP_BOOST 1
 
 /* Control 2 Settings */
-#define BIDIR_INPUT 1
-#define BRAKE_STAB 1 /* Loopgain is reduced when braking is almost complete to improve stability */
-#define SAMPLE_TIME 3
-#define BLANKING_TIME 1
-#define IDISS_TIME 1
+#define DRV2605L_BIDIR_INPUT 1
+#define DRV2605L_BRAKE_STAB 1 /* Loopgain is reduced when braking is almost complete to improve stability */
+#define DRV2605L_SAMPLE_TIME 3
+#define DRV2605L_BLANKING_TIME 1
+#define DRV2605L_IDISS_TIME 1
 
 /* Control 3 settings */
-#define NG_THRESH 2
-#define ERM_OPEN_LOOP 1
-#define SUPPLY_COMP_DIS 0
-#define DATA_FORMAT_RTO 0
-#define LRA_DRIVE_MODE 0
-#define N_PWM_ANALOG 0
-#define LRA_OPEN_LOOP 0
+#define DRV2605L_NG_THRESH 2
+#define DRV2605L_ERM_OPEN_LOOP 1
+#define DRV2605L_SUPPLY_COMP_DIS 0
+#define DRV2605L_DATA_FORMAT_RTO 0
+#define DRV2605L_LRA_DRIVE_MODE 0
+#define DRV2605L_N_PWM_ANALOG 0
+#define DRV2605L_LRA_OPEN_LOOP 0
 /* Control 4 settings */
-#define ZC_DET_TIME 0
-#define AUTO_CAL_TIME 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 10
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define DRV2605L_ZC_DET_TIME 0
+#define DRV2605L_AUTO_CAL_TIME 3
+
+#define RGB_MATRIX_LED_COUNT 10
 
 // #define RGB_MATRIX_KEYPRESSES
 
diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/info.json
index 753a9676ceb4..381a5dc5501e 100644
--- a/keyboards/hadron/ver3/info.json
+++ b/keyboards/hadron/ver3/info.json
@@ -3,7 +3,7 @@
         "device_version": "0.0.3"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B8", "B2", "B10", "A0", "A1", "A2", "B0", "A3", "B1", "A6", "A7", "B12", "C13", "B11", "B9"],
@@ -15,6 +15,21 @@
             {"pin_a": "B13", "pin_b": "B14"}
         ]
     },
+    "rgblight": {
+        "led_count": 10,
+        "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": "B5"
     },
diff --git a/keyboards/hadron/ver3/keymaps/ishtob/config.h b/keyboards/hadron/ver3/keymaps/ishtob/config.h
deleted file mode 100644
index 6f70f09beec2..000000000000
--- a/keyboards/hadron/ver3/keymaps/ishtob/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
index e99ff55caf03..a3b522fa0474 100644
--- a/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/ishtob/keymap.c
@@ -239,12 +239,3 @@ bool music_mask_user(uint16_t keycode) {
       return true;
   }
 }
-
-
-void matrix_init_keymap(void) {
-}
-
-
-void matrix_scan_keymap(void) {
-}
-
diff --git a/keyboards/hadron/ver3/keymaps/sebaslayout/keymap.c b/keyboards/hadron/ver3/keymaps/sebaslayout/keymap.c
index 01fe45bd05e7..fcae7f07c6c3 100644
--- a/keyboards/hadron/ver3/keymaps/sebaslayout/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/sebaslayout/keymap.c
@@ -41,17 +41,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 };
 
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/hadron/ver3/rules.mk b/keyboards/hadron/ver3/rules.mk
index 5739e57d19bc..edc5fa7d5bf5 100644
--- a/keyboards/hadron/ver3/rules.mk
+++ b/keyboards/hadron/ver3/rules.mk
@@ -12,7 +12,6 @@ AUDIO_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = DRV2605L
+HAPTIC_DRIVER = drv2605l
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLER = yes
diff --git a/keyboards/halfcliff/config.h b/keyboards/halfcliff/config.h
index 6f5dd093d657..d3c5de43387f 100644
--- a/keyboards/halfcliff/config.h
+++ b/keyboards/halfcliff/config.h
@@ -25,14 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { F5, F6, F7, D7, B5, F5, F6, F7, D7, B5 }
 #define MATRIX_COL_PINS { B4, E6, C6, B6, B2 }
 
-   #define RGBLED_NUM 10
-   #define RGBLIGHT_SPLIT
-   #define RGBLED_SPLIT { 5, 5 }
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
 /* 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/halfcliff/info.json b/keyboards/halfcliff/info.json
index fb0666fbf434..0c9b4ddb0f48 100644
--- a/keyboards/halfcliff/info.json
+++ b/keyboards/halfcliff/info.json
@@ -16,6 +16,13 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "sleep": true,
+        "split_count": [5, 5]
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/halokeys/elemental75/config.h b/keyboards/halokeys/elemental75/config.h
index c23763ee9bfa..ea52da292806 100644
--- a/keyboards/halokeys/elemental75/config.h
+++ b/keyboards/halokeys/elemental75/config.h
@@ -15,28 +15,6 @@
   */
 #pragma once
 
-#define TAP_CODE_DELAY 10 // tap_code function delay for register and unregister
-
-#define RGBLED_NUM 22
-#define RGBLIGHT_SLEEP
-
-/* animations enabled */
-#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_DISABLE_KEYCODES
-
-// Tap dance term declaration
-#define TAPPING_TERM 300
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/halokeys/elemental75/info.json b/keyboards/halokeys/elemental75/info.json
index 5f8bdb38a6a9..1ee23d967ba9 100644
--- a/keyboards/halokeys/elemental75/info.json
+++ b/keyboards/halokeys/elemental75/info.json
@@ -18,11 +18,31 @@
             {"pin_a": "B6", "pin_b": "B5"}
         ]
     },
+    "tapping": {
+        "term": 300
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "ws2812": {
         "pin": "A10"
     },
     "rgblight": {
-        "max_brightness": 225
+        "led_count": 22,
+        "max_brightness": 225,
+        "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
+        }
     },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/hand88/rules.mk b/keyboards/hand88/rules.mk
old mode 100755
new mode 100644
index 266889cfe705..475da662628f
--- a/keyboards/hand88/rules.mk
+++ b/keyboards/hand88/rules.mk
@@ -1,7 +1,3 @@
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/handwired/2x5keypad/config.h b/keyboards/handwired/2x5keypad/config.h
index 819f0f640f52..5f360813239b 100644
--- a/keyboards/handwired/2x5keypad/config.h
+++ b/keyboards/handwired/2x5keypad/config.h
@@ -5,6 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Tap dancing params */
-#define TAPPING_TERM 250
diff --git a/keyboards/handwired/2x5keypad/info.json b/keyboards/handwired/2x5keypad/info.json
index 1df0ccbdee5c..b33273e19dbb 100644
--- a/keyboards/handwired/2x5keypad/info.json
+++ b/keyboards/handwired/2x5keypad/info.json
@@ -8,6 +8,9 @@
         "pid": "0x2020",
         "device_version": "0.0.1"
     },
+    "tapping": {
+        "term": 250
+    },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4"],
         "rows": ["B3", "B2"]
diff --git a/keyboards/handwired/3dp660/config.h b/keyboards/handwired/3dp660/config.h
index f804456960f6..c2949ab3a7a4 100644
--- a/keyboards/handwired/3dp660/config.h
+++ b/keyboards/handwired/3dp660/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define TAPPING_TERM 400
-
 /* 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/3dp660/info.json b/keyboards/handwired/3dp660/info.json
index c3bc103d773d..82132e447332 100644
--- a/keyboards/handwired/3dp660/info.json
+++ b/keyboards/handwired/3dp660/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3660",
         "device_version": "0.0.1"
     },
+    "tapping": {
+        "term": 400
+    },
     "matrix_pins": {
         "cols": ["D2", "D3", "C6", "C7", "D5", "D4", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1"],
         "rows": ["B0", "B1", "B2", "B3", "B7"]
@@ -15,6 +18,7 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "halfkay",
+    "community_layouts": ["66_ansi"],
     "layouts": {
         "LAYOUT_66_ansi": {
             "layout": [
diff --git a/keyboards/handwired/3dp660_oled/3dp660_oled.c b/keyboards/handwired/3dp660_oled/3dp660_oled.c
new file mode 100644
index 000000000000..cc98d235f45a
--- /dev/null
+++ b/keyboards/handwired/3dp660_oled/3dp660_oled.c
@@ -0,0 +1,121 @@
+// Copyright 2023 xia0 (@xia0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#if defined (OLED_ENABLE)
+
+
+// WPM responsiveness
+#define IDLE_FRAMES 5
+#define IDLE_SPEED 20  // Speed at which animation goes into idle
+#define TAP_FRAMES 2
+#define TAP_SPEED 40  // WPM to trigger Bongo
+#define ANIM_FRAME_DURATION 200  // Frame MS
+#define ANIM_SIZE 636  // Number of bytes in array, max 1024
+
+
+
+static void render_animation(void) {
+
+    static uint32_t anim_timer         = 0;
+    static uint32_t anim_sleep         = 0;
+    static uint8_t  current_idle_frame = 0;
+    static uint8_t current_tap_frame = 0;
+
+    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) {
+        oled_on();  // Enables OLED on 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_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+
+    // Render Bongo Cat
+    render_animation();
+
+    // WPM text
+    oled_set_cursor(0, 0);
+    oled_write(get_u8_str(get_current_wpm(), '0'), false);
+
+    // Caps lock text
+    led_t led_state = host_keyboard_led_state();
+    oled_set_cursor(0, 3);
+    if (led_state.caps_lock) {
+        oled_write_P(PSTR("CAPS"), false);
+    }
+
+    return true;
+}
+
+#endif
diff --git a/keyboards/handwired/3dp660_oled/info.json b/keyboards/handwired/3dp660_oled/info.json
new file mode 100644
index 000000000000..a43aca34643c
--- /dev/null
+++ b/keyboards/handwired/3dp660_oled/info.json
@@ -0,0 +1,251 @@
+{
+    "manufacturer": "xia0",
+    "keyboard_name": "handwired/3dp660_oled",
+    "maintainer": "xia0",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "oled": true,
+        "nkro": true,
+        "wpm": true
+    },
+    "build": {
+        "lto": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D5", "B0", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x3661",
+        "vid": "0x6662"
+    },
+    "layouts": {
+        "LAYOUT_66_ansi": {
+          "layout": [
+            { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+            { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+            { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+            { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+            { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+            { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+            { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+            { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+            { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
+            { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
+            { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
+            { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
+            { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+            { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
+            { "label": "Page Up", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+            { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+            { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+            { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+            { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+            { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+            { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+            { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+            { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+            { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
+            { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
+            { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
+            { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
+            { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+            { "label": "|", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
+            { "label": "Page Down", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+            { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+            { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+            { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+            { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+            { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+            { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+            { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+            { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+            { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
+            { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
+            { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
+            { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
+            { "label": "Enter", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 },
+            { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+            { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+            { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+            { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+            { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+            { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+            { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+            { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
+            { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
+            { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
+            { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
+            { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
+            { "label": "Up", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+            { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+            { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+            { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+            { "label": "Space", "matrix": [4, 6], "w": 6, "x": 3.75, "y": 4 },
+            { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 },
+            { "label": "Win", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 },
+            { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
+            { "label": "Left", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
+            { "label": "Down", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
+            { "label": "Up", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+          ]
+        },
+        "LAYOUT_66_iso": {
+          "layout": [
+            { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+            { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+            { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+            { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+            { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+            { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+            { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+            { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+            { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
+            { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
+            { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
+            { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
+            { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+            { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
+            { "label": "Insert", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+            { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+            { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+            { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+            { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+            { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+            { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+            { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+            { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+            { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
+            { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
+            { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
+            { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
+            { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+            { "label": "Delete", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+            { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+            { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+            { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+            { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+            { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+            { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+            { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+            { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+            { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
+            { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
+            { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
+            { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
+            { "label": "", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 },
+            { "h": 2, "label": "Enter", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 1 },
+            { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+            { "label": "\\", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
+            { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+            { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+            { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+            { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+            { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+            { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+            { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
+            { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
+            { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
+            { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
+            { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
+            { "label": "\u2191", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+            { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+            { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+            { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+            { "label": "Space", "matrix": [4, 6], "w": 6, "x": 3.75, "y": 4 },
+            { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 },
+            { "label": "Ctrl", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 },
+            { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
+            { "label": "\u2190", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
+            { "label": "\u2193", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
+            { "label": "\u2192", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+          ]
+        },
+        "LAYOUT_all": {
+          "layout": [
+            { "label": "GRAVE", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+            { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+            { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+            { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+            { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+            { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+            { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+            { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+            { "label": "8", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
+            { "label": "9", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
+            { "label": "0", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
+            { "label": "DASH", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
+            { "label": "EQUALSIGN", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+            { "label": "YEN", "matrix": [5, 5], "w": 1, "x": 13, "y": 0 },
+            { "label": "BACKSPACE", "matrix": [5, 6], "w": 1, "x": 14, "y": 0 },
+            { "label": "PAGEUP", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+            { "label": "TAB", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+            { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+            { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+            { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+            { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+            { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+            { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+            { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+            { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
+            { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
+            { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
+            { "label": "LBRACKET", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
+            { "label": "RBRACKET", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+            { "label": "BACKSLASH", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
+            { "label": "PAGEDOWN", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+            { "label": "CAPSLOCK", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+            { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+            { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+            { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+            { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+            { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+            { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+            { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+            { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
+            { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
+            { "label": "SEMICOLON", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
+            { "label": "QUOTE", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
+            { "label": "ISOHASH", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 },
+            { "label": "ENTER", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 2 },
+            { "label": "LSHIFT", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+            { "label": "ISOBACKSLASH", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
+            { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+            { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+            { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+            { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+            { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+            { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+            { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
+            { "label": "COMMA", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
+            { "label": "PERIOD", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
+            { "label": "SLASH", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
+            { "label": "JPBACKSLASH", "matrix": [8, 4], "w": 1, "x": 12.25, "y": 3 },
+            { "label": "RSHIFT", "matrix": [8, 5], "w": 1.25, "x": 13.25, "y": 3 },
+            { "label": "UP", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+            { "label": "LCTRL", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+            { "label": "LALT", "matrix": [4, 1], "w": 1, "x": 1.25, "y": 4 },
+            { "label": "LCMD", "matrix": [4, 2], "w": 1.25, "x": 2.25, "y": 4 },
+            { "label": "MUHENKAN", "matrix": [4, 3], "w": 1.25, "x": 3.5, "y": 4 },
+            { "label": "SPACE1", "matrix": [4, 5], "w": 2, "x": 4.75, "y": 4 },
+            { "label": "SPACE2", "matrix": [4, 6], "w": 2, "x": 6.75, "y": 4 },
+            { "label": "HENKAN", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4 },
+            { "label": "RCMD", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 },
+            { "label": "RCTRL", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 },
+            { "label": "FN", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
+            { "label": "LEFT", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
+            { "label": "DOWN", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
+            { "label": "RIGHT", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+          ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/3dp660_oled/keymaps/default/keymap.c b/keyboards/handwired/3dp660_oled/keymaps/default/keymap.c
new file mode 100644
index 000000000000..79e23eaabcaa
--- /dev/null
+++ b/keyboards/handwired/3dp660_oled/keymaps/default/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2023 xia0 (@xia0)
+// 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_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, 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_VOLU,
+                        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_MUTE,          KC_VOLD,
+                        _______, _______, MO(2)  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP,
+                        _______, _______, _______, _______,                   _______, _______,          _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END),
+
+	[2] = LAYOUT_all(   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                        _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                        _______, _______, _______, _______,                   _______, _______,          _______, _______, _______, _______, _______, _______, _______)
+};
diff --git a/keyboards/handwired/3dp660_oled/keymaps/via/keymap.c b/keyboards/handwired/3dp660_oled/keymaps/via/keymap.c
new file mode 100644
index 000000000000..74d17bf0edbf
--- /dev/null
+++ b/keyboards/handwired/3dp660_oled/keymaps/via/keymap.c
@@ -0,0 +1,15 @@
+// Copyright 2023 xia0 (@xia0)
+// 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_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, 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_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, _______, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP,
+                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, _______, KC_TRNS, KC_HOME, KC_PGDN, KC_END),
+};
diff --git a/keyboards/handwired/3dp660_oled/keymaps/via/rules.mk b/keyboards/handwired/3dp660_oled/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/handwired/3dp660_oled/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/handwired/3dp660_oled/readme.md b/keyboards/handwired/3dp660_oled/readme.md
new file mode 100644
index 000000000000..408fa4770a5b
--- /dev/null
+++ b/keyboards/handwired/3dp660_oled/readme.md
@@ -0,0 +1,28 @@
+# handwired/3dp660_oled
+
+![handwired/3dp660_oled](https://i.imgur.com/AQ6VQfgh.jpg)
+
+*A handwired FC660 layout with OLED display support.*
+
+* Keyboard Maintainer: [xia0](https://github.com/xia0)
+* Hardware Supported: ATmega32U4 e.g. Arduino Pro Micro or Teensy 2.0
+  * Note: If using a Pro Micro, pins B0 and D5 are required. [Click for details](https://golem.hu/guide/pro-micro-upgrade/).
+* Hardware Availability: [Printables](https://www.printables.com/model/464322-3dp-fc660-v3-oled-hand-wired-mechanical-keyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/3dp660_oled:default
+
+Flashing example for this keyboard:
+
+    make handwired/3dp660_oled: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 MCU or short RST to GND.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/handwired/3dp660_oled/rules.mk b/keyboards/handwired/3dp660_oled/rules.mk
new file mode 100644
index 000000000000..c80812f6e0a4
--- /dev/null
+++ b/keyboards/handwired/3dp660_oled/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally blank
diff --git a/keyboards/handwired/42/config.h b/keyboards/handwired/42/config.h
index 57a8664649be..fa9a83d08ec4 100644
--- a/keyboards/handwired/42/config.h
+++ b/keyboards/handwired/42/config.h
@@ -4,5 +4,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define TAPPING_TERM 100
diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/info.json
index dccafc6d86ad..e2cc8dbf716f 100644
--- a/keyboards/handwired/42/info.json
+++ b/keyboards/handwired/42/info.json
@@ -8,6 +8,12 @@
         "pid": "0x0000",
         "device_version": "0.0.3"
     },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "tapping": {
+        "term": 100
+    },
     "matrix_pins": {
         "cols": ["F5", "F6", "F7", "F0", "F1", "F4", "B6", "B5", "D7", "C7", "D6", "B7"],
         "rows": ["D2", "D3", "D0", "D1"]
diff --git a/keyboards/handwired/42/rules.mk b/keyboards/handwired/42/rules.mk
index 15cf817e7e31..0c5b506f63f0 100644
--- a/keyboards/handwired/42/rules.mk
+++ b/keyboards/handwired/42/rules.mk
@@ -15,4 +15,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
diff --git a/keyboards/handwired/6macro/config.h b/keyboards/handwired/6macro/config.h
index 55716a3b7a78..248e43f88e72 100644
--- a/keyboards/handwired/6macro/config.h
+++ b/keyboards/handwired/6macro/config.h
@@ -17,18 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 10
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-//   #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 RGB_MATRIX_LED_COUNT 10
diff --git a/keyboards/handwired/6macro/info.json b/keyboards/handwired/6macro/info.json
index 5bc9833fa52d..63dc42e7db6d 100644
--- a/keyboards/handwired/6macro/info.json
+++ b/keyboards/handwired/6macro/info.json
@@ -8,11 +8,23 @@
       "pid": "0x0037",
       "device_version": "0.0.1"
     },
+    "rgblight": {
+      "hue_steps": 10,
+      "led_count": 10,
+      "animations": {
+        "breathing": true,
+        "rainbow_mood": true,
+        "rainbow_swirl": true,
+        "snake": true,
+        "knight": true,
+        "static_gradient": true
+      }
+    },
     "ws2812": {
       "pin": "D2"
     },
     "rgb_matrix": {
-      "driver": "WS2812"
+      "driver": "ws2812"
     },
     "matrix_pins": {
       "cols": ["B0", "B1", "B2"],
diff --git a/keyboards/handwired/aek64/config.h b/keyboards/handwired/aek64/config.h
index 629111515849..fa8d618c7476 100644
--- a/keyboards/handwired/aek64/config.h
+++ b/keyboards/handwired/aek64/config.h
@@ -22,6 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
-
-/* Enable double tab */
-#define TAPPING_TERM 175
diff --git a/keyboards/handwired/aek64/info.json b/keyboards/handwired/aek64/info.json
index dfa762ce817e..e71156e9882f 100644
--- a/keyboards/handwired/aek64/info.json
+++ b/keyboards/handwired/aek64/info.json
@@ -18,6 +18,9 @@
     "levels": 5,
     "breathing": true
   },
+  "tapping": {
+    "term": 175
+  },
   "processor": "at90usb1286",
   "bootloader": "halfkay",
   "layouts": {
diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/info.json
index 8d59a107f700..405436b6f5fb 100644
--- a/keyboards/handwired/alcor_dactyl/info.json
+++ b/keyboards/handwired/alcor_dactyl/info.json
@@ -27,7 +27,7 @@
         "rows": ["GP5", "GP4", "GP3", "GP2", "GP1", "GP0"]
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"x": 0, "y": 0.375},
             {"x": 16.5, "y": 0.38}
diff --git a/keyboards/handwired/amigopunk/rules.mk b/keyboards/handwired/amigopunk/rules.mk
index 395f25f859ec..9c75f75d52d3 100644
--- a/keyboards/handwired/amigopunk/rules.mk
+++ b/keyboards/handwired/amigopunk/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/handwired/angel/config.h b/keyboards/handwired/angel/config.h
index 3439d8c8c18c..ee492503d123 100644
--- a/keyboards/handwired/angel/config.h
+++ b/keyboards/handwired/angel/config.h
@@ -17,8 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// https://docs.qmk.fm/using-qmk/software-features/tap_hold
-#define TAPPING_TERM 200
-
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 #define MATRIX_HAS_GHOST
diff --git a/keyboards/handwired/aranck/config.h b/keyboards/handwired/aranck/config.h
index 6f44c0cbba3c..b20b3099e9ae 100644
--- a/keyboards/handwired/aranck/config.h
+++ b/keyboards/handwired/aranck/config.h
@@ -31,9 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * Aranck-specific definitions END
  */
 
-
-#define TAPPING_TERM 200
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/arrow_pad/keymaps/default/keymap.c b/keyboards/handwired/arrow_pad/keymaps/default/keymap.c
index cecaefe80de8..820851f803ef 100644
--- a/keyboards/handwired/arrow_pad/keymaps/default/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/default/keymap.c
@@ -96,9 +96,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t * record) {
   return true;
 }
 
-void led_set_user(uint8_t usb_led)
+bool led_update_user(led_t led_state)
 {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+    if (led_state.caps_lock) {
         // output high
         DDRD |= (1<<6);
         PORTD |= (1<<6);
@@ -107,7 +107,7 @@ void led_set_user(uint8_t usb_led)
         DDRD &= ~(1<<6);
         PORTD &= ~(1<<6);
     }
-    if (usb_led & (1<<USB_LED_NUM_LOCK)) {
+    if (led_state.num_lock) {
         // output low
         DDRC |= (1<<7);
         PORTC |= ~(1<<7);
@@ -116,4 +116,5 @@ void led_set_user(uint8_t usb_led)
         DDRC &= ~(1<<7);
         PORTC &= ~(1<<7);
     }
+    return false;
 }
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
index cf291c00cf4d..c3ab462ce369 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
@@ -109,9 +109,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t * record) {
   return true;
 }
 
-void led_set_user(uint8_t usb_led)
+bool led_update_user(led_t led_state)
 {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+    if (led_state.caps_lock) {
         // output high
         DDRD |= (1<<6);
         PORTD |= (1<<6);
@@ -120,7 +120,7 @@ void led_set_user(uint8_t usb_led)
         DDRD &= ~(1<<6);
         PORTD &= ~(1<<6);
     }
-    if (usb_led & (1<<USB_LED_NUM_LOCK)) {
+    if (led_state.num_lock) {
         // output low
         DDRC |= (1<<7);
         PORTC |= ~(1<<7);
@@ -129,4 +129,5 @@ void led_set_user(uint8_t usb_led)
         DDRC &= ~(1<<7);
         PORTC &= ~(1<<7);
     }
+    return false;
 }
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c b/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c
index b69d49b7e54d..fc044a0e1ae9 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c
@@ -96,9 +96,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t * record) {
   return true;
 }
 
-void led_set_user(uint8_t usb_led)
+bool led_update_user(led_t led_state)
 {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+    if (led_state.caps_lock) {
         // output high
         DDRD |= (1<<6);
         PORTD |= (1<<6);
@@ -107,7 +107,7 @@ void led_set_user(uint8_t usb_led)
         DDRD &= ~(1<<6);
         PORTD &= ~(1<<6);
     }
-    if (usb_led & (1<<USB_LED_NUM_LOCK)) {
+    if (led_state.num_lock) {
         // output low
         DDRC |= (1<<7);
         PORTC |= ~(1<<7);
@@ -116,4 +116,5 @@ void led_set_user(uint8_t usb_led)
         DDRC &= ~(1<<7);
         PORTC &= ~(1<<7);
     }
+    return false;
 }
diff --git a/keyboards/handwired/atreus50/config.h b/keyboards/handwired/atreus50/config.h
index 89532fd32b22..b9449c4714bf 100644
--- a/keyboards/handwired/atreus50/config.h
+++ b/keyboards/handwired/atreus50/config.h
@@ -22,22 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#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 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/atreus50/info.json b/keyboards/handwired/atreus50/info.json
index cb1d6f6f0a6b..3df8e9f7bb1c 100644
--- a/keyboards/handwired/atreus50/info.json
+++ b/keyboards/handwired/atreus50/info.json
@@ -8,6 +8,22 @@
     "pid": "0x040D",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "hue_steps": 10,
+    "led_count": 12,
+    "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": "C6"
   },
diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/info.json
index eb6e57abdec4..e5c947945370 100644
--- a/keyboards/handwired/bdn9_ble/info.json
+++ b/keyboards/handwired/bdn9_ble/info.json
@@ -8,7 +8,11 @@
     "pid": "0x1134",
     "device_version": "1.0.0"
   },
+  "bluetooth": {
+    "driver": "bluefruit_le"
+  },
   "backlight": {
+    "driver": "timer",
     "pin": "F6",
     "levels": 5
   },
diff --git a/keyboards/handwired/bdn9_ble/rules.mk b/keyboards/handwired/bdn9_ble/rules.mk
index c9d3996b93ef..0dafe2f289e1 100644
--- a/keyboards/handwired/bdn9_ble/rules.mk
+++ b/keyboards/handwired/bdn9_ble/rules.mk
@@ -15,4 +15,3 @@ RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
diff --git a/keyboards/handwired/bento/rev1/config.h b/keyboards/handwired/bento/rev1/config.h
index 75eb7537b2b5..65cc76694543 100644
--- a/keyboards/handwired/bento/rev1/config.h
+++ b/keyboards/handwired/bento/rev1/config.h
@@ -16,22 +16,6 @@
 
 #pragma once
 
-  #define RGBLED_NUM 4
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/bento/rev1/info.json b/keyboards/handwired/bento/rev1/info.json
index 555731bdd585..6730c14a3611 100644
--- a/keyboards/handwired/bento/rev1/info.json
+++ b/keyboards/handwired/bento/rev1/info.json
@@ -8,6 +8,24 @@
     "pid": "0xDAD3",
     "device_version": "1.0.0"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "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": "D3"
   },
diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h
index 61dddcd9c27c..91253b16957a 100644
--- a/keyboards/handwired/brain/config.h
+++ b/keyboards/handwired/brain/config.h
@@ -42,10 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Enables This makes it easier for fast typists to use dual-function keys */
 #define PERMISSIVE_HOLD
 
-#define RGBLED_NUM 28  // Number of LEDs
-
-#define RGBLIGHT_SPLIT
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -61,6 +57,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 TAPPING_TERM 150
-//#define QUICK_TAP_TERM 0
diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json
index 0454b36669ca..910a628ca6a2 100644
--- a/keyboards/handwired/brain/info.json
+++ b/keyboards/handwired/brain/info.json
@@ -20,6 +20,8 @@
         "pin": "D3"
     },
     "rgblight": {
+        "led_count": 28,
+        "split": true,
         "max_brightness": 120
     },
     "split": {
diff --git a/keyboards/handwired/chiron/config.h b/keyboards/handwired/chiron/config.h
index 677804cbe9b1..4d245e80e4b1 100644
--- a/keyboards/handwired/chiron/config.h
+++ b/keyboards/handwired/chiron/config.h
@@ -22,5 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
-
-#define RGBLED_NUM 4
diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json
index 2cb9a7a4d94b..0bbdefe92166 100644
--- a/keyboards/handwired/chiron/info.json
+++ b/keyboards/handwired/chiron/info.json
@@ -17,6 +17,9 @@
         "pin": "B6",
         "levels": 7
     },
+    "rgblight": {
+        "led_count": 4
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/handwired/ck4x4/rules.mk b/keyboards/handwired/ck4x4/rules.mk
index 9a1946bb60fb..91a488483f89 100644
--- a/keyboards/handwired/ck4x4/rules.mk
+++ b/keyboards/handwired/ck4x4/rules.mk
@@ -11,5 +11,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 DEFAULT_FOLDER = handwired/ck4x4
 
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/handwired/co60/rev7/config.h b/keyboards/handwired/co60/rev7/config.h
index 8cafa3c6f3bb..7e50f570ed1a 100644
--- a/keyboards/handwired/co60/rev7/config.h
+++ b/keyboards/handwired/co60/rev7/config.h
@@ -25,19 +25,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RGB underglow configuration */
 #define WS2812_SPI SPID1
 #define WS2812_SPI_MOSI_PAL_MODE 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_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
-#define RGBLED_NUM 16
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
-
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/handwired/co60/rev7/info.json b/keyboards/handwired/co60/rev7/info.json
index 1f1c2a2cf987..0fb11d041817 100644
--- a/keyboards/handwired/co60/rev7/info.json
+++ b/keyboards/handwired/co60/rev7/info.json
@@ -12,6 +12,21 @@
         "pin": "B8",
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 16,
+        "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": "A7",
         "driver": "spi"
diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/info.json
index 0cba4487033b..0f8383a2aaab 100644
--- a/keyboards/handwired/colorlice/info.json
+++ b/keyboards/handwired/colorlice/info.json
@@ -12,7 +12,7 @@
       "pin": "B1"
     },
     "rgb_matrix": {
-      "driver": "WS2812"
+      "driver": "ws2812"
     },
     "matrix_pins": {
       "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"],
diff --git a/keyboards/handwired/concertina/64key/config.h b/keyboards/handwired/concertina/64key/config.h
index b315e309ae30..70aafa3bfd4d 100644
--- a/keyboards/handwired/concertina/64key/config.h
+++ b/keyboards/handwired/concertina/64key/config.h
@@ -16,7 +16,4 @@
 
 #pragma once
 
-/* LEDs are not used in the standard 64key configuration. */
-#define RGBLED_NUM 0
-
 #define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/concertina/64key/info.json b/keyboards/handwired/concertina/64key/info.json
index 1bca5a6fa483..2786c3345192 100644
--- a/keyboards/handwired/concertina/64key/info.json
+++ b/keyboards/handwired/concertina/64key/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3632",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 0
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/handwired/consolekeyboard/18key/config.h b/keyboards/handwired/consolekeyboard/18key/config.h
deleted file mode 100644
index bbc4eccf18e3..000000000000
--- a/keyboards/handwired/consolekeyboard/18key/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Gareth Edwards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 6
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/handwired/consolekeyboard/18key/info.json b/keyboards/handwired/consolekeyboard/18key/info.json
index 3a37174f3646..a49ce18c4b68 100644
--- a/keyboards/handwired/consolekeyboard/18key/info.json
+++ b/keyboards/handwired/consolekeyboard/18key/info.json
@@ -8,6 +8,15 @@
         "pid": "0x3332",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "sleep": true,
+        "animations": {
+            "breathing": true
+        }
+    },
     "ws2812": {
         "pin": "F4"
     },
diff --git a/keyboards/handwired/consolekeyboard/20key/config.h b/keyboards/handwired/consolekeyboard/20key/config.h
deleted file mode 100644
index bbc4eccf18e3..000000000000
--- a/keyboards/handwired/consolekeyboard/20key/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Gareth Edwards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 6
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/handwired/consolekeyboard/20key/info.json b/keyboards/handwired/consolekeyboard/20key/info.json
index 1dc5a331e161..c076b50fa3d0 100644
--- a/keyboards/handwired/consolekeyboard/20key/info.json
+++ b/keyboards/handwired/consolekeyboard/20key/info.json
@@ -8,6 +8,15 @@
         "pid": "0x3432",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "sleep": true,
+        "animations": {
+            "breathing": true
+        }
+    },
     "ws2812": {
         "pin": "F4"
     },
diff --git a/keyboards/handwired/consolekeyboard/27key/config.h b/keyboards/handwired/consolekeyboard/27key/config.h
deleted file mode 100644
index bbc4eccf18e3..000000000000
--- a/keyboards/handwired/consolekeyboard/27key/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Gareth Edwards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 6
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/handwired/consolekeyboard/27key/info.json b/keyboards/handwired/consolekeyboard/27key/info.json
index 86682eb0f4d0..6f9c3a7d2d07 100644
--- a/keyboards/handwired/consolekeyboard/27key/info.json
+++ b/keyboards/handwired/consolekeyboard/27key/info.json
@@ -8,6 +8,15 @@
         "pid": "0x3433",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "sleep": true,
+        "animations": {
+            "breathing": true
+        }
+    },
     "ws2812": {
         "pin": "F4"
     },
diff --git a/keyboards/handwired/consolekeyboard/30key/config.h b/keyboards/handwired/consolekeyboard/30key/config.h
deleted file mode 100644
index 30d9a2f459ee..000000000000
--- a/keyboards/handwired/consolekeyboard/30key/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Gareth Edwards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 6
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/handwired/consolekeyboard/30key/info.json b/keyboards/handwired/consolekeyboard/30key/info.json
index e2bac91ab1a7..d0b726a1ff8f 100644
--- a/keyboards/handwired/consolekeyboard/30key/info.json
+++ b/keyboards/handwired/consolekeyboard/30key/info.json
@@ -8,6 +8,15 @@
         "pid": "0x3433",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "sleep": true,
+        "animations": {
+            "breathing": true
+        }
+    },
     "ws2812": {
         "pin": "F4"
     },
diff --git a/keyboards/handwired/croxsplit44/config.h b/keyboards/handwired/croxsplit44/config.h
deleted file mode 100644
index 5703448756d0..000000000000
--- a/keyboards/handwired/croxsplit44/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2021 Samux6146
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-    #define RGBLED_NUM 42
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/handwired/croxsplit44/info.json b/keyboards/handwired/croxsplit44/info.json
index 399dae6c33aa..c788072d920e 100644
--- a/keyboards/handwired/croxsplit44/info.json
+++ b/keyboards/handwired/croxsplit44/info.json
@@ -8,6 +8,24 @@
         "pid": "0x6146",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 42,
+        "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": "C4"
     },
diff --git a/keyboards/handwired/cyberstar/config.h b/keyboards/handwired/cyberstar/config.h
index 813b56503697..4d9d9bf5c265 100644
--- a/keyboards/handwired/cyberstar/config.h
+++ b/keyboards/handwired/cyberstar/config.h
@@ -27,18 +27,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM3
 #define WS2812_DMA_CHANNEL 3
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
-
-#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
diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/info.json
index 47eaab67a731..6b2db46b1f04 100644
--- a/keyboards/handwired/cyberstar/info.json
+++ b/keyboards/handwired/cyberstar/info.json
@@ -8,6 +8,23 @@
         "pid": "0x432A",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "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": "B4",
         "driver": "pwm"
diff --git a/keyboards/handwired/cyberstar/rules.mk b/keyboards/handwired/cyberstar/rules.mk
index 000ee78e21a2..cc9d7bb3f537 100644
--- a/keyboards/handwired/cyberstar/rules.mk
+++ b/keyboards/handwired/cyberstar/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/handwired/d48/config.h b/keyboards/handwired/d48/config.h
index 64364451ff12..9fc090c3ae37 100644
--- a/keyboards/handwired/d48/config.h
+++ b/keyboards/handwired/d48/config.h
@@ -1,23 +1,5 @@
 #pragma once
 
-/* RGB Underglow */
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 14
-#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
-#endif
-
 /* Audio */
 #ifdef AUDIO_ENABLE
 #define STARTUP_SONG_DOOM SONG(E1M1_DOOM)
@@ -35,9 +17,6 @@
 #define OLED_TIMEOUT 0
 // #define OLED_SCROLL_TIMEOUT 1000
 
-/* Taps (encoder tap_code) */
-#define TAP_CODE_DELAY 10
-
 /* I2C */
 //#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
 //#define PAL_MODE_STM32_ALTERNATE_OPENDRAIN (PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN)
diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/info.json
index db3f2bbacc15..295fead5879d 100644
--- a/keyboards/handwired/d48/info.json
+++ b/keyboards/handwired/d48/info.json
@@ -8,6 +8,23 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "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": "A15"
     },
@@ -22,6 +39,9 @@
             {"pin_a": "A0", "pin_b": "A1"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
diff --git a/keyboards/handwired/d48/rules.mk b/keyboards/handwired/d48/rules.mk
index 411362b652f0..7fa8dfdd340f 100644
--- a/keyboards/handwired/d48/rules.mk
+++ b/keyboards/handwired/d48/rules.mk
@@ -13,7 +13,6 @@ USE_I2C = no
 RGBLIGHT_ENABLE = yes
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 UNICODE_ENABLE = yes
 
 SRC += ds1307.c taphold.c
diff --git a/keyboards/handwired/dactyl/config.h b/keyboards/handwired/dactyl/config.h
index f37a8f2722c9..94b407d73587 100644
--- a/keyboards/handwired/dactyl/config.h
+++ b/keyboards/handwired/dactyl/config.h
@@ -37,10 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_MAX_SPEED    7
 #define MOUSEKEY_WHEEL_DELAY  0
 
-#define TAPPING_TOGGLE  1
-
-#define TAPPING_TERM    200
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
diff --git a/keyboards/handwired/dactyl/info.json b/keyboards/handwired/dactyl/info.json
index 8297e609a1cf..e95c380d9c04 100644
--- a/keyboards/handwired/dactyl/info.json
+++ b/keyboards/handwired/dactyl/info.json
@@ -11,6 +11,9 @@
   "processor": "atmega32u4",
   "bootloader": "halfkay",
   "debounce": 15,
+  "tapping": {
+    "toggle": 1
+  },
   "layouts": {
     "LAYOUT_dactyl": {
       "layout": [
diff --git a/keyboards/handwired/dactyl_cc/info.json b/keyboards/handwired/dactyl_cc/info.json
new file mode 100644
index 000000000000..e607bfad1a48
--- /dev/null
+++ b/keyboards/handwired/dactyl_cc/info.json
@@ -0,0 +1,117 @@
+{
+    "keyboard_name": "Dactyl CC",
+    "manufacturer": "mjohns",
+    "url": "https://github.com/mjohns/dactyl-cc",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444E",
+        "pid": "0x1407",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "development_board": "promicro",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.1, "w":1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0.35},
+                {"matrix": [0, 2], "x": 2.25, "y": 0.1},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0.1},
+                {"matrix": [0, 5], "x": 5.25, "y": 0.1},
+ 
+                {"matrix": [6, 0], "x": 11.25, "y": 0.1},
+                {"matrix": [6, 1], "x": 12.25, "y": 0.1},
+                {"matrix": [6, 2], "x": 13.25, "y": 0},
+                {"matrix": [6, 3], "x": 14.25, "y": 0.1},
+                {"matrix": [6, 4], "x": 15.25, "y": 0.35},
+                {"matrix": [6, 5], "x": 16.25, "y": 0.1, "w":1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.1, "w":1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1.35},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.1},
+
+                {"matrix": [7, 0], "x": 11.25, "y": 1.1},
+                {"matrix": [7, 1], "x": 12.25, "y": 1.1},
+                {"matrix": [7, 2], "x": 13.25, "y": 1},
+                {"matrix": [7, 3], "x": 14.25, "y": 1.1},
+                {"matrix": [7, 4], "x": 15.25, "y": 1.35},
+                {"matrix": [7, 5], "x": 16.25, "y": 1.1, "w":1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.1, "w":1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2.35},
+                {"matrix": [2, 2], "x": 2.25, "y": 2.1},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2.1},
+                {"matrix": [2, 5], "x": 5.25, "y": 2.1},
+
+                {"matrix": [8, 0], "x": 11.25, "y": 2.1},
+                {"matrix": [8, 1], "x": 12.25, "y": 2.1},
+                {"matrix": [8, 2], "x": 13.25, "y": 2},
+                {"matrix": [8, 3], "x": 14.25, "y": 2.1},
+                {"matrix": [8, 4], "x": 15.25, "y": 2.35},
+                {"matrix": [8, 5], "x": 16.25, "y": 2.1, "w":1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.1, "w":1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.35},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.1},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.1},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.1},
+
+                {"matrix": [9, 0], "x": 11.25, "y": 3.1},
+                {"matrix": [9, 1], "x": 12.25, "y": 3.1},
+                {"matrix": [9, 2], "x": 13.25, "y": 3},
+                {"matrix": [9, 3], "x": 14.25, "y": 3.1},
+                {"matrix": [9, 4], "x": 15.25, "y": 3.35},
+                {"matrix": [9, 5], "x": 16.25, "y": 3.1, "w":1.25},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4.35},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.1},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.1},
+
+                {"matrix": [10, 1], "x": 12.25, "y": 4.1},
+                {"matrix": [10, 2], "x": 13.25, "y": 4},
+                {"matrix": [10, 3], "x": 14.25, "y": 4.1},
+                {"matrix": [10, 4], "x": 15.25, "y": 4.35},
+
+                {"matrix": [5, 4], "x": 6.25, "y": 5},
+                {"matrix": [4, 5], "x": 7.25, "y": 5},
+
+                {"matrix": [10, 0], "x": 9.25, "y": 5},
+                {"matrix": [11, 1], "x": 10.25, "y": 5},
+
+                {"matrix": [5, 1], "x": 5.25, "y": 6, "h": 2},
+                {"matrix": [5, 2], "x": 6.25, "y": 6, "h": 2},
+                {"matrix": [5, 5], "x": 7.25, "y": 6},
+
+                {"matrix": [11, 0], "x": 9.25, "y": 6},
+                {"matrix": [11, 3], "x": 10.25, "y": 6, "h": 2},
+                {"matrix": [11, 4], "x": 11.25, "y": 6, "h": 2},
+
+                {"matrix": [5, 3], "x": 7.25, "y": 7},
+                {"matrix": [11, 2], "x": 9.25, "y": 7}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_cc/keymaps/default/config.h b/keyboards/handwired/dactyl_cc/keymaps/default/config.h
new file mode 100644
index 000000000000..49d5477f0a71
--- /dev/null
+++ b/keyboards/handwired/dactyl_cc/keymaps/default/config.h
@@ -0,0 +1,28 @@
+// Copyright 2022 mjohns
+// 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
+
+/* Enables This makes it easier for fast typists to use dual-function keys */
+#define PERMISSIVE_HOLD
+
+/* mouse config */
+#define MOUSEKEY_DELAY          0
+// Lowering MOUSEKEY_INTERVAL raises the cursor speed significantly, you may want to lower MOUSEKEY_MAX_SPEED (default: 10)
+#define MOUSEKEY_INTERVAL       20
+#define MOUSEKEY_MAX_SPEED       7
+#define MOUSEKEY_WHEEL_DELAY 0
+
+/* layer config */
+#define TAPPING_TOGGLE 1
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c b/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c
new file mode 100644
index 000000000000..6422699684c4
--- /dev/null
+++ b/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+// Copyright 2022 mjohns
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    BASE,
+    NAV
+};
+
+#define CTL_ESC LCTL_T(KC_ESC)
+#define CTL_CAP LCTL_T(KC_CAPS)
+#define ALT_BSP LALT_T(KC_BSPC)
+#define LT_SCLN LT(NAV, KC_SCLN)
+
+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_HOME,
+        KC_TAB,  KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,                                         KC_Y, KC_U,    KC_I,    KC_O,   KC_P,    KC_BSLS,
+        CTL_CAP, KC_A,    KC_S,   KC_D,    KC_F,    KC_G,                                         KC_H, KC_J,    KC_K,    KC_L,   LT_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_MINS, KC_EQL, KC_LBRC, KC_RBRC,                                                     KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT,
+                                                          TT(NAV),  KC_DEL,     KC_PGUP, KC_RCTL,
+                                                 KC_BSPC, CTL_ESC, KC_LGUI,     KC_PGDN, KC_ENT,  KC_SPC,
+                                                                   KC_LALT,     KC_RALT  
+    ),
+    [NAV] = LAYOUT(
+        QK_BOOT, KC_NO,   KC_MPRV, KC_MPLY, KC_MNXT, KC_NO,                                           KC_BRIU, KC_P7,   KC_P8,  KC_P9,   KC_NO,   QK_BOOT,
+        _______, KC_VOLU, KC_WBAK, KC_MS_U, KC_WFWD, KC_WH_U,                                         KC_BRID, KC_P4,   KC_P5,  KC_P6,   KC_PMNS, _______,
+        _______, KC_VOLD, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,                                         KC_PPLS, KC_P1,   KC_P2,  KC_P3,   KC_PSLS, _______,
+        KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_NO,                                           KC_PAST, KC_PCMM, KC_P0,  KC_PDOT, KC_PENT, _______,
+                 KC_F5,   KC_F6,   KC_F7,   KC_F8,                                                             KC_F9,   KC_F10, KC_F11,  KC_F12,
+                                                              _______, _______,     KC_HOME, _______,
+                                                     KC_BTN1, KC_BTN2, _______,     KC_END,  _______, _______,
+                                                                       _______,     ALT_BSP 
+    )
+};
diff --git a/keyboards/handwired/dactyl_cc/keymaps/via/config.h b/keyboards/handwired/dactyl_cc/keymaps/via/config.h
new file mode 100644
index 000000000000..49d5477f0a71
--- /dev/null
+++ b/keyboards/handwired/dactyl_cc/keymaps/via/config.h
@@ -0,0 +1,28 @@
+// Copyright 2022 mjohns
+// 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
+
+/* Enables This makes it easier for fast typists to use dual-function keys */
+#define PERMISSIVE_HOLD
+
+/* mouse config */
+#define MOUSEKEY_DELAY          0
+// Lowering MOUSEKEY_INTERVAL raises the cursor speed significantly, you may want to lower MOUSEKEY_MAX_SPEED (default: 10)
+#define MOUSEKEY_INTERVAL       20
+#define MOUSEKEY_MAX_SPEED       7
+#define MOUSEKEY_WHEEL_DELAY 0
+
+/* layer config */
+#define TAPPING_TOGGLE 1
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c b/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c
new file mode 100644
index 000000000000..aad8656a06c6
--- /dev/null
+++ b/keyboards/handwired/dactyl_cc/keymaps/via/keymap.c
@@ -0,0 +1,64 @@
+// Copyright 2022 mjohns
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _BASE,
+    _NAV,
+    _SYS,
+    _BLANK
+};
+
+#define LT_1BSP LT(1, KC_BSPC)
+#define LT_2SPC LT(2, KC_SPC)
+#define MH_DEL  MEH_T(KC_DEL)
+#define HY_ENT  HYPR_T(KC_ENT)
+#define CA_PGDN LCA_T(KC_PGDN)
+#define CAG_END LCAG_T(KC_END)
+#define AG_PGUP LAG_T(KC_PGUP)
+#define CG_HOME MT(MOD_LGUI | MOD_LCTL, KC_HOME)
+
+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_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_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_MINS, KC_EQL, KC_LBRC, KC_RBRC,                                                         KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT,
+                                                             KC_LCTL, KC_LALT,     KC_RGUI, KC_RCTL,
+                                                    LT_1BSP, MH_DEL,  CG_HOME,     AG_PGUP, HY_ENT,  LT_2SPC,
+                                                                      CAG_END,     CA_PGDN
+    ),
+    [_NAV] = LAYOUT(
+        _______, _______, _______, _______, _______, _______,                                         _______, KC_NUM,  KC_PEQL, KC_PSLS, KC_PAST, _______,
+        _______, _______, _______, _______, _______, _______,                                         _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, _______,
+        _______, QK_BOOT, _______, _______, KC_SLEP, _______,                                         _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, _______,
+        _______, _______, _______, _______, _______, _______,                                         _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
+                 _______, _______, _______, _______,                                                           _______, _______, KC_PDOT, KC_PENT, 
+                                                              _______, _______,     _______, KC_P0,
+                                                     _______, _______, _______,     _______, _______, MO(3),
+                                                                       _______,     _______
+    ),
+    [_SYS] = 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_VOLU, KC_WBAK, KC_MS_U, KC_WFWD, KC_WH_U,                                         _______, KC_NO,   KC_NO,   KC_NO,  KC_NO,   _______,
+        _______, KC_MUTE, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,                                         _______, KC_PSCR, KC_PAUS, KC_INS, KC_SCRL, _______,
+        _______, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,                                         _______, KC_NO,   KC_NO,   KC_NO,  KC_NO,   _______,
+                 _______, _______, _______, _______,                                                           _______, _______, KC_UP,  KC_RGHT, 
+                                                              _______, _______,     _______, _______,
+                                                     KC_BTN1, KC_BTN2, _______,     _______, _______, _______,
+                                                                       _______,     _______
+
+    ),
+    [_BLANK] = 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  
+    )
+};
diff --git a/keyboards/handwired/dactyl_cc/keymaps/via/rules.mk b/keyboards/handwired/dactyl_cc/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/handwired/dactyl_cc/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/handwired/dactyl_cc/readme.md b/keyboards/handwired/dactyl_cc/readme.md
new file mode 100644
index 000000000000..580539639bd1
--- /dev/null
+++ b/keyboards/handwired/dactyl_cc/readme.md
@@ -0,0 +1,27 @@
+# Dactyl-CC
+
+![DactylCC](https://i.imgur.com/CUbPLZCh.jpeg)
+
+Modelled on the *Kinesis Advantage* (KA) 1|2, though missing it's combined function and program row, the *Dactyl CC* retains the finger and thumb key placements of the KA but opts to split board into physical halves.
+
+* Keyboard Maintainer: [Michael Johns](https://github.com/mjohns)
+* Hardware Supported: Pro micro controller or clones of
+* Hardware Availability: [Dactyl CC GitHub](https://github.com/mjohns/dactyl-cc)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/dactyl_cc:default
+
+Flashing example for this keyboard:
+
+    make handwired/dactyl_cc: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/dactyl_cc/rules.mk b/keyboards/handwired/dactyl_cc/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/handwired/dactyl_kinesis/info.json b/keyboards/handwired/dactyl_kinesis/info.json
new file mode 100644
index 000000000000..91cb98e0409b
--- /dev/null
+++ b/keyboards/handwired/dactyl_kinesis/info.json
@@ -0,0 +1,141 @@
+{
+    "keyboard_name": "Dactyl Kinesis",
+    "manufacturer": "dmik",
+    "url": "",
+    "maintainer": "dmik",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3636",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "audio": false,
+        "backlight": false,
+        "rgblight": false
+    },
+    "rgblight": {
+        "led_count": 12
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "development_board": "promicro",
+    "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": [7, 0], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [7, 2], "x": 13, "y": 0},
+                {"matrix": [7, 3], "x": 14, "y": 0},
+                {"matrix": [7, 4], "x": 15, "y": 0},
+                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 1},
+                {"matrix": [8, 1], "x": 12, "y": 1},
+                {"matrix": [8, 2], "x": 13, "y": 1},
+                {"matrix": [8, 3], "x": 14, "y": 1},
+                {"matrix": [8, 4], "x": 15, "y": 1},
+                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2},
+                {"matrix": [9, 1], "x": 12, "y": 2},
+                {"matrix": [9, 2], "x": 13, "y": 2},
+                {"matrix": [9, 3], "x": 14, "y": 2},
+                {"matrix": [9, 4], "x": 15, "y": 2},
+                {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3},
+                {"matrix": [10, 1], "x": 12, "y": 3},
+                {"matrix": [10, 2], "x": 13, "y": 3},
+                {"matrix": [10, 3], "x": 14, "y": 3},
+                {"matrix": [10, 4], "x": 15, "y": 3},
+                {"matrix": [10, 5], "x": 16, "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": [11, 0], "x": 11, "y": 4},
+                {"matrix": [11, 1], "x": 12, "y": 4},
+                {"matrix": [11, 2], "x": 13, "y": 4},
+                {"matrix": [11, 3], "x": 14, "y": 4},
+                {"matrix": [11, 4], "x": 15, "y": 4},
+                {"matrix": [11, 5], "x": 16, "y": 4},
+
+                {"matrix": [5, 0], "x": 1, "y": 5},
+                {"matrix": [5, 1], "x": 2, "y": 5},
+                {"matrix": [5, 2], "x": 3, "y": 5},
+                {"matrix": [5, 3], "x": 4, "y": 5},
+
+                {"matrix": [12, 2], "x": 12, "y": 5},
+                {"matrix": [12, 3], "x": 13, "y": 5},
+                {"matrix": [12, 4], "x": 14, "y": 5},
+                {"matrix": [12, 5], "x": 15, "y": 5},
+
+                {"matrix": [6, 4], "x": 6, "y": 6},
+                {"matrix": [6, 5], "x": 7, "y": 6},
+
+                {"matrix": [13, 0], "x": 9, "y": 6},
+                {"matrix": [13, 1], "x": 10, "y": 6},
+
+                {"matrix": [5, 4], "x": 5, "y": 7, "h": 2},
+                {"matrix": [5, 5], "x": 6, "y": 7, "h": 2},
+
+                {"matrix": [12, 0], "x": 10, "y": 7, "h": 2},
+                {"matrix": [12, 1], "x": 11, "y": 7, "h": 2},
+
+                {"matrix": [6, 3], "x": 7, "y": 7},
+                {"matrix": [13, 2], "x": 9, "y": 7},
+                
+                {"matrix": [6, 2], "x": 7, "y": 8},
+                {"matrix": [13, 3], "x": 9, "y": 8}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_kinesis/keymaps/default/keymap.c b/keyboards/handwired/dactyl_kinesis/keymaps/default/keymap.c
new file mode 100644
index 000000000000..05e138da72df
--- /dev/null
+++ b/keyboards/handwired/dactyl_kinesis/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+// Copyright 2012 Jun Wako <wakojun@gmail.com>
+// Copyright 2021 Dmitriy Kuminov (@dmik)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _QWERTY,
+    _LOWER
+};
+
+#define LOWER MO(_LOWER)
+
+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_CAPS,
+        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_GRV , LOWER  , KC_LEFT, KC_RGHT,                                            KC_UP  , KC_DOWN, KC_LBRC, KC_RBRC,
+                                                     KC_LGUI, KC_LALT,        KC_RCTL, KC_RGUI,
+                                            KC_BSPC,  KC_DEL, KC_HOME,        KC_PGUP, KC_ENT , KC_SPC ,
+                                                              KC_END ,        KC_PGDN
+    ),
+
+    [_LOWER] = LAYOUT(
+        _______, KC_F11 , KC_F12 , _______, _______, _______,                          KC_BRID, KC_BRIU, KC_MUTE, KC_VOLD, KC_VOLU, _______,
+        _______, _______, _______, _______, _______, _______,                          _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                          _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                          _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                          _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______,                                            _______, _______, _______, _______,
+                                                     _______, _______,        _______, _______,
+                                            _______, KC_INS , _______,        _______, _______, _______,
+                                                              _______,        _______
+    )
+};
diff --git a/keyboards/handwired/dactyl_kinesis/readme.md b/keyboards/handwired/dactyl_kinesis/readme.md
new file mode 100644
index 000000000000..69427406d12e
--- /dev/null
+++ b/keyboards/handwired/dactyl_kinesis/readme.md
@@ -0,0 +1,109 @@
+# Dactyl Kinesis
+
+Essentially a Dactyl CC physical key layout with an additional top row, further emulating the Kinesis Advantage (*1|2*) physical key layout.
+
+* Keyboard Maintainer: [dmik](https://github.com/dmik)
+* Hardware Supported: Pro Micro controller, or clone of
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/dactyl_kinesis:default
+
+Flashing example for this keyboard:
+
+    make handwired/dactyl_kinesis: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).
+
+## Kinesis Advantage Keymap
+
+### About
+
+This keymap is designed after Kinesis Advantage's QWERTY layout with the following key differences:
+ - There are only 10 F-keys in the main layer, F1 and F2 are moved to additional LOWER layer.
+ - The INS key acts like a LOWER layer activation key and Del in LOWER layer ats like INS.
+ - LCtl is placed where CAPS should be and CAPS is moved to a free key after F10.
+ - Brigtness and volume control keys are added to LOWER layer.
+
+ The keymap file also contains RAISE layer but it is currently equivalent to LOWER layer and does
+ not have an activation key mapped. It is intended for possible extensions.
+
+### Keymap
+
+       Main QUERTY layer:
+       ,-------------------------------------------.                           ,-------------------------------------------.
+       | ESC    |  F1  |  F2  |  F3  |  F4  |  F5  |                           |  F6  |  F7  |  F8  |  F9  |  F10 | CAPS   |
+       |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+       | =      |   1  |   2  |   3  |   4  |   5  |                           |   6  |   7  |   8  |   9  |   0  |   -    |
+       |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+       | Tab    |   Q  |   W  |   E  |   R  |   T  |                           |   Y  |   U  |   I  |   O  |   P  |   \    |
+       |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+       | LCtl   |   A  |   S  |   D  |   F  |   G  |                           |   H  |   J  |   K  |   L  |   ;  |   '    |
+       |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+       | LShift |   Z  |   X  |   C  |   V  |   B  |                           |   N  |   M  |   ,  |   .  |   /  | RShift |
+       `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
+                |   `  | LOWER| Left | Rght |                                         |  Up  |  Dn  |   [  |   ]  |
+                `---------------------------'                                         `---------------------------'
+                                               ,-------------.      ,-------------.
+                                               | LGui | LAlt |      | RCtl | RGui |
+                                        ,------|------|------|      |------+------+------.
+                                        |      |      | Home |      | PgUp |      |      |
+                                        | BkSp | Del  |------|      |------|Enter |Space |
+                                        |      |      | End  |      | PgDn |      |      |
+                                        `--------------------'      `--------------------'
+
+       LOWER layer:
+       ,-------------------------------------------.                           ,-------------------------------------------.
+       |        |  F11 |  F12 |      |      |      |                           |BriDn |BriUp |VMute |VolDn |VolUp |        |
+       |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+       |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+       |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+       |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+       |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+       |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+       |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+       |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+       `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
+                |      |      |      |      |                                         |      |      |      |      |
+                `---------------------------'                                         `---------------------------'
+                                               ,-------------.      ,-------------.
+                                               |      |      |      |      |      |
+                                        ,------|------|------|      |------+------+------.
+                                        |      |      |      |      |      |      |      |
+                                        |      | INS  |------|      |------|      |      |
+                                        |      |      |      |      |      |      |      |
+                                        `--------------------'      `--------------------'
+
+### Key Matrix Wiring
+
+The below picture shows correspondence between the keys and the row/column wires of the left and
+right halves:
+
+       ,-------------------------------------------.                           ,-------------------------------------------.
+       |  L00   | L01  | L02  | L03  | L04  | L05  |                           | R00  | R01  | R02  | R03  | R04  |  R05   |
+       |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+       |  L10   | L11  | L12  | L13  | L14  | L15  |                           | R10  | R11  | R12  | R13  | R14  |  R15   |
+       |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+       |  L20   | L21  | L22  | L23  | L24  | L25  |                           | R20  | R21  | R22  | R23  | R24  |  R25   |
+       |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+       |  L30   | L31  | L32  | L33  | L34  | L35  |                           | R30  | R31  | R32  | R33  | R34  |  R35   |
+       |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+       |  L40   | L41  | L42  | L43  | L44  | L45  |                           | R40  | R41  | R42  | R43  | R44  |  R45   |
+       `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
+                | L50  | L51  | L52  | L53  |                                         | R52  | R53  | R54  | R55  |
+                `---------------------------'                                         `---------------------------'
+                                               ,-------------.      ,-------------.
+                                               | L64  | L65  |      | R60  | R61  |
+                                        ,------|------|------|      |------+------+------.
+                                        |      |      | L63  |      | R62  |      |      |
+                                        | L54  | L55  |------|      |------| R50  | R51  |
+                                        |      |      | L62  |      | R63  |      |      |
+                                        `--------------------'      `--------------------'
+
+## 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/dactyl_kinesis/rules.mk b/keyboards/handwired/dactyl_kinesis/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/handwired/dactyl_kinesis/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/dactyl_lightcycle/info.json b/keyboards/handwired/dactyl_lightcycle/info.json
index 4a123e711d25..4d581b974e09 100644
--- a/keyboards/handwired/dactyl_lightcycle/info.json
+++ b/keyboards/handwired/dactyl_lightcycle/info.json
@@ -36,173 +36,173 @@
     "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, 0], "x": 0, "y": 0.35},
+                {"matrix": [0, 1], "x": 1, "y": 0.35},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
                 {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
 
-                {"matrix": [5, 0], "x": 11, "y": 0},
-                {"matrix": [5, 1], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 11, "y": 0.1},
+                {"matrix": [5, 1], "x": 12, "y": 0.1},
                 {"matrix": [5, 2], "x": 13, "y": 0},
-                {"matrix": [5, 3], "x": 14, "y": 0},
-                {"matrix": [5, 4], "x": 15, "y": 0},
-                {"matrix": [5, 5], "x": 16, "y": 0},
+                {"matrix": [5, 3], "x": 14, "y": 0.1},
+                {"matrix": [5, 4], "x": 15, "y": 0.35},
+                {"matrix": [5, 5], "x": 16, "y": 0.35},
 
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1.35},
+                {"matrix": [1, 1], "x": 1, "y": 1.35},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
                 {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
 
-                {"matrix": [6, 0], "x": 11, "y": 1},
-                {"matrix": [6, 1], "x": 12, "y": 1},
+                {"matrix": [6, 0], "x": 11, "y": 1.1},
+                {"matrix": [6, 1], "x": 12, "y": 1.1},
                 {"matrix": [6, 2], "x": 13, "y": 1},
-                {"matrix": [6, 3], "x": 14, "y": 1},
-                {"matrix": [6, 4], "x": 15, "y": 1},
-                {"matrix": [6, 5], "x": 16, "y": 1},
+                {"matrix": [6, 3], "x": 14, "y": 1.1},
+                {"matrix": [6, 4], "x": 15, "y": 1.35},
+                {"matrix": [6, 5], "x": 16, "y": 1.35},
 
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2.35},
+                {"matrix": [2, 1], "x": 1, "y": 2.35},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
                 {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
 
-                {"matrix": [3, 5], "x": 6, "y": 2, "h": 1.25},
-                {"matrix": [4, 5], "x": 7, "y": 2, "h": 1.5},
+                {"matrix": [3, 5], "x": 6, "y": 2.1, "h": 1.25},
+                {"matrix": [4, 5], "x": 7, "y": 2.1, "h": 1.5},
 
-                {"matrix": [9, 0], "x": 9, "y": 2, "h": 1.5},
-                {"matrix": [8, 0], "x": 10, "y": 2, "h": 1.25},
+                {"matrix": [9, 0], "x": 9, "y": 2.1, "h": 1.5},
+                {"matrix": [8, 0], "x": 10, "y": 2.1, "h": 1.25},
 
-                {"matrix": [7, 0], "x": 11, "y": 2},
-                {"matrix": [7, 1], "x": 12, "y": 2},
+                {"matrix": [7, 0], "x": 11, "y": 2.1},
+                {"matrix": [7, 1], "x": 12, "y": 2.1},
                 {"matrix": [7, 2], "x": 13, "y": 2},
-                {"matrix": [7, 3], "x": 14, "y": 2},
-                {"matrix": [7, 4], "x": 15, "y": 2},
-                {"matrix": [7, 5], "x": 16, "y": 2},
+                {"matrix": [7, 3], "x": 14, "y": 2.1},
+                {"matrix": [7, 4], "x": 15, "y": 2.35},
+                {"matrix": [7, 5], "x": 16, "y": 2.35},
 
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3.35},
+                {"matrix": [3, 1], "x": 1, "y": 3.35},
+                {"matrix": [3, 2], "x": 2, "y": 3.1},
                 {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.1},
 
-                {"matrix": [4, 2], "x": 5, "y": 3, "h": 2},
-                {"matrix": [4, 3], "x": 6, "y": 3.25, "h": 1.75},
-                {"matrix": [4, 4], "x": 7, "y": 3.5, "h": 1.5},
+                {"matrix": [4, 2], "x": 5, "y": 3.1, "h": 2},
+                {"matrix": [4, 3], "x": 6, "y": 3.35, "h": 1.75},
+                {"matrix": [4, 4], "x": 7, "y": 3.6, "h": 1.5},
 
-                {"matrix": [9, 1], "x": 9, "y": 3.5, "h": 1.5},
-                {"matrix": [9, 2], "x": 10, "y": 3.25, "h": 1.75},
-                {"matrix": [9, 3], "x": 11, "y": 3, "h": 2},
+                {"matrix": [9, 1], "x": 9, "y": 3.6, "h": 1.5},
+                {"matrix": [9, 2], "x": 10, "y": 3.35, "h": 1.75},
+                {"matrix": [9, 3], "x": 11, "y": 3.1, "h": 2},
 
-                {"matrix": [8, 1], "x": 12, "y": 3},
+                {"matrix": [8, 1], "x": 12, "y": 3.1},
                 {"matrix": [8, 2], "x": 13, "y": 3},
-                {"matrix": [8, 3], "x": 14, "y": 3},
-                {"matrix": [8, 4], "x": 15, "y": 3},
-                {"matrix": [8, 5], "x": 16, "y": 3}
+                {"matrix": [8, 3], "x": 14, "y": 3.1},
+                {"matrix": [8, 4], "x": 15, "y": 3.35},
+                {"matrix": [8, 5], "x": 16, "y": 3.35}
             ]
         },
         "LAYOUT_split_3x6_3": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0.35},
+                {"matrix": [0, 1], "x": 1, "y": 0.35},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
                 {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
 
-                {"matrix": [5, 0], "x": 11, "y": 0},
-                {"matrix": [5, 1], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 11, "y": 0.1},
+                {"matrix": [5, 1], "x": 12, "y": 0.1},
                 {"matrix": [5, 2], "x": 13, "y": 0},
-                {"matrix": [5, 3], "x": 14, "y": 0},
-                {"matrix": [5, 4], "x": 15, "y": 0},
-                {"matrix": [5, 5], "x": 16, "y": 0},
+                {"matrix": [5, 3], "x": 14, "y": 0.1},
+                {"matrix": [5, 4], "x": 15, "y": 0.35},
+                {"matrix": [5, 5], "x": 16, "y": 0.35},
 
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1.35},
+                {"matrix": [1, 1], "x": 1, "y": 1.35},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
                 {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
 
-                {"matrix": [6, 0], "x": 11, "y": 1},
-                {"matrix": [6, 1], "x": 12, "y": 1},
+                {"matrix": [6, 0], "x": 11, "y": 1.1},
+                {"matrix": [6, 1], "x": 12, "y": 1.1},
                 {"matrix": [6, 2], "x": 13, "y": 1},
-                {"matrix": [6, 3], "x": 14, "y": 1},
-                {"matrix": [6, 4], "x": 15, "y": 1},
-                {"matrix": [6, 5], "x": 16, "y": 1},
+                {"matrix": [6, 3], "x": 14, "y": 1.1},
+                {"matrix": [6, 4], "x": 15, "y": 1.35},
+                {"matrix": [6, 5], "x": 16, "y": 1.35},
 
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2.35},
+                {"matrix": [2, 1], "x": 1, "y": 2.35},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
                 {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
 
-                {"matrix": [7, 0], "x": 11, "y": 2},
-                {"matrix": [7, 1], "x": 12, "y": 2},
+                {"matrix": [7, 0], "x": 11, "y": 2.1},
+                {"matrix": [7, 1], "x": 12, "y": 2.1},
                 {"matrix": [7, 2], "x": 13, "y": 2},
-                {"matrix": [7, 3], "x": 14, "y": 2},
-                {"matrix": [7, 4], "x": 15, "y": 2},
-                {"matrix": [7, 5], "x": 16, "y": 2},
+                {"matrix": [7, 3], "x": 14, "y": 2.1},
+                {"matrix": [7, 4], "x": 15, "y": 2.35},
+                {"matrix": [7, 5], "x": 16, "y": 2.35},
 
-                {"matrix": [4, 2], "x": 5, "y": 3, "h": 2},
-                {"matrix": [4, 3], "x": 6, "y": 3.25, "h": 1.75},
-                {"matrix": [4, 4], "x": 7, "y": 3.5, "h": 1.5},
+                {"matrix": [4, 2], "x": 5, "y": 3.1, "h": 2},
+                {"matrix": [4, 3], "x": 6, "y": 3.35, "h": 1.75},
+                {"matrix": [4, 4], "x": 7, "y": 3.6, "h": 1.5},
 
-                {"matrix": [9, 1], "x": 9, "y": 3.5, "h": 1.5},
-                {"matrix": [9, 2], "x": 10, "y": 3.25, "h": 1.75},
-                {"matrix": [9, 3], "x": 11, "y": 3, "h": 2}
+                {"matrix": [9, 1], "x": 9, "y": 3.6, "h": 1.5},
+                {"matrix": [9, 2], "x": 10, "y": 3.35, "h": 1.75},
+                {"matrix": [9, 3], "x": 11, "y": 3.1, "h": 2}
             ]
         },
         "LAYOUT_split_3x5_3": {
             "layout": [
-                {"matrix": [0, 1], "x": 0, "y": 0},
-                {"matrix": [0, 2], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 0, "y": 0.35},
+                {"matrix": [0, 2], "x": 1, "y": 0.1},
                 {"matrix": [0, 3], "x": 2, "y": 0},
-                {"matrix": [0, 4], "x": 3, "y": 0},
-                {"matrix": [0, 5], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 3, "y": 0.1},
+                {"matrix": [0, 5], "x": 4, "y": 0.1},
 
-                {"matrix": [5, 0], "x": 10, "y": 0},
-                {"matrix": [5, 1], "x": 11, "y": 0},
+                {"matrix": [5, 0], "x": 10, "y": 0.1},
+                {"matrix": [5, 1], "x": 11, "y": 0.1},
                 {"matrix": [5, 2], "x": 12, "y": 0},
-                {"matrix": [5, 3], "x": 13, "y": 0},
-                {"matrix": [5, 4], "x": 14, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0.1},
+                {"matrix": [5, 4], "x": 14, "y": 0.35},
 
-                {"matrix": [1, 1], "x": 0, "y": 1},
-                {"matrix": [1, 2], "x": 1, "y": 1},
+                {"matrix": [1, 1], "x": 0, "y": 1.35},
+                {"matrix": [1, 2], "x": 1, "y": 1.1},
                 {"matrix": [1, 3], "x": 2, "y": 1},
-                {"matrix": [1, 4], "x": 3, "y": 1},
-                {"matrix": [1, 5], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 3, "y": 1.1},
+                {"matrix": [1, 5], "x": 4, "y": 1.1},
 
-                {"matrix": [6, 0], "x": 10, "y": 1},
-                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 0], "x": 10, "y": 1.1},
+                {"matrix": [6, 1], "x": 11, "y": 1.1},
                 {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1.1},
+                {"matrix": [6, 4], "x": 14, "y": 1.35},
 
-                {"matrix": [2, 1], "x": 0, "y": 2},
-                {"matrix": [2, 2], "x": 1, "y": 2},
+                {"matrix": [2, 1], "x": 0, "y": 2.35},
+                {"matrix": [2, 2], "x": 1, "y": 2.1},
                 {"matrix": [2, 3], "x": 2, "y": 2},
-                {"matrix": [2, 4], "x": 3, "y": 2},
-                {"matrix": [2, 5], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 3, "y": 2.1},
+                {"matrix": [2, 5], "x": 4, "y": 2.1},
 
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 0], "x": 10, "y": 2.1},
+                {"matrix": [7, 1], "x": 11, "y": 2.1},
                 {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2.1},
+                {"matrix": [7, 4], "x": 14, "y": 2.35},
 
-                {"matrix": [4, 2], "x": 4, "y": 3, "h": 2},
-                {"matrix": [4, 3], "x": 5, "y": 3.25, "h": 1.75},
-                {"matrix": [4, 4], "x": 6, "y": 3.5, "h": 1.5},
+                {"matrix": [4, 2], "x": 4, "y": 3.1, "h": 2},
+                {"matrix": [4, 3], "x": 5, "y": 3.35, "h": 1.75},
+                {"matrix": [4, 4], "x": 6, "y": 3.6, "h": 1.5},
 
-                {"matrix": [9, 1], "x": 8, "y": 3.5, "h": 1.5},
-                {"matrix": [9, 2], "x": 9, "y": 3.25, "h": 1.75},
-                {"matrix": [9, 3], "x": 10, "y": 3, "h": 2}
+                {"matrix": [9, 1], "x": 8, "y": 3.6, "h": 1.5},
+                {"matrix": [9, 2], "x": 9, "y": 3.35, "h": 1.75},
+                {"matrix": [9, 3], "x": 10, "y": 3.1, "h": 2}
             ]
         }
     }
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/info.json b/keyboards/handwired/dactyl_manuform/3x5_3/info.json
deleted file mode 100644
index cfe109fb3729..000000000000
--- a/keyboards/handwired/dactyl_manuform/3x5_3/info.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-    "keyboard_name": "Dactyl Minidox (3x5+3)",
-    "manufacturer": "DLFord",
-    "url": "https://www.dlford.io/keyboard-build-guide-per-key-rgb-leds/",
-    "maintainer": "dlford",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3536",
-        "device_version": "0.0.3"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgb_matrix": {
-        "driver": "WS2812"
-    },
-    "matrix_pins": {
-        "cols": ["C6", "D7", "E6", "B4", "B5"],
-        "rows": ["B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["split_3x5_3"],
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "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": [4, 0], "x": 10, "y": 0},
-                {"matrix": [4, 1], "x": 11, "y": 0},
-                {"matrix": [4, 2], "x": 12, "y": 0},
-                {"matrix": [4, 3], "x": 13, "y": 0},
-                {"matrix": [4, 4], "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": [5, 0], "x": 10, "y": 1},
-                {"matrix": [5, 1], "x": 11, "y": 1},
-                {"matrix": [5, 2], "x": 12, "y": 1},
-                {"matrix": [5, 3], "x": 13, "y": 1},
-                {"matrix": [5, 4], "x": 14, "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": [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": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-
-                {"matrix": [7, 0], "x": 10, "y": 3},
-                {"matrix": [7, 1], "x": 11, "y": 3},
-                {"matrix": [7, 2], "x": 12, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/rules.mk b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/rules.mk
deleted file mode 100644
index f40ace960604..000000000000
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Includes
-SRC += features/caps_word.c
-
-# Build Options
-#   change yes to no to disable
-#
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-DYNAMIC_MACRO_ENABLE = yes  # Create macros on the fly
-RGB_MATRIX_DRIVER = WS2812
-INDICATOR_LIGHTS = yes      # Enable indicator lights for caps lock, etc.
-# TAP_DANCE_ENABLE = yes      # Send different keycodes if tapped multiple times
-# KEY_OVERRIDE_ENABLE = yes   # Override key combos
-# COMBO_ENABLE = yes          # Custom key combos
-
-LTO_ENABLE = yes
-RGBLIGHT_SUPPORTED = yes
-RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk b/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk
deleted file mode 100644
index 38ee6f425280..000000000000
--- a/keyboards/handwired/dactyl_manuform/3x5_3/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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-# AUDIO_ENABLE = yes          # Audio output
-
-RGB_MATRIX_ENABLE = yes     # Enable WS2812 RGB matrix
-SPLIT_KEYBOARD = yes
-
-RGBLIGHT_SUPPORTED = yes
-RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/handwired/dactyl_manuform/4x5/config.h b/keyboards/handwired/dactyl_manuform/4x5/config.h
deleted file mode 100644
index 9a4e39dad218..000000000000
--- a/keyboards/handwired/dactyl_manuform/4x5/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/info.json
index 5fdab01ef43c..141bb4771774 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x5/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3435",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 12
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/info.json b/keyboards/handwired/dactyl_manuform/4x5_5/info.json
index 7ad7118ee472..76f13971d45b 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "Dactyl Manuform 4x5 5 thumb keys",
+    "keyboard_name": "Dactyl ManuForm 4x5_5",
     "manufacturer": "ssedrick",
     "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/dactyl_manuform/4x5_5",
     "maintainer": "ssedrick",
@@ -16,9 +16,7 @@
     "split": {
         "soft_serial_pin": "D0"
     },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["split_3x5_3"],
+    "development_board": "promicro",
     "layouts": {
         "LAYOUT": {
             "layout": [
@@ -28,11 +26,11 @@
                 {"matrix": [0, 3], "x": 3, "y": 0},
                 {"matrix": [0, 4], "x": 4, "y": 0},
 
-                {"matrix": [5, 0], "x": 6, "y": 0},
-                {"matrix": [5, 1], "x": 7, "y": 0},
-                {"matrix": [5, 2], "x": 8, "y": 0},
-                {"matrix": [5, 3], "x": 9, "y": 0},
-                {"matrix": [5, 4], "x": 10, "y": 0},
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
 
                 {"matrix": [1, 0], "x": 0, "y": 1},
                 {"matrix": [1, 1], "x": 1, "y": 1},
@@ -40,11 +38,11 @@
                 {"matrix": [1, 3], "x": 3, "y": 1},
                 {"matrix": [1, 4], "x": 4, "y": 1},
 
-                {"matrix": [6, 0], "x": 6, "y": 1},
-                {"matrix": [6, 1], "x": 7, "y": 1},
-                {"matrix": [6, 2], "x": 8, "y": 1},
-                {"matrix": [6, 3], "x": 9, "y": 1},
-                {"matrix": [6, 4], "x": 10, "y": 1},
+                {"matrix": [6, 0], "x": 8, "y": 1},
+                {"matrix": [6, 1], "x": 9, "y": 1},
+                {"matrix": [6, 2], "x": 10, "y": 1},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1},
 
                 {"matrix": [2, 0], "x": 0, "y": 2},
                 {"matrix": [2, 1], "x": 1, "y": 2},
@@ -52,82 +50,31 @@
                 {"matrix": [2, 3], "x": 3, "y": 2},
                 {"matrix": [2, 4], "x": 4, "y": 2},
 
-                {"matrix": [7, 0], "x": 6, "y": 2},
-                {"matrix": [7, 1], "x": 7, "y": 2},
-                {"matrix": [7, 2], "x": 8, "y": 2},
-                {"matrix": [7, 3], "x": 9, "y": 2},
-                {"matrix": [7, 4], "x": 10, "y": 2},
+                {"matrix": [7, 0], "x": 8, "y": 2},
+                {"matrix": [7, 1], "x": 9, "y": 2},
+                {"matrix": [7, 2], "x": 10, "y": 2},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2},
 
                 {"matrix": [3, 1], "x": 1, "y": 3},
                 {"matrix": [3, 2], "x": 2, "y": 3},
 
-                {"matrix": [8, 2], "x": 8, "y": 3},
-                {"matrix": [8, 3], "x": 9, "y": 3},
+                {"matrix": [8, 2], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
 
                 {"matrix": [3, 3], "x": 3, "y": 4},
+                {"matrix": [3, 4], "x": 4, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 4},
 
-                {"matrix": [8, 1], "x": 7, "y": 4},
+                {"matrix": [8, 1], "x": 9, "y": 4},
+                {"matrix": [9, 0], "x": 7, "y": 4},
+                {"matrix": [8, 0], "x": 8, "y": 4},
 
-                {"matrix": [3, 4], "x": 3, "y": 5},
-                {"matrix": [4, 4], "x": 4, "y": 5},
+                {"matrix": [4, 2], "x": 4, "y": 5},
+                {"matrix": [4, 3], "x": 5, "y": 5},
 
-                {"matrix": [9, 0], "x": 6, "y": 5},
-                {"matrix": [8, 0], "x": 7, "y": 5},
-
-                {"matrix": [4, 2], "x": 3, "y": 6},
-                {"matrix": [4, 3], "x": 4, "y": 6},
-
-                {"matrix": [9, 1], "x": 6, "y": 6},
-                {"matrix": [9, 2], "x": 7, "y": 6}
-            ]
-        },
-        "LAYOUT_split_3x5_3": {
-            "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": [5, 0], "x": 6, "y": 0},
-                {"matrix": [5, 1], "x": 7, "y": 0},
-                {"matrix": [5, 2], "x": 8, "y": 0},
-                {"matrix": [5, 3], "x": 9, "y": 0},
-                {"matrix": [5, 4], "x": 10, "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": [6, 0], "x": 6, "y": 1},
-                {"matrix": [6, 1], "x": 7, "y": 1},
-                {"matrix": [6, 2], "x": 8, "y": 1},
-                {"matrix": [6, 3], "x": 9, "y": 1},
-                {"matrix": [6, 4], "x": 10, "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": [7, 0], "x": 6, "y": 2},
-                {"matrix": [7, 1], "x": 7, "y": 2},
-                {"matrix": [7, 2], "x": 8, "y": 2},
-                {"matrix": [7, 3], "x": 9, "y": 2},
-                {"matrix": [7, 4], "x": 10, "y": 2},
-
-                {"matrix": [3, 3], "x": 3, "y": 4},
-
-                {"matrix": [8, 1], "x": 7, "y": 4},
-
-                {"matrix": [3, 4], "x": 3, "y": 5},
-                {"matrix": [4, 4], "x": 4, "y": 5},
-
-                {"matrix": [9, 0], "x": 6, "y": 5},
-                {"matrix": [8, 0], "x": 7, "y": 5}
+                {"matrix": [9, 1], "x": 7, "y": 5},
+                {"matrix": [9, 2], "x": 8, "y": 5}
             ]
         }
     }
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c
index cb78c9fb56b2..8d38152f969e 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
-#include "print.h"
 
 enum key_layers {
     _BASE,
@@ -11,145 +10,45 @@ enum key_layers {
     _LOWER
 };
 
-enum layer_keycodes {
-    QWERTY = SAFE_RANGE,
-    COLEMAK,
-};
-
 #define RAISE MO(_RAISE)
 #define LOWER MO(_LOWER)
 #define SH_ESC SFT_T(KC_ESC)
-#define ____ KC_TRANSPARENT
+#define ____ KC_TRNS
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base (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  |                                | BSPC |
-     *                      |-------------,                  ,------+------|
-     *                      | GUI  |  TAB |                  | SHIFT| SPACE|
-     *                      |------+------|                  |------+------|
-     *                      | RAISE| CTRL |                  | LOWER| ENTER|
-     *                      '-------------'                  '-------------'
-     */
     [_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_LBRC, KC_RBRC,                                              KC_QUOT, KC_GRV,
-                                    SH_ESC,                            KC_BSPC,
-                                    KC_LGUI, KC_TAB,          KC_RSFT, KC_SPC,
-                                    RAISE,   KC_LCTL,         LOWER,  KC_ENT
+        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_LBRC, KC_RBRC,                                                       KC_QUOT, KC_GRV,
+                                   SH_ESC, KC_LGUI, KC_TAB,    KC_RSFT, KC_SPC, KC_BSPC,
+                                   RAISE,  KC_LCTL,                     LOWER,  KC_ENT
     ),
    
-    /* 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  |   ,  |   .  |   /  |
-     * '------+------+------+-------------'                  '------+------+------+------+------'
-     *        |  [   |   ]  |                                              |   '  |  `~  |
-     *        '-------------+------,                                ,------|-------------'
-     *                      | ESC  |                                | BSPC |
-     *                      |-------------,                  ,------+------|
-     *                      | GUI  |  TAB |                  | SHIFT| SPACE|
-     *                      |------+------|                  |------+------|
-     *                      | RAISE| CTRL |                  | LOWER| ENTER|
-     *                      '-------------'                  '-------------'
-     */
     [_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_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_LBRC, KC_RBRC,                                              KC_QUOT, KC_GRV,
-                                    KC_ESC,                            KC_BSPC,
-                                    KC_LGUI, KC_TAB,          KC_RSFT, KC_SPC,
-                                    RAISE,   KC_LCTL,         LOWER,  KC_ENT
+                                   KC_ESC, ____,  ____,     ____, ____,   ____,
+                                   ____,   ____,                  ____,   ____
     ),
-    /*  RAISE
-     * ,----------------------------------,                  ,----------------------------------,
-     * |   1  |   2  |   3  |   4  |   5  |                  |   6  |   7  |   8  |   9  |   0  |
-     * |------+------+------+------+------|                  |------+------+------+------+------|
-     * |   (  |   )  |   {  |   }  |   =  |                  |  -   |   4  |   5  |   6  |   ;  |
-     * |------+------+------+------+------|                  |------+------+------+------+------|
-     * | QK_BOOT| BOOT |   [  |   ]  |      |                  |      |   1  |   2  |   3  |      |
-     * |------+------+------+-------------|                  |------+------+------+------+------,
-     *        |      |      |                                              |   0  |   .  |
-     *        '-------------+------,                                ,------|-------------'
-     *                      | ESC  |                                | BSPC |
-     *                      |-------------,                  ,------+------|
-     *                      | GUI  |  TAB |                  | SHIFT| SPACE|
-     *                      |------+------|                  |------+------|
-     *                      | RAISE| CTRL |                  | LOWER| ENTER|
-     *                      '-------------'                  '-------------'
-     */
+
     [_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_LCBR, KC_RCBR,  KC_EQL,            KC_MINS,  KC_4,    KC_5,    KC_6, KC_QUOT,
-      QK_RBT, QK_BOOT, KC_LBRC, KC_RBRC,    ____,             ____,    KC_1,    KC_2,    KC_3,    ____,
-                 ____,    ____,                                                 KC_0,  KC_DOT,
-                                   ____,                               ____,
-                                   ____,    ____,             ____,    ____,
-                                   ____,    ____,             ____,    ____
+        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_LCBR, KC_RCBR,  KC_EQL,               KC_MINS,    KC_4,    KC_5,    KC_6, KC_QUOT,
+      QK_RBT, QK_BOOT, KC_LBRC, KC_RBRC,    ____,                  ____,    KC_1,    KC_2,    KC_3,    ____,
+                 ____,    ____,                                                      KC_0,  KC_DOT,
+                                   ____,    ____,  ____,     ____, ____,    ____,
+                                   ____,    ____,                  ____,    ____
     ),
 
-    /*  LOWER
-     * ,----------------------------------,                  ,----------------------------------,
-     * |   !  |   @  |   #  |   $  |   %  |                  |   ^  |   &  |   *  |   (  |   )  |
-     * |------+------+------+------+------|                  |------+------+------+------+------|
-     * |   (  |   )  |   {  |   }  |   =  |                  |      |   -  |   +  |   |  |      |
-     * |------+------+------+------+------|                  |------+------+------+------+------|
-     * |      |      |      |      |      |                  |      | LEFT | DOWN |  UP  | RIGHT|
-     * |------+------+------+-------------|                  |------+------+------+------+------,
-     *        |      |      |                                              |QWERTY|COLEMA|
-     *        '-------------+------,                                ,------|-------------'
-     *                      | ESC  |                                | BSPC |
-     *                      |-------------,                  ,------+------|
-     *                      | GUI  |  TAB |                  | SHIFT| SPACE|
-     *                      |------+------|                  |------+------|
-     *                      | RAISE| CTRL |                  | LOWER| ENTER|
-     *                      '-------------'                  '-------------'
-     */
     [_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,               ____, KC_MINS,  KC_EQL, KC_PIPE,    ____,
-        ____,    ____,    ____,    ____,    ____,               ____, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT,
-                 ____,    ____,                                              QWERTY, COLEMAK,
-                                   ____,                               ____,
-                                   ____,    ____,             ____,    ____,
-                                   ____,    ____,             ____,    ____
+     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,                  ____, KC_MINS,  KC_EQL, KC_PIPE,    ____,
+        ____,    ____,    ____,    ____,    ____,                  ____, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT,
+                 ____,    ____,                                                    KC_QUOT, KC_GRV,
+                                   ____,    ____,  ____,     ____, ____,    ____,
+                                   ____,    ____,                  ____,    ____
     )
 };
-
-
-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/4x5_5/keymaps/ssedrick/keymap.c b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
index 0e9620231585..5774ab7f3bd6 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
@@ -16,7 +16,6 @@ enum layer_keycodes {
     COLEMAK,
 };
 
-
 #define RAISE  TT(_RAISE)
 #define LOWER  MO(_LOWER)
 #define SH_ESC SFT_T(KC_ESC)
@@ -28,111 +27,40 @@ enum layer_keycodes {
 #define TAPPING_TOGGLE 2
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base (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|
-     *                      |-------------,                  ,------+------|
-     *                      | GUI  |  TAB |                  | BCKSP| SPACE|
-     *                      |------+------|                  |------+------|
-     *                      | RAISE| CTRL |                  | SHIFT| LOWER|
-     *                      '-------------'                  '-------------'
-     */
     [_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_ENT,
-                                   KC_LGUI, KC_TAB,           KC_RSFT, KC_SPC,
-                                   RAISE,   KC_LCTL,          KC_BSPC, LOWER
+        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
-     * ,----------------------------------,                  ,----------------------------------,
-     * |   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  |                                | BSPC |
-     *                      |-------------,                  ,------+------|
-     *                      | GUI  |  TAB |                  | SHIFT| SPACE|
-     *                      |------+------|                  |------+------|
-     *                      | RAISE| CTRL |                  | LOWER| ENTER|
-     *                      '-------------'                  '-------------'
-     */
+
     [_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,
-                                   SH_ESC,                             KC_ENT,
-                                   KC_LGUI, KC_TAB,           KC_RSFT, KC_SPC,
-                                   RAISE,   KC_LCTL,          KC_BSPC, LOWER
+        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
-     * ,----------------------------------,                  ,----------------------------------,
-     * |   1  |   2  |   3  |   4  |   5  |                  |   6  |   7  |   8  |   9  |   0  |
-     * |------+------+------+------+------|                  |------+------+------+------+------|
-     * |   (  |   )  |   [  |   ]  |   =  |                  |   _  |   4  |   5  |   6  |   ;  |
-     * |------+------+------+------+------|                  |------+------+------+------+------|
-     * | QK_BOOT| BOOT |      |      |      |                  |      |   1  |   2  |   3  |      |
-     * |------+------+------+-------------|                  |------+------+------+------+------,
-     *        |MAC_LC|      |                                              |   0  |   .  |
-     *        '-------------+------,                                ,------|-------------'
-     *                      | ESC  |                                | BSPC |
-     *                      |-------------,                  ,------+------|
-     *                      | GUI  |  TAB |                  | SHIFT| SPACE|
-     *                      |------+------|                  |------+------|
-     *                      | RAISE| CTRL |                  | LOWER| ENTER|
-     *                      '-------------'                  '-------------'
-     */
+
     [_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
-     * ,----------------------------------,                  ,----------------------------------,
-     * |   !  |   @  |   #  |   $  |   %  |                  |   ^  |   &  |   *  |   (  |   )  |
-     * |------+------+------+------+------|                  |------+------+------+------+------|
-     * |   (  |   )  |   {  |   }  |   =  |                  |   _  |   -  |   +  |   \  |   |  |
-     * |------+------+------+------+------|                  |------+------+------+------+------|
-     * | NEXT | PLAY | VOLU | VOLD |      |                  |      | LEFT | DOWN |  UP  | RIGHT|
-     * |------+------+------+-------------|                  |------+------+------+------+------,
-     *        |      |      |                                              |QWERTY|COLEMA|
-     *        '-------------+------,                                ,------|-------------'
-     *                      | ESC  |                                | BSPC |
-     *                      |-------------,                  ,------+------|
-     *                      | GUI  |  TAB |                  | SHIFT| SPACE|
-     *                      |------+------|                  |------+------|
-     *                      | RAISE| CTRL |                  | LOWER| ENTER|
-     *                      '-------------'                  '-------------'
-     */
     [_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,
-                                   ____,                               ____,
-                                   ____,    ____,             ____,    ____,
-                                   ____,    ____,             ____,    ____
+                                   ____,    ____,  ____,     ____, ____,    ____,
+                                   ____,    ____,                  ____,    ____
     )
 };
 
diff --git a/keyboards/handwired/dactyl_manuform/4x6/config.h b/keyboards/handwired/dactyl_manuform/4x6/config.h
deleted file mode 100644
index 9a4e39dad218..000000000000
--- a/keyboards/handwired/dactyl_manuform/4x6/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/info.json
index 7de3ef0b0d23..5b415fbd2bb7 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3436",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 12
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/keymap.c b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/keymap.c
index 2e92d4b86b3f..24f6b35f57dc 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/keymap.c
@@ -60,5 +60,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                         N_PASTE     , N_UNDO        ,      KC_BSPC , KC_DEL
 
   ),
-
 };
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/rules.mk b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/rules.mk
index 9991dcad7190..53ce5a31906f 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/rules.mk
@@ -8,3 +8,4 @@ COMMAND_ENABLE = no
 NKRO_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 DEBOUNCE_TYPE = asym_eager_defer_pk
+USER_NAME := scheiklp
diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/info.json b/keyboards/handwired/dactyl_manuform/4x6_4_3/info.json
new file mode 100644
index 000000000000..60830dbf80af
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_4_3/info.json
@@ -0,0 +1,111 @@
+{
+    "keyboard_name": "Dactyl-Manuform (4x6 + 4 and 3 for thumbs)",
+    "manufacturer": "joshreve",
+    "url": "https://github.com/joshreve/dactyl-keyboard",
+    "maintainer": "rek",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3536",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "development_board": "promicro",
+    "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": [6, 0], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+                {"matrix": [6, 4], "x": 15, "y": 0},
+                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
+                {"matrix": [7, 1], "x": 12, "y": 1},
+                {"matrix": [7, 2], "x": 13, "y": 1},
+                {"matrix": [7, 3], "x": 14, "y": 1},
+                {"matrix": [7, 4], "x": 15, "y": 1},
+                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
+                {"matrix": [8, 1], "x": 12, "y": 2},
+                {"matrix": [8, 2], "x": 13, "y": 2},
+                {"matrix": [8, 3], "x": 14, "y": 2},
+                {"matrix": [8, 4], "x": 15, "y": 2},
+                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
+                {"matrix": [9, 1], "x": 12, "y": 3},
+                {"matrix": [9, 2], "x": 13, "y": 3},
+                {"matrix": [9, 3], "x": 14, "y": 3},
+                {"matrix": [9, 4], "x": 15, "y": 3},
+                {"matrix": [9, 5], "x": 16, "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": [10, 2], "x": 11, "y": 4},
+                {"matrix": [10, 3], "x": 12, "y": 4},
+                {"matrix": [10, 4], "x": 13, "y": 4},
+                {"matrix": [10, 5], "x": 14, "y": 4},
+
+                {"matrix": [5, 3], "x": 3, "y": 5},
+                {"matrix": [5, 4], "x": 4, "y": 5},
+                {"matrix": [5, 5], "x": 5, "y": 5},
+
+                {"matrix": [11, 0], "x": 14, "y": 5},
+                {"matrix": [11, 1], "x": 15, "y": 5},
+                {"matrix": [11, 2], "x": 16, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/config.h
new file mode 100644
index 000000000000..4d83c191f3c1
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/config.h
@@ -0,0 +1,23 @@
+/*
+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
diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/keymap.c
new file mode 100644
index 000000000000..d8fe94a59bfd
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+// Copyright 2023 Adam Tombleson (@rekarnar)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+enum layer_names {
+    _BASE,
+    _RAISE,
+    _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    , KC_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_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_BSLS,
+        KC_LCTL , KC_TAB , KC_LSFT, KC_LALT,                                      KC_COMMA,KC_DOT  , KC_LBRC , KC_RBRC ,
+                                      LOWER, KC_SPC , KC_BSPC,                    RAISE  , KC_ENT  , KC_DEL
+    ),
+ 
+    [_LOWER] = LAYOUT(
+        _______ , KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,                    KC_CIRC, KC_AMPR , KC_ASTR , KC_LPRN , KC_RPRN , KC_DEL,
+        QK_BOOT , _______, _______, _______, _______, _______,                    _______, _______ , _______ , _______ , KC_TILD , KC_PLUS,
+        _______ , KC_HOME, KC_PGUP, KC_PGDN, KC_END , _______,                    _______, KC_LEFT , KC_UP   , KC_DOWN , KC_RGHT , KC_PIPE,
+        _______ , _______, _______, _______, _______, _______,                    _______, _______ , _______ , _______ , KC_EQL  , KC_UNDS,
+        _______ , _______, _______, _______,                                      KC_TILD, _______ , KC_LPRN , KC_RPRN ,
+                              _______, KC_LGUI, LALT(KC_PSCR),                    C(S(KC_LEFT)), KC_GRAVE, C(S(KC_RIGHT))
+
+    ),
+
+    [_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_PGUP , KC_PGDN , KC_END  , _______,
+        _______ , _______,_______ , _______, _______, _______,                    _______, _______ , _______ , _______ , _______ , _______,
+        _______ , _______,_______ , _______,                                      _______, _______ , _______ , LALT(KC_TAB),
+                                    KC_VOLD, KC_MUTE, KC_VOLU,                    _______, _______ , _______
+    )
+};
diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/readme.md b/keyboards/handwired/dactyl_manuform/4x6_4_3/readme.md
new file mode 100644
index 000000000000..c3574c52bb8f
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_4_3/readme.md
@@ -0,0 +1,9 @@
+# Dactyl-Manuform (4x6 + 4 and 3 for thumbs)
+
+This is a 4x6 manuform with a 4 key bottom row and 3 key thumb clusters.
+
+The result is a 62 key layout.
+
+## Description
+
+* Keyboard Maintainer: https://github.com/joshreve/dactyl-keyboard
diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/rules.mk b/keyboards/handwired/dactyl_manuform/4x6_4_3/rules.mk
new file mode 100644
index 000000000000..3bbd2614291a
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_4_3/rules.mk
@@ -0,0 +1 @@
+# File intentionally blank
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/config.h b/keyboards/handwired/dactyl_manuform/4x6_5/config.h
deleted file mode 100644
index 9a4e39dad218..000000000000
--- a/keyboards/handwired/dactyl_manuform/4x6_5/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
index b9ebd6d7df1e..f54f0d56d25e 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3436",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 12
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/handwired/dactyl_manuform/5x6/config.h b/keyboards/handwired/dactyl_manuform/5x6/config.h
deleted file mode 100644
index 9a4e39dad218..000000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/info.json
index 89c2c800c6e2..e6372961d8f4 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3536",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 12
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/rules.mk
index 53ca4b51d0ab..09e4c42d693c 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/rules.mk
@@ -1,5 +1,5 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
+RGB_MATRIX_DRIVER = ws2812
 DYNAMIC_MACRO_ENABLE = yes
 # CONSOLE_ENABLE = yes
 
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/rules.mk
index 6e58ff5d15ed..c83f96e10280 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/333fred/rules.mk
@@ -1,5 +1,4 @@
 KEY_LOCK_ENABLE = yes
 CONSOLE_ENABLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/info.json b/keyboards/handwired/dactyl_manuform/5x6_68/info.json
index f82f84da9c51..78a602cb64f8 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_68/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_68/info.json
@@ -3,14 +3,25 @@
     "manufacturer": "kpagratis",
     "url": "",
     "maintainer": "kpagratis",
-    "bootloader": "caterina",
-    "processor": "atmega32u4",
+    "development_board": "promicro",
     "usb": {
         "vid": "0xFEED",
         "pid": "0x0016",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "audio": false,
+        "backlight": false,
+        "rgblight": false
+    },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "matrix_pins": {
@@ -21,80 +32,89 @@
     "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": 3, "y": 0, "matrix": [0, 3]},
-                {"x": 4, "y": 0, "matrix": [0, 4]},
-                {"x": 5, "y": 0, "matrix": [0, 5]},
-                {"x": 14, "y": 0, "matrix": [6, 0]},
-                {"x": 15, "y": 0, "matrix": [6, 1]},
-                {"x": 16, "y": 0, "matrix": [6, 2]},
-                {"x": 17, "y": 0, "matrix": [6, 3]},
-                {"x": 18, "y": 0, "matrix": [6, 4]},
-                {"x": 19, "y": 0, "matrix": [6, 5]},
+                {"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": [6, 0], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+                {"matrix": [6, 4], "x": 15, "y": 0},
+                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
+                {"matrix": [7, 1], "x": 12, "y": 1},
+                {"matrix": [7, 2], "x": 13, "y": 1},
+                {"matrix": [7, 3], "x": 14, "y": 1},
+                {"matrix": [7, 4], "x": 15, "y": 1},
+                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
+                {"matrix": [8, 1], "x": 12, "y": 2},
+                {"matrix": [8, 2], "x": 13, "y": 2},
+                {"matrix": [8, 3], "x": 14, "y": 2},
+                {"matrix": [8, 4], "x": 15, "y": 2},
+                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
+                {"matrix": [9, 1], "x": 12, "y": 3},
+                {"matrix": [9, 2], "x": 13, "y": 3},
+                {"matrix": [9, 3], "x": 14, "y": 3},
+                {"matrix": [9, 4], "x": 15, "y": 3},
+                {"matrix": [9, 5], "x": 16, "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": [10, 2], "x": 13, "y": 4},
+                {"matrix": [10, 3], "x": 14, "y": 4},
+                {"matrix": [10, 4], "x": 15, "y": 4},
+                {"matrix": [10, 5], "x": 16, "y": 4},
 
-                {"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": 4, "y": 1, "matrix": [1, 4]},
-                {"x": 5, "y": 1, "matrix": [1, 5]},
-                {"x": 14, "y": 1, "matrix": [7, 0]},
-                {"x": 15, "y": 1, "matrix": [7, 1]},
-                {"x": 16, "y": 1, "matrix": [7, 2]},
-                {"x": 17, "y": 1, "matrix": [7, 3]},
-                {"x": 18, "y": 1, "matrix": [7, 4]},
-                {"x": 19, "y": 1, "matrix": [7, 5]},
+                {"matrix": [4, 4], "x": 4, "y": 5},
+                {"matrix": [4, 5], "x": 5, "y": 5},
 
-                {"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": 4, "y": 2, "matrix": [2, 4]},
-                {"x": 5, "y": 2, "matrix": [2, 5]},
-                {"x": 14, "y": 2, "matrix": [8, 0]},
-                {"x": 15, "y": 2, "matrix": [8, 1]},
-                {"x": 16, "y": 2, "matrix": [8, 2]},
-                {"x": 17, "y": 2, "matrix": [8, 3]},
-                {"x": 18, "y": 2, "matrix": [8, 4]},
-                {"x": 19, "y": 2, "matrix": [8, 5]},
+                {"matrix": [10, 0], "x": 11, "y": 5},
+                {"matrix": [10, 1], "x": 12, "y": 5},
 
-                {"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]},
-                {"x": 4, "y": 3, "matrix": [3, 4]},
-                {"x": 5, "y": 3, "matrix": [3, 5]},
-                {"x": 14, "y": 3, "matrix": [9, 0]},
-                {"x": 15, "y": 3, "matrix": [9, 1]},
-                {"x": 16, "y": 3, "matrix": [9, 2]},
-                {"x": 17, "y": 3, "matrix": [9, 3]},
-                {"x": 18, "y": 3, "matrix": [9, 4]},
-                {"x": 19, "y": 3, "matrix": [9, 5]},
+                {"matrix": [5, 4], "x": 6, "y": 6},
+                {"matrix": [5, 5], "x": 7, "y": 6},
 
-                {"x": 0, "y": 4, "matrix": [4, 0]},
-                {"x": 1, "y": 4, "matrix": [4, 1]},
-                {"x": 2, "y": 4, "matrix": [4, 2]},
-                {"x": 3, "y": 4, "matrix": [4, 3]},
-                {"x": 16, "y": 4, "matrix": [10, 2]},
-                {"x": 17, "y": 4, "matrix": [10, 3]},
-                {"x": 18, "y": 4, "matrix": [10, 4]},
-                {"x": 19, "y": 4, "matrix": [10, 5]},
+                {"matrix": [11, 0], "x": 9, "y": 6},
+                {"matrix": [11, 1], "x": 10, "y": 6},
 
-                {"x": 5, "y": 5, "matrix": [5, 0]},
-                {"x": 6, "y": 5, "matrix": [5, 1]},
-                {"x": 7, "y": 5, "matrix": [5, 2]},
-                {"x": 13, "y": 5, "matrix": [11, 0]},
-                {"x": 14, "y": 5, "matrix": [11, 1]},
-                {"x": 15, "y": 5, "matrix": [11, 2]},
+                {"matrix": [5, 2], "x": 6, "y": 7},
+                {"matrix": [5, 3], "x": 7, "y": 7},
 
-                {"x": 5, "y": 6, "matrix": [5, 3]},
-                {"x": 6, "y": 6, "matrix": [5, 4]},
-                {"x": 7, "y": 6, "matrix": [5, 5]},
-                {"x": 13, "y": 6, "matrix": [11, 3]},
-                {"x": 14, "y": 6, "matrix": [11, 4]},
-                {"x": 15, "y": 6, "matrix": [11, 5]}
+                {"matrix": [11, 2], "x": 9, "y": 7},
+                {"matrix": [11, 3], "x": 10, "y": 7}
             ]
         }
     }
diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/keymap.c
index 20699ed2e147..4e774ea71605 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/keymap.c
@@ -5,39 +5,45 @@
 
 enum custom_layers {
     _QWERTY,
-    _LAYER2,
+    _LOWER,
+    _RAISE
 };
 
-#define GUI_J   RGUI_T(KC_J)
-#define GUI_F   LGUI_T(KC_F)
-#define SFT_A   LSFT_T(KC_A)
-#define CTL_S   LCTL_T(KC_S)
-#define ALT_D   LALT_T(KC_D)
-#define ALT_K   RALT_T(KC_K)
-#define CTL_L   RCTL_T(KC_L)
-#define SFT_SC  RSFT_T(KC_SCLN)
-#define IMPORTS LALT(LCTL(KC_O))    //Intellij Organize Imports
-#define LINES   LALT(LGUI(KC_L))    //Intellij Reformat Code
-#define USAGES  LALT(KC_F7)         //Intelllj Find Usages
-#define RENAME  LSFT(KC_F6)         //Intellij Refactor Rename
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_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 , SFT_A  , CTL_S  , ALT_D  , GUI_F  , KC_G   ,                          KC_H   , GUI_J  , ALT_K  , CTL_L  , SFT_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_RSFT,
-                 KC_GRV , KC_INS , KC_LEFT, KC_RGHT,                                                              KC_DOWN, KC_UP  , KC_LBRC, KC_RBRC,
-                                                     KC_LCTL, KC_LALT, KC_HOME,        KC_DEL , KC_PGUP, KC_BSPC,
-                                                     KC_SPC , KC_DEL , KC_END ,        MO(_LAYER2), KC_PGDN, KC_ENT
+        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_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_LBRC, KC_RBRC,                                          KC_MINS, KC_EQL, KC_RALT, KC_RCTL,
+                                            RAISE,   KC_SPC,         KC_ENT,  LOWER,
+                                            KC_HOME, KC_BSPC,        KC_DEL,  KC_END,
+                                            KC_PGUP, KC_LGUI,        KC_RGUI, KC_PGDN
     ),
-    [_LAYER2] = LAYOUT(
-                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
-                 XXXXXXX, IMPORTS, XXXXXXX, USAGES , RENAME , XXXXXXX,                          XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX,
-                 XXXXXXX, LINES  , 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,                                                              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                                                     XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX,XXXXXXX, XXXXXXX, 
-                                                     XXXXXXX, XXXXXXX, XXXXXXX,         _______,XXXXXXX, XXXXXXX
+
+    [_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_LBRC,        KC_RBRC, KC_P7,   KC_P8,   KC_P9,   _______, _______,
+        _______, KC_SCRL, KC_INS,  KC_PAUS, KC_PSCR, KC_LPRN,        KC_RPRN, KC_P4,   KC_P5,   KC_P6,   _______, _______,
+        _______, _______, _______, _______, _______, _______,        _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,
+        _______, _______, _______, _______,                                            KC_P0,   KC_PDOT, _______, _______,
+                                            _______, _______,        _______, _______,
+                                            _______, _______,        _______, _______,
+                                            _______, _______,        _______, _______
+
+    ),
+
+    [_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_NUM,  _______, _______, KC_MUTE,
+        _______, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, KC_TRNS,        KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
+        _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, KC_VOLD,
+        _______, _______, _______, _______,                                            _______, _______, _______, _______,
+                                            _______, _______,        _______, _______,
+                                            _______, _______,        _______, _______,
+                                            _______, _______,        _______, _______
     )
 };
diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/readme.md b/keyboards/handwired/dactyl_manuform/5x6_68/readme.md
index 69f68bbfb897..b21270e39116 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_68/readme.md
+++ b/keyboards/handwired/dactyl_manuform/5x6_68/readme.md
@@ -1,5 +1,5 @@
-# Dactyl Manuform
+# Dactyl Manuform 5x6_68
 
-This is a 5x6 manuform with a 4 key bottom row and 6 key thumb clusters.
+This is a Dactyl ManuForm 5x6 with an extended, 4 key, bottom row; totalling 68 keys.  
 
-This results in a 68 key 5x6
\ No newline at end of file
+![diagram](https://i.imgur.com/TGd36fWh.png)
diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_68/rules.mk
index 5ef0d2fdb96f..6e7633bfe015 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_68/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/5x6_68/rules.mk
@@ -1,13 +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 = 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
-SPLIT_KEYBOARD = yes
+# This file intentionally left blank
diff --git a/keyboards/handwired/dactyl_manuform/5x7/config.h b/keyboards/handwired/dactyl_manuform/5x7/config.h
deleted file mode 100644
index 9a4e39dad218..000000000000
--- a/keyboards/handwired/dactyl_manuform/5x7/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json
index b166df22a043..68270606cc49 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x7/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3537",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 12
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h b/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
deleted file mode 100644
index 1da1cb9590ad..000000000000
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
index 2b542a15da27..245310fd3c5a 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
@@ -7,6 +7,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "led_count": 12
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/config.h b/keyboards/handwired/dactyl_manuform/6x6_4/config.h
deleted file mode 100644
index 9a4e39dad218..000000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_4/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
index 567057cf084e..955060de7a0e 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3636",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 12
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
deleted file mode 100644
index 9a4e39dad218..000000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
deleted file mode 100644
index 8f14c5049e85..000000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-    "keyboard_name": "Dactyl-Manuform (6x6+4)",
-    "manufacturer": "tshort",
-    "url": "",
-    "maintainer": "dmik",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3636",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_6x6_kinesis": {
-            "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": [7, 0], "x": 11, "y": 0},
-                {"matrix": [7, 1], "x": 12, "y": 0},
-                {"matrix": [7, 2], "x": 13, "y": 0},
-                {"matrix": [7, 3], "x": 14, "y": 0},
-                {"matrix": [7, 4], "x": 15, "y": 0},
-                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 1},
-                {"matrix": [8, 1], "x": 12, "y": 1},
-                {"matrix": [8, 2], "x": 13, "y": 1},
-                {"matrix": [8, 3], "x": 14, "y": 1},
-                {"matrix": [8, 4], "x": 15, "y": 1},
-                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2},
-                {"matrix": [9, 1], "x": 12, "y": 2},
-                {"matrix": [9, 2], "x": 13, "y": 2},
-                {"matrix": [9, 3], "x": 14, "y": 2},
-                {"matrix": [9, 4], "x": 15, "y": 2},
-                {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3},
-                {"matrix": [10, 1], "x": 12, "y": 3},
-                {"matrix": [10, 2], "x": 13, "y": 3},
-                {"matrix": [10, 3], "x": 14, "y": 3},
-                {"matrix": [10, 4], "x": 15, "y": 3},
-                {"matrix": [10, 5], "x": 16, "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": [11, 0], "x": 11, "y": 4},
-                {"matrix": [11, 1], "x": 12, "y": 4},
-                {"matrix": [11, 2], "x": 13, "y": 4},
-                {"matrix": [11, 3], "x": 14, "y": 4},
-                {"matrix": [11, 4], "x": 15, "y": 4},
-                {"matrix": [11, 5], "x": 16, "y": 4},
-
-                {"matrix": [5, 0], "x": 1, "y": 5},
-                {"matrix": [5, 1], "x": 2, "y": 5},
-                {"matrix": [5, 2], "x": 3, "y": 5},
-                {"matrix": [5, 3], "x": 4, "y": 5},
-
-                {"matrix": [12, 2], "x": 12, "y": 5},
-                {"matrix": [12, 3], "x": 13, "y": 5},
-                {"matrix": [12, 4], "x": 14, "y": 5},
-                {"matrix": [12, 5], "x": 15, "y": 5},
-
-                {"matrix": [5, 4], "x": 5, "y": 7, "h": 2},
-                {"matrix": [5, 5], "x": 6, "y": 7, "h": 2},
-
-                {"matrix": [12, 0], "x": 10, "y": 7, "h": 2},
-                {"matrix": [12, 1], "x": 11, "y": 7, "h": 2},
-
-                {"matrix": [6, 4], "x": 6, "y": 6},
-                {"matrix": [6, 5], "x": 7, "y": 6},
-
-                {"matrix": [13, 0], "x": 9, "y": 6},
-                {"matrix": [13, 1], "x": 10, "y": 6},
-
-                {"matrix": [6, 2], "x": 7, "y": 8},
-                {"matrix": [6, 3], "x": 7, "y": 7},
-
-                {"matrix": [13, 2], "x": 9, "y": 7},
-                {"matrix": [13, 3], "x": 9, "y": 8}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/keymap.c
deleted file mode 100644
index 2ef9794d6d7e..000000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/keymap.c
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2012 Jun Wako <wakojun@gmail.com>
-// Copyright 2021 Dmitriy Kuminov (@dmik)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum custom_layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-};
-
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_6x6_kinesis(
-        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                         KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_CAPS,
-        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_GRV , LOWER  , KC_LEFT, KC_RGHT,                                           KC_UP  , KC_DOWN, KC_LBRC, KC_RBRC,
-                                            KC_BSPC, KC_DEL ,                         KC_ENT , KC_SPC ,
-                                            KC_LGUI, KC_LALT,                         KC_RCTL, KC_RGUI,
-                                            KC_END , KC_HOME,                         KC_PGUP, KC_PGDN
-    ),
-
-    [_LOWER] = LAYOUT_6x6_kinesis(
-        _______, KC_F11 , KC_F12 , _______, _______, _______,                         KC_BRID, KC_BRIU, KC_MUTE, KC_VOLD, KC_VOLU, _______,
-        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
-                 _______, _______, _______, _______,                                           _______, _______, _______, _______,
-                                            _______, KC_INS ,                         _______, _______,
-                                            _______, _______,                         _______, _______,
-                                            _______, _______,                         _______, _______
-    ),
-
-    [_RAISE] = LAYOUT_6x6_kinesis(
-        _______, KC_F11 , KC_F12 , _______, _______, _______,                         KC_BRID, KC_BRIU, KC_MUTE, KC_VOLD, KC_VOLU, _______,
-        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
-                 _______, _______, _______, _______,                                           _______, _______, _______, _______,
-                                            _______, KC_INS ,                         _______, _______,
-                                            _______, _______,                         _______, _______,
-                                            _______, _______,                         _______, _______
-    ),
-};
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md b/keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md
deleted file mode 100644
index 1e44cc96015e..000000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# Kinesis Advantage Keymap
-
-## About this keymap
-
-This keymap is designed after Kinesis Advantage's QWERTY layout with the following key differences:
- - There are only 10 F-keys in the main layer, F1 and F2 are moved to additional LOWER layer.
- - The INS key acts like a LOWER layer activation key and Del in LOWER layer ats like INS.
- - LCtl is placed where CAPS should be and CAPS is moved to a free key after F10.
- - Brigtness and volume control keys are added to LOWER layer.
-
- The keymap file also contains RAISE layer but it is currently equivalent to LOWER layer and does
- not have an activation key mapped. It is intended for possible extensions.
-
-## Mapping details
-
-        Main QUERTY layer:
-        ,-------------------------------------------.                           ,-------------------------------------------.
-        | ESC    |  F1  |  F2  |  F3  |  F4  |  F5  |                           |  F6  |  F7  |  F8  |  F9  |  F10 | CAPS   |
-        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-        | =      |   1  |   2  |   3  |   4  |   5  |                           |   6  |   7  |   8  |   9  |   0  |   -    |
-        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-        | Tab    |   Q  |   W  |   E  |   R  |   T  |                           |   Y  |   U  |   I  |   O  |   P  |   \    |
-        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-        | LCtl   |   A  |   S  |   D  |   F  |   G  |                           |   H  |   J  |   K  |   L  |   ;  |   '    |
-        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-        | LShift |   Z  |   X  |   C  |   V  |   B  |                           |   N  |   M  |   ,  |   .  |   /  | RShift |
-        `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
-                 |   `  | LOWER| Left | Rght |                                         |  Up  |  Dn  |   [  |   ]  |
-                 `---------------------------'                                         `---------------------------'
-                                                ,-------------.      ,-------------.
-                                                | LGui | LAlt |      | RCtl | RGui |
-                                         ,------|------|------|      |------+------+------.
-                                         |      |      | Home |      | PgUp |      |      |
-                                         | BkSp | Del  |------|      |------|Enter |Space |
-                                         |      |      | End  |      | PgDn |      |      |
-                                         `--------------------'      `--------------------'
-
-        LOWER layer:
-        ,-------------------------------------------.                           ,-------------------------------------------.
-        |        |  F11 |  F12 |      |      |      |                           |BriDn |BriUp |VMute |VolDn |VolUp |        |
-        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-        |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-        |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-        |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-        |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-        `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
-                 |      |      |      |      |                                         |      |      |      |      |
-                 `---------------------------'                                         `---------------------------'
-                                                ,-------------.      ,-------------.
-                                                |      |      |      |      |      |
-                                         ,------|------|------|      |------+------+------.
-                                         |      |      |      |      |      |      |      |
-                                         |      | INS  |------|      |------|      |      |
-                                         |      |      |      |      |      |      |      |
-                                         `--------------------'      `--------------------'
-
-## Soldering details
-
-The below picture shows correspondence between the keys and the row/column wires of the left and
-right halves:
-
-        LOWER layer:
-        ,-------------------------------------------.                           ,-------------------------------------------.
-        |  L00   | L01  | L02  | L03  | L04  | L05  |                           | R00  | R01  | R02  | R03  | R04  |  R05   |
-        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-        |  L10   | L11  | L12  | L13  | L14  | L15  |                           | R10  | R11  | R12  | R13  | R14  |  R15   |
-        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-        |  L20   | L21  | L22  | L23  | L24  | L25  |                           | R20  | R21  | R22  | R23  | R24  |  R25   |
-        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-        |  L30   | L31  | L32  | L33  | L34  | L35  |                           | R30  | R31  | R32  | R33  | R34  |  R35   |
-        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-        |  L40   | L41  | L42  | L43  | L44  | L45  |                           | R40  | R41  | R42  | R43  | R44  |  R45   |
-        `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
-                 | L50  | L51  | L52  | L53  |                                         | R52  | R53  | R54  | R55  |
-                 `---------------------------'                                         `---------------------------'
-                                                ,-------------.      ,-------------.
-                                                | L64  | L65  |      | R60  | R61  |
-                                         ,------|------|------|      |------+------+------.
-                                         |      |      | L63  |      | R62  |      |      |
-                                         | L54  | L55  |------|      |------| R50  | R51  |
-                                         |      |      | L62  |      | R63  |      |      |
-                                         `--------------------'      `--------------------'
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk b/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk
deleted file mode 100644
index b893863bb52f..000000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk
+++ /dev/null
@@ -1,13 +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
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/6x7/config.h b/keyboards/handwired/dactyl_manuform/6x7/config.h
deleted file mode 100644
index 9a4e39dad218..000000000000
--- a/keyboards/handwired/dactyl_manuform/6x7/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/info.json
index ea983da9c8b5..529d92bd3f90 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x7/info.json
@@ -8,21 +8,35 @@
         "pid": "0x3636",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "audio": false,
+        "backlight": false,
+        "rgblight": false
+    },
     "ws2812": {
         "pin": "D3"
     },
     "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B7"],
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"],
         "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "rgblight": {
+        "led_count": 12
+    },
+    "development_board": "promicro",
     "layouts": {
-        "LAYOUT_6x7": {
+        "LAYOUT": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c
index 83fab9409df3..5653786dcfb1 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ enum custom_layer {
 #define LOWER MO(_LOWER)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_6x7(
+    [_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_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_TAB  , KC_Q   , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U   , KC_I   , KC_O  , KC_P  , KC_QUOT  , KC_BSLS,
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                     KC_BSPC,KC_GRV,                         KC_LGUI, KC_LALT
     ),
 
-    [_LOWER] = LAYOUT_6x7(
+    [_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 , _______,
         _______, 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, _______,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                 _______,_______,                         _______,_______
     ),
 
-    [_RAISE] = LAYOUT_6x7(
+    [_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, _______,
diff --git a/keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/keymap.c b/keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/keymap.c
index 0e8436788e6f..dbbc54cdcab9 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/keymap.c
@@ -10,7 +10,7 @@ enum custom_layer {
 #define RAISE MO(_RAISE)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_QWERTZ] = LAYOUT_6x7(
+	[_QWERTZ] = 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_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   ,              KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_END ,
 		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,
@@ -18,12 +18,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LCTL, 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_MPLY,
 		                           KC_LEFT, KC_RGHT,                                                  KC_UP  , KC_DOWN,
 		                                             KC_SPC , KC_LSFT,              KC_RALT, KC_ENT ,
-
 		                                             KC_LGUI, KC_LALT,              KC_BSPC, KC_DEL ,
 		                                             KC_PGDN, KC_PGUP,              KC_TAB , KC_INS
 		),
 
-	[_RAISE] = LAYOUT_6x7(
+	[_RAISE] = LAYOUT(
 		QK_BOOT, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______, _______, _______,
@@ -31,7 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______, _______, _______,
 		                           KC_MPRV, KC_MNXT,                                                  KC_VOLU, KC_VOLD,
 	                                                 _______, _______,              _______, _______,
-
 													 _______, _______,              _______, _______,
 													 _______, _______,              _______, _______
 		)
diff --git a/keyboards/handwired/dactyl_manuform/6x7/rules.mk b/keyboards/handwired/dactyl_manuform/6x7/rules.mk
index b893863bb52f..e69de29bb2d1 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x7/rules.mk
@@ -1,13 +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
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
index 41af664c2588..e8bbf91d0800 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
@@ -1,9 +1,5 @@
 #pragma once
 
 // WS2812 RGB LED, normally used to indicate keyboard state:
-#define RGBLIGHT_EFFECT_KNIGHT
 #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
-#define RGBLIGHT_EFFECT_CHRISTMAS
 #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
-#define RGBLED_NUM 6           // Used when chaining strips
-#define RGBLED_SPLIT { 3, 3 }  // Used when not chaining strips
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
index c2a818bde299..8e27a68f16e2 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
@@ -10,6 +10,14 @@
         "pid": "0x3632",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 6,
+        "split_count": [3, 3],
+        "animations": {
+            "knight": true,
+            "christmas": true
+        }
+    },
     "ws2812": {
         "pin": "D1"
     },
diff --git a/keyboards/handwired/dactyl_manuform/readme.md b/keyboards/handwired/dactyl_manuform/readme.md
index 560562f54429..dd281844007b 100644
--- a/keyboards/handwired/dactyl_manuform/readme.md
+++ b/keyboards/handwired/dactyl_manuform/readme.md
@@ -1,188 +1,112 @@
-# Dactyl Manuform (4x5, 5x6, 5x7, 6x6, 6x7)
+# Dactyl ManuForm
 
-the [Dactyl-Manuform](https://github.com/tshort/dactyl-keyboard) is a split curved keyboard based on the design of [adereth dactyl](https://github.com/adereth/dactyl-keyboard) and thumb cluster design of the [manuform](https://geekhack.org/index.php?topic=46015.0) keyboard, the hardware is similar to the let's split keyboard. all information needed for making one is in the first link.
-![Imgur](https://i.imgur.com/7y0Vbyd.jpg)
+![Imgur](https://i.imgur.com/7y0Vbydh.jpg)  
+*Pair of Dactyl Manuform 4x6*
 
-## First Time Setup
+Forked from the [Dactyl](/keyboards/handwired/dactyl), the *Dactyl ManuForm* is a parameterized, handwired, split bodied, tented, concave key-well design that incorporates the thumb cluster from the [ManuForm](https://geekhack.org/index.php?topic=46015.0).
 
-Download or clone the `qmk_firmware` repo and navigate to its top level directory. Once your build environment is setup, you'll be able to generate the default .hex using:
+* Keyboard Maintainer: [Tom Short](https://github.com/tshort)
+* Hardware Supported: Pro Micro, or clone of
+* Hardware Availability: [Github](https://github.com/tshort/dactyl-keyboard)
 
-Depending on your Layout chose one of the follwing commands:
+## Variants
 
-```
-$ make handwired/dactyl_manuform/YOUR_LAYOUT:YOUR_KEYMAP_NAME
-```
-
-example:
-
-```
-$ make handwired/dactyl_manuform/4x5:default
-```
-
-If everything worked correctly you will see a file:
-
-```
-dactyl_manuform_YOUR_LAYOUT_YOUR_KEYMAP_NAME.hex
-```
-
-For more information on customizing keymaps, take a look at the primary documentation for [Customizing Your Keymap](/docs/faq_keymap.md) in the main readme.md.
-
-## Keymaps
-
-### [Keymaps 4x5](/keyboards/handwired/dactyl_manuform/4x5/keymaps/)
-
-#### Default
-
-Simple QWERTY layout with 3 Layers.
-
-#### Dvorak
-
-### [Keymaps 5x6](/keyboards/handwired/dactyl_manuform/5x6/keymaps/)
-
-#### Default
-
-Just a copy of the Impstyle keymap. Feel free to adjust it.
-
-#### Impstyle
-
-A simple QWERTY keymap with 3 Layers. Both sides are connected via serial and the Left ist the master.
-
-### [Keymaps 5x6_5](/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/)
-
-Similar layout to 5x6 but with only 5 thumb keys per side instead of 6.
-
-#### Default
-QWERTY layout with 7 Layers.
+*Dactyl ManuForm's* are built in variations that cater for different row and column counts, and thumb clusters.  
 
-#### Via
-Similar to Default but adds support for the [Via](https://www.caniusevia.com/) keymap configurator. Reduces the number of layers to 4 to comply with Via defaults, and remaps
-some keys to accomodate that constraint.
+As standard: 
+- The finger keywell bottom row has 2 keys, 1 each in ring and middle columns
+    - Exception to this rule is the `5x7` variant - that has two additional keys, per half, in this row
+- The thumb cluster has 6 keys, arranged in a staggered 2 columns by 3 rows 
 
-### [Keymaps 5x7 aka almost Ergodox](/keyboards/handwired/dactyl_manuform/5x7/keymaps/)
+Variants are denoted as `RowCount`*x*`ColumnCount`*(_`Alteration`)*
 
-#### Default
+### Row
+| Count | Description |
+| :---: | :---: |
+| 4 | Three rows, typically for alphabet and some puncuation characters, with 2 key (finger keywell) bottom row |
+| 5 | As *4 row* with number row above |
+| 6 | As *5 row* with function row above |
 
-Keymap of Loligagger from geekhack.
+### Column
+| Count | Description |
+| :---: | :---: |
+| 5 | A column for each finger with additional column for first finger |  
+| 6 | As *5 column* with additional pinky finger column |
+| 7 | As *6 column* with either an additional first finger column (`5x7`) or additional pinky column (`6x7`) |  
 
-### [Keymaps 6x6](/keyboards/handwired/dactyl_manuform/6x6/keymaps/)
+### Alteration
+| Code | Description |
+| :---: | :---: |
+| 5 | Thumb cluster replaced with five key thumb cluster of [Dactyl Manuform Mini](https://github.com/l4u/dactyl-manuform-mini-keyboard) | 
+| 2_5 | Same as code *5* with two additional keys added to finger key-well bottom row |
 
-#### Default
+## Case Files Generator
 
-Simple QWERTY layout with 3 Layers.
+[Dactyl Generator](https://ryanis.cool/dactyl), created by [rianadon](https://github.com/rianadon), is a web based file generator that negates having to compose case files using programming languages, which was the matter when using the original *Dactyl* and *Dactyl ManuForm* GitHub repos, by instead compiling case files based on options and parameters configured in a web front end.
 
-### [Keymaps 6x7](/keyboards/handwired/dactyl_manuform/6x7/keymaps/)
+## Compile
 
-#### Default
+Make example for this keyboard (after setting up your build environment) in the 5x6 variant:
 
-Simple QWERTY layout with 3 Layers.
+    make handwired/dactyl_manuform/5x6:default
 
-### [Keymaps 3x5_3](/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/)
+Flashing example for this keyboard:
 
-#### Dlford
+    make handwired/dactyl_manuform/5x6:default:flash
 
-QWERTY/Colemak layout with per key RGB and other features
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
-## Required Hardware
-
-Apart from diodes and key switches for the keyboard matrix in each half, you
-will need:
-
--   2 Arduino Pro Micros. You can find these on AliExpress for ≈3.50USD each.
--   2 TRRS sockets and 1 TRRS cable, or 2 TRS sockets and 1 TRS cable
-
-Alternatively, you can use any sort of cable and socket that has at least 3
-wires. If you want to use I2C to communicate between halves, you will need a
-cable with at least 4 wires and 2x 4.7kΩ pull-up resistors
-
-## Optional Hardware
-
-A speaker can be hooked-up to either side to the `5` (`C6`) pin and `GND`, and turned on via `AUDIO_ENABLE`.
-
-## Wiring
-
-The 3 wires of the TRS/TRRS cable need to connect GND, VCC, and digital pin 3 (i.e.
-PD0 on the ATmega32u4) between the two Pro Micros.
+## Keymaps
 
-Next, wire your key matrix to any of the remaining 17 IO pins of the pro micro
-and modify the `matrix.c` accordingly.
+### Default
 
-The wiring for serial:
+The default functional layout, based on QWERTY, and every variant has this keymap; used as a starting point/template for custom keymaps and for debugging purposes when soldering key matrix to controller.
 
-![serial wiring](https://i.imgur.com/C3D1GAQ.png)
+### VIA
+Similar to *Default* but adds support for the [VIA](https://usevia.app/) keymap configurator. Layer count set to 4 to comply with VIA defaults, and remaps keys to accommodate this constraint, if applicable.
 
-The wiring for i2c:
+Variants with VIA support:
+- 4x6
+- 5x6_5
+- 5x7
 
-![i2c wiring](https://i.imgur.com/Hbzhc6E.png)
+### Miryoku
 
-The pull-up resistors may be placed on either half. It is also possible
-to use 4 resistors and have the pull-ups in both halves, but this is
-unnecessary in simple use cases.
+For more information on this layout schematic, please see the [Miryoku Reference Manual](https://github.com/manna-harbour/miryoku/tree/master/docs/reference).  
+For QMK specifics, please see [Miryoku QMK](https://github.com/manna-harbour/miryoku_qmk/tree/miryoku/users/manna-harbour_miryoku).  
 
-You can change your configuration between serial and i2c by modifying your `config.h` file.
+Variants with *Miryoku* support:
+- 4x5
+- 4x5_5
+- 4x6
+- 4x6_5
+- 5x6
 
-## Notes on Software Configuration
+## Non-Pro Micro Controller Compilation
 
-the keymaps in here are for the 4x5 layout of the keyboard only.
+If building a Dactyl Manuform with controllers that aren't a pro micro, the Converter feature of QMK will allow compilation of firmware for the intended variant and supported controller without having to create a new QMK keyboard/keymap.  
+Please see [Converters](https://docs.qmk.fm/#/feature_converters?id=supported-converters) documentation for list of controllers that are supported converting from `pro_micro` and how to implement conversion.
 
 ## Flashing
 
-To flash your firmware take a look at: [Flashing Instructions and Bootloader Information](https://docs.qmk.fm/#/flashing)
-
-## Choosing which board to plug the USB cable into (choosing Master)
-
-Because the two boards are identical, the firmware has logic to differentiate the left and right board.
-
-It uses two strategies to figure things out: looking at the EEPROM (memory on the chip) or looking if the current board has the usb cable.
-
-The EEPROM approach requires additional setup (flashing the eeprom) but allows you to swap the usb cable to either side.
-
-The USB cable approach is easier to setup and if you just want the usb cable on the left board, you do not need to do anything extra.
+To flash your board with generated firmware file, please see [Flashing Instructions and Bootloader Information](https://docs.qmk.fm/#/flashing)
 
-### Setting the left hand as master
+## Handedness configurations
 
-If you always plug the usb cable into the left board, nothing extra is needed as this is the default. Comment out `EE_HANDS` and comment out `I2C_MASTER_RIGHT` or `MASTER_RIGHT` if for some reason it was set.
+See [Handedness](https://docs.qmk.fm/#/config_options?id=setting-handedness) documentation for more information on configuring handedness/master half.
 
-### Setting the right hand as master
-
-If you always plug the usb cable into the right board, add an extra flag to your `config.h`
-
-```
- #define MASTER_RIGHT
-```
-
-### Setting EE_hands to use either hands as master
-
-If you define `EE_HANDS` in your `config.h`, you will need to set the
-EEPROM for the left and right halves.
-
-The EEPROM is used to store whether the
-half is left handed or right handed. This makes it so that the same firmware
-file will run on both hands instead of having to flash left and right handed
-versions of the firmware to each half. To flash the EEPROM file for the left
-half run:
+## VIA Configuration 
 
+Variants with a `via` keymap are VIA capable. 
+Compile firmware, for [enabled variant](#via), with it's `via` keymap and flash board with this firmware file.
 ```
-make handwired/dactyl_promicro:default:dfu-split-left
-make handwired/dactyl_promicro:default:dfu-split-right
+qmk compile -kb handwired/dactyl_manuform/4x6 -km via
 ```
 
-After you have flashed the EEPROM, you then need to set `EE_HANDS` in your config.h, rebuild the hex files and reflash.
-
-Note that you need to program both halves, but you have the option of using
-different keymaps for each half. You could program the left half with a QWERTY
-layout and the right half with a Colemak layout using bootmagic's default layout option.
-Then if you connect the left half to a computer by USB the keyboard will use QWERTY and Colemak when the
-right half is connected.
-
-## Notes on Using Pro Micro 3.3V
+## Bootloader
 
-Do update the `F_CPU` parameter in `rules.mk` to `8000000` which reflects
-the frequency on the 3.3V board.
+Enter the bootloader in 3 ways:
 
-Also, if the slave board is producing weird characters in certain columns,
-update the following line in `matrix.c` to the following:
-
-```
-// wait_us(30);  // without this wait read unstable value.
-wait_us(300);  // without this wait read unstable value.
-```
+* **Bootmagic reset**: If enabled, 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 or controller - 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/dactyl_maximus/info.json b/keyboards/handwired/dactyl_maximus/info.json
index 1d3c9443f313..081fab571adf 100644
--- a/keyboards/handwired/dactyl_maximus/info.json
+++ b/keyboards/handwired/dactyl_maximus/info.json
@@ -32,83 +32,83 @@
     "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, 0], "x": 0, "y": 0.35},
+                {"matrix": [0, 1], "x": 1, "y": 0.35},
+                {"matrix": [0, 2], "x": 2, "y": 0.35},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
                 {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
+                {"matrix": [0, 6], "x": 6, "y": 0.1},
 
-                {"matrix": [6, 0], "x": 12, "y": 0},
-                {"matrix": [6, 1], "x": 13, "y": 0},
+                {"matrix": [6, 0], "x": 12, "y": 0.1},
+                {"matrix": [6, 1], "x": 13, "y": 0.1},
                 {"matrix": [6, 2], "x": 14, "y": 0},
-                {"matrix": [6, 3], "x": 15, "y": 0},
-                {"matrix": [6, 4], "x": 16, "y": 0},
-                {"matrix": [6, 5], "x": 17, "y": 0},
-                {"matrix": [6, 6], "x": 18, "y": 0},
+                {"matrix": [6, 3], "x": 15, "y": 0.1},
+                {"matrix": [6, 4], "x": 16, "y": 0.35},
+                {"matrix": [6, 5], "x": 17, "y": 0.35},
+                {"matrix": [6, 6], "x": 18, "y": 0.35},
 
-                {"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, 0], "x": 0, "y": 1.35},
+                {"matrix": [1, 1], "x": 1, "y": 1.35},
+                {"matrix": [1, 2], "x": 2, "y": 1.35},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
                 {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
+                {"matrix": [1, 6], "x": 6, "y": 1.1},
 
-                {"matrix": [7, 0], "x": 12, "y": 1},
-                {"matrix": [7, 1], "x": 13, "y": 1},
+                {"matrix": [7, 0], "x": 12, "y": 1.1},
+                {"matrix": [7, 1], "x": 13, "y": 1.1},
                 {"matrix": [7, 2], "x": 14, "y": 1},
-                {"matrix": [7, 3], "x": 15, "y": 1},
-                {"matrix": [7, 4], "x": 16, "y": 1},
-                {"matrix": [7, 5], "x": 17, "y": 1},
-                {"matrix": [7, 6], "x": 18, "y": 1},
+                {"matrix": [7, 3], "x": 15, "y": 1.1},
+                {"matrix": [7, 4], "x": 16, "y": 1.35},
+                {"matrix": [7, 5], "x": 17, "y": 1.35},
+                {"matrix": [7, 6], "x": 18, "y": 1.35},
 
-                {"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, 0], "x": 0, "y": 2.35},
+                {"matrix": [2, 1], "x": 1, "y": 2.35},
+                {"matrix": [2, 2], "x": 2, "y": 2.35},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
                 {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
+                {"matrix": [2, 6], "x": 6, "y": 2.1},
 
-                {"matrix": [8, 0], "x": 12, "y": 2},
-                {"matrix": [8, 1], "x": 13, "y": 2},
+                {"matrix": [8, 0], "x": 12, "y": 2.1},
+                {"matrix": [8, 1], "x": 13, "y": 2.1},
                 {"matrix": [8, 2], "x": 14, "y": 2},
-                {"matrix": [8, 3], "x": 15, "y": 2},
-                {"matrix": [8, 4], "x": 16, "y": 2},
-                {"matrix": [8, 5], "x": 17, "y": 2},
-                {"matrix": [8, 6], "x": 18, "y": 2},
+                {"matrix": [8, 3], "x": 15, "y": 2.1},
+                {"matrix": [8, 4], "x": 16, "y": 2.35},
+                {"matrix": [8, 5], "x": 17, "y": 2.35},
+                {"matrix": [8, 6], "x": 18, "y": 2.35},
 
-                {"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, 0], "x": 0, "y": 3.35},
+                {"matrix": [3, 1], "x": 1, "y": 3.35},
+                {"matrix": [3, 2], "x": 2, "y": 3.35},
+                {"matrix": [3, 3], "x": 3, "y": 3.1},
                 {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3.1},
+                {"matrix": [3, 6], "x": 6, "y": 3.1},
 
-                {"matrix": [9, 0], "x": 12, "y": 3},
-                {"matrix": [9, 1], "x": 13, "y": 3},
+                {"matrix": [9, 0], "x": 12, "y": 3.1},
+                {"matrix": [9, 1], "x": 13, "y": 3.1},
                 {"matrix": [9, 2], "x": 14, "y": 3},
-                {"matrix": [9, 3], "x": 15, "y": 3},
-                {"matrix": [9, 4], "x": 16, "y": 3},
-                {"matrix": [9, 5], "x": 17, "y": 3},
-                {"matrix": [9, 6], "x": 18, "y": 3},
+                {"matrix": [9, 3], "x": 15, "y": 3.1},
+                {"matrix": [9, 4], "x": 16, "y": 3.35},
+                {"matrix": [9, 5], "x": 17, "y": 3.35},
+                {"matrix": [9, 6], "x": 18, "y": 3.35},
 
-                {"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, 0], "x": 0, "y": 4.35},
+                {"matrix": [4, 1], "x": 1, "y": 4.35},
+                {"matrix": [4, 2], "x": 2, "y": 4.35},
+                {"matrix": [4, 3], "x": 3, "y": 4.1},
                 {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4.1},
 
-                {"matrix": [10, 1], "x": 13, "y": 4},
+                {"matrix": [10, 1], "x": 13, "y": 4.1},
                 {"matrix": [10, 2], "x": 14, "y": 4},
-                {"matrix": [10, 3], "x": 15, "y": 4},
-                {"matrix": [10, 4], "x": 16, "y": 4},
-                {"matrix": [10, 5], "x": 17, "y": 4},
-                {"matrix": [10, 6], "x": 18, "y": 4},
+                {"matrix": [10, 3], "x": 15, "y": 4.1},
+                {"matrix": [10, 4], "x": 16, "y": 4.35},
+                {"matrix": [10, 5], "x": 17, "y": 4.35},
+                {"matrix": [10, 6], "x": 18, "y": 4.35},
 
                 {"matrix": [4, 6], "x": 7, "y": 5},
                 {"matrix": [5, 6], "x": 8, "y": 5},
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c b/keyboards/handwired/dactyl_minidox/3x5_3.c
similarity index 100%
rename from keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c
rename to keyboards/handwired/dactyl_minidox/3x5_3.c
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/config.h b/keyboards/handwired/dactyl_minidox/config.h
similarity index 100%
rename from keyboards/handwired/dactyl_manuform/3x5_3/config.h
rename to keyboards/handwired/dactyl_minidox/config.h
diff --git a/keyboards/handwired/dactyl_minidox/info.json b/keyboards/handwired/dactyl_minidox/info.json
new file mode 100644
index 000000000000..a0bb416ce48b
--- /dev/null
+++ b/keyboards/handwired/dactyl_minidox/info.json
@@ -0,0 +1,80 @@
+{
+    "keyboard_name": "Dactyl Minidox",
+    "manufacturer": "dlford",
+    "url": "https://www.dlford.io/keyboard-build-guide-per-key-rgb-leds/",
+    "maintainer": "dlford",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3536",
+        "device_version": "0.0.3"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "development_board": "promicro",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_3"
+    },
+    "community_layouts": ["split_3x5_3"],
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "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": [4, 0], "x": 10, "y": 0},
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [4, 2], "x": 12, "y": 0},
+                {"matrix": [4, 3], "x": 13, "y": 0},
+                {"matrix": [4, 4], "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": [5, 0], "x": 10, "y": 1},
+                {"matrix": [5, 1], "x": 11, "y": 1},
+                {"matrix": [5, 2], "x": 12, "y": 1},
+                {"matrix": [5, 3], "x": 13, "y": 1},
+                {"matrix": [5, 4], "x": 14, "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": [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": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+
+                {"matrix": [7, 0], "x": 10, "y": 3},
+                {"matrix": [7, 1], "x": 11, "y": 3},
+                {"matrix": [7, 2], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/default/keymap.c b/keyboards/handwired/dactyl_minidox/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/handwired/dactyl_manuform/3x5_3/keymaps/default/keymap.c
rename to keyboards/handwired/dactyl_minidox/keymaps/default/keymap.c
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h b/keyboards/handwired/dactyl_minidox/keymaps/dlford/config.h
similarity index 100%
rename from keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h
rename to keyboards/handwired/dactyl_minidox/keymaps/dlford/config.h
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.c b/keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.c
similarity index 100%
rename from keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.c
rename to keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.c
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.h b/keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.h
similarity index 100%
rename from keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.h
rename to keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.h
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c b/keyboards/handwired/dactyl_minidox/keymaps/dlford/keymap.c
similarity index 100%
rename from keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c
rename to keyboards/handwired/dactyl_minidox/keymaps/dlford/keymap.c
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/dlford/rules.mk b/keyboards/handwired/dactyl_minidox/keymaps/dlford/rules.mk
new file mode 100644
index 000000000000..d24f7a0cbd8d
--- /dev/null
+++ b/keyboards/handwired/dactyl_minidox/keymaps/dlford/rules.mk
@@ -0,0 +1,16 @@
+# Includes
+SRC += features/caps_word.c
+
+# Build Options
+#   change yes to no to disable
+#
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+DYNAMIC_MACRO_ENABLE = yes  # Create macros on the fly
+INDICATOR_LIGHTS = yes      # Enable indicator lights for caps lock, etc.
+# TAP_DANCE_ENABLE = yes      # Send different keycodes if tapped multiple times
+# KEY_OVERRIDE_ENABLE = yes   # Override key combos
+# COMBO_ENABLE = yes          # Custom key combos
+
+LTO_ENABLE = yes
+RGBLIGHT_SUPPORTED = yes
+RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/via/config.h b/keyboards/handwired/dactyl_minidox/keymaps/via/config.h
new file mode 100644
index 000000000000..bb5b0bf6af6d
--- /dev/null
+++ b/keyboards/handwired/dactyl_minidox/keymaps/via/config.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+Copyright 2021 @dlford
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should 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/handwired/dactyl_minidox/keymaps/via/keymap.c b/keyboards/handwired/dactyl_minidox/keymaps/via/keymap.c
new file mode 100644
index 000000000000..80b9b62b5355
--- /dev/null
+++ b/keyboards/handwired/dactyl_minidox/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum layers{
+    _BASE,
+    _RAISE,
+    _LOWER,
+    _BLANK
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_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,
+        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_LGUI, KC_BSPC, KC_SPC,           KC_SPC,  KC_ENT,  KC_RALT
+    ),
+    [_RAISE] = LAYOUT_split_3x5_3(
+        _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______,
+                                   _______, _______, _______,          _______, _______, _______                                          
+    ),
+    [_LOWER] = LAYOUT_split_3x5_3(
+        _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______,
+                                   _______, _______, _______,          _______, _______, _______
+    ),
+    [_BLANK] = LAYOUT_split_3x5_3(
+        _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______,
+                                   _______, _______, _______,          _______, _______, _______
+    )
+};
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/via/rules.mk b/keyboards/handwired/dactyl_minidox/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/handwired/dactyl_minidox/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/handwired/dactyl_minidox/readme.md b/keyboards/handwired/dactyl_minidox/readme.md
new file mode 100644
index 000000000000..5826403a80ff
--- /dev/null
+++ b/keyboards/handwired/dactyl_minidox/readme.md
@@ -0,0 +1,27 @@
+# Dactyl Minidox
+
+![DactylMinidox](https://i.imgur.com/PqjgeRfh.jpg)
+
+A 36 key (3x5+3), split bodied keyboard derived from the [Dactyl ManuForm](/keyboards/handwired/dactyl_manuform/).
+
+* Keyboard Maintainer: [Dan Ford](https://github.com/dlford)
+* Hardware Supported: Pro Micro controller, or clone of
+* Hardware Availability: [Build Guide](https://www.dlford.io/keyboard-build-guide-per-key-rgb-leds/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/dactyl_minidox:default
+
+Flashing example for this keyboard:
+
+    make handwired/dactyl_minidox: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/dactyl_minidox/rules.mk b/keyboards/handwired/dactyl_minidox/rules.mk
new file mode 100644
index 000000000000..e22ac7f3ffcf
--- /dev/null
+++ b/keyboards/handwired/dactyl_minidox/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 = yes          # Audio output
diff --git a/keyboards/handwired/dactyl_promicro/config.h b/keyboards/handwired/dactyl_promicro/config.h
index ab6beb807f03..543ef8e6c5a0 100644
--- a/keyboards/handwired/dactyl_promicro/config.h
+++ b/keyboards/handwired/dactyl_promicro/config.h
@@ -33,8 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Enables This makes it easier for fast typists to use dual-function keys */
 #define PERMISSIVE_HOLD
 
-#define RGBLED_NUM 12    // Number of LEDs
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/dactyl_promicro/info.json b/keyboards/handwired/dactyl_promicro/info.json
index 5f0b4f85a285..2ae20d2f4a8c 100644
--- a/keyboards/handwired/dactyl_promicro/info.json
+++ b/keyboards/handwired/dactyl_promicro/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "led_count": 12
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/handwired/dactyl_promicro/keymaps/default/keymap.c b/keyboards/handwired/dactyl_promicro/keymaps/default/keymap.c
index ed2d1440c832..1dd2f4784109 100644
--- a/keyboards/handwired/dactyl_promicro/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_promicro/keymaps/default/keymap.c
@@ -1,5 +1,22 @@
-#include QMK_KEYBOARD_H
+/*
+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/>.
+*/
+
+#include QMK_KEYBOARD_H
 
 #define _QWERTY 0
 #define _LOWER 1
diff --git a/keyboards/handwired/dactyl_promicro/readme.md b/keyboards/handwired/dactyl_promicro/readme.md
index a426319b4e56..63fd3a8df6dd 100644
--- a/keyboards/handwired/dactyl_promicro/readme.md
+++ b/keyboards/handwired/dactyl_promicro/readme.md
@@ -1,93 +1,30 @@
-# Dactyl with Arduino Pro Micro
+# Dactyl (Pro Micro)
 
-See https://github.com/adereth/dactyl-keyboard for the original Version.
+![Dactyl](https://i.imgur.com/a7uY1eSh.png)
 
-This Dactyl uses the Arduino Pro Mirco (2x).
-Wiring is a 6x6 Matrix like the [Dactyl Manuform](https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/dactyl_manuform)
+A split body, concave shaped key well, columnar keyboard with a 6 key thumb cluster that takes inspiration from the Kinesis Advantage keyboard range. This rendition of the *Dactyl* requires two micro controllers rather than the [original implementation](/keyboards/handwired/dactyl/) of a micro controller and I/O expander.
 
+* Keyboard Maintainer: [Matt Adereth](https://github.com/adereth)
+* Hardware Supported: Pro Micro controller, or clones of
+* Hardware Availability: [GitHub](https://github.com/adereth/dactyl-keyboard)
 
-## Build the Firmware:
+Make example for this keyboard (after setting up your build environment):
 
-  - Build the firmware with `make handwired/dactyl_promicro:<keymapname>`, for example `make handwired/dactyl:default`
-  - This will result in a hex file called `handwired_dactyl_promicro_<keymapname>.hex`, e.g.
-    `handwired_dactyl_promicro_default.hex`
+    make handwired/dactyl_promicro:default
 
-How to setup your build enviroment can be found here: [Installing Build Tools](https://docs.qmk.fm/#/getting_started_build_tools)
+Flashing example for this keyboard:
 
-## Required Hardware
+    make handwired/dactyl_promicro:default:flash
 
-Apart from diodes and key switches for the keyboard matrix in each half, you
-will need:
-
-* 2 Arduino Pro Micros. You can find these on AliExpress for ≈3.50USD each.
-* 2 TRRS sockets and 1 TRRS cable, or 2 TRS sockets and 1 TRS cable
-
-Alternatively, you can use any sort of cable and socket that has at least 3
-wires. If you want to use I2C to communicate between halves, you will need a
-cable with at least 4 wires and 2x 4.7kΩ pull-up resistors
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
 ## Optional Hardware
-A speaker can be hooked-up to either side to the `5` (`C6`) pin and `GND`, and turned on via `AUDIO_ENABLE`.
-
-## Wiring
-
-The 3 wires of the TRS/TRRS cable need to connect GND, VCC, and digital pin 3 (i.e.
-PD0 on the ATmega32u4) between the two Pro Micros.
-
-Next, wire your key matrix to any of the remaining 17 IO pins of the pro micro
-and modify the `matrix.c` accordingly.
-
-The wiring for serial:
-
-![serial wiring](https://i.imgur.com/C3D1GAQ.png)
-
-The wiring for i2c:
-
-![i2c wiring](https://i.imgur.com/Hbzhc6E.png)
-
-The pull-up resistors may be placed on either half. It is also possible
-to use 4 resistors and have the pull-ups in both halves, but this is
-unnecessary in simple use cases.
-
-You can change your configuration between serial and i2c by modifying your `config.h` file.
-
-## Notes on Software Configuration
 
-the keymaps in here are for the 4x5 layout of the keyboard only.
-
-## Flashing
-
-To flash your firmware take a look at: [Flashing Instructions and Bootloader Information](https://docs.qmk.fm/#/flashing).
-
-Under Windows the most convenient way is installing the [QMK Drivers](https://github.com/qmk/qmk_driver_installer/releases) and use the [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases).
-
-
-## Choosing which board to plug the USB cable into (choosing Master)
-
-### Setting the right or left hand as master
-
-If you always plug the usb cable into the right board, add an extra flag to your `config.h`
-```
- #define MASTER_RIGHT
-```
-
-OR
-
-```
- #define MASTER_LEFT
-```
-
-
-Notes on Using Pro Micro 3.3V
------------------------------
+A speaker can be hooked-up to either side to the `5` (`C6`) pin and `GND`, and turned on via `AUDIO_ENABLE`.
 
-Do update the `F_CPU` parameter in `rules.mk` to `8000000` which reflects
-the frequency on the 3.3V board.
+## Bootloader
 
-Also, if the slave board is producing weird characters in certain columns,
-update the following line in `matrix.c` to the following:
+Enter the bootloader in 2 ways:
 
-```
-// _delay_us(30);  // without this wait read unstable value.
-_delay_us(300);  // without this wait read unstable value.
-```
+* **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/dactyl_rah/config.h b/keyboards/handwired/dactyl_rah/config.h
index e40f6dfc69ef..107d8e166835 100644
--- a/keyboards/handwired/dactyl_rah/config.h
+++ b/keyboards/handwired/dactyl_rah/config.h
@@ -24,9 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_MAX_SPEED       7
 #define MOUSEKEY_WHEEL_DELAY 0
 
-/* layer config */
-#define TAPPING_TOGGLE 1
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/handwired/dactyl_rah/info.json b/keyboards/handwired/dactyl_rah/info.json
index 9234536a2323..bfacb99a4b0a 100644
--- a/keyboards/handwired/dactyl_rah/info.json
+++ b/keyboards/handwired/dactyl_rah/info.json
@@ -18,6 +18,9 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "tapping": {
+    "toggle": 1
+  },
   "layouts": {
     "LAYOUT_6x6": {
       "layout": [
diff --git a/keyboards/handwired/dactyl_tracer/info.json b/keyboards/handwired/dactyl_tracer/info.json
new file mode 100644
index 000000000000..29e599066687
--- /dev/null
+++ b/keyboards/handwired/dactyl_tracer/info.json
@@ -0,0 +1,92 @@
+{
+    "keyboard_name": "Dactyl Tracer",
+    "manufacturer": "mjohns",
+    "url": "https://github.com/mjohns/tracer",
+    "maintainer": "mjohns",
+    "usb": {
+        "vid": "0x444E",
+        "pid": "0x1307",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "development_board": "promicro",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "layouts": {
+        "LAYOUT" : {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"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": [5, 0], "x": 9, "y": 0},
+                {"matrix": [5, 1], "x": 10, "y": 0},
+                {"matrix": [5, 2], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 4], "x": 13, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 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": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.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": [7, 0], "x": 9, "y": 2},
+                {"matrix": [7, 1], "x": 10, "y": 2},
+                {"matrix": [7, 2], "x": 11, "y": 2},
+                {"matrix": [7, 3], "x": 12, "y": 2},
+                {"matrix": [7, 4], "x": 13, "y": 2.5},
+
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 2], "x": 11, "y": 3},
+                {"matrix": [8, 3], "x": 12, "y": 3},
+
+                {"matrix": [4, 2], "x": 3, "y": 4 },
+                {"matrix": [3, 3], "x": 4, "y": 4 },
+                {"matrix": [4, 4], "x": 5, "y": 4.25},
+                                
+                {"matrix": [9, 0], "x": 8, "y": 4.25},
+                {"matrix": [8, 1], "x": 9, "y": 4},
+                {"matrix": [9, 2], "x": 10, "y": 4},
+
+                {"matrix": [4, 3], "x": 4.5, "y": 5.25},
+                
+                {"matrix": [9, 1], "x": 8.5, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_tracer/keymaps/default/config.h b/keyboards/handwired/dactyl_tracer/keymaps/default/config.h
new file mode 100644
index 000000000000..0cb73d6a454f
--- /dev/null
+++ b/keyboards/handwired/dactyl_tracer/keymaps/default/config.h
@@ -0,0 +1,23 @@
+// Copyright 2022 mjohns
+// 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
+
+/* Enables This makes it easier for fast typists to use dual-function keys */
+#define PERMISSIVE_HOLD
+
+/* mouse config */
+#define MOUSEKEY_INTERVAL    20
+#define MOUSEKEY_DELAY       0
+#define MOUSEKEY_TIME_TO_MAX 60
+#define MOUSEKEY_MAX_SPEED   7
+#define MOUSEKEY_WHEEL_DELAY 0
+
+#define TAPPING_TERM    200
+
+#define MASTER_RIGHT
diff --git a/keyboards/handwired/dactyl_tracer/keymaps/default/keymap.c b/keyboards/handwired/dactyl_tracer/keymaps/default/keymap.c
new file mode 100644
index 000000000000..0fa218b9307a
--- /dev/null
+++ b/keyboards/handwired/dactyl_tracer/keymaps/default/keymap.c
@@ -0,0 +1,60 @@
+// Copyright 2022 mjohns
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _BASE,
+    _RAISE,
+    _LOWER,
+    _SYS,
+};
+
+#define MG_A LGUI_T(KC_A)
+#define MA_S LALT_T(KC_S)
+#define MC_D LCTL_T(KC_D)
+#define MS_F LSFT_T(KC_F)
+#define MS_J RSFT_T(KC_J)
+#define MC_K RCTL_T(KC_K)
+#define MA_L LALT_T(KC_L)
+#define MG_SCLN RGUI_T(KC_SCLN)
+#define APP_N A(KC_TAB)
+#define APP_P LSA(KC_TAB)
+
+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,
+        MG_A, MA_S,    MC_D,    MS_F,   KC_G,                         KC_H,   MS_J,   MC_K,    MA_L,    MG_SCLN,
+        KC_Z, KC_X,    KC_C,    KC_V,   KC_B,                         KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_QUOT,
+              KC_LEFT, KC_RGHT,                 KC_HOME,     KC_END,                  KC_UP,   KC_DOWN,
+                                KC_TAB, KC_SPC, KC_DEL,      KC_BSPC, KC_ENT, KC_ESC,
+                                        MO(1),                        MO(2)
+    ),
+
+    [_RAISE] = 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_LBRC,                      KC_RBRC, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR,
+        KC_PIPE, KC_GRV,  KC_BSLS, KC_LPRN, KC_LCBR,                      KC_RCBR, KC_RPRN, KC_SLSH, KC_QUES, KC_TILD,
+                 KC_MINS, KC_PLUS,                   KC_NO,      KC_LALT,                   KC_EQL,  KC_UNDS,
+                                   KC_NO,   KC_NO,   KC_NO,      KC_RCTL, KC_RSFT, KC_RGUI,
+                                            _______,                      MO(3)
+    ),
+
+    [_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_INS,  KC_PAUS, KC_PGUP, KC_PSCR,                      KC_MUTE, KC_VOLU, KC_MNXT, KC_MPRV, KC_F12,
+        KC_SCRL, KC_NO,   KC_NO,   KC_PGDN, KC_NO,                        KC_NO,   KC_VOLD, KC_MPLY, KC_MSTP, KC_NO,
+                 KC_BRID, KC_BRIU,                   KC_LALT,      KC_NO,                   APP_N,   APP_P,
+                                   KC_LGUI, KC_LSFT, KC_LCTL,      KC_NO, KC_NO,   KC_NO,
+                                            MO(3),                        _______
+    ),
+
+    [_SYS] = LAYOUT(
+        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_SLEP, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO,                      KC_NO,  KC_NO,   KC_NO, KC_NO, KC_NO,
+               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/dactyl_tracer/keymaps/via/config.h b/keyboards/handwired/dactyl_tracer/keymaps/via/config.h
new file mode 100644
index 000000000000..ab8832c96e4d
--- /dev/null
+++ b/keyboards/handwired/dactyl_tracer/keymaps/via/config.h
@@ -0,0 +1,15 @@
+// Copyright 2022 mjohns
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* mouse config */
+#define MOUSEKEY_INTERVAL    20
+#define MOUSEKEY_DELAY       0
+#define MOUSEKEY_TIME_TO_MAX 60
+#define MOUSEKEY_MAX_SPEED   7
+#define MOUSEKEY_WHEEL_DELAY 0
+
+#define TAPPING_TERM    200
+
+#define MASTER_RIGHT
diff --git a/keyboards/handwired/dactyl_tracer/keymaps/via/keymap.c b/keyboards/handwired/dactyl_tracer/keymaps/via/keymap.c
new file mode 100644
index 000000000000..0fa218b9307a
--- /dev/null
+++ b/keyboards/handwired/dactyl_tracer/keymaps/via/keymap.c
@@ -0,0 +1,60 @@
+// Copyright 2022 mjohns
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _BASE,
+    _RAISE,
+    _LOWER,
+    _SYS,
+};
+
+#define MG_A LGUI_T(KC_A)
+#define MA_S LALT_T(KC_S)
+#define MC_D LCTL_T(KC_D)
+#define MS_F LSFT_T(KC_F)
+#define MS_J RSFT_T(KC_J)
+#define MC_K RCTL_T(KC_K)
+#define MA_L LALT_T(KC_L)
+#define MG_SCLN RGUI_T(KC_SCLN)
+#define APP_N A(KC_TAB)
+#define APP_P LSA(KC_TAB)
+
+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,
+        MG_A, MA_S,    MC_D,    MS_F,   KC_G,                         KC_H,   MS_J,   MC_K,    MA_L,    MG_SCLN,
+        KC_Z, KC_X,    KC_C,    KC_V,   KC_B,                         KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_QUOT,
+              KC_LEFT, KC_RGHT,                 KC_HOME,     KC_END,                  KC_UP,   KC_DOWN,
+                                KC_TAB, KC_SPC, KC_DEL,      KC_BSPC, KC_ENT, KC_ESC,
+                                        MO(1),                        MO(2)
+    ),
+
+    [_RAISE] = 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_LBRC,                      KC_RBRC, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR,
+        KC_PIPE, KC_GRV,  KC_BSLS, KC_LPRN, KC_LCBR,                      KC_RCBR, KC_RPRN, KC_SLSH, KC_QUES, KC_TILD,
+                 KC_MINS, KC_PLUS,                   KC_NO,      KC_LALT,                   KC_EQL,  KC_UNDS,
+                                   KC_NO,   KC_NO,   KC_NO,      KC_RCTL, KC_RSFT, KC_RGUI,
+                                            _______,                      MO(3)
+    ),
+
+    [_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_INS,  KC_PAUS, KC_PGUP, KC_PSCR,                      KC_MUTE, KC_VOLU, KC_MNXT, KC_MPRV, KC_F12,
+        KC_SCRL, KC_NO,   KC_NO,   KC_PGDN, KC_NO,                        KC_NO,   KC_VOLD, KC_MPLY, KC_MSTP, KC_NO,
+                 KC_BRID, KC_BRIU,                   KC_LALT,      KC_NO,                   APP_N,   APP_P,
+                                   KC_LGUI, KC_LSFT, KC_LCTL,      KC_NO, KC_NO,   KC_NO,
+                                            MO(3),                        _______
+    ),
+
+    [_SYS] = LAYOUT(
+        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_SLEP, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO,                      KC_NO,  KC_NO,   KC_NO, KC_NO, KC_NO,
+               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/dactyl_tracer/keymaps/via/rules.mk b/keyboards/handwired/dactyl_tracer/keymaps/via/rules.mk
new file mode 100644
index 000000000000..36b7ba9cbc98
--- /dev/null
+++ b/keyboards/handwired/dactyl_tracer/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/handwired/dactyl_tracer/readme.md b/keyboards/handwired/dactyl_tracer/readme.md
new file mode 100644
index 000000000000..c6e1d80892d8
--- /dev/null
+++ b/keyboards/handwired/dactyl_tracer/readme.md
@@ -0,0 +1,27 @@
+# Dactyl Tracer
+
+![DactylTracer](https://i.imgur.com/ReCBppEh.jpeg)
+
+The Dactyl Tracer is a handwired, split bodied, concave key-well, columnar keyboard. Case design is similar to the [Dactyl CC](/keyboards/handwired/dactyl_cc) though overall design is closer to the [Dactyl ManuForm](/keyboards/handwired/dactyl_manuform/). The `Q` and `P` keys are vertically offset, from `A` and `;` keys respectively, to allow for easier actuation by third/ring finger.
+
+* Keyboard Maintainer: [Michael Johns](https://github.com/mjohns)
+* Hardware Supported: Pro Micro controller, or clone of
+* Hardware Availability: [Case Files](https://github.com/mjohns/tracer)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/dactyl_tracer:default
+
+Flashing example for this keyboard:
+
+    make handwired/dactyl_tracer: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/dactyl_tracer/rules.mk b/keyboards/handwired/dactyl_tracer/rules.mk
new file mode 100644
index 000000000000..3bbd2614291a
--- /dev/null
+++ b/keyboards/handwired/dactyl_tracer/rules.mk
@@ -0,0 +1 @@
+# File intentionally blank
diff --git a/keyboards/handwired/dactylmacropad/config.h b/keyboards/handwired/dactylmacropad/config.h
deleted file mode 100644
index a2a5455ab148..000000000000
--- a/keyboards/handwired/dactylmacropad/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2022 bwprobably
-// 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 TAP_CODE_DELAY 100
diff --git a/keyboards/handwired/dactylmacropad/info.json b/keyboards/handwired/dactylmacropad/info.json
index 6744d4b7015d..5d40a240a9fd 100644
--- a/keyboards/handwired/dactylmacropad/info.json
+++ b/keyboards/handwired/dactylmacropad/info.json
@@ -28,6 +28,9 @@
             {"pin_a": "D1", "pin_b": "D0"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 100
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/handwired/daishi/config.h b/keyboards/handwired/daishi/config.h
deleted file mode 100644
index 2e6498ab5d81..000000000000
--- a/keyboards/handwired/daishi/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2019 Crokto
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should 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 delay for tap_code on rotary encoder */
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/handwired/daishi/info.json b/keyboards/handwired/daishi/info.json
index 37d80633a79f..6b6508eb83b2 100644
--- a/keyboards/handwired/daishi/info.json
+++ b/keyboards/handwired/daishi/info.json
@@ -18,6 +18,9 @@
             {"pin_a": "F1", "pin_b": "F0", "resolution": 2}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/handwired/datahand/config.h b/keyboards/handwired/datahand/config.h
index 0b2de61490a0..b1d8cc9c773a 100644
--- a/keyboards/handwired/datahand/config.h
+++ b/keyboards/handwired/datahand/config.h
@@ -20,8 +20,6 @@
 #define MATRIX_ROWS 13
 #define MATRIX_COLS 4
 
-//#define DIODE_DIRECTION
-
 /* 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/datahand/keymaps/default/keymap.c b/keyboards/handwired/datahand/keymaps/default/keymap.c
index 7ebcff366ff5..608c45dea349 100644
--- a/keyboards/handwired/datahand/keymaps/default/keymap.c
+++ b/keyboards/handwired/datahand/keymaps/default/keymap.c
@@ -302,8 +302,9 @@ void matrix_init_user(void) {
 #endif
 }
 
-void led_set_user(uint8_t usb_led) {
-  lock_led_set(usb_led & (1<<USB_LED_NUM_LOCK), LED_NUM_LOCK);
-  lock_led_set(usb_led & (1<<USB_LED_CAPS_LOCK), LED_CAPS_LOCK);
-  lock_led_set(usb_led & (1<<USB_LED_SCROLL_LOCK), LED_SCROLL_LOCK);
+bool led_update_user(led_t led_state) {
+  lock_led_set(led_state.num_lock, LED_NUM_LOCK);
+  lock_led_set(led_state.caps_lock, LED_CAPS_LOCK);
+  lock_led_set(led_state.scroll_lock, LED_SCROLL_LOCK);
+  return false;
 }
diff --git a/keyboards/handwired/ergocheap/config.h b/keyboards/handwired/ergocheap/config.h
index 445892274611..23b6e9bad96d 100644
--- a/keyboards/handwired/ergocheap/config.h
+++ b/keyboards/handwired/ergocheap/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAPPING_TERM 500
 #define PERMISSIVE_HOLD
 
 /*
diff --git a/keyboards/handwired/ergocheap/info.json b/keyboards/handwired/ergocheap/info.json
index 12bff57b3e06..17d786323770 100644
--- a/keyboards/handwired/ergocheap/info.json
+++ b/keyboards/handwired/ergocheap/info.json
@@ -8,6 +8,9 @@
         "pid": "0x6942",
         "device_version": "0.0.1"
     },
+    "tapping": {
+        "term": 500
+    },
     "matrix_pins": {
         "cols": ["A8", "A9", "B14", "B12", "B13", "B15", "B3", "B11", "A4", "A5", "A6", "A7", "B0", "B1", "B10"],
         "rows": ["B5", "B6", "B7", "B9", "B8"]
diff --git a/keyboards/handwired/ergocheap/rules.mk b/keyboards/handwired/ergocheap/rules.mk
index 2c8f1f42bf10..10c9a692dffa 100644
--- a/keyboards/handwired/ergocheap/rules.mk
+++ b/keyboards/handwired/ergocheap/rules.mk
@@ -1,5 +1,3 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/handwired/frenchdev/config.h b/keyboards/handwired/frenchdev/config.h
index 9cb309c78ff3..d758c6023943 100644
--- a/keyboards/handwired/frenchdev/config.h
+++ b/keyboards/handwired/frenchdev/config.h
@@ -31,10 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_MAX_SPEED      2
 #define MOUSEKEY_WHEEL_DELAY 0
 
-#define TAPPING_TOGGLE  1
-
-#define TAPPING_TERM    200
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/info.json
index a22b06d41716..8d031b3c42fa 100644
--- a/keyboards/handwired/frenchdev/info.json
+++ b/keyboards/handwired/frenchdev/info.json
@@ -9,6 +9,9 @@
   },
   "processor": "atmega32u4",
   "bootloader": "halfkay",
+  "tapping": {
+    "toggle": 1
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/handwired/frenchdev/keymaps/default/keymap.c b/keyboards/handwired/frenchdev/keymaps/default/keymap.c
index e5a5dcc6c163..60e355f290e7 100644
--- a/keyboards/handwired/frenchdev/keymaps/default/keymap.c
+++ b/keyboards/handwired/frenchdev/keymaps/default/keymap.c
@@ -351,11 +351,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)){
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock){
     frenchdev_led_3_on();
   } else {
     frenchdev_led_3_off();
   }
-  return ;
+  return false;
 }
diff --git a/keyboards/handwired/freoduo/config.h b/keyboards/handwired/freoduo/config.h
index 232d5638eb04..e176ec9442c4 100644
--- a/keyboards/handwired/freoduo/config.h
+++ b/keyboards/handwired/freoduo/config.h
@@ -17,26 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EE_HANDS
 
-/* ws2812 RGB LED */
-#if !defined(RGBLED_NUM)
-#    define RGBLED_NUM 30
-#    define RGBLIGHT_SPLIT
-#    define RGBLED_SPLIT { 16, 14 }
-// Switch RGB sides with LED MAP.
-#    define RGBLIGHT_LED_MAP { 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30}
 #    define RGBLIGHT_LAYERS
-#endif
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLIGHT_SLEEP
-#define RGBLIGHT_HUE_STEP 16
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/info.json
index 5ddf21ee7956..0be6c8cdb983 100644
--- a/keyboards/handwired/freoduo/info.json
+++ b/keyboards/handwired/freoduo/info.json
@@ -16,6 +16,27 @@
 "split": {
     "soft_serial_pin": "D0"
 },
+"rgblight": {
+    "hue_steps": 16,
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 30,
+    "sleep": true,
+    "led_map": [15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30],
+    "split_count": [16, 14],
+    "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": "D4"
 },
diff --git a/keyboards/handwired/fruity60/info.json b/keyboards/handwired/fruity60/info.json
index dab7f609a80d..34b1edc82078 100644
--- a/keyboards/handwired/fruity60/info.json
+++ b/keyboards/handwired/fruity60/info.json
@@ -8,6 +8,9 @@
         "pid": "0xB170",
         "device_version": "0.0.1"
     },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
     "matrix_pins": {
         "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "B7", "D6", "C7"],
         "rows": ["B6", "B5", "D7", "C6", "D0", "D1"]
diff --git a/keyboards/handwired/fruity60/rules.mk b/keyboards/handwired/fruity60/rules.mk
index 61260f5e3982..79e2ef4eff97 100644
--- a/keyboards/handwired/fruity60/rules.mk
+++ b/keyboards/handwired/fruity60/rules.mk
@@ -14,4 +14,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
diff --git a/keyboards/handwired/hacked_motospeed/info.json b/keyboards/handwired/hacked_motospeed/info.json
index 86736773ece8..899bd58bcbf1 100644
--- a/keyboards/handwired/hacked_motospeed/info.json
+++ b/keyboards/handwired/hacked_motospeed/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0690",
     "device_version": "0.0.1"
   },
+  "bluetooth": {
+    "driver": "rn42"
+  },
   "matrix_pins": {
     "cols": ["F7", "F6", "F5", "F4", "F3", "F2", "E0", "E1", "C0", "C1", "C2", "C3"],
     "rows": ["B3", "B4", "F1", "B5", "B6", "D5", "D4", "D6", "D7", "C4"]
diff --git a/keyboards/handwired/hacked_motospeed/rules.mk b/keyboards/handwired/hacked_motospeed/rules.mk
index 50716e356f86..362a7fadbed4 100644
--- a/keyboards/handwired/hacked_motospeed/rules.mk
+++ b/keyboards/handwired/hacked_motospeed/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 NO_USB_STARTUP_CHECK = yes  # Disable initialization only when usb is plugged in
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = RN42
diff --git a/keyboards/handwired/heisenberg/config.h b/keyboards/handwired/heisenberg/config.h
index 00362c53758e..7ad28a9c225f 100644
--- a/keyboards/handwired/heisenberg/config.h
+++ b/keyboards/handwired/heisenberg/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-	#define RGBLED_NUM 6
-//   #define RGBLIGHT_HUE_STEP 8
-//   #define RGBLIGHT_SAT_STEP 8
-//   #define RGBLIGHT_VAL_STEP 8
-//   #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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -47,9 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * Heisenberg-specific definitions END
  */
 
-
-#define TAPPING_TERM 200
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/heisenberg/info.json b/keyboards/handwired/heisenberg/info.json
index 5b3e000fba30..09e03bd06319 100644
--- a/keyboards/handwired/heisenberg/info.json
+++ b/keyboards/handwired/heisenberg/info.json
@@ -8,6 +8,21 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "led_count": 6,
+    "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": "D4"
   },
diff --git a/keyboards/handwired/hnah108/info.json b/keyboards/handwired/hnah108/info.json
index 4d7d3e038616..a399ffedf5df 100644
--- a/keyboards/handwired/hnah108/info.json
+++ b/keyboards/handwired/hnah108/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F0", "E6", "B0", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"],
diff --git a/keyboards/handwired/hnah40rgb/info.json b/keyboards/handwired/hnah40rgb/info.json
index 9f952d685a80..fce74cefef5b 100644
--- a/keyboards/handwired/hnah40rgb/info.json
+++ b/keyboards/handwired/hnah40rgb/info.json
@@ -12,7 +12,7 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D5", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"],
diff --git a/keyboards/handwired/iso85k/info.json b/keyboards/handwired/iso85k/info.json
new file mode 100644
index 000000000000..625a356e307b
--- /dev/null
+++ b/keyboards/handwired/iso85k/info.json
@@ -0,0 +1,123 @@
+{
+    "manufacturer": "Fredrik A. Kristiansen",
+    "keyboard_name": "iso85k",
+    "maintainer": "FredrikAleksander",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A7", "C4", "C5", "B0", "B1", "B2", "B10", "B11", "C10", "C11", "C12", "B3", "B4", "B5", "B8", "B9"],
+        "rows": ["C7", "C6", "B15", "B14", "B13", "B12"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xCAFE",
+        "vid": "0xD666"
+    },
+    "community_layouts": ["75_iso"],
+    "layouts": {
+        "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, 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, 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, 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": [2, 14], "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, 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/handwired/iso85k/keymaps/default/keymap.c b/keyboards/handwired/iso85k/keymaps/default/keymap.c
new file mode 100644
index 000000000000..aaba9c1ea1e2
--- /dev/null
+++ b/keyboards/handwired/iso85k/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+// Copyright 2023 Fredrik A. Kristiansen (fredrikaxk@gmail.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _BL,
+    _FL
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BL] = LAYOUT_75_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_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_BSPC,          KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_PGDN,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FL] = LAYOUT_75_iso(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM,  KC_SCRL, KC_INS,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/handwired/iso85k/keymaps/via/keymap.c b/keyboards/handwired/iso85k/keymaps/via/keymap.c
new file mode 100644
index 000000000000..3d64364cc698
--- /dev/null
+++ b/keyboards/handwired/iso85k/keymaps/via/keymap.c
@@ -0,0 +1,28 @@
+// Copyright 2023 Fredrik A. Kristiansen (fredrikaxk@gmail.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _BL,
+    _FL
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BL] = LAYOUT_75_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_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_BSPC,          KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_PGDN,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FL] = LAYOUT_75_iso(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NUM,  KC_SCRL, KC_INS,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/handwired/iso85k/keymaps/via/rules.mk b/keyboards/handwired/iso85k/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/handwired/iso85k/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/handwired/iso85k/readme.md b/keyboards/handwired/iso85k/readme.md
new file mode 100644
index 000000000000..89e3d60d2ae8
--- /dev/null
+++ b/keyboards/handwired/iso85k/readme.md
@@ -0,0 +1,25 @@
+# iso85k
+
+*A 85-key ISO keyboard*
+
+* Keyboard Maintainer: [Fredrik A. Kristiansen](https://github.com/FredrikAleksander)
+* Hardware Supported: Custom PCB using STM32F072
+* Hardware Availability: PCB gerbers available upon request (fredrikaxk@gmail.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/iso85k:via
+
+Flashing example for this keyboard:
+
+    make handwired/iso85k:via: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, while shorting the pins marked BOOT0
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/handwired/iso85k/rules.mk b/keyboards/handwired/iso85k/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/handwired/iso85k/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/jankrp2040dactyl/config.h b/keyboards/handwired/jankrp2040dactyl/config.h
new file mode 100644
index 000000000000..0cabd353361b
--- /dev/null
+++ b/keyboards/handwired/jankrp2040dactyl/config.h
@@ -0,0 +1,5 @@
+// Copyright 2023 Ethan Perry (@wheres-perry)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define GRAVE_ESC_SHIFT_OVERRIDE
\ No newline at end of file
diff --git a/keyboards/handwired/jankrp2040dactyl/info.json b/keyboards/handwired/jankrp2040dactyl/info.json
new file mode 100644
index 000000000000..c4543b5d12a0
--- /dev/null
+++ b/keyboards/handwired/jankrp2040dactyl/info.json
@@ -0,0 +1,103 @@
+{
+    "manufacturer": "Ethan Perry",
+    "keyboard_name": "rp2040dactyl",
+    "maintainer": "wheres-perry",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP0"
+    },
+
+    "features": {
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "bootmagic": true
+    },
+
+    "matrix_pins": {
+        "cols": ["GP14", "GP15", "GP16", "GP17", "GP21", "GP22"],
+        "rows": ["GP8", "GP9", "GP10", "GP11", "GP12"]
+    },
+
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+
+    "layouts": {
+        "LAYOUT": {
+            "layout": 
+                [{"matrix": [0, 0],"label":"Esc", "x":0, "y":0},
+                {"matrix": [0, 1], "label":"1!", "x":1, "y":0},
+                {"matrix": [0, 2], "label":"2@", "x":2, "y":0},
+                {"matrix": [0, 3], "label":"3#", "x":3, "y":0},
+                {"matrix": [0, 4], "label":"4$", "x":4, "y":0},
+                {"matrix": [0, 5], "label":"5%", "x":5, "y":0},
+                {"matrix": [5, 0], "label":"6^", "x":7, "y":0},
+                {"matrix": [5, 1], "label":"7&", "x":8, "y":0},
+                {"matrix": [5, 2], "label":"8*", "x":9, "y":0},
+                {"matrix": [5, 3], "label":"9(", "x":10, "y":0},
+                {"matrix": [5, 4], "label":"0)", "x":11, "y":0},
+                {"matrix": [5, 5], "label":"+", "x":12, "y":0},
+
+                {"matrix": [1, 0], "label":"|", "x":0, "y":1},
+                {"matrix": [1, 1], "label":"B", "x":1, "y":1},
+                {"matrix": [1, 2], "label":"Y", "x":2, "y":1},
+                {"matrix": [1, 3], "label":"O", "x":3, "y":1},
+                {"matrix": [1, 4], "label":"U", "x":4, "y":1},
+                {"matrix": [1, 5], "label":"\"", "x":5, "y":1},
+                {"matrix": [6, 0], "label":":", "x":7, "y":1},
+                {"matrix": [6, 1], "label":"L", "x":8, "y":1},
+                {"matrix": [6, 2], "label":"D", "x":9, "y":1},
+                {"matrix": [6, 3], "label":"W", "x":10, "y":1},
+                {"matrix": [6, 4], "label":"V", "x":11, "y":1},
+                {"matrix": [6, 5], "label":"Z", "x":12, "y":1},
+
+                {"matrix": [2, 0], "label":"Arrows", "x":0, "y":2},
+                {"matrix": [2, 1], "label":"C", "x":1, "y":2},
+                {"matrix": [2, 2], "label":"I", "x":2, "y":2},
+                {"matrix": [2, 3], "label":"E", "x":3, "y":2},
+                {"matrix": [2, 4], "label":"A", "x":4, "y":2},
+                {"matrix": [2, 5], "label":"<", "x":5, "y":2},
+                {"matrix": [7, 0], "label":">", "x":7, "y":2},
+                {"matrix": [7, 1], "label":"H", "x":8, "y":2},
+                {"matrix": [7, 2], "label":"T", "x":9, "y":2},
+                {"matrix": [7, 3], "label":"S", "x":10, "y":2},
+                {"matrix": [7, 4], "label":"N", "x":11, "y":2},
+                {"matrix": [7, 5], "label":"Q", "x":12, "y":2},
+
+                {"matrix": [3, 0], "label":"Shift", "x":0, "y":3},
+                {"matrix": [3, 1], "label":"G", "x":1, "y":3},
+                {"matrix": [3, 2], "label":"X", "x":2, "y":3},
+                {"matrix": [3, 3], "label":"J", "x":3, "y":3},
+                {"matrix": [3, 4], "label":"K", "x":4, "y":3},
+                {"matrix": [3, 5], "label":"_", "x":5, "y":3},
+                {"matrix": [8, 0], "label":"?", "x":7, "y":3},
+                {"matrix": [8, 1], "label":"R", "x":8, "y":3},
+                {"matrix": [8, 2], "label":"M", "x":9, "y":3},
+                {"matrix": [8, 3], "label":"F", "x":10, "y":3},
+                {"matrix": [8, 4], "label":"P", "x":11, "y":3},
+                {"matrix": [8, 5], "label":"FN", "x":12, "y":3},
+
+                {"matrix": [4, 3], "label":"Del", "x":3, "y":5},
+                {"matrix": [4, 4], "label":"Space", "x":4, "y":5},
+                {"matrix": [4, 5], "label":"Backspace", "x":5, "y":5},
+                
+                {"matrix": [9, 0], "label":"Enter", "x":7, "y":5},
+                {"matrix": [9, 3], "label":"Symbol", "x":8, "y":5},
+                {"matrix": [9, 2], "label":"Tab", "x":9, "y":5},
+
+                {"matrix": [4, 1], "label":"Windows", "x":4, "y":6},
+                {"matrix": [4, 2], "label":"Alt", "x":5, "y":6},
+
+                {"matrix": [9, 1], "label":"Ctrl", "x":7, "y":6},
+                {"matrix": [9, 4], "label":"Blank", "x":8, "y":6}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/jankrp2040dactyl/keymaps/default/keymap.c b/keyboards/handwired/jankrp2040dactyl/keymaps/default/keymap.c
new file mode 100644
index 000000000000..a9bc7b04f9a1
--- /dev/null
+++ b/keyboards/handwired/jankrp2040dactyl/keymaps/default/keymap.c
@@ -0,0 +1,70 @@
+/* Copyright 2023 Ethan Perry (@wheres-perry)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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 {
+  _BASELAYER,
+  _FUNCTIONLAYER,
+  _ARROWLAYER,
+  _SYMBOLLAYER
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASELAYER] = LAYOUT(
+        QK_GESC,KC_1,	  KC_2,   KC_3,   KC_4,   KC_5,         KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_EQUAL,
+        KC_BSLS,KC_B,  	KC_Y,   KC_O, 	KC_U,	  KC_QUOT,      KC_SCLN,KC_L,	  KC_D,	  KC_W,	  KC_V,	  KC_Z,
+        MO(_FUNCTIONLAYER),   KC_C, 	KC_I,   KC_E,	  KC_A, 	KC_COMM,      KC_DOT,	KC_H, 	KC_T,	  KC_S,	  KC_N,	  KC_Q,
+        KC_LSFT,KC_G, 	KC_X,   KC_J,	  KC_K, 	KC_MINS,      KC_SLSH,KC_R,   KC_M,	  KC_F,	  KC_P,	  MO(_ARROWLAYER),
+
+                                  KC_DEL, KC_SPC,KC_BSPC,       KC_ENT, MO(_SYMBOLLAYER), KC_TAB,    
+                                  KC_LGUI,KC_LALT,              KC_RCTL,KC_NO                  
+                                                                	    
+                                                                                   
+    ),
+    [_ARROWLAYER] = 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_UP,  KC_TRNS,KC_TRNS,KC_TRNS,
+        MO(_FUNCTIONLAYER),  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_DEL, KC_SPC,KC_BSPC,      KC_ENT, MO(_SYMBOLLAYER), KC_TAB,    
+                                  KC_LGUI,KC_LALT,             KC_RCTL,KC_NO               
+                                                                    
+                                                               
+    ),
+    [_FUNCTIONLAYER] = 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,KC_TRNS,KC_TRNS,
+
+                                  KC_DEL, KC_SPC,KC_BSPC,      KC_ENT, MO(_SYMBOLLAYER), KC_TAB,    
+                                  KC_LGUI,KC_LALT,             KC_RCTL,   KC_NO                 
+                                                                	    
+                                                                
+    ),
+    [_SYMBOLLAYER] = LAYOUT(
+        KC_TILD,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_PIPE,KC_BSLS,KC_EQL, KC_LT,	KC_GT,        KC_LCBR,KC_RCBR,KC_UNDS,KC_ASTR,KC_PLUS,	KC_NO,
+       KC_TRNS,  KC_QUES,KC_QUOT,KC_DQUO,KC_COLN,KC_SCLN,      KC_LPRN,KC_RPRN,KC_COMM,KC_DOT, KC_MINS,KC_NO,
+        KC_LSFT,KC_CIRC,KC_PERC,KC_AMPR,KC_HASH,KC_SLSH,      KC_LBRC,KC_RBRC,KC_DLR,	KC_AT,	KC_EXLM,KC_TRNS,
+                                  KC_DEL, KC_SPC,KC_BSPC,       KC_ENT, KC_TRNS, KC_TAB,    
+                                  KC_LGUI,KC_LALT,             KC_RCTL,KC_NO                 
+                                                                	    
+                                                                
+    )
+};
diff --git a/keyboards/handwired/jankrp2040dactyl/readme.md b/keyboards/handwired/jankrp2040dactyl/readme.md
new file mode 100644
index 000000000000..0453816b1806
--- /dev/null
+++ b/keyboards/handwired/jankrp2040dactyl/readme.md
@@ -0,0 +1,26 @@
+# handwired/jankrp2040dactyl
+
+
+A budget Dactyl-Manuform build using Raspberry Pi Pico. 
+
+* Keyboard Maintainer: [Ethan Perry](https://github.com/wheres-perry)
+* Hardware Supported: RP2040 Community Edition
+* Hardware Availability: https://www.digikey.com/en/product-highlight/r/raspberry-pi/raspberry-pi-picoboard
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/jankrp2040dactyl:default
+
+Flashing example for this keyboard:
+
+    make handwired/jankrp2040dactyl: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/jankrp2040dactyl/rules.mk b/keyboards/handwired/jankrp2040dactyl/rules.mk
new file mode 100644
index 000000000000..743228e94b64
--- /dev/null
+++ b/keyboards/handwired/jankrp2040dactyl/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
\ No newline at end of file
diff --git a/keyboards/handwired/jopr/config.h b/keyboards/handwired/jopr/config.h
index 5d5233ca9994..59717346c33d 100644
--- a/keyboards/handwired/jopr/config.h
+++ b/keyboards/handwired/jopr/config.h
@@ -7,9 +7,3 @@
 #define LOCKING_RESYNC_ENABLE
 
 #define NO_ACTION_ONESHOT
-#define TAPPING_TOGGLE 3
-
-#define RGBLED_NUM 1
-#define RGBLIGHT_HUE_STEP 1
-#define RGBLIGHT_SAT_STEP 1
-#define RGBLIGHT_VAL_STEP 1
diff --git a/keyboards/handwired/jopr/info.json b/keyboards/handwired/jopr/info.json
index efebe52d0bcf..78fb52cb9951 100644
--- a/keyboards/handwired/jopr/info.json
+++ b/keyboards/handwired/jopr/info.json
@@ -8,6 +8,12 @@
     "pid": "0x1000",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "hue_steps": 1,
+    "saturation_steps": 1,
+    "brightness_steps": 1,
+    "led_count": 1
+  },
   "ws2812": {
     "pin": "F4"
   },
@@ -18,6 +24,9 @@
   "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
+  "tapping": {
+    "toggle": 3
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/handwired/jopr/keymaps/default/keymap.c b/keyboards/handwired/jopr/keymaps/default/keymap.c
index 1dc0f3a59e34..fc615b010914 100644
--- a/keyboards/handwired/jopr/keymaps/default/keymap.c
+++ b/keyboards/handwired/jopr/keymaps/default/keymap.c
@@ -22,23 +22,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
-void led_set_user(uint8_t usb_led) {
+bool led_update_user(led_t led_state) {
 
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+    if (led_state.caps_lock) {
         writePinHigh(F1);
 	} else {
         writePinLow(F1);
     }
 
-    if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
+    if (led_state.scroll_lock) {
         writePinHigh(F0);
 	} else {
         writePinLow(F0);
     }
     
-    if (!(IS_LED_ON(usb_led, USB_LED_NUM_LOCK))) {
+    if (!led_state.num_lock) {
         tap_code(KC_NUM_LOCK);
     }
+    return false;
 }
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     static bool sysreq_led = false;
diff --git a/keyboards/handwired/jopr/keymaps/modded_white/keymap.c b/keyboards/handwired/jopr/keymaps/modded_white/keymap.c
index edaabe78e6bf..69d1a56bb5c6 100644
--- a/keyboards/handwired/jopr/keymaps/modded_white/keymap.c
+++ b/keyboards/handwired/jopr/keymaps/modded_white/keymap.c
@@ -22,23 +22,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
-void led_set_user(uint8_t usb_led) {
+bool led_update_user(led_t led_state) {
 
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+    if (led_state.caps_lock) {
         writePinHigh(F1);
 	} else {
         writePinLow(F1);
     }
 
-    if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
+    if (led_state.scroll_lock) {
         writePinHigh(F0);
 	} else {
         writePinLow(F0);
     }
     
-    if (!(IS_LED_ON(usb_led, USB_LED_NUM_LOCK))) {
+    if (!led_state.num_lock) {
         tap_code(KC_NUM_LOCK);
     }
+    return false;
 }
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     static bool sysreq_led = false;
diff --git a/keyboards/handwired/jscotto/scotto36/info.json b/keyboards/handwired/jscotto/scotto36/info.json
deleted file mode 100644
index 3247b4019bdd..000000000000
--- a/keyboards/handwired/jscotto/scotto36/info.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "manufacturer": "Joe Scotto",
-    "keyboard_name": "Scotto36",
-    "maintainer": "joe-scotto",
-    "bootloader": "caterina",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        // 4, 5, 6, 7, 8, 9, A3, A2, A1, A0
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7"],
-        // 15, 14, 16, 10
-        "rows": ["B1", "B3", "B2", "B6"]
-    },
-    "processor": "atmega32u4",
-    "url": "",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0000",
-        "vid": "0xFEED"
-    },
-    "layouts": {
-        "LAYOUT_ortho_3x10_6": {
-            "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},
-
-                // Row 2
-                {"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},
-
-                // Row 3
-                {"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},
-
-                // Row 4
-                {"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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/jscotto/scotto36/keymaps/default/keymap.c b/keyboards/handwired/jscotto/scotto36/keymaps/default/keymap.c
deleted file mode 100644
index ad8451ac09fe..000000000000
--- a/keyboards/handwired/jscotto/scotto36/keymaps/default/keymap.c
+++ /dev/null
@@ -1,281 +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
-
-#include <stdio.h>
-char wpm_str[10];
-
-// Tap Dance declarations
-enum {
-    TD_ESC_SPOTLIGHT_EMOJI,
-    TD_ESC_WINDOWS_EMOJI
-};
-
-void td_esc_spotlight_emoji (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        tap_code(KC_ESC);
-    } else if (state->count == 2) {
-        tap_code16(G(KC_SPC));
-    } else if (state->count == 3) {
-        tap_code16(C(G(KC_SPC)));
-    }
-}
-
-void td_esc_windows_emoji (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        tap_code(KC_ESC);
-    } else if (state->count == 2) {
-        tap_code(KC_LGUI);
-    } else if (state->count == 3) {
-        tap_code16(G(KC_DOT));
-    }
-};
-
- // Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_ESC_SPOTLIGHT_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_spotlight_emoji),
-    [TD_ESC_WINDOWS_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_windows_emoji)
-};
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TD(TD_ESC_SPOTLIGHT_EMOJI) :
-        case TD(TD_ESC_WINDOWS_EMOJI) :
-        case LGUI_T(KC_SPC) :
-        case LT(1, KC_TAB) :
-        case LT(2, KC_ENT) :
-      return 200;
-    default:
-      return TAPPING_TERM;
-  }
-};
-
-// Layer Names
-enum layer_names {
-    _MAC_DEFAULT,
-    _MAC_CODE,
-    _MAC_NUM,
-    _MAC_FUNC,
-    _WIN_DEFAULT,
-    _WIN_CODE,
-    _WIN_NUM,
-    _WIN_FUNC
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_ortho_3x10_6(
-        KC_Q,         KC_W, KC_F,    KC_P,    KC_G,           KC_J,          KC_L,          KC_U,                      KC_Y,   KC_BSPC,
-        KC_A,         KC_R, KC_S,    KC_T,    KC_D,           KC_H,          KC_N,          KC_E,                      KC_I,   KC_O,
-        LSFT_T(KC_Z), KC_X, KC_C,    KC_V,    KC_B,           KC_K,          KC_M,          KC_COMMA,                  KC_DOT, RSFT_T(KC_SLSH),
-                            KC_LCTL, KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT), TD(TD_ESC_SPOTLIGHT_EMOJI)
-    ),
-    [1] = LAYOUT_ortho_3x10_6(
-        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_LCTL, KC_LALT, LGUI_T(KC_SPC), KC_TRNS,  KC_TRNS, TD(TD_ESC_SPOTLIGHT_EMOJI)
-    ),
-    [2] = LAYOUT_ortho_3x10_6(
-        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_LCTL, KC_LALT, LGUI_T(KC_SPC), KC_TRNS, KC_TRNS, TD(TD_ESC_SPOTLIGHT_EMOJI)
-    ),
-    [3] = LAYOUT_ortho_3x10_6(
-         KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,          KC_NO,   KC_NO,   KC_NO,                     KC_NO, TO(4),
-         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_LCTL, KC_LALT, LGUI_T(KC_SPC), KC_TRNS, KC_TRNS, TD(TD_ESC_SPOTLIGHT_EMOJI)
-     ),
-     [4] = LAYOUT_ortho_3x10_6(
-        KC_Q,         KC_W, KC_F,    KC_P,    KC_G,   KC_J,          KC_L,          KC_U,                    KC_Y,   KC_BSPC,
-        KC_A,         KC_R, KC_S,    KC_T,    KC_D,   KC_H,          KC_N,          KC_E,                    KC_I,   KC_O,
-        LSFT_T(KC_Z), KC_X, KC_C,    KC_V,    KC_B,   KC_K,          KC_M,          KC_COMMA,                KC_DOT, RSFT_T(KC_SLSH),
-                            KC_LALT, KC_LCTL, KC_SPC, LT(5, KC_TAB), LT(6, KC_ENT), TD(TD_ESC_WINDOWS_EMOJI)
-    ),
-    [5] = LAYOUT_ortho_3x10_6(
-        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_LALT, KC_LCTL, KC_SPC,  KC_TRNS, KC_TRNS, TD(TD_ESC_WINDOWS_EMOJI)
-    ),
-    [6] = LAYOUT_ortho_3x10_6(
-        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(7),   KC_NO,   KC_NO,   KC_COMM,                 KC_DOT,  RSFT_T(KC_SLSH),
-                          KC_LALT, KC_LCTL, KC_SPC,  KC_TRNS, KC_TRNS, TD(TD_ESC_WINDOWS_EMOJI)
-    ),
-    [7] = LAYOUT_ortho_3x10_6(
-         KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,                   KC_NO, TO(0),
-         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_LALT, KC_LCTL, KC_SPC,  KC_TRNS, KC_TRNS, TD(TD_ESC_WINDOWS_EMOJI)
-     )
-};
-
-// OLED
-#ifdef OLED_ENABLE
-// WPM responsiveness
-#define IDLE_FRAMES 5
-#define IDLE_SPEED 20  // Speed at which animation goes into idle
-#define TAP_FRAMES 2
-#define TAP_SPEED 40  // WPM to trigger Bongo
-#define ANIM_FRAME_DURATION 200  // Frame MS
-#define ANIM_SIZE 636  // Number of bytes in array, max 1024
-
-uint32_t anim_timer         = 0;
-uint32_t anim_sleep         = 0;
-uint8_t  current_idle_frame = 0;
-uint8_t current_tap_frame = 0;
-
-static void render_animation(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) {
-        oled_on();  // Enables OLED on 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();
-            }
-        }
-    }
-}
-
-// Draw to OLED
-bool oled_task_user(void) {
-    // Render Bongo Cat
-    render_animation();
-
-    // WPM text
-    oled_set_cursor(0, 0);
-    sprintf(wpm_str, "%03d", get_current_wpm()); // %03d defines digits to display
-    oled_write(wpm_str, false);
-
-    // Layer text
-    oled_set_cursor(0, 1);
-    switch (get_highest_layer(layer_state)) {
-        case _MAC_DEFAULT :
-            oled_write_P(PSTR("MAC"), false);
-            oled_set_cursor(0, 2);
-            oled_write_P(PSTR("MAIN"), false);
-            break;
-        case _MAC_CODE :
-            oled_write_P(PSTR("MAC"), false);
-            oled_set_cursor(0, 2);
-            oled_write_P(PSTR("CODE"), false);
-            break;
-        case _MAC_NUM :
-            oled_write_P(PSTR("MAC"), false);
-            oled_set_cursor(0, 2);
-            oled_write_P(PSTR("NUM"), false);
-            break;
-        case _MAC_FUNC :
-            oled_write_P(PSTR("MAC"), false);
-            oled_set_cursor(0, 2);
-            oled_write_P(PSTR("FUNC"), false);
-            break;
-        case _WIN_DEFAULT :
-            oled_write_P(PSTR("WIN"), false);
-            oled_set_cursor(0, 2);
-            oled_write_P(PSTR("MAIN"), false);
-            break;
-        case _WIN_CODE :
-            oled_write_P(PSTR("WIN"), false);
-            oled_set_cursor(0, 2);
-            oled_write_P(PSTR("CODE"), false);
-            break;
-        case _WIN_NUM :
-            oled_write_P(PSTR("WIN"), false);
-            oled_set_cursor(0, 2);
-            oled_write_P(PSTR("NUM"), false);
-            break;
-        case _WIN_FUNC :
-            oled_write_P(PSTR("WIN"), false);
-            oled_set_cursor(0, 2);
-            oled_write_P(PSTR("FUNC"), false);
-            break;
-    }
-
-    // Caps lock text
-    led_t led_state = host_keyboard_led_state();
-    oled_set_cursor(0, 3);
-    oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR(""), false);
-    
-    return false;
-}
-#endif
-
diff --git a/keyboards/handwired/jscotto/scotto36/keymaps/default/rules.mk b/keyboards/handwired/jscotto/scotto36/keymaps/default/rules.mk
deleted file mode 100644
index 6e339da6c697..000000000000
--- a/keyboards/handwired/jscotto/scotto36/keymaps/default/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-LTO_ENABLE = yes
-TAP_DANCE_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/jscotto/scotto36/readme.md b/keyboards/handwired/jscotto/scotto36/readme.md
deleted file mode 100644
index ba40ed9d0594..000000000000
--- a/keyboards/handwired/jscotto/scotto36/readme.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Scotto36
-
-![Scotto36](https://i.imgur.com/MCGv0ZHh.jpeg)
-
-A 36-key split monoblock ergonomic ortholinear keyboard with 15° of angle on each half. Case files available [here](https://github.com/joe-scotto/keyboards.git).
-
-*   Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
-*   Hardware Supported: ATmega32U4, 0.91” 128x32 I2C OLED
-*   Hardware Availability: [Amazon](https://amazon.com)
-
-
-# Compiling
-
-Make example for this keyboard (after setting up your build environment):
-
-    make handwired/jscotto/scotto36:default
-
-Flashing example for this keyboard:
-
-    make handwired/jscotto/scotto36: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**: 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/jscotto/scotto40/info.json b/keyboards/handwired/jscotto/scotto40/info.json
deleted file mode 100644
index 767ff1de5499..000000000000
--- a/keyboards/handwired/jscotto/scotto40/info.json
+++ /dev/null
@@ -1,180 +0,0 @@
-{
-    "manufacturer": "Joe Scotto",
-    "keyboard_name": "Scotto40",
-    "maintainer": "joe-scotto",
-    "bootloader": "caterina",
-    "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", "B5", "F4", "F5"],
-        "rows": ["B1", "B3", "B2", "B6"]
-    },
-    "processor": "atmega32u4",
-    "url": "",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0000",
-        "vid": "0xFEED"
-    },
-    "layouts": {
-        "LAYOUT_ortho_3x10_7": {
-            "layout": [
-                // Row 1
-                {"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},
-
-                // Row 2
-                {"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},
-
-                // Row 3
-                {"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},
-
-                // Row 4
-                {"matrix": [3, 0], "x": 0, "y": 3},
-
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-
-                {"matrix": [3, 9], "x": 9, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_3x10_8": {
-            "layout": [
-                // Row 1
-                {"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},
-
-                // Row 2
-                {"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},
-
-                // Row 3
-                {"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},
-
-                // Row 4
-                {"matrix": [3, 0], "x": 0, "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, 9], "x": 9, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_4x10": {
-            "layout": [
-                // Row 1
-                {"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},
-
-                // Row 2
-                {"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},
-
-                // Row 3
-                {"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},
-
-                // Row 4
-                {"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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/jscotto/scotto40/keymaps/default/keymap.c b/keyboards/handwired/jscotto/scotto40/keymaps/default/keymap.c
deleted file mode 100644
index ba5f7bc7a8ca..000000000000
--- a/keyboards/handwired/jscotto/scotto40/keymaps/default/keymap.c
+++ /dev/null
@@ -1,114 +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
-
-// Tap Dance declarations
-enum {
-    TD_ESC_SPOTLIGHT_EMOJI,
-    TD_ESC_WINDOWS_EMOJI
-};
-
-void td_esc_spotlight_emoji (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        tap_code(KC_ESC);
-    } else if (state->count == 2) {
-        tap_code16(G(KC_SPC));
-    } else if (state->count == 3) {
-        tap_code16(C(G(KC_SPC)));
-    }
-}
-
-void td_esc_windows_emoji (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        tap_code(KC_ESC);
-    } else if (state->count == 2) {
-        tap_code(KC_LGUI);
-    } else if (state->count == 3) {
-        tap_code16(G(KC_DOT));
-    }
-};
-
- // Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_ESC_SPOTLIGHT_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_spotlight_emoji),
-    [TD_ESC_WINDOWS_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_windows_emoji)
-};
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TD(TD_ESC_SPOTLIGHT_EMOJI) :
-        case TD(TD_ESC_WINDOWS_EMOJI) :
-        case LGUI_T(KC_SPC) :
-        case LT(1, KC_TAB) :
-        case LT(2, KC_ENT) :
-      return 200;
-    default:
-      return TAPPING_TERM;
-  }
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_ortho_3x10_7(
-        KC_Q,         KC_W, KC_F,    KC_P,    KC_G,           KC_J, KC_L,          KC_U,          KC_Y,   KC_BSPC,
-        KC_A,         KC_R, KC_S,    KC_T,    KC_D,           KC_H, KC_N,          KC_E,          KC_I,   KC_O,
-        LSFT_T(KC_Z), KC_X, KC_C,    KC_V,    KC_B,           KC_K, KC_M,          KC_COMMA,      KC_DOT, RSFT_T(KC_SLSH),
-        KC_ESC,             KC_LCTL, KC_LALT, LGUI_T(KC_SPC),       LT(1, KC_TAB), LT(2, KC_ENT),         TD(TD_ESC_SPOTLIGHT_EMOJI)
-    ),
-    [1] = LAYOUT_ortho_3x10_7(
-        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_ESC,                   KC_LCTL, KC_LALT, LGUI_T(KC_SPC),           KC_TRNS, KC_TRNS,          TD(TD_ESC_SPOTLIGHT_EMOJI)
-    ),
-    [2] = LAYOUT_ortho_3x10_7(
-        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_ESC,         KC_LCTL, KC_LALT, LGUI_T(KC_SPC),          KC_TRNS, KC_TRNS,          TD(TD_ESC_SPOTLIGHT_EMOJI) 
-    ),
-    [3] = LAYOUT_ortho_3x10_7(
-        KC_NO,  KC_NO, KC_NO,   KC_NO,   KC_NO,          KC_NO, KC_NO,   KC_NO,   KC_NO, TO(4), 
-        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_ESC,        KC_LCTL, KC_LALT, LGUI_T(KC_SPC),        KC_TRNS, KC_TRNS,        TD(TD_ESC_SPOTLIGHT_EMOJI) 
-    ),
-    [4] = LAYOUT_ortho_3x10_7(
-        KC_Q,         KC_W, KC_F,    KC_P,    KC_G,   KC_J, KC_L,          KC_U,          KC_Y,   KC_BSPC,
-        KC_A,         KC_R, KC_S,    KC_T,    KC_D,   KC_H, KC_N,          KC_E,          KC_I,   KC_O,
-        LSFT_T(KC_Z), KC_X, KC_C,    KC_V,    KC_B,   KC_K, KC_M,          KC_COMMA,      KC_DOT, RSFT_T(KC_SLSH),
-        KC_ESC,             KC_LALT, KC_LCTL, KC_SPC,       LT(5, KC_TAB), LT(6, KC_ENT),         TD(TD_ESC_WINDOWS_EMOJI)
-    ),
-    [5] = LAYOUT_ortho_3x10_7(
-        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_ESC,             KC_LALT, KC_LCTL, KC_SPC,       LT(5, KC_TAB), LT(6, KC_ENT),         TD(TD_ESC_WINDOWS_EMOJI)
-    ),
-    [6] = LAYOUT_ortho_3x10_7(
-        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(7),   KC_NO,   KC_NO,         KC_COMM,       KC_DOT,  RSFT_T(KC_SLSH),
-        KC_ESC,         KC_LALT, KC_LCTL, KC_SPC,           LT(5, KC_TAB), LT(6, KC_ENT),          TD(TD_ESC_WINDOWS_EMOJI)
-    ),
-    [7] = LAYOUT_ortho_3x10_7(
-        KC_NO,  KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,         KC_NO,         KC_NO, TO(0), 
-        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_ESC,        KC_LALT, KC_LCTL, KC_SPC,         LT(5, KC_TAB), LT(6, KC_ENT),        TD(TD_ESC_WINDOWS_EMOJI)
-    )
-};
diff --git a/keyboards/handwired/jscotto/scotto40/readme.md b/keyboards/handwired/jscotto/scotto40/readme.md
deleted file mode 100644
index 867313ecfc2b..000000000000
--- a/keyboards/handwired/jscotto/scotto40/readme.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Scotto40
-
-![Scotto40](https://i.imgur.com/wtW5xOth.jpeg)
-
-A 37, 38, or 40 key handwired ortholinear keyboard. Case files available [here](https://github.com/joe-scotto/keyboards).
-
--   Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
--   Hardware Supported: ATmega32U4
--   Hardware Availability: [Amazon](https://amazon.com)
-
-# Compiling
-
-Make example for this keyboard (after setting up your build environment):
-
-    make handwired/jscotto/scotto40:default
-
-Flashing example for this keyboard:
-
-    make handwired/jscotto/scotto40:default
-    
-# Bootloader
-
-Uses [bootmagic](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_bootmagic.md) allowing you to hold the top left key (0, 0) when plugging the board in to enter 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).
diff --git a/keyboards/handwired/jscotto/scotto9/info.json b/keyboards/handwired/jscotto/scotto9/info.json
deleted file mode 100644
index 8bd393bd434b..000000000000
--- a/keyboards/handwired/jscotto/scotto9/info.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "manufacturer": "Joe Scotto",
-    "keyboard_name": "Scotto9",
-    "maintainer": "joe-scotto",
-    "bootloader": "caterina",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        // 4, 5, 6
-        "cols": ["D4", "C6", "D7"],
-        // 15, 14, 16
-        "rows": ["B1", "B3", "B2"]
-    },
-    "processor": "atmega32u4",
-    "url": "",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0000",
-        "vid": "0xFEED"
-    },
-    "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},
-
-                // Row 2
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-
-                // Row 3
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/jscotto/scotto9/keymaps/default/keymap.c b/keyboards/handwired/jscotto/scotto9/keymaps/default/keymap.c
deleted file mode 100644
index eec8d684ada3..000000000000
--- a/keyboards/handwired/jscotto/scotto9/keymaps/default/keymap.c
+++ /dev/null
@@ -1,27 +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
-
-// Keymap
-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/handwired/jscotto/scotto9/readme.md b/keyboards/handwired/jscotto/scotto9/readme.md
deleted file mode 100644
index 2e5291cba730..000000000000
--- a/keyboards/handwired/jscotto/scotto9/readme.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Scotto9
-
-![Scotto9](https://imgur.com/inbmNSEh.jpeg)
-
-A 9 key handwired macropad. Case files available [here](https://github.com/joe-scotto/keyboards.git).
-
--   Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
--   Hardware Supported: ATmega32U4
--   Hardware Availability: [Amazon](https://amazon.com)
-
-# Compiling
-
-Make example for this keyboard (after setting up your build environment):
-
-    make handwired/jscotto/scotto9:default
-
-Flashing example for this keyboard:
-
-    make handwired/jscotto/scotto9:default
-    
-# Bootloader
-
-Uses [bootmagic](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_bootmagic.md) allowing you to hold the top left key (0, 0) when plugging the board in to enter 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).
diff --git a/keyboards/handwired/jscotto/scottocmd/config.h b/keyboards/handwired/jscotto/scottocmd/config.h
deleted file mode 100644
index a168f0ef218f..000000000000
--- a/keyboards/handwired/jscotto/scottocmd/config.h
+++ /dev/null
@@ -1,21 +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
-
-// OLED 
-#define OLED_DISPLAY_128X64
\ No newline at end of file
diff --git a/keyboards/handwired/jscotto/scottocmd/info.json b/keyboards/handwired/jscotto/scottocmd/info.json
deleted file mode 100644
index 991be93b52cc..000000000000
--- a/keyboards/handwired/jscotto/scottocmd/info.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-    "manufacturer": "Joe Scotto",
-    "keyboard_name": "ScottoCMD",
-    "maintainer": "joe-scotto",
-    "bootloader": "caterina",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        // TX0, RX1, 4, 5, 6, 7, 8, 9, A3, A2, A1
-        "cols": ["D3", "D2", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6"],
-        // A0, 15, 14, 16, 10
-        "rows": ["F7", "B1", "B3", "B2", "B6"]
-    },
-    "processor": "atmega32u4",
-    "url": "",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0000",
-        "vid": "0xFEED"
-    },
-    "bootmagic": {
-        "matrix": [1, 0]
-    },
-    "layouts": {
-        "LAYOUT_ortho_4_3x10_4": {
-            "layout": [
-                // Row 1 (Macros)
-                {"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},
-
-                // Row 2
-                {"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},
-
-                // Row 3
-                {"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},
-
-                // Row 4
-                {"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},
-
-                // Row 5
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-                {"matrix": [4, 9], "x": 9, "y": 4},
-                {"matrix": [4, 10], "x": 10, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/jscotto/scottocmd/keymaps/default/keymap.c b/keyboards/handwired/jscotto/scottocmd/keymaps/default/keymap.c
deleted file mode 100644
index b1c77ae94470..000000000000
--- a/keyboards/handwired/jscotto/scottocmd/keymaps/default/keymap.c
+++ /dev/null
@@ -1,515 +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
-
-#include <stdio.h>
-char wpm_str[10];
-
-// Tap Dance declarations
-enum {
-    TD_ESC_SPOTLIGHT_EMOJI,
-    TD_ESC_WINDOWS_EMOJI
-};
-
-void td_esc_spotlight_emoji (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        tap_code(KC_ESC);
-    } else if (state->count == 2) {
-        tap_code16(G(KC_SPC));
-    } else if (state->count == 3) {
-        tap_code16(C(G(KC_SPC)));
-    }
-}
-
-void td_esc_windows_emoji (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        tap_code(KC_ESC);
-    } else if (state->count == 2) {
-        tap_code(KC_LGUI);
-    } else if (state->count == 3) {
-        tap_code16(G(KC_DOT));
-    }
-};
-
- // Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_ESC_SPOTLIGHT_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_spotlight_emoji),
-    [TD_ESC_WINDOWS_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_windows_emoji)
-};
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TD(TD_ESC_SPOTLIGHT_EMOJI) :
-        case TD(TD_ESC_WINDOWS_EMOJI) :
-        case LGUI_T(KC_SPC) :
-        case LT(1, KC_TAB) :
-        case LT(2, KC_ENT) :
-      return 200;
-    default:
-      return TAPPING_TERM;
-  }
-};
-
-// Layer Names
-enum layer_names {
-    _MAC_DEFAULT,
-    _MAC_CODE,
-    _MAC_NUM,
-    _MAC_FUNC,
-    _WIN_DEFAULT,
-    _WIN_CODE,
-    _WIN_NUM,
-    _WIN_FUNC
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_ortho_4_3x10_4(
-                                                                      KC_LCTL, KC_2,     KC_3,          TD(TD_ESC_SPOTLIGHT_EMOJI),
-        KC_TAB, KC_Q,         KC_W, KC_F, KC_P, KC_G,           KC_J, KC_L,    KC_U,     KC_Y,          KC_BSPC,
-        KC_ENT, KC_A,         KC_R, KC_S, KC_T, KC_D,           KC_H, KC_N,    KC_E,     KC_I,          KC_O,
-                LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B,           KC_K, KC_M,    KC_COMMA, KC_DOT,        RSFT_T(KC_SLSH),
-                KC_LALT,                        LGUI_T(KC_SPC),                          LT(1, KC_TAB), LT(2, KC_ENT)
-    ),
-    [1] = LAYOUT_ortho_4_3x10_4(
-                                                                                      KC_LCTL, KC_2,    KC_3,    TD(TD_ESC_SPOTLIGHT_EMOJI),
-        KC_TAB, KC_UNDS,         KC_MINS, KC_PLUS, KC_EQL,  KC_COLN,        KC_GRV,   KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
-        KC_ENT, 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_LALT,                                    LGUI_T(KC_SPC),                             KC_TRNS, KC_TRNS
-    ),
-    [2] = LAYOUT_ortho_4_3x10_4(
-                                                                          KC_LCTL, KC_2,    KC_3,    TD(TD_ESC_SPOTLIGHT_EMOJI),
-        KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,        KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, 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_LSFT, KC_NO, KC_NO,   KC_NO,  MO(3),          KC_NO,   KC_NO,   KC_COMM, KC_DOT,  RSFT_T(KC_SLSH),
-                KC_LALT,                         LGUI_T(KC_SPC),                            KC_TRNS, KC_TRNS
-    ),
-    [3] = LAYOUT_ortho_4_3x10_4(
-                                                                         KC_LCTL, KC_2,  KC_3,    TD(TD_ESC_SPOTLIGHT_EMOJI),
-        KC_TAB, KC_NO,   KC_NO, KC_NO, KC_NO,   KC_NO,            KC_NO, KC_NO,   KC_NO, KC_NO,   TO(4),
-        KC_ENT, 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_LALT,                          LGUI_T(KC_SPC),                        KC_TRNS, KC_TRNS
-     ),
-     [4] = LAYOUT_ortho_4_3x10_4(
-                                                              KC_1, KC_2,     KC_3,          TD(TD_ESC_WINDOWS_EMOJI),
-        KC_TAB, KC_Q,         KC_W, KC_F, KC_P, KC_G,   KC_J, KC_L, KC_U,     KC_Y,          KC_BSPC,
-        KC_ENT, KC_A,         KC_R, KC_S, KC_T, KC_D,   KC_H, KC_N, KC_E,     KC_I,          KC_O,
-                LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B,   KC_K, KC_M, KC_COMMA, KC_DOT,        RSFT_T(KC_SLSH),
-                KC_LCTL,                        KC_SPC,                       LT(5, KC_TAB), LT(6, KC_ENT)
-    ),
-    [5] = LAYOUT_ortho_4_3x10_4(
-                                                                               KC_1,    KC_2,    KC_3,    TD(TD_ESC_WINDOWS_EMOJI),
-        KC_TAB, KC_UNDS,         KC_MINS, KC_PLUS, KC_EQL,  KC_COLN, KC_GRV,   KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
-        KC_ENT, 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_LCTL,                                    KC_SPC,                              KC_TRNS, KC_TRNS
-    ),
-    [6] = LAYOUT_ortho_4_3x10_4(
-                                                                   KC_1,    KC_2,    KC_3,    TD(TD_ESC_WINDOWS_EMOJI),
-        KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, 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_LSFT, KC_NO, KC_NO,   KC_NO,  MO(7),   KC_NO,   KC_NO,   KC_COMM, KC_DOT,  RSFT_T(KC_SLSH),
-                KC_LCTL,                         KC_SPC,                             KC_TRNS, KC_TRNS
-    ),
-    [7] = LAYOUT_ortho_4_3x10_4(
-                                                                KC_1,  KC_2,  KC_3,    TD(TD_ESC_WINDOWS_EMOJI),
-        KC_TAB, KC_NO,   KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO,   TO(0),
-        KC_ENT, 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_LCTL,                        KC_SPC,                       KC_TRNS, KC_TRNS
-     )
-};
-
-// OLED
-#ifdef OLED_ENABLE
-// WPM responsiveness
-#define IDLE_FRAMES              5   // How many idle frames in animation
-#define IDLE_SPEED               20  // Speed at which animation idles
-#define TAP_FRAMES               2   // How many tapping frames
-#define TAP_SPEED                40  // WPM to trigger Bongo
-#define ANIMATION_FRAME_DURATION 200 // MS duration of each frame
-#define ANIMATION_SIZE           256 // Number of bytes per animation frame
-
-uint32_t anim_timer         = 0;
-uint32_t anim_sleep         = 0;
-uint8_t  current_idle_frame = 0;
-uint8_t current_tap_frame   = 0;
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_90;  // flips the display 180 degrees if offhand
-}
-
-static void render_animation(void) {
-    static const char PROGMEM idle[IDLE_FRAMES][ANIMATION_SIZE] = {
-        { 
-            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, 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, 
-            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, 
-            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, 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, 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, 
-            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, 
-            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, 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, 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, 
-            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, 
-            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, 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, 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, 
-            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, 
-            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, 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, 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, 
-            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, 
-            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
-        }
-    };
-    static const char PROGMEM prep[][ANIMATION_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, 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, 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, 
-            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, 
-            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
-        }
-    };
-    static const char PROGMEM tap[TAP_FRAMES][ANIMATION_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, 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, 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, 
-            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, 
-            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, 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, 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, 
-            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, 
-            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
-        }
-    };
-
-    void animation_phase(void) {
-        // Set cursor to draw from the bottom up
-        oled_set_cursor(128, 0);
-
-        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)], ANIMATION_SIZE);
-        }
-
-        // Start prep image
-        if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
-            oled_write_raw_P(prep[0], ANIMATION_SIZE);
-        }
-
-        // Start tap animation
-        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)], ANIMATION_SIZE);
-        }
-    }
-    if (get_current_wpm() != 000) {
-        oled_on();  // Enables OLED on any alpha keypress
-
-        if (timer_elapsed32(anim_timer) > ANIMATION_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) > ANIMATION_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-        }
-    }
-}
-
-// Draw to OLED
-bool oled_task_user(void) {
-    // Caps lock text
-    led_t led_state = host_keyboard_led_state();
-    oled_set_cursor(0,1);
-    oled_write_P(led_state.caps_lock ? PSTR(" Caps Lock "): PSTR(" ScottoCMD "), false);
-
-    //WPM text
-    oled_set_cursor(0, 9);
-    oled_write(get_u8_str(get_current_wpm(), '0'), false);
-    oled_write_P(PSTR(" WPM"), false);
-    
-    static const char PROGMEM logos[][256] = {
-            // Apple
-            {
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x78, 0x7c, 0x3e, 0x1f, 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, 0xc0, 0xf0, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 
-                0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3e, 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, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 
-                0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00  
-
-            },
-
-            // Windows
-            {
-                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, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
-                0xf8, 0xf8, 0x00, 0x80, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 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, 0xb8, 0x9f, 0x9f, 0x9f, 0x9f, 0x8f, 0x9f, 0x9f, 0x9f, 0x1f, 0x3f, 0x3f, 
-                0x07, 0xc0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 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, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x03, 0xe0, 
-                0xfc, 0xfc, 0xf9, 0xf9, 0xf9, 0xf3, 0xf3, 0xf3, 0xfb, 0xfb, 0xf9, 0x19, 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, 
-                0x02, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x07, 0x01, 0x00, 0x1e, 0x1f, 
-                0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-            },
-
-            // Code
-            {
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x78, 0x3c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 
-                0xf8, 0xfc, 0x3f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x3c, 0x78, 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, 
-                0x01, 0x03, 0x07, 0x0f, 0x3e, 0x3c, 0x38, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfc, 0x7e, 0x1f, 0x07, 
-                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x3c, 0x3e, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            },
-
-            // Number
-            {
-                0x00, 0x00, 0x00, 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, 0xff, 0xff, 0x1f, 
-                0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x1e, 0x1e, 0x1e, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1e, 
-                0x1e, 0x1e, 0xbe, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1e, 0x1e, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x78, 0x78, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x78, 0x78, 
-                0x78, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x78, 0x78, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xff, 0xff, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 
-                0xc0, 0xff, 0xff, 0xff, 0xff, 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
-
-            },
-
-            // Function
-            {
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xfe, 0xfe, 0xff, 0x9f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0xc0, 0xc0, 0x8f, 0x3f, 
-                0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf8, 0xfc, 0xfe, 0x7f, 0x3f, 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, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3e, 
-                0x1e, 0x0c, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 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, 
-                0x78, 0xfc, 0xff, 0xff, 0xff, 0x7f, 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 
-            },
-
-            // Caps Lock
-            {
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 
-                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, 
-                0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf8, 0xf0, 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, 0x01, 
-                0x01, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 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
-            }
-        };
-
-    // Layer images 
-    oled_set_cursor(32, 0);
-    switch (get_highest_layer(layer_state)) {
-        case _MAC_DEFAULT :
-            oled_write_raw_P(logos[0], sizeof(logos[0]));
-            break;
-        case _WIN_DEFAULT :
-            oled_write_raw_P(logos[1], sizeof(logos[1]));
-            break;
-        case _MAC_CODE :
-        case _WIN_CODE :
-            oled_write_raw_P(logos[2], sizeof(logos[2]));
-            break;
-        case _MAC_NUM :
-        case _WIN_NUM :
-            oled_write_raw_P(logos[3], sizeof(logos[3]));
-            break;
-        case _MAC_FUNC :
-        case _WIN_FUNC :
-            oled_write_raw_P(logos[4], sizeof(logos[4]));
-            break;
-    }
-
-    // Render Bongo Cat
-    render_animation(); 
-
-    return false;
-}
-#endif
diff --git a/keyboards/handwired/jscotto/scottocmd/keymaps/default/rules.mk b/keyboards/handwired/jscotto/scottocmd/keymaps/default/rules.mk
deleted file mode 100644
index bcee933e75eb..000000000000
--- a/keyboards/handwired/jscotto/scottocmd/keymaps/default/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-WPM_ENABLE = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/handwired/jscotto/scottocmd/readme.md b/keyboards/handwired/jscotto/scottocmd/readme.md
deleted file mode 100644
index b08d02d678e8..000000000000
--- a/keyboards/handwired/jscotto/scottocmd/readme.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# ScottoCMD
-
-![ScottoCMD](https://i.imgur.com/rxiMZNnh.jpg)
-
-A 40 key handwired ortholinear keyboard with non-ortho bottom row. Featuring a 128x64 OLED display along with a 6.25u spacebar. Case files available [here](https://github.com/joe-scotto/keyboards.git).
-
--   Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
--   Hardware Supported: ATmega32U4
--   Hardware Availability: [Amazon](https://amazon.com)
-
-# Compiling
-
-Make example for this keyboard (after setting up your build environment):
-
-    make handwired/jscotto/scottocmd:default
-
-Flashing example for this keyboard:
-
-    make handwired/jscotto/scottocmd:default
-
-# Bootloader
-
-Uses [bootmagic](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_bootmagic.md) allowing you to hold the top left key (1, 0) when plugging the board in to enter 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).
diff --git a/keyboards/handwired/jscotto/scottocmd/rules.mk b/keyboards/handwired/jscotto/scottocmd/rules.mk
deleted file mode 100644
index 9f00574d5d01..000000000000
--- a/keyboards/handwired/jscotto/scottocmd/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-OLED_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/handwired/jscotto/scottostarter/info.json b/keyboards/handwired/jscotto/scottostarter/info.json
deleted file mode 100644
index 65fe2d931067..000000000000
--- a/keyboards/handwired/jscotto/scottostarter/info.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-    "manufacturer": "Joe Scotto",
-    "keyboard_name": "ScottoStarter",
-    "maintainer": "joe-scotto",
-    "bootloader": "caterina",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        // RX1, 4, 5, 6, 7, 8, 9, A3, A2, A1, TX0
-        "cols": ["D2", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "D3"],
-        // A0, 15, 14, 16, 10
-        "rows": ["F7", "B1", "B3", "B2", "B6"]
-    },
-    "processor": "atmega32u4",
-    "url": "",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0000",
-        "vid": "0xFEED"
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x11_8": {
-            "layout": [
-                // Row 1
-                {"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},
-
-                // Row 2
-                {"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},
-
-                // Row 3
-                {"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},
-
-                // Row 4
-                {"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},
-
-                // Row 5
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 4], "x": 4, "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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/jscotto/scottostarter/keymaps/default/keymap.c b/keyboards/handwired/jscotto/scottostarter/keymaps/default/keymap.c
deleted file mode 100644
index fb47637f189d..000000000000
--- a/keyboards/handwired/jscotto/scottostarter/keymaps/default/keymap.c
+++ /dev/null
@@ -1,52 +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_ortho_4x11_8( 
-        KC_1,         KC_2,    KC_3,    KC_4,    KC_5,   KC_6,  KC_7,  KC_8,     KC_9,   KC_0,            KC_BSPC,
-        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,
-        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_ENT,
-        KC_LCTL,      KC_LGUI, KC_LALT,          KC_SPC,               MO(1),    MO(2),  KC_ESC,         KC_CAPS
-    ),
-    [1] = LAYOUT_ortho_4x11_8(
-        KC_NO,           KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,           KC_DEL,
-        KC_UNDS,         KC_MINS, KC_PLUS, KC_EQL,  KC_COLN,  KC_GRV,   KC_MRWD, KC_MPLY, KC_MFFD, KC_NO,           KC_TAB,
-        KC_LCBR,         KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE,  KC_ESC,   KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT,         KC_QUOT,
-        LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN,  KC_TILD, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS), KC_ENT,
-        KC_LCTL,         KC_LGUI, KC_LALT,          KC_SPC,                      KC_TRNS, KC_TRNS, KC_ESC,          KC_CAPS
-    ),
-    [2] = LAYOUT_ortho_4x11_8(
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,           KC_BSPC,
-        KC_EXLM, KC_AT,   KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,         KC_TAB,
-        KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,            KC_QUOT,
-        KC_LSFT, KC_NO,   KC_NO,   KC_NO,  MO(3),   KC_NO,   KC_NO,   KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_ENT,
-        KC_LCTL, KC_LGUI, KC_LALT,         KC_SPC,                    KC_TRNS, KC_TRNS, KC_ESC,          KC_CAPS
-    ),
-    [3] = LAYOUT_ortho_4x11_8(
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,  KC_BSPC,
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO,   KC_NO,   TO(4),  KC_TAB,
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, KC_F7, KC_F8,   KC_F9,   KC_F10, KC_QUOT,
-        KC_F11,  KC_NO,   KC_NO,   QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_F12, KC_ENT,
-        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                KC_TRNS, KC_TRNS, KC_ESC, KC_CAPS
-    )
-};
-
-
-
diff --git a/keyboards/handwired/jscotto/scottostarter/readme.md b/keyboards/handwired/jscotto/scottostarter/readme.md
deleted file mode 100644
index 5886bc9d3b0d..000000000000
--- a/keyboards/handwired/jscotto/scottostarter/readme.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# ScottoStarter
-
-![ScottoStarter](https://i.imgur.com/bspbVPah.jpg)
-
-A 52 key ortholinear keyboard that is designed to help transition you into smaller layouts. Case files available [here](https://github.com/joe-scotto/keyboards.git).
-
--   Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
--   Hardware Supported: ATmega32U4
--   Hardware Availability: [Amazon](https://amazon.com)
-
-# Compiling
-
-Make example for this keyboard (after setting up your build environment):
-
-    make handwired/jscotto/scottostarter:default
-
-Flashing example for this keyboard:
-
-    make handwired/jscotto/scottostarter:default
-
-# Bootloader
-
-Uses [bootmagic](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_bootmagic.md) allowing you to hold the top left key (0, 0) when plugging the board in to enter 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).
diff --git a/keyboards/handwired/k_numpad17/config.h b/keyboards/handwired/k_numpad17/config.h
index 9bcc1ca12edf..9f71a07f90c4 100644
--- a/keyboards/handwired/k_numpad17/config.h
+++ b/keyboards/handwired/k_numpad17/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define TAPPING_TERM 400
-
 /* 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/k_numpad17/info.json b/keyboards/handwired/k_numpad17/info.json
index e0cd79a9c000..97d5f38774ba 100644
--- a/keyboards/handwired/k_numpad17/info.json
+++ b/keyboards/handwired/k_numpad17/info.json
@@ -8,6 +8,9 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "tapping": {
+        "term": 400
+    },
     "matrix_pins": {
         "cols": ["B2", "B1", "F6", "F4"],
         "rows": ["D1", "D4", "C6", "D7", "E6"]
diff --git a/keyboards/handwired/kbod/config.h b/keyboards/handwired/kbod/config.h
index f95288177271..b9449c4714bf 100644
--- a/keyboards/handwired/kbod/config.h
+++ b/keyboards/handwired/kbod/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 TAPPING_TOGGLE 2
diff --git a/keyboards/handwired/kbod/info.json b/keyboards/handwired/kbod/info.json
index 6508b3d85969..69005c657900 100644
--- a/keyboards/handwired/kbod/info.json
+++ b/keyboards/handwired/kbod/info.json
@@ -18,6 +18,9 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "tapping": {
+        "toggle": 2
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/handwired/lovelive9/config.h b/keyboards/handwired/lovelive9/config.h
index a946442dc05b..5de39092bf58 100644
--- a/keyboards/handwired/lovelive9/config.h
+++ b/keyboards/handwired/lovelive9/config.h
@@ -1,22 +1,3 @@
-
-
 #pragma once
 
-#define RGBLED_NUM 9    // 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_EFFECT_SNAKE_LENGTH 4
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-#define TAPPING_TERM 200
diff --git a/keyboards/handwired/lovelive9/info.json b/keyboards/handwired/lovelive9/info.json
index 4000b543c317..835fa55bef6c 100644
--- a/keyboards/handwired/lovelive9/info.json
+++ b/keyboards/handwired/lovelive9/info.json
@@ -17,6 +17,22 @@
     "backlight": {
         "breathing_period": 2
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 9,
+        "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": "D3"
     },
diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h
index d20625da0858..95e7d9d1aa61 100644
--- a/keyboards/handwired/macroboard/config.h
+++ b/keyboards/handwired/macroboard/config.h
@@ -23,22 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_STREAM   STM32_DMA1_STREAM6  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 #define WS2812_DMA_CHANNEL  2                   // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 #define WS2812_PWM_TARGET_PERIOD 800000
-#define RGBLIGHT_LED_MAP { 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 23, 21, 19, 17, 15, 13, 11, 9, 7, 5, 3, 1  }
-
-#    define RGBLED_NUM 24
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/macroboard/info.json b/keyboards/handwired/macroboard/info.json
index b82cee4fb523..5c27c96ae9ff 100644
--- a/keyboards/handwired/macroboard/info.json
+++ b/keyboards/handwired/macroboard/info.json
@@ -8,6 +8,23 @@
         "pid": "0x2137",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 24,
+        "sleep": true,
+        "led_map": [0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 23, 21, 19, 17, 15, 13, 11, 9, 7, 5, 3, 1],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true
+        }
+    },
     "ws2812": {
         "pin": "B9"
     },
diff --git a/keyboards/handwired/marauder/config.h b/keyboards/handwired/marauder/config.h
index bdb092a3ae83..9d56df98e1d9 100644
--- a/keyboards/handwired/marauder/config.h
+++ b/keyboards/handwired/marauder/config.h
@@ -17,9 +17,3 @@
 #pragma once
 
 #define LAYER_STATE_8BIT
-
-    #define RGBLED_NUM 7
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
diff --git a/keyboards/handwired/marauder/info.json b/keyboards/handwired/marauder/info.json
index a4bab132846f..5c17825a634f 100644
--- a/keyboards/handwired/marauder/info.json
+++ b/keyboards/handwired/marauder/info.json
@@ -8,6 +8,12 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 7,
+        "sleep": true
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/handwired/marauder/keymaps/orvia/rules.mk b/keyboards/handwired/marauder/keymaps/orvia/rules.mk
index 9b5ee6b6fa52..e39f8c6e9e80 100644
--- a/keyboards/handwired/marauder/keymaps/orvia/rules.mk
+++ b/keyboards/handwired/marauder/keymaps/orvia/rules.mk
@@ -1,4 +1,3 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # OLED Driver Enable
 WPM_ENABLE = yes			# WPM counting Enable
diff --git a/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c b/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c
index 7d541270fba6..26e6fc630ceb 100644
--- a/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c
+++ b/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c
@@ -59,9 +59,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     },
 #ifdef UNICODE_H
     [_RUNE] = {
-        {KC_ESC,  X(INGWZ), X(WUNJO),  X(EHWAZ), X(RAIDO), X(TIWAZ), X(IWAZ),  X(UR),    X(ISAZ),  X(ETHEL), X(PERTH), SC(BSPC) },
-        {ED(TAB), X(ANSUZ), X(SOWIL),  X(DAGAZ), X(FE),    X(GEBO),  X(HAGLZ), X(JERAN), X(KAUNA), X(LAUKZ), XXXXXXX,  NM(SCLN) },
-        {MT_QUOT, XXXXXXX,  X(ALGIZ),  X(THURS), X(KAUNA), X(WUNJO), X(BEORC), X(NAUDZ), X(MANNZ), KC_COMM,  FK(DOT),  RS(SLSH) },
+        {KC_ESC,  UM(INGWZ), UM(WUNJO),  UM(EHWAZ), UM(RAIDO), UM(TIWAZ), UM(IWAZ),  UM(UR),    UM(ISAZ),  UM(ETHEL), UM(PERTH), SC(BSPC) },
+        {ED(TAB), UM(ANSUZ), UM(SOWIL),  UM(DAGAZ), UM(FE),    UM(GEBO),  UM(HAGLZ), UM(JERAN), UM(KAUNA), UM(LAUKZ), XXXXXXX,  NM(SCLN) },
+        {MT_QUOT, XXXXXXX,  UM(ALGIZ),  UM(THURS), UM(KAUNA), UM(WUNJO), UM(BEORC), UM(NAUDZ), UM(MANNZ), KC_COMM,  FK(DOT),  RS(SLSH) },
         {LC(ESC), XXXXXXX,  LG(LBRC),  LA(RBRC), NM(BSPC), XXXXXXX,  XXXXXXX,  SM(SPC),  XXXXXXX,  RA(MINS), RG(EQL),  RC(ENT)  }
     },
 #endif
diff --git a/keyboards/handwired/mutepad/config.h b/keyboards/handwired/mutepad/config.h
index 83c78b163420..632465bba71f 100644
--- a/keyboards/handwired/mutepad/config.h
+++ b/keyboards/handwired/mutepad/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
 /* 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/mutepad/info.json b/keyboards/handwired/mutepad/info.json
index e8df528eff32..5adb2505fbc8 100644
--- a/keyboards/handwired/mutepad/info.json
+++ b/keyboards/handwired/mutepad/info.json
@@ -19,6 +19,9 @@
             {"pin_a": "F4", "pin_b": "F5", "resolution": 2}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/handwired/myskeeb/config.h b/keyboards/handwired/myskeeb/config.h
index 2e2a2bbcbf5a..8c37524a0e5d 100644
--- a/keyboards/handwired/myskeeb/config.h
+++ b/keyboards/handwired/myskeeb/config.h
@@ -13,7 +13,3 @@
 #define OLED_FONT_HEIGHT 8
 #define OLED_FONT_WIDTH 6
 #define OLED_FONT_H "skeeb_font.c"
-
-// Tap Dance
-
-#define TAPPING_TERM 200
diff --git a/keyboards/handwired/myskeeb/oled.c b/keyboards/handwired/myskeeb/oled.c
index 3f43590b8e90..675b290630d9 100644
--- a/keyboards/handwired/myskeeb/oled.c
+++ b/keyboards/handwired/myskeeb/oled.c
@@ -127,13 +127,13 @@ void render_layer_state(void){
 }
 
 // Keylock State
-void render_keylock_status(uint8_t led_usb_state) {
+void render_keylock_status(led_t led_state) {
 	oled_write_P(PSTR(" "), false);
-	oled_write_P(led_usb_state & (1<<USB_LED_NUM_LOCK) ? PSTR("-NUML") : PSTR("-----"), false);
+	oled_write_P(led_state.num_lock ? PSTR("-NUML") : PSTR("-----"), false);
 	oled_write_P(PSTR(" "), false);
-	oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK) ? PSTR("-CAPS") : PSTR("-----"), false);
+	oled_write_P(led_state.caps_lock ? PSTR("-CAPS") : PSTR("-----"), false);
 	oled_write_P(PSTR(" "), false);
-	oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("-SCRL") : PSTR("-----"), false);
+	oled_write_P(led_state.scroll_lock ? PSTR("-SCRL") : PSTR("-----"), false);
 	oled_write_P(PSTR(" "), false);
 }
 
@@ -213,7 +213,7 @@ if (is_keyboard_master()) {
 	oled_write_P(oled_layer_line_end, false);
 	oled_write_P(oled_layer_keylog_bottom, false);
 	oled_write_P(oled_line_start, false);
-	render_keylock_status(host_keyboard_leds());
+	render_keylock_status(host_keyboard_led_state());
 	oled_write_P(oled_layer_line_end, false);
 	oled_write_P(oled_mods_bottom, false);
 	oled_write_P(oled_line_start, false);
diff --git a/keyboards/handwired/myskeeb/rules.mk b/keyboards/handwired/myskeeb/rules.mk
index a67d345674e4..e09e2e2bbe98 100644
--- a/keyboards/handwired/myskeeb/rules.mk
+++ b/keyboards/handwired/myskeeb/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes        # Enables split keyboard support
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 NO_USB_STARTUP_CHECK = yes
diff --git a/keyboards/handwired/obuwunkunubi/spaget/rules.mk b/keyboards/handwired/obuwunkunubi/spaget/rules.mk
index bf275d4f6f27..9652815de213 100644
--- a/keyboards/handwired/obuwunkunubi/spaget/rules.mk
+++ b/keyboards/handwired/obuwunkunubi/spaget/rules.mk
@@ -14,6 +14,4 @@ UNICODE_ENABLE = yes     # Unicode
 AUDIO_ENABLE = no        # Audio output
 
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306 # Enable OLED display support
 ENCODER_ENABLE = yes     # Enable encoder support
-
diff --git a/keyboards/handwired/onekey/blackpill_f401/config.h b/keyboards/handwired/onekey/blackpill_f401/config.h
index 6183ee981971..22143dfac515 100644
--- a/keyboards/handwired/onekey/blackpill_f401/config.h
+++ b/keyboards/handwired/onekey/blackpill_f401/config.h
@@ -19,7 +19,6 @@
 
 #define BACKLIGHT_PWM_DRIVER  PWMD5
 #define BACKLIGHT_PWM_CHANNEL 1
-#define BACKLIGHT_PAL_MODE 2
 
 #define ADC_PIN A0
 
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/config.h b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/config.h
index 6183ee981971..22143dfac515 100755
--- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/config.h
+++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/config.h
@@ -19,7 +19,6 @@
 
 #define BACKLIGHT_PWM_DRIVER  PWMD5
 #define BACKLIGHT_PWM_CHANNEL 1
-#define BACKLIGHT_PAL_MODE 2
 
 #define ADC_PIN A0
 
diff --git a/keyboards/handwired/onekey/blackpill_f411/config.h b/keyboards/handwired/onekey/blackpill_f411/config.h
index 6183ee981971..22143dfac515 100644
--- a/keyboards/handwired/onekey/blackpill_f411/config.h
+++ b/keyboards/handwired/onekey/blackpill_f411/config.h
@@ -19,7 +19,6 @@
 
 #define BACKLIGHT_PWM_DRIVER  PWMD5
 #define BACKLIGHT_PWM_CHANNEL 1
-#define BACKLIGHT_PAL_MODE 2
 
 #define ADC_PIN A0
 
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
index 6183ee981971..22143dfac515 100755
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
@@ -19,7 +19,6 @@
 
 #define BACKLIGHT_PWM_DRIVER  PWMD5
 #define BACKLIGHT_PWM_CHANNEL 1
-#define BACKLIGHT_PAL_MODE 2
 
 #define ADC_PIN A0
 
diff --git a/keyboards/handwired/onekey/bluepill/rules.mk b/keyboards/handwired/onekey/bluepill/rules.mk
index a92b0993283e..8b137891791f 100644
--- a/keyboards/handwired/onekey/bluepill/rules.mk
+++ b/keyboards/handwired/onekey/bluepill/rules.mk
@@ -1,2 +1 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
index 8fd4321938e1..71bc488563a8 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
+++ b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
@@ -7,9 +7,6 @@ BOOTLOADER_TYPE = stm32duino
 DFU_ARGS = -d 1EAF:0003 -a 2 -R
 DFU_SUFFIX_ARGS = -v 1EAF -p 0003
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # LTO is required to fit the firmware into the available 24K of flash
 LTO_ENABLE = yes
 
diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/rules.mk b/keyboards/handwired/onekey/bluepill_uf2boot/rules.mk
index a92b0993283e..8b137891791f 100644
--- a/keyboards/handwired/onekey/bluepill_uf2boot/rules.mk
+++ b/keyboards/handwired/onekey/bluepill_uf2boot/rules.mk
@@ -1,2 +1 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
diff --git a/keyboards/handwired/onekey/config.h b/keyboards/handwired/onekey/config.h
index 7ef807c5d111..09cf96594124 100644
--- a/keyboards/handwired/onekey/config.h
+++ b/keyboards/handwired/onekey/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define TAPPING_TERM 500
 #define PERMISSIVE_HOLD
 
 /*
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/config.h b/keyboards/handwired/onekey/evb_wb32f3g71/config.h
index 4a65e9a72fe9..5f6f04f7b413 100644
--- a/keyboards/handwired/onekey/evb_wb32f3g71/config.h
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/config.h
@@ -3,13 +3,8 @@
 
 #pragma once
 
-
 #define ADC_PIN A0
 
-#define BACKLIGHT_PWM_DRIVER  PWMD4
-#define BACKLIGHT_PWM_CHANNEL 3
-#define BACKLIGHT_PAL_MODE    2
-
 #define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4)))
 
 #define SOLENOID_PIN B12
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/config.h b/keyboards/handwired/onekey/evb_wb32fq95/config.h
index 4a65e9a72fe9..5f6f04f7b413 100644
--- a/keyboards/handwired/onekey/evb_wb32fq95/config.h
+++ b/keyboards/handwired/onekey/evb_wb32fq95/config.h
@@ -3,13 +3,8 @@
 
 #pragma once
 
-
 #define ADC_PIN A0
 
-#define BACKLIGHT_PWM_DRIVER  PWMD4
-#define BACKLIGHT_PWM_CHANNEL 3
-#define BACKLIGHT_PAL_MODE    2
-
 #define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4)))
 
 #define SOLENOID_PIN B12
diff --git a/keyboards/handwired/onekey/info.json b/keyboards/handwired/onekey/info.json
index 339dfe5974e0..17bb84a82c14 100644
--- a/keyboards/handwired/onekey/info.json
+++ b/keyboards/handwired/onekey/info.json
@@ -7,6 +7,9 @@
         "pid": "0x6465",
         "device_version": "0.0.1"
     },
+    "tapping": {
+        "term": 500
+    },
     "diode_direction": "COL2ROW",
     "features": {
         "bootmagic": false,
diff --git a/keyboards/handwired/onekey/kb2040/rules.mk b/keyboards/handwired/onekey/kb2040/rules.mk
index a5429ba9935e..0e5631b02b3f 100644
--- a/keyboards/handwired/onekey/kb2040/rules.mk
+++ b/keyboards/handwired/onekey/kb2040/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 OPT_DEFS += -DHAL_USE_I2C=TRUE
diff --git a/keyboards/handwired/onekey/keymaps/apa102/rules.mk b/keyboards/handwired/onekey/keymaps/apa102/rules.mk
index 70932cb75168..5f15fa9e7080 100644
--- a/keyboards/handwired/onekey/keymaps/apa102/rules.mk
+++ b/keyboards/handwired/onekey/keymaps/apa102/rules.mk
@@ -1,2 +1,2 @@
 RGBLIGHT_ENABLE = yes
-RGBLIGHT_DRIVER = APA102
+RGBLIGHT_DRIVER = apa102
diff --git a/keyboards/handwired/onekey/keymaps/haptic/rules.mk b/keyboards/handwired/onekey/keymaps/haptic/rules.mk
index 802f7e5ddeee..05201736e601 100644
--- a/keyboards/handwired/onekey/keymaps/haptic/rules.mk
+++ b/keyboards/handwired/onekey/keymaps/haptic/rules.mk
@@ -1,2 +1,2 @@
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = SOLENOID
+HAPTIC_DRIVER = solenoid
diff --git a/keyboards/handwired/onekey/keymaps/oled/rules.mk b/keyboards/handwired/onekey/keymaps/oled/rules.mk
index 83757b190967..f39e8ce4bde1 100644
--- a/keyboards/handwired/onekey/keymaps/oled/rules.mk
+++ b/keyboards/handwired/onekey/keymaps/oled/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 TAP_DANCE_ENABLE = yes
 CONSOLE_ENABLE = yes
diff --git a/keyboards/handwired/onekey/nucleo_f446re/config.h b/keyboards/handwired/onekey/nucleo_f446re/config.h
index c6c04ed61544..4401623e85ca 100644
--- a/keyboards/handwired/onekey/nucleo_f446re/config.h
+++ b/keyboards/handwired/onekey/nucleo_f446re/config.h
@@ -2,11 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-
-#define BACKLIGHT_PWM_DRIVER  PWMD4
-#define BACKLIGHT_PWM_CHANNEL 3
-#define BACKLIGHT_PAL_MODE    2
-
 #define ADC_PIN A0
 
 #define SOLENOID_PINS { B12, B13, B14, B15 }
diff --git a/keyboards/handwired/onekey/nucleo_h723zg/info.json b/keyboards/handwired/onekey/nucleo_h723zg/info.json
new file mode 100644
index 000000000000..7596d007b2d1
--- /dev/null
+++ b/keyboards/handwired/onekey/nucleo_h723zg/info.json
@@ -0,0 +1,19 @@
+{
+    "keyboard_name": "Onekey Nucleo H723ZG",
+    "processor": "STM32H723",
+    "bootloader": "stm32-dfu",
+    "matrix_pins": {
+        "cols": ["A9"],
+        "rows": ["A10"]
+    },
+    "backlight": {
+        "pin": "B8"
+    },
+    "ws2812": {
+        "pin": "A0"
+    },
+    "apa102": {
+        "data_pin": "A0",
+        "clock_pin": "B13"
+    }
+}
diff --git a/keyboards/handwired/onekey/nucleo_h723zg/readme.md b/keyboards/handwired/onekey/nucleo_h723zg/readme.md
new file mode 100755
index 000000000000..97a2da51153d
--- /dev/null
+++ b/keyboards/handwired/onekey/nucleo_h723zg/readme.md
@@ -0,0 +1,5 @@
+# ST Microelectronics Nucleo144-H723 onekey
+
+Supported Hardware: <https://www.st.com/en/evaluation-tools/nucleo-h723zg.html>
+
+To trigger keypress, short together pins *A9* and *A10*.
diff --git a/keyboards/handwired/onekey/nucleo_h723zg/rules.mk b/keyboards/handwired/onekey/nucleo_h723zg/rules.mk
new file mode 100755
index 000000000000..e69de29bb2d1
diff --git a/keyboards/handwired/onekey/nucleo_l432kc/config.h b/keyboards/handwired/onekey/nucleo_l432kc/config.h
index d344a110942e..03e017892c73 100644
--- a/keyboards/handwired/onekey/nucleo_l432kc/config.h
+++ b/keyboards/handwired/onekey/nucleo_l432kc/config.h
@@ -2,9 +2,4 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-
-#define BACKLIGHT_PWM_DRIVER  PWMD4
-#define BACKLIGHT_PWM_CHANNEL 3
-#define BACKLIGHT_PAL_MODE    2
-
 #define ADC_PIN A0
diff --git a/keyboards/handwired/onekey/proton_c/config.h b/keyboards/handwired/onekey/proton_c/config.h
index 49376e474e27..07ce9292211d 100644
--- a/keyboards/handwired/onekey/proton_c/config.h
+++ b/keyboards/handwired/onekey/proton_c/config.h
@@ -16,9 +16,4 @@
 
 #pragma once
 
-
-#define BACKLIGHT_PWM_DRIVER  PWMD4
-#define BACKLIGHT_PWM_CHANNEL 3
-#define BACKLIGHT_PAL_MODE    2
-
 #define ADC_PIN A0
diff --git a/keyboards/handwired/onekey/rp2040/config.h b/keyboards/handwired/onekey/rp2040/config.h
index 5cbfb8dbffc1..0563ebfa5f1f 100644
--- a/keyboards/handwired/onekey/rp2040/config.h
+++ b/keyboards/handwired/onekey/rp2040/config.h
@@ -13,7 +13,6 @@
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
 
-#define BACKLIGHT_PWM_DRIVER PWMD4
 #define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B
 
 #define AUDIO_PIN GP16
diff --git a/keyboards/handwired/onekey/stm32f0_disco/config.h b/keyboards/handwired/onekey/stm32f0_disco/config.h
index 806eb69df4e3..b8880f65813a 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/config.h
+++ b/keyboards/handwired/onekey/stm32f0_disco/config.h
@@ -16,9 +16,7 @@
 
 #pragma once
 
-
 #define BACKLIGHT_PWM_DRIVER  PWMD3
-#define BACKLIGHT_PWM_CHANNEL 3
 #define BACKLIGHT_PAL_MODE    0
 
 #define ADC_PIN A0
diff --git a/keyboards/handwired/onekey/stm32f0_disco/rules.mk b/keyboards/handwired/onekey/stm32f0_disco/rules.mk
index a92b0993283e..8b137891791f 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/rules.mk
+++ b/keyboards/handwired/onekey/stm32f0_disco/rules.mk
@@ -1,2 +1 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
diff --git a/keyboards/handwired/onekey/stm32f3_disco/config.h b/keyboards/handwired/onekey/stm32f3_disco/config.h
new file mode 100644
index 000000000000..a0e3c54ec1c4
--- /dev/null
+++ b/keyboards/handwired/onekey/stm32f3_disco/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define ADC_PIN A0
diff --git a/keyboards/handwired/onekey/stm32f3_disco/halconf.h b/keyboards/handwired/onekey/stm32f3_disco/halconf.h
new file mode 100644
index 000000000000..e9d7ece8fc98
--- /dev/null
+++ b/keyboards/handwired/onekey/stm32f3_disco/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_ADC TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/stm32f3_disco/info.json b/keyboards/handwired/onekey/stm32f3_disco/info.json
new file mode 100644
index 000000000000..b541cd8ae4d1
--- /dev/null
+++ b/keyboards/handwired/onekey/stm32f3_disco/info.json
@@ -0,0 +1,19 @@
+{
+    "keyboard_name": "Onekey STM32F3 Discovery",
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "matrix_pins": {
+        "cols": ["B4"],
+        "rows": ["B5"]
+    },
+    "backlight": {
+        "pin": "E8"
+    },
+    "ws2812": {
+        "pin": "A0"
+    },
+    "apa102": {
+        "data_pin": "A0",
+        "clock_pin": "B13"
+    }
+}
diff --git a/keyboards/handwired/onekey/stm32f3_disco/mcuconf.h b/keyboards/handwired/onekey/stm32f3_disco/mcuconf.h
new file mode 100644
index 000000000000..9172860b0f12
--- /dev/null
+++ b/keyboards/handwired/onekey/stm32f3_disco/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/handwired/onekey/stm32f3_disco/readme.md b/keyboards/handwired/onekey/stm32f3_disco/readme.md
new file mode 100644
index 000000000000..ff5c061184b6
--- /dev/null
+++ b/keyboards/handwired/onekey/stm32f3_disco/readme.md
@@ -0,0 +1,5 @@
+# STM32F303 Discovery kit onekey
+
+* Supported Hardware: [STM32F303 Discovery](https://www.st.com/en/evaluation-tools/stm32f3discovery.html)
+
+To trigger keypress, short together pins *B4* and *B5*.
diff --git a/keyboards/handwired/onekey/stm32f3_disco/rules.mk b/keyboards/handwired/onekey/stm32f3_disco/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/handwired/onekey/stm32f405_feather/rules.mk b/keyboards/handwired/onekey/stm32f405_feather/rules.mk
index a92b0993283e..8b137891791f 100644
--- a/keyboards/handwired/onekey/stm32f405_feather/rules.mk
+++ b/keyboards/handwired/onekey/stm32f405_feather/rules.mk
@@ -1,2 +1 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
diff --git a/keyboards/handwired/onekey/teensy_32/rules.mk b/keyboards/handwired/onekey/teensy_32/rules.mk
index a92b0993283e..8b137891791f 100644
--- a/keyboards/handwired/onekey/teensy_32/rules.mk
+++ b/keyboards/handwired/onekey/teensy_32/rules.mk
@@ -1,2 +1 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
diff --git a/keyboards/handwired/onekey/teensy_35/rules.mk b/keyboards/handwired/onekey/teensy_35/rules.mk
index a92b0993283e..8b137891791f 100644
--- a/keyboards/handwired/onekey/teensy_35/rules.mk
+++ b/keyboards/handwired/onekey/teensy_35/rules.mk
@@ -1,2 +1 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
diff --git a/keyboards/handwired/onekey/teensy_lc/rules.mk b/keyboards/handwired/onekey/teensy_lc/rules.mk
index 9803d8cc7039..abd2f7fce976 100644
--- a/keyboards/handwired/onekey/teensy_lc/rules.mk
+++ b/keyboards/handwired/onekey/teensy_lc/rules.mk
@@ -1,4 +1,2 @@
 USE_CHIBIOS_CONTRIB = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/handwired/orbweaver/info.json b/keyboards/handwired/orbweaver/info.json
index 9db6243a6949..489a7e288878 100644
--- a/keyboards/handwired/orbweaver/info.json
+++ b/keyboards/handwired/orbweaver/info.json
@@ -13,7 +13,7 @@
         "nkro": true
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "matrix_pins": {
         "rows": ["GP4", "GP5", "GP6", "GP7", "GP8", "GP9"],
diff --git a/keyboards/handwired/ortho5x14/config.h b/keyboards/handwired/ortho5x14/config.h
index c37ac425370b..5f60fd44d7e9 100644
--- a/keyboards/handwired/ortho5x14/config.h
+++ b/keyboards/handwired/ortho5x14/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 TAPPING_TERM 200
-
 //#define PERMISSIVE_HOLD
 
 /*
diff --git a/keyboards/handwired/osborne1/info.json b/keyboards/handwired/osborne1/info.json
index d226b4dd71a8..2f613b5876da 100644
--- a/keyboards/handwired/osborne1/info.json
+++ b/keyboards/handwired/osborne1/info.json
@@ -12,6 +12,9 @@
         "mousekey": false,
         "nkro": false
     },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
     "matrix_pins": {
         "cols": ["D3", "D2", "F0", "F1", "F4", "F5", "F6", "F7"],
         "rows": ["D0", "B7", "B5", "C6", "D1", "B6", "D7", "D6"]
diff --git a/keyboards/handwired/osborne1/rules.mk b/keyboards/handwired/osborne1/rules.mk
index 2bf3fe5811eb..9ccac102c70b 100644
--- a/keyboards/handwired/osborne1/rules.mk
+++ b/keyboards/handwired/osborne1/rules.mk
@@ -1,2 +1 @@
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
diff --git a/keyboards/handwired/owlet60/config.h b/keyboards/handwired/owlet60/config.h
index ba5322f32fb2..f37ee57798d4 100644
--- a/keyboards/handwired/owlet60/config.h
+++ b/keyboards/handwired/owlet60/config.h
@@ -40,22 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-  #define RGBLED_NUM 8
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/info.json
index d03691175538..f6bd2d2f239c 100644
--- a/keyboards/handwired/owlet60/info.json
+++ b/keyboards/handwired/owlet60/info.json
@@ -12,7 +12,23 @@
         "pin": "D0"
     },
     "rgblight": {
-        "max_brightness": 128
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "max_brightness": 128,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c b/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c
index f617fb5e682f..f54ceb44910a 100644
--- a/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c
+++ b/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c
@@ -67,24 +67,6 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
   return OLED_ROTATION_180;
 }
 bool oled_task_user(void) {
-  // Host Keyboard Layer Status
-  /*oled_write_P(PSTR("Lyr: "), false);
-  switch (get_highest_layer(layer_state)) {
-    case 0:
-      oled_write_P(PSTR("Alpha\n"), false);
-      break;
-    case 1:
-      oled_write_P(PSTR("FN\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);
-  }
-
-  uint8_t led_usb_state = host_keyboard_leds();
-  oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR("       "), 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,
diff --git a/keyboards/handwired/owlet60/keymaps/oled_testing/rules.mk b/keyboards/handwired/owlet60/keymaps/oled_testing/rules.mk
index d34d066ded93..dd68e9d3b090 100644
--- a/keyboards/handwired/owlet60/keymaps/oled_testing/rules.mk
+++ b/keyboards/handwired/owlet60/keymaps/oled_testing/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/handwired/p65rgb/info.json b/keyboards/handwired/p65rgb/info.json
index a9ec2634efb4..2fa35c2cbfd8 100644
--- a/keyboards/handwired/p65rgb/info.json
+++ b/keyboards/handwired/p65rgb/info.json
@@ -12,7 +12,7 @@
         "pin": "B4"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "rgblight": {
         "max_brightness": 180
diff --git a/keyboards/handwired/pill60/blackpill_f401/halconf.h b/keyboards/handwired/pill60/blackpill_f401/halconf.h
index 1e126a8656ac..b2ef07f1c936 100644
--- a/keyboards/handwired/pill60/blackpill_f401/halconf.h
+++ b/keyboards/handwired/pill60/blackpill_f401/halconf.h
@@ -23,7 +23,4 @@
 
 #define HAL_USE_I2C TRUE
 
-#define HAL_USE_PWM TRUE
-
 #include_next <halconf.h>
-
diff --git a/keyboards/handwired/pill60/blackpill_f401/mcuconf.h b/keyboards/handwired/pill60/blackpill_f401/mcuconf.h
index ab89514fb1c7..563b86d26db1 100644
--- a/keyboards/handwired/pill60/blackpill_f401/mcuconf.h
+++ b/keyboards/handwired/pill60/blackpill_f401/mcuconf.h
@@ -19,6 +19,3 @@
 
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
-
-#undef STM32_PWM_USE_TIM5
-#define STM32_PWM_USE_TIM5 TRUE
\ No newline at end of file
diff --git a/keyboards/handwired/pill60/blackpill_f411/halconf.h b/keyboards/handwired/pill60/blackpill_f411/halconf.h
index 435bf3274e98..f563693fac76 100644
--- a/keyboards/handwired/pill60/blackpill_f411/halconf.h
+++ b/keyboards/handwired/pill60/blackpill_f411/halconf.h
@@ -23,7 +23,4 @@
 
 #define HAL_USE_I2C TRUE
 
-#define HAL_USE_PWM TRUE
-
 #include_next <halconf.h>
-
diff --git a/keyboards/handwired/pill60/blackpill_f411/mcuconf.h b/keyboards/handwired/pill60/blackpill_f411/mcuconf.h
index ab89514fb1c7..563b86d26db1 100644
--- a/keyboards/handwired/pill60/blackpill_f411/mcuconf.h
+++ b/keyboards/handwired/pill60/blackpill_f411/mcuconf.h
@@ -19,6 +19,3 @@
 
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
-
-#undef STM32_PWM_USE_TIM5
-#define STM32_PWM_USE_TIM5 TRUE
\ No newline at end of file
diff --git a/keyboards/handwired/pill60/bluepill/halconf.h b/keyboards/handwired/pill60/bluepill/halconf.h
index 459ec86e2da1..d423df151290 100644
--- a/keyboards/handwired/pill60/bluepill/halconf.h
+++ b/keyboards/handwired/pill60/bluepill/halconf.h
@@ -23,7 +23,4 @@
 
 #define HAL_USE_I2C TRUE
 
-#define HAL_USE_PWM TRUE
-
 #include_next <halconf.h>
-
diff --git a/keyboards/handwired/pill60/bluepill/mcuconf.h b/keyboards/handwired/pill60/bluepill/mcuconf.h
index 22f8b02704ce..f335353541ca 100644
--- a/keyboards/handwired/pill60/bluepill/mcuconf.h
+++ b/keyboards/handwired/pill60/bluepill/mcuconf.h
@@ -26,9 +26,5 @@
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
 
-#undef STM32_PWM_USE_TIM2
-#define STM32_PWM_USE_TIM2 TRUE
-
 #undef STM32_SPI_USE_SPI2
 #define STM32_SPI_USE_SPI2 FALSE
-
diff --git a/keyboards/handwired/pill60/bluepill/rules.mk b/keyboards/handwired/pill60/bluepill/rules.mk
index a92b0993283e..8b137891791f 100644
--- a/keyboards/handwired/pill60/bluepill/rules.mk
+++ b/keyboards/handwired/pill60/bluepill/rules.mk
@@ -1,2 +1 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
diff --git a/keyboards/handwired/pill60/config.h b/keyboards/handwired/pill60/config.h
deleted file mode 100644
index 399d0f2212cb..000000000000
--- a/keyboards/handwired/pill60/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
- /* Copyright 2020 Imam Rafii
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have 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    PWMD5
-#define BACKLIGHT_PWM_CHANNEL   1
diff --git a/keyboards/handwired/pill60/info.json b/keyboards/handwired/pill60/info.json
index 6cc337f8eee1..ac8c9013ba93 100644
--- a/keyboards/handwired/pill60/info.json
+++ b/keyboards/handwired/pill60/info.json
@@ -13,11 +13,6 @@
             {"pin_a": "B9", "pin_b": "B8", "resolution": 2}
         ]
     },
-    "backlight": {
-        "driver": "software",
-        "pin": "B14",
-        "levels": 5
-    },
     "debounce": 1,
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/handwired/pill60/rules.mk b/keyboards/handwired/pill60/rules.mk
index f8bae6b6dfad..6bb5fa15810e 100644
--- a/keyboards/handwired/pill60/rules.mk
+++ b/keyboards/handwired/pill60/rules.mk
@@ -7,12 +7,10 @@ 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 = yes      # Enable keyboard backlight functionality
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-SLEEP_LED_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 
 DEFAULT_FOLDER = handwired/pill60/bluepill
diff --git a/keyboards/handwired/prime_exl_plus/config.h b/keyboards/handwired/prime_exl_plus/config.h
index a660e0ddfa11..cb77f4eda203 100644
--- a/keyboards/handwired/prime_exl_plus/config.h
+++ b/keyboards/handwired/prime_exl_plus/config.h
@@ -17,18 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 10
-#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
-
 /* 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/prime_exl_plus/info.json b/keyboards/handwired/prime_exl_plus/info.json
index cb4a939a02d8..c463d5baa7a7 100644
--- a/keyboards/handwired/prime_exl_plus/info.json
+++ b/keyboards/handwired/prime_exl_plus/info.json
@@ -8,6 +8,21 @@
     "pid": "0x6579",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "led_count": 10,
+    "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": "D4"
   },
diff --git a/keyboards/handwired/prkl30/feather/config.h b/keyboards/handwired/prkl30/feather/config.h
deleted file mode 100644
index bb71df9c64fd..000000000000
--- a/keyboards/handwired/prkl30/feather/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2020 Erkki Halinen & Toni Johansson
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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 Configuration */
-#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 13
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/prkl30/feather/info.json b/keyboards/handwired/prkl30/feather/info.json
index 08c6e107ddfd..a89fe9ec57fd 100644
--- a/keyboards/handwired/prkl30/feather/info.json
+++ b/keyboards/handwired/prkl30/feather/info.json
@@ -1,7 +1,27 @@
 {
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 13,
+        "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": "D1"
     },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
     "matrix_pins": {
         "cols": ["D3", "D1", "B7", "D6", "C7", "B6", "B5", "D7", "C6", "D0"],
         "rows": ["F4", "F1", "F0", "D2"]
diff --git a/keyboards/handwired/prkl30/feather/rules.mk b/keyboards/handwired/prkl30/feather/rules.mk
index 6b109855a57c..aaab95b9e04e 100644
--- a/keyboards/handwired/prkl30/feather/rules.mk
+++ b/keyboards/handwired/prkl30/feather/rules.mk
@@ -16,4 +16,3 @@ AUDIO_ENABLE  = no          # This can be enabled if a speaker is connected to t
 RGBLIGHT_ENABLE  = no       # This can be enabled if a ws2812 strip is connected to the expansion port.
 
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
diff --git a/keyboards/handwired/prkl30/promicro/config.h b/keyboards/handwired/prkl30/promicro/config.h
deleted file mode 100644
index bb71df9c64fd..000000000000
--- a/keyboards/handwired/prkl30/promicro/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2020 Erkki Halinen & Toni Johansson
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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 Configuration */
-#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 13
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/handwired/prkl30/promicro/info.json b/keyboards/handwired/prkl30/promicro/info.json
index 69c3ae8bfe4f..395cb9f27604 100644
--- a/keyboards/handwired/prkl30/promicro/info.json
+++ b/keyboards/handwired/prkl30/promicro/info.json
@@ -3,6 +3,23 @@
         "cols": ["B4", "B5", "F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"],
         "rows": ["D4", "C6", "D7", "E6"]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 13,
+        "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": "D1"
     },
diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/info.json
index 6daf5dd0c698..c26325069b46 100644
--- a/keyboards/handwired/promethium/info.json
+++ b/keyboards/handwired/promethium/info.json
@@ -11,6 +11,9 @@
   "ws2812": {
     "pin": "B5"
   },
+  "bluetooth": {
+    "driver": "bluefruit_le"
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c
index 100db976781e..ff73e51d5eb2 100644
--- a/keyboards/handwired/promethium/keymaps/default/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/default/keymap.c
@@ -779,9 +779,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_PUNC] = LAYOUT(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, X(LTEQ), X(GTEQ), _______,
-  KC_GRV,  KC_ASTR, KC_BSLS, KC_MINS,  KC_EQL, KC_SLSH, X(NOTEQ),KC_LPRN, KC_RPRN, KC_LABK, KC_RABK, _______,
-  KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, X(PLMIN),KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, _______,
+  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, _______,
                                            _______, _______, _______
 ),
@@ -836,9 +836,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_GREEKU] = LAYOUT(
-  _______, XXXXXXX, XXXXXXX,X(UEPSI), X(URHO), X(UTAU),X(UUPSI),X(UTHET),X(UIOTA),X(UOMIC),  X(UPI), _______,
-  _______,X(UALPH),X(USIGM),X(UDELT), X(UPHI),X(UGAMM), X(UETA),  X(UXI),X(UKAPP),X(ULAMB), KC_QUOT, _______,
-  _______,X(UZETA), X(UCHI), X(UPSI),X(UOMEG),X(UBETA),  X(UNU),  X(UMU), KC_COMM, KC_DOT,  KC_SLSH, _______,
+  _______, 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, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                                            _______, _______, _______
 ),
@@ -855,9 +855,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_GREEKL] = LAYOUT(
-  _______, XXXXXXX,X(FSIGM),X(LEPSI), X(LRHO), X(LTAU),X(LUPSI),X(LTHET),X(LIOTA),X(LOMIC),  X(LPI), _______,
-  _______,X(LALPH),X(LSIGM),X(LDELT), X(LPHI),X(LGAMM), X(LETA),  X(LXI),X(LKAPP),X(LLAMB), KC_QUOT, _______,
-  _______,X(LZETA), X(LCHI), X(LPSI),X(LOMEG),X(LBETA),  X(LNU),  X(LMU), KC_COMM, KC_DOT,  KC_SLSH, _______,
+  _______, 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, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                                            _______, _______, _______
 ),
@@ -893,10 +893,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_EMOJI] = LAYOUT(
-  X(HART2), X(CRY2),X(WEARY),X(EYERT),X(SMIRK), X(TJOY),X(RECYC),X(UNAMU),X(MUSIC),X(OKHND),X(PENSV), X(PHEW),
-  X(THMUP), X(PRAY),X(SMILE),X(SMIL2),X(FLUSH), X(GRIN),X(HEART),  X(BYE), X(KISS),X(CELEB), X(COOL),X(NOEVS),
-  X(THMDN),X(SLEEP), X(CLAP),  X(CRY),  X(VIC),X(BHART),  X(SUN),X(SMEYE), X(WINK), X(MOON),X(CONFU),X(NOEVH),
-    X(POO), X(EYES), X(HUNRD),_______, X(SKULL),X(HORNS), X(HALO), X(FEAR),_______,X(YUMMY),X(DISAP),X(NOEVK),
+  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),
                                            _______, _______, _______
 ),
 
@@ -1303,8 +1303,8 @@ void turn_off_capslock(void) {
     rgbsps_send();
   }
 
-  void led_set_user(uint8_t usb_led) {
-    bool new_capslock = usb_led & (1<<USB_LED_CAPS_LOCK);
+  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);
@@ -1313,6 +1313,7 @@ void turn_off_capslock(void) {
       }
       rgbsps_send();
     }
+    return false;
   }
 #endif
 
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
index 1d299c229932..37cff59cb1fb 100644
--- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
@@ -782,9 +782,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_PUNC] = LAYOUT(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, X(LTEQ), X(GTEQ), _______,
-  KC_GRV,  KC_ASTR, KC_BSLS, KC_MINS,  KC_EQL, KC_SLSH, X(NOTEQ),KC_LPRN, KC_RPRN, KC_LABK, KC_RABK, _______,
-  KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, X(PLMIN),KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, _______,
+  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, _______,
                                            _______, _______, _______
 ),
@@ -839,9 +839,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_GREEKU] = LAYOUT(
-  _______, XXXXXXX, XXXXXXX,X(UEPSI), X(URHO), X(UTAU),X(UUPSI),X(UTHET),X(UIOTA),X(UOMIC),  X(UPI), _______,
-  _______,X(UALPH),X(USIGM),X(UDELT), X(UPHI),X(UGAMM), X(UETA),  X(UXI),X(UKAPP),X(ULAMB), KC_QUOT, _______,
-  _______,X(UZETA), X(UCHI), X(UPSI),X(UOMEG),X(UBETA),  X(UNU),  X(UMU), KC_COMM, KC_DOT,  KC_SLSH, _______,
+  _______, 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, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                                            _______, _______, _______
 ),
@@ -858,9 +858,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_GREEKL] = LAYOUT(
-  _______, XXXXXXX,X(FSIGM),X(LEPSI), X(LRHO), X(LTAU),X(LUPSI),X(LTHET),X(LIOTA),X(LOMIC),  X(LPI), _______,
-  _______,X(LALPH),X(LSIGM),X(LDELT), X(LPHI),X(LGAMM), X(LETA),  X(LXI),X(LKAPP),X(LLAMB), KC_QUOT, _______,
-  _______,X(LZETA), X(LCHI), X(LPSI),X(LOMEG),X(LBETA),  X(LNU),  X(LMU), KC_COMM, KC_DOT,  KC_SLSH, _______,
+  _______, 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, _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                                            _______, _______, _______
 ),
@@ -896,10 +896,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_EMOJI] = LAYOUT(
-  X(HART2), X(CRY2),X(WEARY),X(EYERT),X(SMIRK), X(TJOY),X(RECYC),X(UNAMU),X(MUSIC),X(OKHND),X(PENSV), X(PHEW),
-  X(THMUP), X(PRAY),X(SMILE),X(SMIL2),X(FLUSH), X(GRIN),X(HEART),  X(BYE), X(KISS),X(CELEB), X(COOL),X(NOEVS),
-  X(THMDN),X(SLEEP), X(CLAP),  X(CRY),  X(VIC),X(BHART),  X(SUN),X(SMEYE), X(WINK), X(MOON),X(CONFU),X(NOEVH),
-    X(POO), X(EYES), X(HUNRD),_______, X(SKULL),X(HORNS), X(HALO), X(FEAR),_______,X(YUMMY),X(DISAP),X(NOEVK),
+  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),
                                            _______, _______, _______
 ),
 
@@ -1306,8 +1306,8 @@ void turn_off_capslock(void) {
     rgbsps_send();
   }
 
-  void led_set_user(uint8_t usb_led) {
-    bool new_capslock = usb_led & (1<<USB_LED_CAPS_LOCK);
+  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);
@@ -1316,6 +1316,7 @@ void turn_off_capslock(void) {
       }
       rgbsps_send();
     }
+    return false;
   }
 #endif
 
diff --git a/keyboards/handwired/promethium/rules.mk b/keyboards/handwired/promethium/rules.mk
index a0be87690e18..609c4d0e7e57 100644
--- a/keyboards/handwired/promethium/rules.mk
+++ b/keyboards/handwired/promethium/rules.mk
@@ -18,7 +18,6 @@ PS2_ENABLE = yes
 PS2_DRIVER = interrupt
 CUSTOM_MATRIX = yes
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
 WS2812_DRIVER_REQUIRED = yes
 
 SRC += rgbsps.c
diff --git a/keyboards/handwired/pterodactyl/config.h b/keyboards/handwired/pterodactyl/config.h
index 40aee1e05e60..ff53a1970dbc 100644
--- a/keyboards/handwired/pterodactyl/config.h
+++ b/keyboards/handwired/pterodactyl/config.h
@@ -37,8 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_MAX_SPEED    7
 #define MOUSEKEY_WHEEL_DELAY  0
 
-#define TAPPING_TOGGLE  1
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
diff --git a/keyboards/handwired/pterodactyl/info.json b/keyboards/handwired/pterodactyl/info.json
index 213b7aa53bbf..ad83f34999d2 100644
--- a/keyboards/handwired/pterodactyl/info.json
+++ b/keyboards/handwired/pterodactyl/info.json
@@ -11,6 +11,12 @@
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "debounce": 0,
+  "tapping": {
+    "toggle": 1
+  },
+  "bluetooth": {
+    "driver": "bluefruit_le"
+  },
   "layouts": {
     "LAYOUT_pterodactyl": {
       "layout": [
diff --git a/keyboards/handwired/pterodactyl/rules.mk b/keyboards/handwired/pterodactyl/rules.mk
index eb2487d4103e..9f0cabc750f4 100644
--- a/keyboards/handwired/pterodactyl/rules.mk
+++ b/keyboards/handwired/pterodactyl/rules.mk
@@ -16,7 +16,6 @@ AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes
 CUSTOM_MATRIX = yes
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
 
 SRC += matrix.c
 QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/info.json
index b78ca3c807e0..7fba95f9d134 100644
--- a/keyboards/handwired/qc60/info.json
+++ b/keyboards/handwired/qc60/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0C60",
     "device_version": "1.0.0"
   },
+  "rgblight": {
+    "led_count": 1
+  },
   "ws2812": {
     "pin": "D3"
   },
diff --git a/keyboards/handwired/qc60/proto/config.h b/keyboards/handwired/qc60/proto/config.h
deleted file mode 100644
index a64c4ebeecbd..000000000000
--- a/keyboards/handwired/qc60/proto/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 1    // Number of LEDs
diff --git a/keyboards/handwired/riblee_f401/config.h b/keyboards/handwired/riblee_f401/config.h
index 09a304e1c735..3e384e5b5b36 100644
--- a/keyboards/handwired/riblee_f401/config.h
+++ b/keyboards/handwired/riblee_f401/config.h
@@ -16,6 +16,7 @@
 
 #pragma once
 
-#define MOUSEKEY_INTERVAL 32
+#define BACKLIGHT_PWM_DRIVER PWMD5
+#define BACKLIGHT_PWM_CHANNEL 1
 
-#define TAPPING_TERM 175
\ No newline at end of file
+#define MOUSEKEY_INTERVAL 32
diff --git a/keyboards/handwired/riblee_f401/halconf.h b/keyboards/handwired/riblee_f401/halconf.h
index 3c20471df1a0..b537d56c2687 100644
--- a/keyboards/handwired/riblee_f401/halconf.h
+++ b/keyboards/handwired/riblee_f401/halconf.h
@@ -23,5 +23,6 @@
 
 #define SERIAL_USB_BUFFERS_SIZE 256
 
-#include_next <halconf.h>
+#define HAL_USE_PWM TRUE
 
+#include_next <halconf.h>
diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/info.json
index 7b9b320b98be..933973d5f39a 100644
--- a/keyboards/handwired/riblee_f401/info.json
+++ b/keyboards/handwired/riblee_f401/info.json
@@ -8,13 +8,15 @@
         "pid": "0x002A",
         "device_version": "0.0.1"
     },
+    "tapping": {
+        "term": 175
+    },
     "matrix_pins": {
         "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
         "rows": ["A6", "A5", "A4", "A3", "A2"]
     },
     "diode_direction": "COL2ROW",
     "backlight": {
-        "driver": "software",
         "pin": "A0",
         "levels": 5
     },
diff --git a/keyboards/handwired/riblee_f401/mcuconf.h b/keyboards/handwired/riblee_f401/mcuconf.h
new file mode 100644
index 000000000000..674f5e362fa4
--- /dev/null
+++ b/keyboards/handwired/riblee_f401/mcuconf.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM5
+#define STM32_PWM_USE_TIM5 TRUE
diff --git a/keyboards/handwired/riblee_f411/config.h b/keyboards/handwired/riblee_f411/config.h
index 425b35f266ad..c39cbc87f5e9 100644
--- a/keyboards/handwired/riblee_f411/config.h
+++ b/keyboards/handwired/riblee_f411/config.h
@@ -17,5 +17,3 @@
 #pragma once
 
 #define MOUSEKEY_INTERVAL 32
-
-#define TAPPING_TERM 175
diff --git a/keyboards/handwired/riblee_f411/info.json b/keyboards/handwired/riblee_f411/info.json
index d13dfb229190..1c957e994043 100644
--- a/keyboards/handwired/riblee_f411/info.json
+++ b/keyboards/handwired/riblee_f411/info.json
@@ -8,6 +8,9 @@
         "pid": "0x002B",
         "device_version": "0.0.1"
     },
+    "tapping": {
+        "term": 175
+    },
     "matrix_pins": {
         "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B14", "A0", "B8", "B9"],
         "rows": ["A6", "A5", "A4", "A3", "A2"]
diff --git a/keyboards/handwired/riblee_split/config.h b/keyboards/handwired/riblee_split/config.h
new file mode 100644
index 000000000000..c3b0720ba5df
--- /dev/null
+++ b/keyboards/handwired/riblee_split/config.h
@@ -0,0 +1,11 @@
+// Copyright 2023 Daniel Reibl (@riblee)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// If the pin is high, then the controller assumes it is the left hand, and if it’s low, it’s assumed to be the right side.
+#define SPLIT_HAND_PIN C15
+
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN B6
+#define SERIAL_USART_RX_PIN B7
diff --git a/keyboards/handwired/riblee_split/halconf.h b/keyboards/handwired/riblee_split/halconf.h
new file mode 100644
index 000000000000..1d5c3fd700ff
--- /dev/null
+++ b/keyboards/handwired/riblee_split/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Daniel Reibl (@riblee)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SERIAL TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/riblee_split/info.json b/keyboards/handwired/riblee_split/info.json
new file mode 100644
index 000000000000..49b5ca3a54f2
--- /dev/null
+++ b/keyboards/handwired/riblee_split/info.json
@@ -0,0 +1,108 @@
+{
+    "manufacturer": "Riblee",
+    "keyboard_name": "Split",
+    "maintainer": "riblee",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B1", "B0", "A7", "A6", "A5"],
+        "rows": ["A4", "A3", "A2", "A1", "A0"]
+    },
+    "development_board": "blackpill_f411",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0xFEED",
+        "pid": "0x2B2B"
+    },
+    "split": {
+        "enabled": true,
+        "transport": {
+            "sync_matrix_state": true
+        }
+    },
+    "community_layouts": ["ortho_5x12"],
+    "layouts": {
+        "LAYOUT_ortho_5x12": {
+            "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 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": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 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": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 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": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "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": [9, 0], "x": 7, "y": 4},
+                {"matrix": [9, 1], "x": 8, "y": 4},
+                {"matrix": [9, 2], "x": 9, "y": 4},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/riblee_split/keymaps/default/keymap.c b/keyboards/handwired/riblee_split/keymaps/default/keymap.c
new file mode 100644
index 000000000000..f954599c90ee
--- /dev/null
+++ b/keyboards/handwired/riblee_split/keymaps/default/keymap.c
@@ -0,0 +1,155 @@
+// Copyright 2023 Daniel Reibl (@riblee)
+// 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 layer_names {
+  _QWERTY,
+  _COLEMAK,
+  _DVORAK,
+  _LOWER,
+  _RAISE,
+  _ADJUST
+};
+
+enum custom_keycodes {
+  QWERTY = SAFE_RANGE,
+  COLEMAK,
+  DVORAK,
+  LOWER,
+  RAISE,
+  ADJUST,
+};
+
+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 |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+     * `-----------------------------------------------------------------------------------'
+     */
+     [_QWERTY] = 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_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 ,
+       ADJUST,  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 |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+     * `-----------------------------------------------------------------------------------'
+     */
+     [_COLEMAK] = 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_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 ,
+       ADJUST,  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 |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+     * `-----------------------------------------------------------------------------------'
+     */
+     [_DVORAK] = 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_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 ,
+       ADJUST,  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 | | Home | End  |      |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+     * `-----------------------------------------------------------------------------------'
+     */
+     [_LOWER] = LAYOUT_ortho_5x12(
+       KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_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,
+       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
+     ),
+ 
+     /* 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_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_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|RGB Tg|RGB Md|Hue Up|Hue Dn|Sat Up|Sat Dn|Val Up|Val Dn|      |  Del |
+     * |------+------+------+------+------+-------------+------+------+------+------+------|
+     * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
+     * |------+------+------+------+------+------|------+------+------+------+------+------|
+     * |      |      |      |      |      |      |      |      |      |      |      |      |
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * |      |      |      |      |      |             |      |      |      |      |      |
+     * `-----------------------------------------------------------------------------------'
+     */
+     [_ADJUST] =  LAYOUT_ortho_5x12(
+       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,  COLEMAK, DVORAK,  _______, _______,
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+     )
+
+};
diff --git a/keyboards/handwired/riblee_split/mcuconf.h b/keyboards/handwired/riblee_split/mcuconf.h
new file mode 100644
index 000000000000..4ea061c7bf36
--- /dev/null
+++ b/keyboards/handwired/riblee_split/mcuconf.h
@@ -0,0 +1,7 @@
+// Copyright 2023 Daniel Reibl (@riblee)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include_next <mcuconf.h>
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/handwired/riblee_split/readme.md b/keyboards/handwired/riblee_split/readme.md
new file mode 100644
index 000000000000..b0acf5b3ba6f
--- /dev/null
+++ b/keyboards/handwired/riblee_split/readme.md
@@ -0,0 +1,24 @@
+# Handwired Split
+
+This is a compact (12x5) ortholinear split keyboard.
+
+* Keyboard Maintainer: [Daniel Reibl](https://github.com/riblee)
+* Hardware Supported: STM32F411 BlackPill
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/riblee_split:default
+
+Flashing example for this keyboard:
+
+    make handwired/riblee_split: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/riblee_split/rules.mk b/keyboards/handwired/riblee_split/rules.mk
new file mode 100644
index 000000000000..c6e298832137
--- /dev/null
+++ b/keyboards/handwired/riblee_split/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = usart
diff --git a/keyboards/handwired/scottokeebs/scottoalp/info.json b/keyboards/handwired/scottokeebs/scottoalp/info.json
index d6262e11e64b..7a4210bb403a 100644
--- a/keyboards/handwired/scottokeebs/scottoalp/info.json
+++ b/keyboards/handwired/scottokeebs/scottoalp/info.json
@@ -65,11 +65,11 @@
                 { "matrix": [2, 9], "x": 9, "y": 2 },
 
                 // Row 4
-                { "matrix": [3, 1], "x": 1, "y": 3 },
-                { "matrix": [3, 2], "x": 2, "y": 3 },
-                { "matrix": [3, 4], "x": 4, "y": 3 },
-                { "matrix": [3, 6], "x": 6, "y": 3 },
-                { "matrix": [3, 7], "x": 7, "y": 3 }
+                { "matrix": [3, 1], "x": 1.5, "y": 3 },
+                { "matrix": [3, 2], "x": 2.5, "y": 3 },
+                { "matrix": [3, 4], "x": 3.5, "y": 3, "w": 3 },
+                { "matrix": [3, 6], "x": 6.5, "y": 3 },
+                { "matrix": [3, 7], "x": 7.5, "y": 3 }
             ]
         }
     }
diff --git a/keyboards/handwired/scottokeebs/scottocmd/info.json b/keyboards/handwired/scottokeebs/scottocmd/info.json
index d945b70ce9cc..a26b95c1db4a 100644
--- a/keyboards/handwired/scottokeebs/scottocmd/info.json
+++ b/keyboards/handwired/scottokeebs/scottocmd/info.json
@@ -35,54 +35,54 @@
         "LAYOUT_ortho_4_3x10_4": {
             "layout": [
                 // Row 1 (Macros)
-                {"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, 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": 10.5, "y": 0},
 
                 // Row 2
-                {"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, 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},
 
                 // Row 3
-                {"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, 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},
 
                 // Row 4
-                {"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, 1], "x": 1.5, "y": 3},
+                {"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},
 
                 // Row 5
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-                {"matrix": [4, 9], "x": 9, "y": 4},
-                {"matrix": [4, 10], "x": 10, "y": 4}
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.75},
+                {"matrix": [4, 5], "x": 3.25, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 9.5, "y": 4},
+                {"matrix": [4, 10], "x": 10.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/scottokeebs/scottoergo/info.json b/keyboards/handwired/scottokeebs/scottoergo/info.json
index cc4fb126b6e3..4f6d955271a8 100644
--- a/keyboards/handwired/scottokeebs/scottoergo/info.json
+++ b/keyboards/handwired/scottokeebs/scottoergo/info.json
@@ -28,48 +28,48 @@
         "LAYOUT_split_3x5_3": {
             "layout": [
                 // Row 1
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "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 },
-                { "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, 3], "x": 3, "y": 0.25 },
+                { "matrix": [0, 4], "x": 4, "y": 0.5 },
+                { "matrix": [0, 5], "x": 7, "y": 0.5 },
+                { "matrix": [0, 6], "x": 8, "y": 0.25 },
+                { "matrix": [0, 7], "x": 9, "y": 0 },
+                { "matrix": [0, 8], "x": 10, "y": 0.25 },
+                { "matrix": [0, 9], "x": 11, "y": 0.5 },
 
                 // Row 2
-                { "matrix": [1, 0], "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "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 },
-                { "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, 3], "x": 3, "y": 1.25 },
+                { "matrix": [1, 4], "x": 4, "y": 1.5 },
+                { "matrix": [1, 5], "x": 7, "y": 1.5 },
+                { "matrix": [1, 6], "x": 8, "y": 1.25 },
+                { "matrix": [1, 7], "x": 9, "y": 1 },
+                { "matrix": [1, 8], "x": 10, "y": 1.25 },
+                { "matrix": [1, 9], "x": 11, "y": 1.5 },
 
                 // Row 3
-                { "matrix": [2, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "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 },
-                { "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, 3], "x": 3, "y": 2.25 },
+                { "matrix": [2, 4], "x": 4, "y": 2.5 },
+                { "matrix": [2, 5], "x": 7, "y": 2.5 },
+                { "matrix": [2, 6], "x": 8, "y": 2.25 },
+                { "matrix": [2, 7], "x": 9, "y": 2 },
+                { "matrix": [2, 8], "x": 10, "y": 2.25 },
+                { "matrix": [2, 9], "x": 11, "y": 2.5 },
 
                 // Row 4
-                { "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, 2], "x": 2.5, "y": 3.25 },
+                { "matrix": [3, 3], "x": 3.5, "y": 3.5 },
+                { "matrix": [3, 4], "x": 4.5, "y": 3.75 },
+                { "matrix": [3, 5], "x": 6.5, "y": 3.75 },
+                { "matrix": [3, 6], "x": 7.5, "y": 3.5 },
+                { "matrix": [3, 7], "x": 8.5, "y": 3.25 }
             ]
         }
     }
diff --git a/keyboards/handwired/scottokeebs/scottofly/info.json b/keyboards/handwired/scottokeebs/scottofly/info.json
new file mode 100644
index 000000000000..5255a5baf49f
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottofly/info.json
@@ -0,0 +1,78 @@
+{
+    "manufacturer": "ScottoKeebs",
+    "keyboard_name": "ScottoFly",
+    "maintainer": "joe-scotto",
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        //  3, 4, 5, 6, 7, 8, 9, A3, A2, A1
+        "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6"],
+
+        // 15, 14, 16, 10
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "url": "https://scottokeebs.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0009",
+        "vid": "0xFEED"
+    },
+    "community_layouts": ["split_3x5_3"],
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                // Row 1
+                { "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 },
+
+                // Row 2
+                { "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 },
+
+                // Row 3
+                { "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 },
+
+                // Row 4
+                { "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 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h b/keyboards/handwired/scottokeebs/scottofly/keymaps/default/config.h
similarity index 100%
rename from keyboards/handwired/jscotto/scotto36/keymaps/default/config.h
rename to keyboards/handwired/scottokeebs/scottofly/keymaps/default/config.h
diff --git a/keyboards/handwired/scottokeebs/scottofly/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottofly/keymaps/default/keymap.c
new file mode 100644
index 000000000000..2633845d509e
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottofly/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/*
+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_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_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, KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT), KC_ESC
+    ),
+    [1] = LAYOUT_split_3x5_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, KC_TRNS,  KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_split_3x5_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, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = 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_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, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottofly/readme.md b/keyboards/handwired/scottokeebs/scottofly/readme.md
new file mode 100644
index 000000000000..ae51e0ef75bb
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottofly/readme.md
@@ -0,0 +1,27 @@
+# ScottoFly
+
+![ScottoFly](https://i.imgur.com/TXuNxt7h.jpg)
+
+A 36-key split monoblock ergonomic column-staggered ortholinear keyboard with 20° of angle on each half. 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/scottofly:default
+
+Flashing example for this keyboard:
+
+    make handwired/scottokeebs/scottofly: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/scottofly/rules.mk b/keyboards/handwired/scottokeebs/scottofly/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottofly/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottofrog/info.json b/keyboards/handwired/scottokeebs/scottofrog/info.json
index 202626b70fff..147f2d8aa77d 100644
--- a/keyboards/handwired/scottokeebs/scottofrog/info.json
+++ b/keyboards/handwired/scottokeebs/scottofrog/info.json
@@ -43,11 +43,11 @@
                 { "matrix": [2, 3], "x": 3, "y": 2 },
                 { "matrix": [2, 4], "x": 4, "y": 2 },
                 { "matrix": [2, 5], "x": 5, "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, 5], "x": 5, "y": 3 },
-                { "matrix": [3, 6], "x": 6, "y": 3 }
+                { "matrix": [3, 0], "x": 0, "y": 2, "h": 2 },
+                { "matrix": [3, 1], "x": 1, "y": 3, "w": 1.5 },
+                { "matrix": [3, 3], "x": 2.5, "y": 3, "w": 2 },
+                { "matrix": [3, 5], "x": 4.5, "y": 3, "w": 1.5 },
+                { "matrix": [3, 6], "x": 6, "y": 2, "h": 2 }
             ]
         }
     }
diff --git a/keyboards/handwired/scottokeebs/scottogame/info.json b/keyboards/handwired/scottokeebs/scottogame/info.json
index 5c300b866e44..912cfdfaaa2c 100644
--- a/keyboards/handwired/scottokeebs/scottogame/info.json
+++ b/keyboards/handwired/scottokeebs/scottogame/info.json
@@ -38,7 +38,7 @@
                 { "matrix": [0, 2], "x": 2, "y": 0 },
                 { "matrix": [0, 3], "x": 3, "y": 0 },
                 { "matrix": [0, 4], "x": 4, "y": 0 },
-                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 6], "x": 5.125, "y": 0, "w": 2.75 },
 
                 // Row 2
                 { "matrix": [1, 0], "x": 0, "y": 1 },
@@ -79,8 +79,8 @@
                 // Row 5
                 { "matrix": [4, 1], "x": 1, "y": 4 },
                 { "matrix": [4, 2], "x": 2, "y": 4 },
-                { "matrix": [4, 3], "x": 3, "y": 4 },
-                { "matrix": [4, 6], "x": 6, "y": 4 },
+                { "matrix": [4, 3], "x": 3, "y": 4, "w": 2 },
+                { "matrix": [4, 6], "x": 5, "y": 4, "w": 2 },
                 { "matrix": [4, 7], "x": 7, "y": 4 },
                 { "matrix": [4, 8], "x": 8, "y": 4 }
             ]
diff --git a/keyboards/handwired/scottokeebs/scottoinvader/info.json b/keyboards/handwired/scottokeebs/scottoinvader/info.json
index 89a4fca4b487..2a9054cd4f63 100644
--- a/keyboards/handwired/scottokeebs/scottoinvader/info.json
+++ b/keyboards/handwired/scottokeebs/scottoinvader/info.json
@@ -30,47 +30,47 @@
         "LAYOUT_split_3x5_3": {
             "layout": [
                 // Row 1
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "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 },
-                { "matrix": [0, 4], "x": 4, "y": 0 },
-                { "matrix": [0, 5], "x": 5, "y": 0 },
-                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0.25 },
+                { "matrix": [0, 4], "x": 4, "y": 0.5 },
+                { "matrix": [0, 5], "x": 5, "y": 0.5 },
+                { "matrix": [0, 6], "x": 6, "y": 0.25 },
                 { "matrix": [0, 7], "x": 7, "y": 0 },
-                { "matrix": [0, 8], "x": 8, "y": 0 },
-                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0.25 },
+                { "matrix": [0, 9], "x": 9, "y": 0.5 },
 
                 // Row 2
-                { "matrix": [1, 0], "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "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 },
-                { "matrix": [1, 4], "x": 4, "y": 1 },
-                { "matrix": [1, 5], "x": 5, "y": 1 },
-                { "matrix": [1, 6], "x": 6, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "matrix": [1, 4], "x": 4, "y": 1.5 },
+                { "matrix": [1, 5], "x": 5, "y": 1.5 },
+                { "matrix": [1, 6], "x": 6, "y": 1.25 },
                 { "matrix": [1, 7], "x": 7, "y": 1 },
-                { "matrix": [1, 8], "x": 8, "y": 1 },
-                { "matrix": [1, 9], "x": 9, "y": 1 },
+                { "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "matrix": [1, 9], "x": 9, "y": 1.5 },
 
                 // Row 3
-                { "matrix": [2, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "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 },
-                { "matrix": [2, 4], "x": 4, "y": 2 },
-                { "matrix": [2, 5], "x": 5, "y": 2 },
-                { "matrix": [2, 6], "x": 6, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2.25 },
+                { "matrix": [2, 4], "x": 4, "y": 2.5 },
+                { "matrix": [2, 5], "x": 5, "y": 2.5 },
+                { "matrix": [2, 6], "x": 6, "y": 2.25 },
                 { "matrix": [2, 7], "x": 7, "y": 2 },
-                { "matrix": [2, 8], "x": 8, "y": 2 },
-                { "matrix": [2, 9], "x": 9, "y": 2 },
+                { "matrix": [2, 8], "x": 8, "y": 2.25 },
+                { "matrix": [2, 9], "x": 9, "y": 2.5 },
 
                 // Row 4
                 { "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, 3], "x": 3, "y": 3.25 },
+                { "matrix": [3, 4], "x": 4, "y": 3.5 },
+                { "matrix": [3, 5], "x": 5, "y": 3.5 },
+                { "matrix": [3, 6], "x": 6, "y": 3.25 },
                 { "matrix": [3, 7], "x": 7, "y": 3 }
             ]
         }
diff --git a/keyboards/handwired/scottokeebs/scottolong/info.json b/keyboards/handwired/scottokeebs/scottolong/info.json
new file mode 100644
index 000000000000..156772d21396
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottolong/info.json
@@ -0,0 +1,72 @@
+{
+    "manufacturer": "ScottoKeebs",
+    "keyboard_name": "ScottoLong",
+    "maintainer": "joe-scotto",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15"],
+        "rows": ["GP2", "GP3", "GP4", "GP5"]
+    },
+    "processor": "RP2040",
+    "url": "https://scottokeebs.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0011",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT_ortho_3x10_3": {
+            "layout": [
+                // Row 1
+                { "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 },
+
+                // Row 2
+                { "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 },
+
+                // Row 3
+                { "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 },
+
+                // Row 4
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 4], "x": 4, "y": 3 },
+                { "matrix": [3, 9], "x": 9, "y": 3 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h b/keyboards/handwired/scottokeebs/scottolong/keymaps/default/config.h
similarity index 100%
rename from keyboards/handwired/jscotto/scotto40/keymaps/default/config.h
rename to keyboards/handwired/scottokeebs/scottolong/keymaps/default/config.h
diff --git a/keyboards/handwired/scottokeebs/scottolong/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottolong/keymaps/default/keymap.c
new file mode 100644
index 000000000000..e63da854f006
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottolong/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/*
+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_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/scottolong/readme.md b/keyboards/handwired/scottokeebs/scottolong/readme.md
new file mode 100644
index 000000000000..bdea4ee350eb
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottolong/readme.md
@@ -0,0 +1,27 @@
+# ScottoLong
+
+![ScottoLong](https://i.imgur.com/AEQWXLlh.jpeg)
+
+A 33-key ortholinear keyboard with a 7u 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/scottolong:default
+
+Flashing example for this keyboard:
+
+    make handwired/scottokeebs/scottolong: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/scottolong/rules.mk b/keyboards/handwired/scottokeebs/scottolong/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottolong/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/info.json b/keyboards/handwired/scottokeebs/scottomacrodeck/info.json
new file mode 100644
index 000000000000..f238564c7fb3
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottomacrodeck/info.json
@@ -0,0 +1,52 @@
+{
+    "manufacturer": "ScottoKeebs",
+    "keyboard_name": "ScottoMacrodeck",
+    "maintainer": "joe-scotto",
+    "development_board": "promicro",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "build" : {
+        "lto": true,
+    },
+    "matrix_pins": {
+        "direct": [
+            ["D3", "D2", "D1", null],
+            ["D0", "D4", "C6", "D7"],
+            ["E6", "B4", "B5", "F4"]
+        ]
+    },
+    "url": "https://scottokeebs.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0015",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                // Row 1
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+
+                // Row 2
+                { "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 },
+
+                // Row 3
+                { "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 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/default/keymap.c
new file mode 100644
index 000000000000..c8becfca5809
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottomacrodeck/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+/*
+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_1, KC_2, KC_3,
+        KC_Q, KC_W, KC_E, KC_R,
+        KC_A, KC_S, KC_D, KC_F
+    )
+};
diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md b/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md
new file mode 100644
index 000000000000..4fc82f42c8bd
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottomacrodeck/readme.md
@@ -0,0 +1,29 @@
+# ScottoMacrodeck
+
+![ScottoMacrodeck](https://imgur.com/KVJuIVNh.jpeg)
+
+An 11-key macropad designed specifically for someone who games with a single thumb, however, it can be used as a traditional macropad. 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)
+
+# Compiling
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/scottokeebs/scottomacrodeck:default
+
+Flashing example for this keyboard:
+
+    make handwired/scottokeebs/scottomacrodeck: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/scottomacrodeck/rules.mk b/keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/handwired/scottokeebs/scottomouse/info.json b/keyboards/handwired/scottokeebs/scottomouse/info.json
new file mode 100644
index 000000000000..36f92f48e268
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottomouse/info.json
@@ -0,0 +1,39 @@
+{
+    "manufacturer": "ScottoKeebs",
+    "keyboard_name": "ScottoMouse",
+    "maintainer": "joe-scotto",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5"]
+        ]
+    },
+    "processor": "RP2040",
+    "url": "https://scottokeebs.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0018",
+        "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/scottokeebs/scottomouse/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottomouse/keymaps/default/keymap.c
new file mode 100644
index 000000000000..6cc4d9014446
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottomouse/keymaps/default/keymap.c
@@ -0,0 +1,24 @@
+/*
+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_MS_BTN1, KC_MS_BTN2, KC_MS_LEFT, KC_MS_UP,  KC_MS_DOWN, KC_MS_RIGHT
+    )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/config.h b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/config.h
new file mode 100644
index 000000000000..4b0d2cd2fb00
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/config.h
@@ -0,0 +1,26 @@
+/*
+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/>.
+*/
+
+#pragma once
+
+// 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
+
diff --git a/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/keymap.c b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/keymap.c
new file mode 100644
index 000000000000..d17ed1f28aab
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/keymap.c
@@ -0,0 +1,33 @@
+/*
+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 scroll_down[] = {KC_MS_BTN1, KC_MS_BTN2, KC_MS_DOWN, COMBO_END};
+const uint16_t PROGMEM scroll_up[] = {KC_MS_BTN1, KC_MS_BTN2, KC_MS_UP, COMBO_END};
+const uint16_t PROGMEM middle_click[] = {KC_MS_BTN1, KC_MS_BTN2, COMBO_END};
+combo_t key_combos[] = {
+    COMBO(scroll_down, KC_MS_WH_DOWN),
+    COMBO(scroll_up, KC_MS_WH_UP),
+    COMBO(middle_click, KC_MS_BTN3)
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_MS_BTN1, KC_MS_BTN2, KC_MS_LEFT, KC_MS_UP,  KC_MS_DOWN, KC_MS_RIGHT
+    )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/rules.mk b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/rules.mk
new file mode 100644
index 000000000000..ab1e438182a3
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/handwired/scottokeebs/scottomouse/readme.md b/keyboards/handwired/scottokeebs/scottomouse/readme.md
new file mode 100644
index 000000000000..4102f633107d
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottomouse/readme.md
@@ -0,0 +1,29 @@
+# ScottoMouse
+
+![ScottoMouse](https://i.imgur.com/yjnhyXWh.jpeg)
+
+A 6-key macropad that utilizes [QMK mouse keys](https://github.com/qmk/qmk_firmware/blob/master/docs/feature_mouse_keys.md) to emulate a mouse, case files available [here](https://github.com/joe-scotto/scottokeebs.git).
+
+*   Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
+*   Hardware Supported: Raspberry Pi Pico
+*   Hardware Availability: [ScottoKeebs](https://scottokeebs.com), [Amazon](https://amazon.com), [Ali](https://amazon.com)
+
+# Compiling
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/scottokeebs/scottomouse:default
+
+Flashing example for this keyboard:
+
+    make handwired/scottokeebs/scottomouse: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/scottomouse/rules.mk b/keyboards/handwired/scottokeebs/scottomouse/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottomouse/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottonum/info.json b/keyboards/handwired/scottokeebs/scottonum/info.json
index 2907b47af86a..f71f75d62b5a 100644
--- a/keyboards/handwired/scottokeebs/scottonum/info.json
+++ b/keyboards/handwired/scottokeebs/scottonum/info.json
@@ -40,16 +40,16 @@
                 { "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, 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 },
-                { "matrix": [4, 0], "x": 0, "y": 4 },
-                { "matrix": [4, 1], "x": 1, "y": 3 }
+                { "matrix": [3, 3], "x": 3, "y": 3, "h": 2 },
+                { "matrix": [4, 0], "x": 0, "y": 4, "w": 2 },
+                { "matrix": [4, 1], "x": 2, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/handwired/scottokeebs/scottoslant/info.json b/keyboards/handwired/scottokeebs/scottoslant/info.json
new file mode 100644
index 000000000000..ebaa1b530c2d
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoslant/info.json
@@ -0,0 +1,75 @@
+{
+    "manufacturer": "ScottoKeebs",
+    "keyboard_name": "ScottoSlant",
+    "maintainer": "joe-scotto",
+    "development_board": "promicro",
+    "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", "B5", "F4", "F5"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "url": "https://scottokeebs.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0004",
+        "vid": "0x534B"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                // Row 1
+                { "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 },
+
+                // Row 2
+                { "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 },
+
+                // Row 3
+                { "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 },
+
+                // Row 4
+                { "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, 6], "x": 6, "y": 3 },
+                { "matrix": [3, 7], "x": 7, "y": 3 },
+                { "matrix": [3, 8], "x": 8, "y": 3 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h b/keyboards/handwired/scottokeebs/scottoslant/keymaps/default/config.h
similarity index 100%
rename from keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h
rename to keyboards/handwired/scottokeebs/scottoslant/keymaps/default/config.h
diff --git a/keyboards/handwired/scottokeebs/scottoslant/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottoslant/keymaps/default/keymap.c
new file mode 100644
index 000000000000..cd70c3ddc253
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoslant/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/*
+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(
+        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_ESC, KC_LCTL, KC_LALT, LGUI_T(KC_SPC),       LT(1, KC_TAB), LT(2, KC_ENT), KC_ESC
+    ),
+    [1] = LAYOUT(
+        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, 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_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, 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_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, KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h b/keyboards/handwired/scottokeebs/scottoslant/keymaps/scotto/config.h
similarity index 100%
rename from keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h
rename to keyboards/handwired/scottokeebs/scottoslant/keymaps/scotto/config.h
diff --git a/keyboards/handwired/scottokeebs/scottoslant/keymaps/scotto/keymap.c b/keyboards/handwired/scottokeebs/scottoslant/keymaps/scotto/keymap.c
new file mode 100644
index 000000000000..dc2d08d91053
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoslant/keymaps/scotto/keymap.c
@@ -0,0 +1,69 @@
+/*
+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(
+        KC_Q,         KC_W,   KC_F,    KC_P,    KC_G,           KC_J, KC_L,          KC_U,          KC_Y,   KC_BSPC,
+        KC_A,         KC_R,   KC_S,    KC_T,    KC_D,           KC_H, KC_N,          KC_E,          KC_I,   KC_O,
+        LSFT_T(KC_Z), KC_X,   KC_C,    KC_V,    KC_B,           KC_K, KC_M,          KC_COMMA,      KC_DOT, RSFT_T(KC_SLSH),
+                      KC_ESC, KC_LCTL, KC_LALT, LGUI_T(KC_SPC),       LT(1, KC_TAB), LT(2, KC_ENT), KC_ESC
+    ),
+    [1] = LAYOUT(
+        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_ESC,  KC_LCTL, KC_LALT, LGUI_T(KC_SPC),           KC_TRNS, KC_TRNS, KC_ESC
+    ),
+    [2] = LAYOUT(
+        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_ESC, KC_LCTL, KC_LALT, LGUI_T(KC_SPC),          KC_TRNS, KC_TRNS, KC_ESC
+    ),
+    [3] = LAYOUT(
+        KC_NO,  KC_NO,  KC_NO,   KC_NO,   KC_NO,          KC_NO, KC_NO,   KC_NO,   KC_NO, TO(4),
+        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_ESC, KC_LCTL, KC_LALT, LGUI_T(KC_SPC),        KC_TRNS, KC_TRNS, KC_ESC
+    ),
+    [4] = LAYOUT(
+        KC_Q,         KC_W,   KC_F,    KC_P,    KC_G,   KC_J, KC_L,          KC_U,          KC_Y,                    KC_BSPC,
+        KC_A,         KC_R,   KC_S,    KC_T,    KC_D,   KC_H, KC_N,          KC_E,          KC_I,                    KC_O,
+        LSFT_T(KC_Z), KC_X,   KC_C,    KC_V,    KC_B,   KC_K, KC_M,          KC_COMMA,      KC_DOT,                  RSFT_T(KC_SLSH),
+                      KC_ESC, KC_LALT, KC_LCTL, KC_SPC,       LT(5, KC_TAB), LT(6, KC_ENT), KC_ESC
+    ),
+    [5] = LAYOUT(
+        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_ESC,  KC_LALT, KC_LCTL, KC_SPC,            LT(5, KC_TAB), LT(6, KC_ENT), KC_ESC
+    ),
+    [6] = LAYOUT(
+        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(7),   KC_NO,   KC_NO,         KC_COMM,       KC_DOT,                  RSFT_T(KC_SLSH),
+                 KC_ESC, KC_LALT, KC_LCTL, KC_SPC,           LT(5, KC_TAB), LT(6, KC_ENT), KC_ESC
+    ),
+    [7] = LAYOUT(
+        KC_NO,  KC_NO,  KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,         KC_NO,         KC_NO,                   TO(0),
+        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_ESC, KC_LALT, KC_LCTL, KC_SPC,         LT(5, KC_TAB), LT(6, KC_ENT), KC_ESC
+    )
+};
diff --git a/keyboards/handwired/jscotto/scotto40/keymaps/default/rules.mk b/keyboards/handwired/scottokeebs/scottoslant/keymaps/scotto/rules.mk
similarity index 100%
rename from keyboards/handwired/jscotto/scotto40/keymaps/default/rules.mk
rename to keyboards/handwired/scottokeebs/scottoslant/keymaps/scotto/rules.mk
diff --git a/keyboards/handwired/scottokeebs/scottoslant/readme.md b/keyboards/handwired/scottokeebs/scottoslant/readme.md
new file mode 100644
index 000000000000..6bb237b6bf71
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoslant/readme.md
@@ -0,0 +1,28 @@
+# ScottoSlant
+
+![ScottoSlant](https://i.imgur.com/p10NGimh.jpg)
+
+A 37-key handwired 0.25u row-staggered keyboard with a 2u spacebar. 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/scottoslant:default
+
+Flashing example for this keyboard:
+
+    make handwired/scottokeebs/scottoslant: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/scottoslant/rules.mk b/keyboards/handwired/scottokeebs/scottoslant/rules.mk
new file mode 100644
index 000000000000..4da205a168c7
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoslant/rules.mk
@@ -0,0 +1 @@
+LTO_ENABLE = yes
diff --git a/keyboards/handwired/scottokeebs/scottosplit/info.json b/keyboards/handwired/scottokeebs/scottosplit/info.json
index 792084b82cca..a44ec329762e 100644
--- a/keyboards/handwired/scottokeebs/scottosplit/info.json
+++ b/keyboards/handwired/scottokeebs/scottosplit/info.json
@@ -30,48 +30,48 @@
         "LAYOUT_split_3x5_3": {
             "layout": [
                 // Row 1
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "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 },
-                { "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, 3], "x": 3, "y": 0.25 },
+                { "matrix": [0, 4], "x": 4, "y": 0.5 },
+                { "matrix": [0, 5], "x": 7, "y": 0.5 },
+                { "matrix": [0, 6], "x": 8, "y": 0.25 },
+                { "matrix": [0, 7], "x": 9, "y": 0 },
+                { "matrix": [0, 8], "x": 10, "y": 0.25 },
+                { "matrix": [0, 9], "x": 11, "y": 0.5 },
 
                 // Row 2
-                { "matrix": [1, 0], "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "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 },
-                { "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, 3], "x": 3, "y": 1.25 },
+                { "matrix": [1, 4], "x": 4, "y": 1.5 },
+                { "matrix": [1, 5], "x": 7, "y": 1.5 },
+                { "matrix": [1, 6], "x": 8, "y": 1.25 },
+                { "matrix": [1, 7], "x": 9, "y": 1 },
+                { "matrix": [1, 8], "x": 10, "y": 1.25 },
+                { "matrix": [1, 9], "x": 11, "y": 1.5 },
 
                 // Row 3
-                { "matrix": [2, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "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 },
-                { "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, 3], "x": 3, "y": 2.25 },
+                { "matrix": [2, 4], "x": 4, "y": 2.5 },
+                { "matrix": [2, 5], "x": 7, "y": 2.5 },
+                { "matrix": [2, 6], "x": 8, "y": 2.25 },
+                { "matrix": [2, 7], "x": 9, "y": 2 },
+                { "matrix": [2, 8], "x": 10, "y": 2.25 },
+                { "matrix": [2, 9], "x": 11, "y": 2.5 },
 
                 // Row 4
-                { "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, 2], "x": 2.5, "y": 3.75 },
+                { "matrix": [3, 3], "x": 3.5, "y": 4 },
+                { "matrix": [3, 4], "x": 4.5, "y": 4.25 },
+                { "matrix": [3, 5], "x": 6.5, "y": 4.25 },
+                { "matrix": [3, 6], "x": 7.5, "y": 4 },
+                { "matrix": [3, 7], "x": 8.5, "y": 3.75 }
             ]
         }
     }
diff --git a/keyboards/handwired/scottokeebs/scottostarter/info.json b/keyboards/handwired/scottokeebs/scottostarter/info.json
index ade3db28a0ee..5e6a70114bb5 100644
--- a/keyboards/handwired/scottokeebs/scottostarter/info.json
+++ b/keyboards/handwired/scottokeebs/scottostarter/info.json
@@ -38,7 +38,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, "w": 1.5},
 
                 // Row 2
                 {"matrix": [1, 0], "x": 0, "y": 1},
@@ -51,7 +51,7 @@
                 {"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, 10], "x": 10, "y": 1, "w": 1.5},
 
                 // Row 3
                 {"matrix": [2, 0], "x": 0, "y": 2},
@@ -64,7 +64,7 @@
                 {"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, 10], "x": 10, "y": 2, "w": 1.5},
 
                 // Row 4
                 {"matrix": [3, 0], "x": 0, "y": 3},
@@ -77,17 +77,17 @@
                 {"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, 10], "x": 10, "y": 3, "w": 1.5},
 
                 // Row 5
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 4], "x": 4, "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, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4},
+                {"matrix": [4, 4], "x": 3.5, "y": 4, "w": 3},
+                {"matrix": [4, 7], "x": 6.5, "y": 4},
+                {"matrix": [4, 8], "x": 7.5, "y": 4},
+                {"matrix": [4, 9], "x": 8.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/handwired/sejin_eat1010r2/rules.mk b/keyboards/handwired/sejin_eat1010r2/rules.mk
index a92b0993283e..8b137891791f 100644
--- a/keyboards/handwired/sejin_eat1010r2/rules.mk
+++ b/keyboards/handwired/sejin_eat1010r2/rules.mk
@@ -1,2 +1 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
diff --git a/keyboards/handwired/selene/config.h b/keyboards/handwired/selene/config.h
index 7ee210aa8463..31c0cc59f756 100644
--- a/keyboards/handwired/selene/config.h
+++ b/keyboards/handwired/selene/config.h
@@ -16,7 +16,5 @@
 
 #pragma once
 
-#define RGBLED_NUM 50
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/handwired/selene/info.json b/keyboards/handwired/selene/info.json
index 24cb90487c4a..b99e41bda580 100644
--- a/keyboards/handwired/selene/info.json
+++ b/keyboards/handwired/selene/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "led_count": 50
+  },
   "ws2812": {
     "pin": "A3"
   },
diff --git a/keyboards/handwired/slash/info.json b/keyboards/handwired/slash/info.json
index 070cbb2c7502..95abaeb9c710 100644
--- a/keyboards/handwired/slash/info.json
+++ b/keyboards/handwired/slash/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
     "matrix_pins": {
         "cols": ["D2", "F0", "F1", "F4", "F5", "F6", "F7", "D3"],
         "rows": ["C7", "D6", "B7", "B6", "B5", "D7", "C6", "D0"]
diff --git a/keyboards/handwired/slash/rules.mk b/keyboards/handwired/slash/rules.mk
index c99c2847ceaa..ca7f6f843fb2 100644
--- a/keyboards/handwired/slash/rules.mk
+++ b/keyboards/handwired/slash/rules.mk
@@ -14,4 +14,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
diff --git a/keyboards/handwired/sono1/stm32f103/rules.mk b/keyboards/handwired/sono1/stm32f103/rules.mk
index a92b0993283e..8b137891791f 100644
--- a/keyboards/handwired/sono1/stm32f103/rules.mk
+++ b/keyboards/handwired/sono1/stm32f103/rules.mk
@@ -1,2 +1 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
diff --git a/keyboards/handwired/split65/promicro/config.h b/keyboards/handwired/split65/promicro/config.h
index b92456da9811..f5c5ee3be295 100644
--- a/keyboards/handwired/split65/promicro/config.h
+++ b/keyboards/handwired/split65/promicro/config.h
@@ -15,8 +15,6 @@
  */
 #pragma once
 
-#define MATRIX_IO_DELAY 5
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 
 // Feature diable options
diff --git a/keyboards/handwired/split65/promicro/info.json b/keyboards/handwired/split65/promicro/info.json
index e1540d99a2c9..ea41cb3ac177 100644
--- a/keyboards/handwired/split65/promicro/info.json
+++ b/keyboards/handwired/split65/promicro/info.json
@@ -1,7 +1,8 @@
 {
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
+        "rows": ["D4", "C6", "D7", "E6", "B4"],
+        "io_delay": 5
     },
     "diode_direction": "COL2ROW",
     "split": {
diff --git a/keyboards/handwired/split65/stm32/config.h b/keyboards/handwired/split65/stm32/config.h
index 020e44f02edb..3d48891e7e74 100644
--- a/keyboards/handwired/split65/stm32/config.h
+++ b/keyboards/handwired/split65/stm32/config.h
@@ -21,8 +21,6 @@
 #define AUDIO_PIN_ALT A4
 #define AUDIO_PIN_ALT_AS_NEGATIVE
 
-#define MATRIX_IO_DELAY 5
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 #define SERIAL_USART_DRIVER SD1
 #define SERIAL_USART_TX_PAL_MODE 7
diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/info.json
index b9956ed7abcb..61aff0e7eab4 100644
--- a/keyboards/handwired/split65/stm32/info.json
+++ b/keyboards/handwired/split65/stm32/info.json
@@ -1,7 +1,8 @@
 {
     "matrix_pins": {
         "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9"],
-        "rows": ["B5", "B4", "B3", "B2", "B1"]
+        "rows": ["B5", "B4", "B3", "B2", "B1"],
+        "io_delay": 5
     },
     "diode_direction": "COL2ROW",
     "split": {
diff --git a/keyboards/handwired/split_cloud/config.h b/keyboards/handwired/split_cloud/config.h
new file mode 100644
index 000000000000..faa2750cafeb
--- /dev/null
+++ b/keyboards/handwired/split_cloud/config.h
@@ -0,0 +1,42 @@
+/*
+Copyright 2023 Cloud Chagnon <cloud.chagnon@ucalgary.ca>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* left/right via compilation flag */
+#define EE_HANDS
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronztize 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/handwired/split_cloud/info.json b/keyboards/handwired/split_cloud/info.json
new file mode 100644
index 000000000000..6d28728f69a5
--- /dev/null
+++ b/keyboards/handwired/split_cloud/info.json
@@ -0,0 +1,118 @@
+{
+    "keyboard_name": "Split-Cloud",
+    "manufacturer": "coolsa",
+    "maintainer": "Cloud Chagnon",
+    "url": "https://github.com/coolsa/cloud_keyboard",
+    "usb": {
+        "vid": "0xCC43",
+        "pid": "0x0001",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "bootmagic": {
+        "enabled": true
+    },
+    "features": {
+        "extrakey": true,
+        "nkro": true
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3",
+        "matrix_pins": {
+            "right": {
+                "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+                "rows": ["F7", "B1", "B3", "B2", "B6"]
+            }
+        },
+        "bootmagic": {
+            "matrix": [5, 5]
+        }
+    },
+    "stenography": {
+        "enabled": true,
+        "protocol": "all"
+    }
+    "development_board": "promicro",
+    "community_layouts": ["ortho_5x12"],
+    "layouts": {
+        "LAYOUT_ortho_5x12": {
+            "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": [5, 5], "x": 7, "y": 0},
+                {"matrix": [5, 4], "x": 8, "y": 0},
+                {"matrix": [5, 3], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 1], "x": 11, "y": 0},
+                {"matrix": [5, 0], "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": [6, 5], "x": 7, "y": 1},
+                {"matrix": [6, 4], "x": 8, "y": 1},
+                {"matrix": [6, 3], "x": 9, "y": 1},
+                {"matrix": [6, 2], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 0], "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": [7, 5], "x": 7, "y": 2},
+                {"matrix": [7, 4], "x": 8, "y": 2},
+                {"matrix": [7, 3], "x": 9, "y": 2},
+                {"matrix": [7, 2], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 0], "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": [8, 5], "x": 7, "y": 3},
+                {"matrix": [8, 4], "x": 8, "y": 3},
+                {"matrix": [8, 3], "x": 9, "y": 3},
+                {"matrix": [8, 2], "x": 10, "y": 3},
+                {"matrix": [8, 1], "x": 11, "y": 3},
+                {"matrix": [8, 0], "x": 12, "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": [9, 5], "x": 7, "y": 4},
+                {"matrix": [9, 4], "x": 8, "y": 4},
+                {"matrix": [9, 3], "x": 9, "y": 4},
+                {"matrix": [9, 2], "x": 10, "y": 4},
+                {"matrix": [9, 1], "x": 11, "y": 4},
+                {"matrix": [9, 0], "x": 12, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/split_cloud/keymaps/default/config.h b/keyboards/handwired/split_cloud/keymaps/default/config.h
new file mode 100644
index 000000000000..7a6ba5e65657
--- /dev/null
+++ b/keyboards/handwired/split_cloud/keymaps/default/config.h
@@ -0,0 +1,24 @@
+/*
+Copyright 2023 Cloud Chagnon <cloud.chagnon@ucalgary.ca>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should 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 defaults are different for the Tri Layers */
+#define TRI_LAYER_LOWER_LAYER 3
+#define TRI_LAYER_UPPER_LAYER 4
+#define TRI_LAYER_ADJUST_LAYER 6
+
diff --git a/keyboards/handwired/split_cloud/keymaps/default/keymap.c b/keyboards/handwired/split_cloud/keymaps/default/keymap.c
new file mode 100644
index 000000000000..f94a112c07d2
--- /dev/null
+++ b/keyboards/handwired/split_cloud/keymaps/default/keymap.c
@@ -0,0 +1,226 @@
+/* Copyright 2023 Cloud Chagnon
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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_steno.h"
+
+// clang-format off
+
+enum layer_names {
+    _QWERTY,
+    _COLEMAK,
+    _DVORAK,
+    _LOWER,
+    _RAISE,
+    _PLOVER,
+    _ADJUST
+};
+
+enum custom_keycodes {
+    QWERTY = SAFE_RANGE,
+    COLEMAK,
+    DVORAK,
+    PLOVER,
+    EXT_PLV
+};
+
+#define ST_BOLT QK_STENO_BOLT
+#define ST_GEM QK_STENO_GEMINI
+
+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  |RCtrl |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+     * `-----------------------------------------------------------------------------------'
+     */
+    [_QWERTY] = 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_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_LGUI, KC_LALT, KC_RCTL, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, 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  |RCtrl |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+     * `-----------------------------------------------------------------------------------'
+     */
+    [_COLEMAK] = 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_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 ,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_RCTL, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, 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  |RCtrl |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+     * `-----------------------------------------------------------------------------------'
+     */
+    [_DVORAK] = 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_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,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_RCTL, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, 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_ortho_5x12(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_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_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_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
+    ),
+
+    /* 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_5x12(
+        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, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        EXT_PLV, XXXXXXX, XXXXXXX, XXXXXXX, STN_A,   STN_O,   STN_E,   STN_U,   XXXXXXX, STN_PWR, STN_RE1, STN_RE2
+    ),
+
+    /* 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|Colemk|Dvorak|Plover|      |
+     * |------+------+------+------+------+------|------+------+------+------+------+------|
+     * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |TXBOLT|GEM RP|
+     * |------+------+------+------+------+------+------+------+------+------+------+------|
+     * |      |      |      |      |      |             |      |      |      |      |      |
+     * `-----------------------------------------------------------------------------------'
+     */
+    [_ADJUST] = LAYOUT_ortho_5x12(
+        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 ,
+        _______, _______, _______, _______, _______, _______, _______, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ST_BOLT, ST_GEM ,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+
+};
+
+// clang-format on
+
+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 PLOVER:
+            if (!record->event.pressed) {
+                layer_on(_PLOVER);
+            }
+            return false;
+        case EXT_PLV:
+            if (record->event.pressed) {
+                layer_off(_PLOVER);
+            }
+            return false;
+    }
+    return true;
+};
diff --git a/keyboards/handwired/split_cloud/keymaps/default/rules.mk b/keyboards/handwired/split_cloud/keymaps/default/rules.mk
new file mode 100644
index 000000000000..7c9bf212a6f5
--- /dev/null
+++ b/keyboards/handwired/split_cloud/keymaps/default/rules.mk
@@ -0,0 +1 @@
+TRI_LAYER_ENABLE = yes
diff --git a/keyboards/handwired/split_cloud/readme.md b/keyboards/handwired/split_cloud/readme.md
new file mode 100644
index 000000000000..1d2731727508
--- /dev/null
+++ b/keyboards/handwired/split_cloud/readme.md
@@ -0,0 +1,22 @@
+# Split-Cloud handwired keyboard
+
+The Split-Cloud is a split ortholinear 5x12 layout, forked from the Preonic and Nyquist keyboard models. The default layout adds extra options for some added game compatibility, two control keys for QEmu, and adds a steno layer based on the Planck example.
+
+![Split-Cloud](https://i.imgur.com/QoHAFeXh.jpg)
+
+* Keyboard Maintainer: [Cloud Chagnon](https://github.com/coolsa)
+* Hardware Supported: Pro Micro
+* Hardware Availability: [Repository](https://github.com/coolsa/split-cloud)
+
+Make example for this keyboard:
+
+    make handwired/split_cloud:default
+
+This keyboard uses [Handedness by EEPROM](https://docs.qmk.fm/#/feature_split_keyboard?id=handedness-by-eeprom) as default, and must be configured once on each side. The make commands are:
+
+    make handwired/split_cloud:default:avrdude-split-left
+    make handwired/split_cloud:default:avrdude-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
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/split_cloud/rules.mk b/keyboards/handwired/split_cloud/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/handwired/splittest/bluepill/rules.mk b/keyboards/handwired/splittest/bluepill/rules.mk
index a92b0993283e..8b137891791f 100644
--- a/keyboards/handwired/splittest/bluepill/rules.mk
+++ b/keyboards/handwired/splittest/bluepill/rules.mk
@@ -1,2 +1 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
diff --git a/keyboards/handwired/splittest/config.h b/keyboards/handwired/splittest/config.h
deleted file mode 100644
index 49bc3cbddb45..000000000000
--- a/keyboards/handwired/splittest/config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define 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 RGBLED_SPLIT { 6, 6 }
-
-/*
- * 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/handwired/splittest/info.json b/keyboards/handwired/splittest/info.json
index efd82d20c47e..73ffb66e9b49 100644
--- a/keyboards/handwired/splittest/info.json
+++ b/keyboards/handwired/splittest/info.json
@@ -8,6 +8,22 @@
         "pid": "0x1111",
         "device_version": "1.0.0"
     },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6],
+        "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": {
             "layout": [
diff --git a/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c b/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c
index 7b6a4c1e7418..21ba0e5b3d51 100644
--- a/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c
+++ b/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c
@@ -62,19 +62,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_LSFT, KC_B,             KC_SPC,  KC_C,                      _______, _______,              _______
   )
 };
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/handwired/steamvan/rev1/config.h b/keyboards/handwired/steamvan/rev1/config.h
index ffd061fa17e4..88323300f8aa 100644
--- a/keyboards/handwired/steamvan/rev1/config.h
+++ b/keyboards/handwired/steamvan/rev1/config.h
@@ -25,18 +25,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_SPI SPID1
 #define WS2812_SPI_MOSI_PAL_MODE 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_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
-#define RGBLED_NUM 16
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
-
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/handwired/steamvan/rev1/info.json b/keyboards/handwired/steamvan/rev1/info.json
index b76753f19f47..54164b573880 100644
--- a/keyboards/handwired/steamvan/rev1/info.json
+++ b/keyboards/handwired/steamvan/rev1/info.json
@@ -17,6 +17,21 @@
     "pin": "B8",
     "breathing": true
   },
+  "rgblight": {
+    "led_count": 16,
+    "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": "A7",
     "driver": "spi"
diff --git a/keyboards/handwired/swiftrax/bumblebee/config.h b/keyboards/handwired/swiftrax/bumblebee/config.h
index 4fe6fb4428e7..fa4c9291e74d 100644
--- a/keyboards/handwired/swiftrax/bumblebee/config.h
+++ b/keyboards/handwired/swiftrax/bumblebee/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB Indicators */
-#define RGBLED_NUM 3
-
 /* Solenid Pin */
 #define SOLENOID_PIN D2
 
diff --git a/keyboards/handwired/swiftrax/bumblebee/info.json b/keyboards/handwired/swiftrax/bumblebee/info.json
index 9a46cb98495e..e2cad64ad8bf 100644
--- a/keyboards/handwired/swiftrax/bumblebee/info.json
+++ b/keyboards/handwired/swiftrax/bumblebee/info.json
@@ -8,6 +8,9 @@
         "pid": "0xE881",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 3
+    },
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c
index 7e7247c80faa..fef24f402fa5 100644
--- a/keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c
+++ b/keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c
@@ -17,13 +17,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 #define SOLENOID_DEFAULT_BUZZ 1
-#define FB_ERM_LRA 0
-#define FB_BRAKEFACTOR 3 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
-#define FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
+#define DRV2605L_FB_ERM_LRA 0
+#define DRV2605L_FB_BRAKEFACTOR 3 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
+#define DRV2605L_FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
 
 /* Please refer to your datasheet for the optimal setting for your specific motor. */
-#define RATED_VOLTAGE 3
-#define V_PEAK 5
+#define DRV2605L_RATED_VOLTAGE 3
+#define DRV2605L_V_PEAK 5
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
diff --git a/keyboards/handwired/swiftrax/bumblebee/keymaps/default/rules.mk b/keyboards/handwired/swiftrax/bumblebee/keymaps/default/rules.mk
index 9c6098640a18..ef72559a0c1f 100644
--- a/keyboards/handwired/swiftrax/bumblebee/keymaps/default/rules.mk
+++ b/keyboards/handwired/swiftrax/bumblebee/keymaps/default/rules.mk
@@ -1,2 +1 @@
 AUDIO_ENABLE = yes
-HAPTIC_ENABLE += SOLENOID
\ No newline at end of file
diff --git a/keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c
index a48f9981005a..12791a69dd64 100644
--- a/keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c
+++ b/keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c
@@ -17,13 +17,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 #define SOLENOID_DEFAULT_BUZZ 1
-#define FB_ERM_LRA 0
-#define FB_BRAKEFACTOR 3 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
-#define FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
+#define DRV2605L_FB_ERM_LRA 0
+#define DRV2605L_FB_BRAKEFACTOR 3 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
+#define DRV2605L_FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
 
 /* Please refer to your datasheet for the optimal setting for your specific motor. */
-#define RATED_VOLTAGE 3
-#define V_PEAK 5
+#define DRV2605L_RATED_VOLTAGE 3
+#define DRV2605L_V_PEAK 5
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
diff --git a/keyboards/handwired/swiftrax/bumblebee/keymaps/via/rules.mk b/keyboards/handwired/swiftrax/bumblebee/keymaps/via/rules.mk
index 8c797e430955..1e79dbce26ac 100644
--- a/keyboards/handwired/swiftrax/bumblebee/keymaps/via/rules.mk
+++ b/keyboards/handwired/swiftrax/bumblebee/keymaps/via/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
-#HAPTIC_ENABLE += SOLENOID
 AUDIO_ENABLE = yes
 #either solenoid or audio not both can be enabled
 LTO_ENABLE = yes
diff --git a/keyboards/handwired/swiftrax/glacier/config.h b/keyboards/handwired/swiftrax/glacier/config.h
index 4bff062d6cea..7f9b0b12d498 100644
--- a/keyboards/handwired/swiftrax/glacier/config.h
+++ b/keyboards/handwired/swiftrax/glacier/config.h
@@ -19,15 +19,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /*EEPROM for via*/
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
-/* RGB */
-#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_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/handwired/swiftrax/glacier/info.json b/keyboards/handwired/swiftrax/glacier/info.json
index 3aed06628fa6..ddfb4ce1ad14 100644
--- a/keyboards/handwired/swiftrax/glacier/info.json
+++ b/keyboards/handwired/swiftrax/glacier/info.json
@@ -8,6 +8,20 @@
         "pid": "0xE890",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 12,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
         "pin": "B0"
     },
diff --git a/keyboards/handwired/swiftrax/koalafications/rules.mk b/keyboards/handwired/swiftrax/koalafications/rules.mk
index 51909d1883c8..efd14377bf4f 100644
--- a/keyboards/handwired/swiftrax/koalafications/rules.mk
+++ b/keyboards/handwired/swiftrax/koalafications/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
diff --git a/keyboards/handwired/swiftrax/the_galleon/rules.mk b/keyboards/handwired/swiftrax/the_galleon/rules.mk
index 5587a8dbbc60..dec78ae4080d 100644
--- a/keyboards/handwired/swiftrax/the_galleon/rules.mk
+++ b/keyboards/handwired/swiftrax/the_galleon/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no         # Rotary Encoder
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # I2C OLED
diff --git a/keyboards/handwired/swiftrax/walter/config.h b/keyboards/handwired/swiftrax/walter/config.h
deleted file mode 100644
index 5fdda201e0c4..000000000000
--- a/keyboards/handwired/swiftrax/walter/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGBLED_NUM 24
-#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/handwired/swiftrax/walter/info.json b/keyboards/handwired/swiftrax/walter/info.json
index a52a0470e70b..804f88503bc5 100644
--- a/keyboards/handwired/swiftrax/walter/info.json
+++ b/keyboards/handwired/swiftrax/walter/info.json
@@ -8,6 +8,21 @@
         "pid": "0xE964",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 24,
+        "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": "E6"
     },
diff --git a/keyboards/handwired/symmetry60/config.h b/keyboards/handwired/symmetry60/config.h
index c92944a48fac..a85f398caecc 100644
--- a/keyboards/handwired/symmetry60/config.h
+++ b/keyboards/handwired/symmetry60/config.h
@@ -17,21 +17,6 @@ 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 RGBLED_NUM 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* 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/symmetry60/info.json b/keyboards/handwired/symmetry60/info.json
index 54d58d8b7f2a..3f8427f3c88d 100644
--- a/keyboards/handwired/symmetry60/info.json
+++ b/keyboards/handwired/symmetry60/info.json
@@ -8,6 +8,23 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 14,
+    "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": "B1"
   },
diff --git a/keyboards/handwired/t111/keymaps/oleg/keymap.c b/keyboards/handwired/t111/keymaps/oleg/keymap.c
index dd0c0971970d..b372de027bfd 100644
--- a/keyboards/handwired/t111/keymaps/oleg/keymap.c
+++ b/keyboards/handwired/t111/keymaps/oleg/keymap.c
@@ -117,10 +117,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */    
     [1] = LAYOUT(
     VRSN,             KC_SLEP, _______, UC_NEXT, _______, _______, _______, _______, _______, _______,        _______,        _______, _______, _______, _______, _______, _______,
-    _______, _______, X(UAT),  X(UHSH), X(UDLR), X(USCT), X(UCFX), X(UAMP), X(UAST), _______, _______,        _______,               _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______,
-    _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, _______, _______, _______, KC_SYRQ, KC_SCRL, KC_PAUS,        XP(ULSB, ULCB), XP(URSB, URCB),        _______,   _______, _______, _______, _______, _______, _______,
-    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5, _______, _______, _______, _______, _______, XP(USCO, UCLN), XP(UAPO, UQOT),        _______,                          _______, _______, _______, _______, _______, _______,
-    _______,          _______, _______, KC_BTN4, _______, _______, _______, _______, XP(UCOM, ULTH), XP(UDOT, UGTH), XP(USLS, UQUE),        KC_APP,               _______,    _______, _______, _______, _______, _______, _______,
+    _______, _______, UM(UAT),  UM(UHSH), UM(UDLR), UM(USCT), UM(UCFX), UM(UAMP), UM(UAST), _______, _______,        _______,               _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______,
+    _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, _______, _______, _______, KC_SYRQ, KC_SCRL, KC_PAUS,        UP(ULSB, ULCB), UP(URSB, URCB),        _______,   _______, _______, _______, _______, _______, _______,
+    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5, _______, _______, _______, _______, _______, UP(USCO, UCLN), UP(UAPO, UQOT),        _______,                          _______, _______, _______, _______, _______, _______,
+    _______,          _______, _______, KC_BTN4, _______, _______, _______, _______, UP(UCOM, ULTH), UP(UDOT, UGTH), UP(USLS, UQUE),        KC_APP,               _______,    _______, _______, _______, _______, _______, _______,
                    _______, _______,                               _______,                                   _______,                                   _______, _______,    _______,   _______
     )
 };
diff --git a/keyboards/handwired/t111/rules.mk b/keyboards/handwired/t111/rules.mk
index 3939229475d7..2542c545bff6 100644
--- a/keyboards/handwired/t111/rules.mk
+++ b/keyboards/handwired/t111/rules.mk
@@ -1,5 +1,3 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h
index c1acec70015d..7c77f53a82dc 100644
--- a/keyboards/handwired/tennie/config.h
+++ b/keyboards/handwired/tennie/config.h
@@ -18,21 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGBW
-  #define RGBLED_NUM 1
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-//   #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
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/tennie/info.json b/keyboards/handwired/tennie/info.json
index a48d64f730c5..32198e1cf623 100644
--- a/keyboards/handwired/tennie/info.json
+++ b/keyboards/handwired/tennie/info.json
@@ -8,6 +8,23 @@
         "pid": "0x1313",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "D1"
     },
diff --git a/keyboards/handwired/terminus_mini/config.h b/keyboards/handwired/terminus_mini/config.h
index 50ee7eac6133..6243804dc58b 100644
--- a/keyboards/handwired/terminus_mini/config.h
+++ b/keyboards/handwired/terminus_mini/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//define tapping-toggle count
-#define TAPPING_TOGGLE 1
-
-//define maximum duration of hold required to register a tap vs hold default is 200
-#define TAPPING_TERM 150 //reduce time required to register a held key
-
 /* 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/terminus_mini/info.json b/keyboards/handwired/terminus_mini/info.json
index 6948b13edc7b..5593be8bb7a0 100644
--- a/keyboards/handwired/terminus_mini/info.json
+++ b/keyboards/handwired/terminus_mini/info.json
@@ -8,6 +8,10 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "tapping": {
+    "term": 150,
+    "toggle": 1
+  },
   "matrix_pins": {
     "cols": ["B0", "D0", "D5", "B6", "D4", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
     "rows": ["B5", "B4", "D7", "D6"]
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
index 0a3a77c91df1..9e172c8089ab 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
@@ -7,7 +7,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["C0", "C1", "C2", "C3", "C4", "C5"],
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
index a0355469e91e..af4b3c0ac0e6 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
@@ -18,12 +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 RGBLED_NUM      20
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT \
-    { 10, 10 }
-
 #define AUDIO_PIN       C6
 
 #define EE_HANDS
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
index e0d074c2b6d6..92e0baace1f2 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
@@ -17,7 +17,9 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 80
+        "led_count": 20,
+        "max_brightness": 80,
+        "split_count": [10, 10]
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
index 2d05b71c92ee..3a7f97f8d2f3 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
@@ -29,11 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #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.
 
-#define RGBLED_NUM          20
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT \
-    { 10, 10 }
-
 #define DEBUG_LED_PIN C13
 
 /* Audio config */
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
index 0e0e020ddfb5..62fa261ac72c 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
@@ -5,6 +5,10 @@
         "rows": ["B10", "B11", "B12", "A14", "A13", "A15"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 20,
+        "split_count": [10, 10]
+    },
     "ws2812": {
         "pin": "A6",
         "driver": "pwm"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index 73ea40fb764c..2ad18267ad57 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -31,12 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_CHANNEL  3                   // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 #define WS2812_PWM_TARGET_PERIOD 800000
 
-
-#define RGBLED_NUM          57
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT \
-    { 26, 31 }
-
 #define DEBUG_LED_PIN      C13
 
 /* Audio config */
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
index 671e3746c66b..3f0c316928bd 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
@@ -5,6 +5,13 @@
         "rows": ["B12", "B13", "B14", "B15", "A8", "A10"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 57,
+        "split_count": [26, 31]
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
     "ws2812": {
         "pin": "A1",
         "driver": "pwm"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
index cd07b8d49f6d..b466a6234adb 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
@@ -5,5 +5,3 @@ MOUSE_SHARED_EP    = yes
 EEPROM_DRIVER = spi
 SERIAL_DRIVER = usart
 AUDIO_DRIVER  = pwm_hardware
-
-DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
index a449a126d6ac..5cb2a76de232 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
@@ -31,6 +31,6 @@
 #define BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT 5
 
 
-#define FB_ERM_LRA         0
-#define DRV_GREETING       alert_750ms
-#define DRV_MODE_DEFAULT   buzz
+#define DRV2605L_FB_ERM_LRA         0
+#define DRV2605L_GREETING       DRV2605L_EFFECT_750_MS_ALERT_100
+#define DRV2605L_DEFAULT_MODE   DRV2605L_EFFECT_BUZZ_1_100
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
index 9f5341e973dc..1cf7a3fccfaa 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
@@ -35,7 +35,7 @@ ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/f411)
     LTO_SUPPORTED                    = no
     OVERLOAD_FEATURES                = yes
     HAPTIC_ENABLE                    = yes
-    HAPTIC_DRIVER                    = DRV2605L
+    HAPTIC_DRIVER                    = drv2605l
 endif
 
 ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
index ce8e65e92486..331a5ec73113 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
@@ -18,13 +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 RGBLED_NUM      20
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT \
-    { 10, 10 }
-#define RGBLIGHT_LIMIT_VAL 80
-
 #define DEBUG_LED_PIN   D6
 
 #define AUDIO_PIN       C6
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
index c65b2266015d..a131ac085bd8 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
@@ -17,7 +17,9 @@
         "pin": "E7"
     },
     "rgblight": {
-        "max_brightness": 80
+        "led_count": 20,
+        "max_brightness": 80,
+        "split_count": [10, 10]
     },
     "processor": "at90usb1286",
     "bootloader": "halfkay"
diff --git a/keyboards/handwired/traveller/config.h b/keyboards/handwired/traveller/config.h
deleted file mode 100644
index f015683e68ce..000000000000
--- a/keyboards/handwired/traveller/config.h
+++ /dev/null
@@ -1,40 +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 RGBLED_NUM 1
-#    define RGBLIGHT_HUE_STEP 10
-#    define RGBLIGHT_SAT_STEP 17
-#    define RGBLIGHT_VAL_STEP 17
-//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
-/*
- * 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/handwired/traveller/info.json b/keyboards/handwired/traveller/info.json
index 91fe9e1cf441..ea1b3e353059 100644
--- a/keyboards/handwired/traveller/info.json
+++ b/keyboards/handwired/traveller/info.json
@@ -8,6 +8,10 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 1
+    },
     "ws2812": {
         "pin": "B2"
     },
diff --git a/keyboards/handwired/tritium_numpad/config.h b/keyboards/handwired/tritium_numpad/config.h
index 838776b5eb43..b9449c4714bf 100644
--- a/keyboards/handwired/tritium_numpad/config.h
+++ b/keyboards/handwired/tritium_numpad/config.h
@@ -22,10 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Underlight configuration
- */
-#define RGBLED_NUM 4     // Number of LEDs
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/tritium_numpad/info.json b/keyboards/handwired/tritium_numpad/info.json
index 8f56d909474b..2e2fc6c81f6f 100644
--- a/keyboards/handwired/tritium_numpad/info.json
+++ b/keyboards/handwired/tritium_numpad/info.json
@@ -21,6 +21,9 @@
     "num_lock": "D5",
     "on_state": 0
   },
+  "rgblight": {
+    "led_count": 4
+  },
   "ws2812": {
     "pin": "D2"
   },
diff --git a/keyboards/handwired/tsubasa/config.h b/keyboards/handwired/tsubasa/config.h
index dee2156fb544..52b64de9f631 100644
--- a/keyboards/handwired/tsubasa/config.h
+++ b/keyboards/handwired/tsubasa/config.h
@@ -18,15 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 #define MASTER_RIGHT
 
-#    define RGBLED_NUM 12
-#    define RGBLIGHT_SPLIT
-#    define RGBLED_SPLIT {6, 6}
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 1
-#    define RGBLIGHT_VAL_STEP 1
-#    define RGBLIGHT_EFFECT_BREATHING
-#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-
 #define SPLIT_WPM_ENABLE
 #define SPLIT_LAYER_STATE_ENABLE
diff --git a/keyboards/handwired/tsubasa/info.json b/keyboards/handwired/tsubasa/info.json
index 1c374f3b08ca..245afe30cc40 100644
--- a/keyboards/handwired/tsubasa/info.json
+++ b/keyboards/handwired/tsubasa/info.json
@@ -8,6 +8,17 @@
         "pid": "0x0000",
         "device_version": "1.0.0"
     },
+    "rgblight": {
+        "saturation_steps": 1,
+        "brightness_steps": 1,
+        "led_count": 12,
+        "split_count": [6, 6],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true
+        }
+    },
     "ws2812": {
         "pin": "D2"
     },
diff --git a/keyboards/handwired/tsubasa/rules.mk b/keyboards/handwired/tsubasa/rules.mk
index cddbc1e33fa0..5838d93ad558 100644
--- a/keyboards/handwired/tsubasa/rules.mk
+++ b/keyboards/handwired/tsubasa/rules.mk
@@ -15,5 +15,4 @@ LTO_ENABLE = yes
 ENCODER_ENABLE = yes
 
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
diff --git a/keyboards/handwired/twadlee/tp69/rules.mk b/keyboards/handwired/twadlee/tp69/rules.mk
index b1b6b8e616d1..b73afc0e44a9 100644
--- a/keyboards/handwired/twadlee/tp69/rules.mk
+++ b/keyboards/handwired/twadlee/tp69/rules.mk
@@ -14,5 +14,3 @@ PS2_MOUSE_ENABLE = no
 
 USE_CHIBIOS_CONTRIB = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/handwired/twig/twig50/config.h b/keyboards/handwired/twig/twig50/config.h
index d3d188ef4257..e4347a75b521 100644
--- a/keyboards/handwired/twig/twig50/config.h
+++ b/keyboards/handwired/twig/twig50/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define TAPPING_TERM 150
-
 #ifdef AUDIO_ENABLE
   #define AUDIO_PIN A5
   #define AUDIO_PIN_ALT A4
diff --git a/keyboards/handwired/twig/twig50/info.json b/keyboards/handwired/twig/twig50/info.json
index c32734cecb45..24eb51d03c17 100644
--- a/keyboards/handwired/twig/twig50/info.json
+++ b/keyboards/handwired/twig/twig50/info.json
@@ -9,6 +9,9 @@
       "device_version": "0.2.1",
       "force_nkro": true
     },
+    "tapping": {
+        "term": 150
+    },
     "matrix_pins": {
       "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9", "B10", "B11", "B3", "B2", "B1", "B0"],
       "rows": ["B7", "B6", "B5", "B4"]
diff --git a/keyboards/handwired/unk/rev1/config.h b/keyboards/handwired/unk/rev1/config.h
index de1208a7ecab..2a7f301a6a98 100644
--- a/keyboards/handwired/unk/rev1/config.h
+++ b/keyboards/handwired/unk/rev1/config.h
@@ -25,8 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 12    // Number of LEDs
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/unk/rev1/info.json b/keyboards/handwired/unk/rev1/info.json
index 162faca32cb7..171ae7bb0270 100644
--- a/keyboards/handwired/unk/rev1/info.json
+++ b/keyboards/handwired/unk/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x3060",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 12
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/handwired/uthol/rev2/config.h b/keyboards/handwired/uthol/rev2/config.h
index bf9b590421ff..f4c4fda7cf68 100644
--- a/keyboards/handwired/uthol/rev2/config.h
+++ b/keyboards/handwired/uthol/rev2/config.h
@@ -18,5 +18,4 @@
 #pragma once
 
 //RGB Stuff
-#define RGBLED_NUM 39
 #define RGBLIGHT_DEFAULT_HUE 201
diff --git a/keyboards/handwired/uthol/rev2/info.json b/keyboards/handwired/uthol/rev2/info.json
index 7c46269579a6..89515a8fefbe 100644
--- a/keyboards/handwired/uthol/rev2/info.json
+++ b/keyboards/handwired/uthol/rev2/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "rgblight": {
+        "led_count": 39
+    },
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/handwired/uthol/rev2/rules.mk b/keyboards/handwired/uthol/rev2/rules.mk
index 445e503d0bd3..c6e22b8dd296 100644
--- a/keyboards/handwired/uthol/rev2/rules.mk
+++ b/keyboards/handwired/uthol/rev2/rules.mk
@@ -6,4 +6,3 @@ EXTRAKEY_ENABLE = yes
 NKRO_ENABLE = yes
 LTO_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-RGBLIGHT_DRIVER = WS2812
diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h
index dd7ef6a5a915..a3a2eb1ca090 100644
--- a/keyboards/handwired/uthol/rev3/config.h
+++ b/keyboards/handwired/uthol/rev3/config.h
@@ -31,19 +31,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define TAPPING_TERM 500
 #define PERMISSIVE_HOLD
 
-// RGB Stuff
-#define RGBLED_NUM 39
-#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_HUE 201
diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json
index 5ba12dc8464f..79818d467044 100644
--- a/keyboards/handwired/uthol/rev3/info.json
+++ b/keyboards/handwired/uthol/rev3/info.json
@@ -3,6 +3,24 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "rgblight": {
+        "led_count": 39,
+        "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
+        }
+    },
+    "tapping": {
+        "term": 500
+    },
     "ws2812": {
         "pin": "B0"
     },
diff --git a/keyboards/handwired/uthol/rev3/rules.mk b/keyboards/handwired/uthol/rev3/rules.mk
index 2eaa7224979b..1577cf8a775d 100644
--- a/keyboards/handwired/uthol/rev3/rules.mk
+++ b/keyboards/handwired/uthol/rev3/rules.mk
@@ -5,9 +5,7 @@ BOOTMAGIC_ENABLE = yes
 NKRO_ENABLE = yes
 KEYBOARD_SHARED_EP = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 EXTRAKEY_ENABLE = yes
 ENCODER_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-RGBLIGHT_DRIVER = WS2812
diff --git a/keyboards/handwired/wulkan/keymaps/default/keymap.c b/keyboards/handwired/wulkan/keymaps/default/keymap.c
index b73592760e2b..3a333198a44b 100644
--- a/keyboards/handwired/wulkan/keymaps/default/keymap.c
+++ b/keyboards/handwired/wulkan/keymaps/default/keymap.c
@@ -95,8 +95,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-  _______, QK_BOOT,   _______, _______, KC_WH_U, _______, _______, KC_MS_U, _______, _______,                   XP(SE_ARNG_LOW, SE_ARNG_HIGH), KC_DEL,
-  _______, _______, _______, _______, KC_WH_D, _______, KC_MS_L, KC_MS_D, KC_MS_R, XP(SE_ODIA_LOW, SE_ODIA_HIGH), XP(SE_ADIA_LOW, SE_ADIA_HIGH), _______,
+  _______, QK_BOOT,   _______, _______, KC_WH_U, _______, _______, KC_MS_U, _______, _______,                   UP(SE_ARNG_LOW, SE_ARNG_HIGH), KC_DEL,
+  _______, _______, _______, _______, KC_WH_D, _______, KC_MS_L, KC_MS_D, KC_MS_R, UP(SE_ODIA_LOW, SE_ODIA_HIGH), UP(SE_ADIA_LOW, SE_ADIA_HIGH), _______,
   _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, KC_BTN1, _______, KC_BTN2, _______,                   _______,                   _______,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,                   _______
 )
diff --git a/keyboards/handwired/xealous/rev1/info.json b/keyboards/handwired/xealous/rev1/info.json
index e23340434727..b8b45e5ee145 100644
--- a/keyboards/handwired/xealous/rev1/info.json
+++ b/keyboards/handwired/xealous/rev1/info.json
@@ -9,6 +9,9 @@
     "device_version": "0.0.1",
     "force_nkro": true
   },
+  "build": {
+    "debounce_type": "sym_eager_pk"
+  },
   "matrix_pins": {
     "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
     "rows": ["B5", "B4", "E6", "D7", "D4"]
diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk
index a9391e9f5674..aff4db8cfd73 100644
--- a/keyboards/handwired/xealous/rules.mk
+++ b/keyboards/handwired/xealous/rules.mk
@@ -13,6 +13,5 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SPLIT_KEYBOARD = yes        # Use shared split_common code
 
 SRC += matrix.c
-DEBOUNCE_TYPE = sym_eager_pk
 
 DEFAULT_FOLDER = handwired/xealous/rev1
diff --git a/keyboards/handwired/z150/rules.mk b/keyboards/handwired/z150/rules.mk
index 8e7bef8b5c81..421d72570ef2 100644
--- a/keyboards/handwired/z150/rules.mk
+++ b/keyboards/handwired/z150/rules.mk
@@ -1,5 +1,3 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/handwired/ziyoulang_k3_mod/info.json b/keyboards/handwired/ziyoulang_k3_mod/info.json
new file mode 100644
index 000000000000..127cc51299c9
--- /dev/null
+++ b/keyboards/handwired/ziyoulang_k3_mod/info.json
@@ -0,0 +1,142 @@
+{
+    "keyboard_name": "ziyoulang k3 mod",
+    "development_board": "bluepill",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xE002",
+        "vid": "0x5006"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
+    "matrix_pins": {
+        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A10", "A9", "A8", "B15", "B14", "B13", "B12", "B1", "B0", "A7", "A6", "A5", "A4"],
+        "rows": ["C14", "C15", "A0", "A1", "A2", "A3"]
+    },
+    "community_layouts": ["96_ansi"],
+    "layouts": {
+        "LAYOUT_96_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
+                {"label":"F1", "x":1, "y":0, "matrix": [0, 2]},
+                {"label":"F2", "x":2, "y":0, "matrix": [0, 3]},
+                {"label":"F3", "x":3, "y":0, "matrix": [0, 4]},
+                {"label":"F4", "x":4, "y":0, "matrix": [0, 5]},
+                {"label":"F5", "x":5, "y":0, "matrix": [0, 6]},
+                {"label":"F6", "x":6, "y":0, "matrix": [0, 7]},
+                {"label":"F7", "x":7, "y":0, "matrix": [0, 8]},
+                {"label":"F8", "x":8, "y":0, "matrix": [0, 9]},
+                {"label":"F9", "x":9, "y":0, "matrix": [0, 10]},
+                {"label":"F10", "x":10, "y":0, "matrix": [0, 11]},
+                {"label":"F11", "x":11, "y":0, "matrix": [0, 12]},
+                {"label":"F12", "x":12, "y":0, "matrix": [0, 13]},
+                {"label":"PrtSc", "x":13, "y":0, "matrix": [0, 14]},
+                {"label":"Delete", "x":14, "y":0, "matrix": [0, 15]},
+                {"label":"Home", "x":15.5, "y":0, "matrix": [0, 16]},
+                {"label":"Insert", "x":16.5, "y":0, "matrix": [0, 17]},
+                {"label":"PgUp", "x":17.5, "y":0, "matrix": [0, 18]},
+                {"label":"PgDn", "x":18.5, "y":0, "matrix": [0, 19]},
+
+                {"label":"~", "x":0, "y":1.25, "matrix": [1, 0]},
+                {"label":"!", "x":1, "y":1.25, "matrix": [1, 1]},
+                {"label":"@", "x":2, "y":1.25, "matrix": [1, 2]},
+                {"label":"#", "x":3, "y":1.25, "matrix": [1, 3]},
+                {"label":"$", "x":4, "y":1.25, "matrix": [1, 4]},
+                {"label":"%", "x":5, "y":1.25, "matrix": [1, 5]},
+                {"label":"^", "x":6, "y":1.25, "matrix": [1, 6]},
+                {"label":"&", "x":7, "y":1.25, "matrix": [1, 7]},
+                {"label":"*", "x":8, "y":1.25, "matrix": [1, 8]},
+                {"label":"(", "x":9, "y":1.25, "matrix": [1, 9]},
+                {"label":")", "x":10, "y":1.25, "matrix": [1, 10]},
+                {"label":"_", "x":11, "y":1.25, "matrix": [1, 11]},
+                {"label":"+", "x":12, "y":1.25, "matrix": [1, 12]},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2, "matrix": [1, 13]},
+                {"label":"Num Lock", "x":15.5, "y":1.25, "matrix": [1, 17]},
+                {"label":"/", "x":16.5, "y":1.25, "matrix": [1, 18]},
+                {"label":"*", "x":17.5, "y":1.25, "matrix": [1, 19]},
+                {"label":"-", "x":18.5, "y":1.25, "matrix": [1, 20]},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
+                {"label":"Q", "x":1.5, "y":2.25, "matrix": [2, 1]},
+                {"label":"W", "x":2.5, "y":2.25, "matrix": [2, 2]},
+                {"label":"E", "x":3.5, "y":2.25, "matrix": [2, 3]},
+                {"label":"R", "x":4.5, "y":2.25, "matrix": [2, 4]},
+                {"label":"T", "x":5.5, "y":2.25, "matrix": [2, 5]},
+                {"label":"Y", "x":6.5, "y":2.25, "matrix": [2, 6]},
+                {"label":"U", "x":7.5, "y":2.25, "matrix": [2, 7]},
+                {"label":"I", "x":8.5, "y":2.25, "matrix": [2, 8]},
+                {"label":"O", "x":9.5, "y":2.25, "matrix": [2, 9]},
+                {"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":"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]},
+                {"label":"+", "x":18.5, "y":2.25, "h":2, "matrix": [2, 20]},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
+                {"label":"A", "x":1.75, "y":3.25, "matrix": [3, 2]},
+                {"label":"S", "x":2.75, "y":3.25, "matrix": [3, 3]},
+                {"label":"D", "x":3.75, "y":3.25, "matrix": [3, 4]},
+                {"label":"F", "x":4.75, "y":3.25, "matrix": [3, 5]},
+                {"label":"G", "x":5.75, "y":3.25, "matrix": [3, 6]},
+                {"label":"H", "x":6.75, "y":3.25, "matrix": [3, 7]},
+                {"label":"J", "x":7.75, "y":3.25, "matrix": [3, 8]},
+                {"label":"K", "x":8.75, "y":3.25, "matrix": [3, 9]},
+                {"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":"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]},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25, "matrix": [4, 0]},
+                {"label":"Z", "x":2.25, "y":4.25, "matrix": [4, 2]},
+                {"label":"X", "x":3.25, "y":4.25, "matrix": [4, 3]},
+                {"label":"C", "x":4.25, "y":4.25, "matrix": [4, 4]},
+                {"label":"V", "x":5.25, "y":4.25, "matrix": [4, 5]},
+                {"label":"B", "x":6.25, "y":4.25, "matrix": [4, 6]},
+                {"label":"N", "x":7.25, "y":4.25, "matrix": [4, 7]},
+                {"label":"M", "x":8.25, "y":4.25, "matrix": [4, 8]},
+                {"label":"<", "x":9.25, "y":4.25, "matrix": [4, 9]},
+                {"label":">", "x":10.25, "y":4.25, "matrix": [4, 10]},
+                {"label":"?", "x":11.25, "y":4.25, "matrix": [4, 11]},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75, "matrix": [4, 13]},
+                {"label":"1", "x":15.5, "y":4.25, "matrix": [4, 17]},
+                {"label":"2", "x":16.5, "y":4.25, "matrix": [4, 18]},
+                {"label":"3", "x":17.5, "y":4.25, "matrix": [4, 19]},
+                {"label":"Enter", "x":18.5, "y":4.25, "h":2, "matrix": [4, 20]},
+
+                {"label":"\u2191", "x":14.25, "y":4.5, "matrix": [4, 15]},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25, "matrix": [5, 0]},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25, "matrix": [5, 2]},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25, "matrix": [5, 3]},
+                {"x":3.75, "y":5.25, "w":6.25, "matrix": [5, 6]},
+                {"label":"Alt", "x":10, "y":5.25, "matrix": [5, 10]},
+                {"label":"Fn", "x":11, "y":5.25, "matrix": [5, 11]},
+                {"label":"Ctrl", "x":12, "y":5.25, "matrix": [5, 13]},
+                {"label":"0", "x":16.5, "y":5.25, "matrix": [5, 17]},
+                {"label":".", "x":17.5, "y":5.25, "matrix": [5, 19]},
+
+                {"label":"\u2190", "x":13.25, "y":5.5, "matrix": [5, 14]},
+                {"label":"\u2193", "x":14.25, "y":5.5, "matrix": [5, 15]},
+                {"label":"\u2192", "x":15.25, "y":5.5, "matrix": [5, 16]}
+            ]
+        }
+    },
+    "manufacturer": "Coom",
+    "maintainer": "coomstoolbox",
+    "url": ""
+}
\ No newline at end of file
diff --git a/keyboards/handwired/ziyoulang_k3_mod/keymaps/default/keymap.c b/keyboards/handwired/ziyoulang_k3_mod/keymaps/default/keymap.c
new file mode 100644
index 000000000000..6cd7d8640368
--- /dev/null
+++ b/keyboards/handwired/ziyoulang_k3_mod/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+// 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│Del│ │Hom│Ins│PgU│PgD│
+     * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘ └───┴───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Num│ / │ * │ - │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │ 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│ Fn│Ctr││ ← │ ↓ │ → ││ 0 │ . │   │
+     * └────┴────┴────┴────────────────────────┴───┴───┴───┘└───┴───┴───┘└───┴───┴───┘
+     */
+    [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_PSCR,  KC_DEL,  KC_HOME, 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,
+        KC_CAPS,          KC_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_P1,   KC_P2,   KC_P3,   KC_PENT,
+                                                                                                                                               KC_UP,
+        KC_LCTL,          KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_RCTL,                            KC_P0,            KC_PDOT,
+                                                                                                                                      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_96_ansi(
+        QK_BOOT,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  _______, KC_SCRL, KC_PAUS,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                            _______, _______, _______, _______,
+                                                                                                                                               _______,
+        _______,          _______, _______,                   _______,                            _______, _______,            _______,                            _______,          _______,
+                                                                                                                                      _______, _______, _______
+    )
+};
diff --git a/keyboards/handwired/ziyoulang_k3_mod/keymaps/via/keymap.c b/keyboards/handwired/ziyoulang_k3_mod/keymaps/via/keymap.c
new file mode 100644
index 000000000000..08825dacce08
--- /dev/null
+++ b/keyboards/handwired/ziyoulang_k3_mod/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│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│PSc│Del│ │Hom│Ins│PgU│PgD│
+     * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘ └───┴───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Num│ / │ * │ - │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │ 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│ Fn│Ctr││ ← │ ↓ │ → ││ 0 │ . │   │
+     * └────┴────┴────┴────────────────────────┴───┴───┴───┘└───┴───┴───┘└───┴───┴───┘
+     */
+    [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_PSCR, KC_DEL,  KC_HOME, 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,
+        KC_CAPS,          KC_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_P1,   KC_P2,   KC_P3,   KC_PENT,
+                                                                                                                                               KC_UP,
+        KC_LCTL,          KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_RCTL,                            KC_P0,            KC_PDOT,
+                                                                                                                                      KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/keyboards/handwired/ziyoulang_k3_mod/keymaps/via/rules.mk b/keyboards/handwired/ziyoulang_k3_mod/keymaps/via/rules.mk
new file mode 100644
index 000000000000..ea877d67869c
--- /dev/null
+++ b/keyboards/handwired/ziyoulang_k3_mod/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+MOUSEKEY_ENABLE = no
+LTO_ENABLE = yes
diff --git a/keyboards/handwired/ziyoulang_k3_mod/readme.md b/keyboards/handwired/ziyoulang_k3_mod/readme.md
new file mode 100644
index 000000000000..7e247fde198b
--- /dev/null
+++ b/keyboards/handwired/ziyoulang_k3_mod/readme.md
@@ -0,0 +1,33 @@
+# ziyoulang_k3_mod
+
+![ziyoulang_k3_mod](https://i.imgur.com/z9mUvIoh.jpg)
+
+
+This base keyboard has  SX83099 IC causes some problems. I needed QMK as an alternative, especially since the controller freezes when the backlight is off.
+
+* Keyboard Maintainer: [Coom](https://github.com/coomstoolbox)
+* Hardware Supported: Ziyoulang K3,Blue Pill
+* Hardware Availability: [Base Keyboard](https://www.aliexpress.com/item/1005005458088199.html), [Blue Pill Board](https://www.aliexpress.com/item/32812837487.html)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/ziyoulang_k3_mod:default
+
+Flashing example for this keyboard:
+
+    make handwired/ziyoulang_k3_mod: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).
+
+## Requires hand wired
+
+[KiCAD wiring diagram](https://github.com/coomstoolbox/ZK3-BP-MOD-wiring-diagram)
+
+![explanation](https://i.imgur.com/yvhvhoBh.png)
+
+## 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
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/handwired/ziyoulang_k3_mod/rules.mk b/keyboards/handwired/ziyoulang_k3_mod/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/handwired/ziyoulang_k3_mod/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/hardwareabstraction/handwire/rules.mk b/keyboards/hardwareabstraction/handwire/rules.mk
index d782fba2a819..8a33a553313c 100644
--- a/keyboards/hardwareabstraction/handwire/rules.mk
+++ b/keyboards/hardwareabstraction/handwire/rules.mk
@@ -1,8 +1,7 @@
 LTO_ENABLE = yes
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER += SOLENOID
+HAPTIC_DRIVER = solenoid
 
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 WPM_ENABLE = yes
diff --git a/keyboards/heliotrope/info.json b/keyboards/heliotrope/info.json
index b443c4d54c96..3b382c7bc91f 100644
--- a/keyboards/heliotrope/info.json
+++ b/keyboards/heliotrope/info.json
@@ -28,7 +28,7 @@
         "pin": "A4"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 0], "x": 7, "y": 5},
             {"flags": 4, "matrix": [0, 1], "x": 22, "y": 5},
diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h
index cf4e9f4ffea4..f5eb4c13e101 100644
--- a/keyboards/helix/pico/config.h
+++ b/keyboards/helix/pico/config.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
 
 #define SERIAL_SLAVE_BUFFER_LENGTH  ((MATRIX_ROWS)/2)
 #define SERIAL_MASTER_BUFFER_LENGTH ((MATRIX_ROWS)/2)
@@ -48,8 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define AUDIO_PIN B5
 #endif
 
-//#define RGBLED_NUM 12    // Number of LEDs. see ./keymaps/default/config.h
-
 // Helix keyboard RGB LED support
 //    see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
 #ifdef RGBLED_BACK
@@ -73,8 +70,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #endif
   #define RGBLIGHT_VAL_STEP 4
 #endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for Helix keyboard
diff --git a/keyboards/helix/pico/info.json b/keyboards/helix/pico/info.json
index 1147d09f3728..953cc2ea1015 100644
--- a/keyboards/helix/pico/info.json
+++ b/keyboards/helix/pico/info.json
@@ -11,6 +11,21 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 100
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/helix/pico/qmk_conf/config.h b/keyboards/helix/pico/qmk_conf/config.h
index 7653185198bc..15b339289561 100644
--- a/keyboards/helix/pico/qmk_conf/config.h
+++ b/keyboards/helix/pico/qmk_conf/config.h
@@ -26,18 +26,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #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/rev2/config.h b/keyboards/helix/rev2/config.h
index 1d7163675710..212d0e1e3847 100644
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define QUICK_TAP_TERM 0
-#define TAPPING_TERM 100
 
 #define SPLIT_LAYER_STATE_ENABLE
 #define SPLIT_LED_STATE_ENABLE
@@ -55,8 +54,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #endif
   #define RGBLIGHT_VAL_STEP 4
 #endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for Helix keyboard
diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/rev2/info.json
index 105b05e6e3bd..0056ba90b1b6 100644
--- a/keyboards/helix/rev2/info.json
+++ b/keyboards/helix/rev2/info.json
@@ -16,6 +16,21 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 100
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/helix/rev2/keymaps/default/keymap.c b/keyboards/helix/rev2/keymaps/default/keymap.c
index 25b0c3dff8e2..b777d35d4536 100644
--- a/keyboards/helix/rev2/keymaps/default/keymap.c
+++ b/keyboards/helix/rev2/keymaps/default/keymap.c
@@ -340,10 +340,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
-
 void matrix_init_user(void) {
     #ifdef AUDIO_ENABLE
         startup_user();
@@ -351,10 +347,6 @@ void matrix_init_user(void) {
     #ifdef RGBLIGHT_ENABLE
       RGB_current_mode = rgblight_get_mode();
     #endif
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init(!has_usb());   // turns on the display
-    #endif
 }
 
 
diff --git a/keyboards/helix/rev2/keymaps/default/oled_display.c b/keyboards/helix/rev2/keymaps/default/oled_display.c
index 384356bd1446..4eb815ce487b 100644
--- a/keyboards/helix/rev2/keymaps/default/oled_display.c
+++ b/keyboards/helix/rev2/keymaps/default/oled_display.c
@@ -136,150 +136,3 @@ bool oled_task_user(void) {
     return false;
 }
 #endif // end of OLED_ENABLE
-
-//SSD1306 OLED update loop
-/*
-    The following code is left as a sample to help you transition from SSD1306OLED to OLED_ENABLE.
-
-    * `matrix_write(matrix, data)` is replaced by `oled_write(data, false)`.
-    * `matrix_write_P(matrix, data)` is replaced by `oled_write_P(data, false)`.
-    * It is no longer necessary to call `iota_gfx_task()`.
-    * `matrix_update()` are no longer needed.
-    * `iota_gfx_task_user()` is no longer needed. Instead, `bool oled_task_user(void)` is provided.
-
-    以下のコードは、SSD1306OLED から OLED_ENABLE に移行する助けになるようにサンプルとして残してあります。
-
-    * `matrix_write(matrix, data)` は、`oled_write(data, false)` に書き換えます。
-    * `matrix_write_P(matrix, data)` は、`oled_write_P(data, false)` に書き換えます。
-    * `iota_gfx_task()` を呼び出す必要はなくなります。
-    * `matrix_update()` は不要になります。
-    * `iota_gfx_task_user()` は不要になります。代りに `bool oled_task_user(void)` を用意します。
- */
-
-#ifdef SSD1306OLED
-#include "ssd1306.h"
-#define oled_write(data,flag)    matrix_write(matrix, data)
-#define oled_write_P(data,flag)  matrix_write_P(matrix, data)
-
-void matrix_scan_user(void) {
-    iota_gfx_task();  // this is what updates the display continuously
-}
-
-void matrix_update(struct CharacterMatrix *dest,
-                   const struct CharacterMatrix *source) {
-    if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-        memcpy(dest->display, source->display, sizeof(dest->display));
-        dest->dirty = true;
-    }
-}
-
-static void render_logo(struct CharacterMatrix *matrix) {
-
-    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);
-}
-
-static void render_rgbled_status(bool full, struct CharacterMatrix *matrix) {
-#    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(struct CharacterMatrix *matrix) {
-  // 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(struct CharacterMatrix *matrix) {
-  // Render to mode icon
-    static const char os_logo[][2][3] PROGMEM = {{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
-    if (is_mac_mode()) {
-        oled_write_P(os_logo[0][0], false);
-        oled_write_P(PSTR("\n"), false);
-        oled_write_P(os_logo[0][1], false);
-    } else {
-        oled_write_P(os_logo[1][0], false);
-        oled_write_P(PSTR("\n"), false);
-        oled_write_P(os_logo[1][1], false);
-    }
-
-    oled_write_P(PSTR(" "), false);
-    render_layer_status(matrix);
-
-    // 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, matrix);
-}
-
-#    if OLED_UPDATE_INTERVAL > 0
-uint16_t oled_update_timeout;
-#    endif
-
-void iota_gfx_task_user(void) {
-    struct CharacterMatrix matrix;
-
-#    if DEBUG_TO_SCREEN
-    if (debug_enable) {
-        return;
-    }
-#    endif
-
-#    if OLED_UPDATE_INTERVAL > 0
-    if (timer_elapsed(oled_update_timeout) < OLED_UPDATE_INTERVAL) {
-        return;
-    }
-    oled_update_timeout = timer_read();
-#    endif
-    matrix_clear(&matrix);
-    if (is_keyboard_master()) {
-        render_status(&matrix);
-    } else {
-        render_logo(&matrix);
-        render_rgbled_status(false, &matrix);
-        render_layer_status(&matrix);
-    }
-    matrix_update(&display, &matrix);
-}
-
-#endif // end of SSD1306OLED
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/oled.c b/keyboards/helix/rev2/keymaps/edvorakjp/oled.c
index 14e3e5533b98..38a91c1639f8 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/oled.c
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/oled.c
@@ -5,13 +5,9 @@
 #ifdef OLED_ENABLE
 void render_host_led_state(void) {
     char    led_state_str[24];
-    uint8_t leds = host_keyboard_leds();
+    led_t led_state = host_keyboard_led_state();
 
-    bool is_num_lock_enabled    = leds & (1 << USB_LED_NUM_LOCK);
-    bool is_caps_lock_enabled   = leds & (1 << USB_LED_CAPS_LOCK);
-    bool is_scroll_lock_enabled = leds & (1 << USB_LED_SCROLL_LOCK);
-
-    snprintf(led_state_str, sizeof(led_state_str), "NL:%s CL:%s SL:%s", is_num_lock_enabled ? "on" : "- ", is_caps_lock_enabled ? "on" : "- ", is_scroll_lock_enabled ? "on" : "- ");
+    snprintf(led_state_str, sizeof(led_state_str), "NL:%s CL:%s SL:%s", led_state.num_lock ? "on" : "- ", led_state.caps_lock ? "on" : "- ", led_state.scroll_lock ? "on" : "- ");
     oled_write(led_state_str, false);
 }
 
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c b/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
index 32b446c498dd..75e50968bcfe 100644
--- a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
+++ b/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
@@ -2,9 +2,6 @@
 #include "keymap_japanese.h"
 #include <stdio.h>
 #include <string.h>
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
 
 // * If you want to recognize that you pressed the Adjust key with the Lower / Raise key you can enable this comment out. However, the binary size may be over. *
 // #define ADJUST_MACRO_ENABLE
@@ -192,7 +189,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-#if defined(SSD1306OLED) || defined(OLED_ENABLE)
+#if defined(OLED_ENABLE)
 char keylog[24] = {};
 const char code_to_name[60] = {
     ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
@@ -205,7 +202,7 @@ const char code_to_name[60] = {
 static inline void set_keylog(uint16_t keycode, keyrecord_t *record)
 {
   char name = ' ';
-  uint8_t leds = host_keyboard_leds();
+  led_t led_state = host_keyboard_led_state();
 
   if (keycode < 60)
   {
@@ -218,9 +215,9 @@ static inline void set_keylog(uint16_t keycode, keyrecord_t *record)
            record->event.key.col,
            keycode,
            name,
-          (leds & (1<<USB_LED_NUM_LOCK)) ? 'N' : ' ',
-          (leds & (1<<USB_LED_CAPS_LOCK)) ? 'C' : ' ',
-          (leds & (1<<USB_LED_SCROLL_LOCK)) ? 'S' : ' '
+          led_state.num_lock ? 'N' : ' ',
+          led_state.caps_lock ? 'C' : ' ',
+          led_state.scroll_lock ? 'S' : ' '
            );
 }
 #endif
@@ -249,7 +246,7 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
 #endif
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  #if defined(SSD1306OLED) || defined(OLED_ENABLE)
+  #if defined(OLED_ENABLE)
     if (record->event.pressed) {
       set_keylog(keycode, record);
     }
@@ -310,121 +307,8 @@ void matrix_init_user(void) {
   #ifdef RGBLIGHT_ENABLE
     RGB_current_mode = rgblight_get_mode();
   #endif
-  //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-  #ifdef SSD1306OLED
-    iota_gfx_init(!has_usb()); // turns on the display
-  #endif
-}
-
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-
-void matrix_scan_user(void) {
-  iota_gfx_task();  // this is what updates the display continuously
-}
-
-static inline void matrix_update(struct CharacterMatrix *dest,
-                          const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-//assign the right code to your layers for OLED display
-#define L_BASE _BASE
-#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)
-#define L_LOW_E (1<<_LOW_E)
-#define L_RAI_E (1<<_RAI_E)
-#define L_ADJUST_TRIE (L_ADJUST|L_RAI_E|L_LOW_E)
-
-const char helix_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};
-
-static inline void render_logo(struct CharacterMatrix *matrix) {
-
-  matrix_write(matrix, helix_logo);
-}
-
-const char mac_win_logo[][2][3]={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
-
-static inline void render_status(struct CharacterMatrix *matrix) {
-
-  char buf[20];
-  // Render to mode icon
-  if(keymap_config.swap_lalt_lgui==false){
-    matrix_write(matrix, mac_win_logo[0][0]);
-    matrix_write_P(matrix, PSTR("\n"));
-    matrix_write(matrix, mac_win_logo[0][1]);
-  } else {
-    matrix_write(matrix, mac_win_logo[1][0]);
-    matrix_write_P(matrix, PSTR("\n"));
-    matrix_write(matrix, mac_win_logo[1][1]);
-  }
-
-  #ifdef RGBLIGHT_ENABLE
-    snprintf(buf, sizeof(buf), "  LED mode:%d", (short)RGB_current_mode);
-    matrix_write(matrix, buf);
-  #endif
-
-  // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
-  matrix_write_P(matrix, PSTR("\nLayer: "));
-  switch (layer_state) {
-    case L_BASE:
-      matrix_write_P(matrix, default_layer_state == (1UL<<_BAS_E) ? PSTR("BaseEx") : PSTR("Base"));
-      break;
-    case L_RAISE:
-      matrix_write_P(matrix, PSTR("Raise"));
-      break;
-    case L_RAI_E:
-      matrix_write_P(matrix, PSTR("RaiseEx"));
-      break;
-    case L_LOWER:
-      matrix_write_P(matrix, PSTR("Lower"));
-      break;
-    case L_LOW_E:
-      matrix_write_P(matrix, PSTR("LowerEx"));
-      break;
-    case L_ADJUST:
-    case L_ADJUST_TRI:
-    case L_ADJUST_TRIE:
-      matrix_write_P(matrix, PSTR("Adjust"));
-      break;
-    default:
-      snprintf(buf, sizeof(buf), "%d", (short)layer_state);
-      matrix_write(matrix, buf);
-  }
-
-  matrix_write(matrix, keylog);
-}
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-
-  #if DEBUG_TO_SCREEN
-    if (debug_enable) {
-      return;
-    }
-  #endif
-
-  matrix_clear(&matrix);
-  if (is_keyboard_master()) {
-    render_status(&matrix);
-  } else {
-    render_logo(&matrix);
-  }
-
-  matrix_update(&display, &matrix);
 }
 
-#endif // end of SSD1306OLED
-
 //OLED update loop
 #ifdef OLED_ENABLE
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
diff --git a/keyboards/helix/rev2/keymaps/froggy/keymap.c b/keyboards/helix/rev2/keymaps/froggy/keymap.c
index 8463365f59d3..dc047d311874 100644
--- a/keyboards/helix/rev2/keymaps/froggy/keymap.c
+++ b/keyboards/helix/rev2/keymaps/froggy/keymap.c
@@ -4,10 +4,6 @@
 #define MIN(x, y) (((x) < (y)) ? (x) : (y))
 #define MAX(x, y) (((x) > (y)) ? (x) : (y))
 
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
-
 #define LAYOUT_half( \
     L00, L01, L02, L03, L04, L05,       \
     L10, L11, L12, L13, L14, L15,       \
@@ -450,10 +446,6 @@ void matrix_init_user(void) {
     #ifdef RGBLIGHT_ENABLE
       RGB_current_mode = rgblight_get_mode();
     #endif
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init(!has_usb());   // turns on the display
-    #endif
 }
 
 
@@ -555,10 +547,6 @@ uint8_t layer_state_old;
 
 //runs every scan cycle (a lot)
 void matrix_scan_user(void) {
-  #ifdef SSD1306OLED
-    iota_gfx_task();  // this is what updates the display continuously
-  #endif
-
   if(delay_key_stat && (timer_elapsed(key_timer) > DELAY_TIME)){
     register_delay_code(_BASE);
     if(!delay_key_pressed){
@@ -629,119 +617,6 @@ void matrix_scan_user(void) {
   #endif
 }
 
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-
-void matrix_update(struct CharacterMatrix *dest,
-                          const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-// Render to OLED
-void render_status(struct CharacterMatrix *matrix) {
-
-  // 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
-  if (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) { rown = 4; } else { rown = 0; }
-  if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) { rowa = 4; } else { rowa = 0; }
-  if (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) { rows = 4; } else { rows = 0; }
-  if (layer_state == L_FUNC) { rowf = 4; }
-
-  matrix_write(matrix, indctr[rown]  [0]);
-  matrix_write(matrix, indctr[rowf]  [1]);
-  matrix_write(matrix, logo  [0]     [0]);
-  matrix_write(matrix, indctr[rown+1][0]);
-  matrix_write(matrix, indctr[rowf+1][1]);
-  matrix_write(matrix, logo  [1]     [0]);
-  matrix_write(matrix, indctr[rowa+2][0]);
-  matrix_write(matrix, indctr[rows+2][1]);
-  matrix_write(matrix, logo  [2]     [0]);
-  matrix_write(matrix, indctr[rowa+3][0]);
-  matrix_write(matrix, indctr[rows+3][1]);
-  matrix_write(matrix, logo  [3]     [0]);
-
-}
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-
-#if DEBUG_TO_SCREEN
-  if (debug_enable) {
-    return;
-  }
-#endif
-
-  matrix_clear(&matrix);
-  if (is_keyboard_master()) {
-    render_status(&matrix);
-  }
-  matrix_update(&display, &matrix);
-}
-
-#endif // end of SSD1306OLED
-
 //OLED update loop
 #ifdef OLED_ENABLE
 
@@ -813,9 +688,10 @@ void render_status(void) {
   int rows = 0;
 
   //Set Indicator icon
-  if (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) { rown = 4; } else { rown = 0; }
-  if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) { rowa = 4; } else { rowa = 0; }
-  if (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) { rows = 4; } else { rows = 0; }
+  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);
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c b/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
index a370c21ea2b8..d0a17cb4ae64 100644
--- a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
+++ b/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
@@ -1,9 +1,6 @@
 #include QMK_KEYBOARD_H
 #include "keymap_japanese.h"
 #include <string.h>
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
 
 #define LAYOUT_half( \
     L00, L01, L02, L03, L04, L05,       \
@@ -563,15 +560,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 
-
-//keyboard start-up code. Runs once when the firmware starts up.
-void matrix_init_user(void) {
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init(!has_usb());   // turns on the display
-    #endif
-}
-
 // LED Effect
 #ifdef RGBLIGHT_ENABLE
 unsigned char rgb[7][5][3];
@@ -632,10 +620,6 @@ layer_state_t layer_state_old;
 
 //runs every scan cycle (a lot)
 void matrix_scan_user(void) {
-  #ifdef SSD1306OLED
-    iota_gfx_task();  // this is what updates the display continuously
-  #endif
-
   if(delay_key_stat && (timer_elapsed(key_timer) > DELAY_TIME)){
     if (IS_MODE_106())
       register_delay_code(_BASE_106);
@@ -693,141 +677,6 @@ void matrix_scan_user(void) {
   #endif
 }
 
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-
-void matrix_update(struct CharacterMatrix *dest,
-                          const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-// Render to OLED
-void render_status(struct CharacterMatrix *matrix) {
-
-  // 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
-  if (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) { rown = 4; }
-  if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) { rowa = 4; }
-  if (host_keyboard_leds() & (1<<USB_LED_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; }
-
-  matrix_write(matrix, indctr[rown]  [0]);
-  matrix_write(matrix, indctr[rowf]  [1]);
-  matrix_write(matrix, modectl[rowm] [0]);
-  matrix_write(matrix, logo[0]);
-  matrix_write(matrix, indctr[rown+1][0]);
-  matrix_write(matrix, indctr[rowf+1][1]);
-  matrix_write(matrix, modectl[rowm] [1]);
-  matrix_write(matrix, logo[1]);
-  matrix_write(matrix, indctr[rowa+2][0]);
-  matrix_write(matrix, indctr[rows+2][1]);
-  matrix_write(matrix, modectl[rowj] [0]);
-  matrix_write(matrix, logo[2]);
-  matrix_write(matrix, indctr[rowa+3][0]);
-  matrix_write(matrix, indctr[rows+3][1]);
-  matrix_write(matrix, modectl[rowj] [1]);
-  matrix_write(matrix, logo[3]);
-
-}
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-
-#if DEBUG_TO_SCREEN
-  if (debug_enable) {
-    return;
-  }
-#endif
-
-  matrix_clear(&matrix);
-  if (is_keyboard_master()) {
-    render_status(&matrix);
-  }
-  matrix_update(&display, &matrix);
-}
-
-#endif // end of SSD1306OLED
-
 //OLED update loop
 #ifdef OLED_ENABLE
 
@@ -909,9 +758,10 @@ void render_status(void) {
   int rowj = 1;
 
   //Set Indicator icon
-  if (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) { rown = 4; }
-  if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) { rowa = 4; }
-  if (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) { rows = 4; }
+  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
diff --git a/keyboards/helix/rev2/keymaps/xulkal/rules.mk b/keyboards/helix/rev2/keymaps/xulkal/rules.mk
index 5a9c1e28906f..09e14f46ee9d 100644
--- a/keyboards/helix/rev2/keymaps/xulkal/rules.mk
+++ b/keyboards/helix/rev2/keymaps/xulkal/rules.mk
@@ -3,7 +3,6 @@ RGBLIGHT_ENABLE = yes
 OPT_DEFS += -DRGBLED_BACK
 
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 # Helix specific font file
 OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
 # Xulkal specific oled define
diff --git a/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c b/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
index b3ae8a3d25c8..20fa181d776b 100644
--- a/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
+++ b/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
@@ -1,9 +1,6 @@
 #include QMK_KEYBOARD_H
 #include <stdio.h>
 #include <string.h>
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -331,10 +328,6 @@ void matrix_init_user(void) {
     #ifdef RGBLIGHT_ENABLE
       RGB_current_mode = rgblight_get_mode();
     #endif
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init(!has_usb());   // turns on the display
-    #endif
 }
 
 
@@ -363,135 +356,6 @@ void music_scale_user(void)
 
 #endif
 
-
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-
-void matrix_scan_user(void) {
-     iota_gfx_task();  // this is what updates the display continuously
-}
-
-void matrix_update(struct CharacterMatrix *dest,
-                          const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-//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(struct CharacterMatrix *matrix) {
-
-  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};
-  matrix_write_P(matrix, helix_logo);
-  //matrix_write_P(&matrix, PSTR(" Split keyboard kit"));
-}
-
-static void render_rgbled_status(bool full, struct CharacterMatrix *matrix) {
-#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());
-      }
-      matrix_write(matrix, buf);
-  }
-#endif
-}
-
-static void render_layer_status(struct CharacterMatrix *matrix) {
-  // 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];
-  matrix_write_P(matrix, PSTR("Layer: "));
-    switch (layer_state) {
-        case L_BASE:
-           matrix_write_P(matrix, PSTR("Default"));
-           break;
-        case L_RAISE:
-           matrix_write_P(matrix, PSTR("Raise"));
-           break;
-        case L_LOWER:
-           matrix_write_P(matrix, PSTR("Lower"));
-           break;
-        case L_ADJUST:
-        case L_ADJUST_TRI:
-           matrix_write_P(matrix, PSTR("Adjust"));
-           break;
-        default:
-           matrix_write_P(matrix, PSTR("Undef-"));
-           snprintf(buf,sizeof(buf), "%ld", layer_state);
-           matrix_write(matrix, buf);
-    }
-}
-
-void render_status(struct CharacterMatrix *matrix) {
-
-  // 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){
-    matrix_write_P(matrix, os_logo[0][0]);
-    matrix_write_P(matrix, PSTR("\n"));
-    matrix_write_P(matrix, os_logo[0][1]);
-  }else{
-    matrix_write_P(matrix, os_logo[1][0]);
-    matrix_write_P(matrix, PSTR("\n"));
-    matrix_write_P(matrix, os_logo[1][1]);
-  }
-
-  matrix_write_P(matrix, PSTR(" "));
-  render_layer_status(matrix);
-  matrix_write_P(matrix, PSTR("\n"));
-
-  // Host Keyboard LED Status
-  matrix_write_P(matrix, (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ?
-                 PSTR("NUMLOCK") : PSTR("       "));
-  matrix_write_P(matrix, (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ?
-                 PSTR("CAPS") : PSTR("    "));
-  matrix_write_P(matrix, (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ?
-                 PSTR("SCLK") : PSTR("    "));
-  matrix_write_P(matrix, PSTR("\n"));
-  render_rgbled_status(true, matrix);
-}
-
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-
-#if DEBUG_TO_SCREEN
-  if (debug_enable) {
-    return;
-  }
-#endif
-
-  matrix_clear(&matrix);
-  if (is_keyboard_master()) {
-    render_status(&matrix);
-  } else {
-    render_logo(&matrix);
-    render_rgbled_status(false, &matrix);
-    render_layer_status(&matrix);
-  }
-  matrix_update(&display, &matrix);
-}
-
-#endif // end of SSD1306OLED
-
 #ifdef OLED_ENABLE
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
     if (is_keyboard_master()) {
@@ -580,12 +444,10 @@ void render_status(void) {
   render_layer_status();
 
   // Host Keyboard LED Status
-  oled_write_P((host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ?
-                 PSTR("NUMLOCK") : PSTR("       "), false);
-  oled_write_P((host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ?
-                 PSTR("CAPS") : PSTR("    "), false);
-  oled_write_P((host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ?
-                 PSTR("SCLK") : PSTR("    "), false);
+  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);
diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk
index 6e63cc717231..4bfee0411de6 100644
--- a/keyboards/helix/rev2/local_features.mk
+++ b/keyboards/helix/rev2/local_features.mk
@@ -63,7 +63,6 @@ ifeq ($(strip $(LED_ANIMATIONS)), yes)
 endif
 
 ifeq ($(strip $(OLED_ENABLE)), yes)
-    OLED_DRIVER = SSD1306
     ifeq ($(strip $(LOCAL_GLCDFONT)), yes)
        OPT_DEFS += -DOLED_FONT_H=\<helixfont.h\>
     else
diff --git a/keyboards/helix/rev2/qmk_conf/config.h b/keyboards/helix/rev2/qmk_conf/config.h
deleted file mode 100644
index b8c1041cdc7b..000000000000
--- a/keyboards/helix/rev2/qmk_conf/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/rev3_4rows/config.h b/keyboards/helix/rev3_4rows/config.h
index 214bd1194169..1e60ed1f0f39 100644
--- a/keyboards/helix/rev3_4rows/config.h
+++ b/keyboards/helix/rev3_4rows/config.h
@@ -44,10 +44,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Dip switch on matrix grid */
 #define DIP_SWITCH_MATRIX_GRID { {0,6}, {1,6}, {5,6}, {6,6} }
 
-#define RGBLED_NUM 50 // Number of LEDs
-
 #ifdef RGB_MATRIX_ENABLE
-  #define RGB_MATRIX_LED_COUNT RGBLED_NUM
+  #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
@@ -55,28 +53,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #   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
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_SPLIT
-  #define RGBLED_SPLIT { 25, 25 }
-//   #define RGBLIGHT_HUE_STEP 8
-//   #define RGBLIGHT_SAT_STEP 8
-//   #define RGBLIGHT_VAL_STEP 8
-//   #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
 
 /* Custom font */
diff --git a/keyboards/helix/rev3_4rows/info.json b/keyboards/helix/rev3_4rows/info.json
index 9a832bbb5b9f..ffe1c987e2b2 100644
--- a/keyboards/helix/rev3_4rows/info.json
+++ b/keyboards/helix/rev3_4rows/info.json
@@ -9,7 +9,10 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "WS2812"
+    "driver": "ws2812",
+    "sat_steps": 8,
+    "val_steps": 8,
+    "speed_steps": 10,
   },
   "encoder": {
     "rotary": [
@@ -23,7 +26,15 @@
     "pin": "D3"
   },
   "rgblight": {
-    "max_brightness": 120
+    "led_count": 50,
+    "max_brightness": 120,
+    "split_count": [25, 25],
+    "animations": {
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "static_gradient": true,
+      "rgb_test": true
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/helix/rev3_4rows/rules.mk b/keyboards/helix/rev3_4rows/rules.mk
index 23b73845f0aa..a46f9d9c59f3 100644
--- a/keyboards/helix/rev3_4rows/rules.mk
+++ b/keyboards/helix/rev3_4rows/rules.mk
@@ -3,7 +3,6 @@ RGBLIGHT_ENABLE = yes   # Enable keyboard RGB underglow
 SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = no
 LTO_ENABLE = yes
diff --git a/keyboards/helix/rev3_5rows/config.h b/keyboards/helix/rev3_5rows/config.h
index 7e11a93fd2bc..f48115663cb9 100644
--- a/keyboards/helix/rev3_5rows/config.h
+++ b/keyboards/helix/rev3_5rows/config.h
@@ -44,10 +44,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Dip switch on matrix grid */
 #define DIP_SWITCH_MATRIX_GRID { {0,6}, {1,6}, {5,6}, {6,6} }
 
-#define RGBLED_NUM 64 // Number of LEDs
-
 #ifdef RGB_MATRIX_ENABLE
-  #define RGB_MATRIX_LED_COUNT RGBLED_NUM
+  #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
@@ -55,28 +53,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #   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
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_SPLIT
-  #define RGBLED_SPLIT { 32, 32 }
-//   #define RGBLIGHT_HUE_STEP 8
-//   #define RGBLIGHT_SAT_STEP 8
-//   #define RGBLIGHT_VAL_STEP 8
-//   #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
 
 /* Custom font */
diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json
index 2ae80dd90113..f7546b1322cd 100644
--- a/keyboards/helix/rev3_5rows/info.json
+++ b/keyboards/helix/rev3_5rows/info.json
@@ -9,7 +9,10 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "WS2812"
+    "driver": "ws2812",
+    "sat_steps": 8,
+    "val_steps": 8,
+    "speed_steps": 10
   },
   "encoder": {
     "rotary": [
@@ -23,7 +26,15 @@
     "pin": "D3"
   },
   "rgblight": {
-    "max_brightness": 120
+    "led_count": 64,
+    "max_brightness": 120,
+    "split_count": [32, 32],
+    "animations": {
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "static_gradient": true,
+      "rgb_test": true
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/helix/rev3_5rows/rules.mk b/keyboards/helix/rev3_5rows/rules.mk
index 23b73845f0aa..a46f9d9c59f3 100644
--- a/keyboards/helix/rev3_5rows/rules.mk
+++ b/keyboards/helix/rev3_5rows/rules.mk
@@ -3,7 +3,6 @@ RGBLIGHT_ENABLE = yes   # Enable keyboard RGB underglow
 SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = no
 LTO_ENABLE = yes
diff --git a/keyboards/hfdkb/ac001/config.h b/keyboards/hfdkb/ac001/config.h
index 899a134762ca..6c0c2a2cf613 100644
--- a/keyboards/hfdkb/ac001/config.h
+++ b/keyboards/hfdkb/ac001/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define TAP_CODE_DELAY 5
-
 /* ws2812 RGB LED */
 #define RGB_MATRIX_LED_COUNT 5
 
diff --git a/keyboards/hfdkb/ac001/info.json b/keyboards/hfdkb/ac001/info.json
index 2efee90deba8..0a361d63ed7f 100644
--- a/keyboards/hfdkb/ac001/info.json
+++ b/keyboards/hfdkb/ac001/info.json
@@ -10,7 +10,7 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["A5", "A6", "A7", "C4", "C5"],
@@ -20,6 +20,9 @@
     "ws2812": {
         "pin": "A1"
     },
+    "qmk": {
+        "tap_keycode_delay": 5
+    },
     "processor": "WB32FQ95",
     "bootloader": "wb32-dfu",
     "layouts": {
diff --git a/keyboards/hfdkb/keyboard_sw/k83/config.h b/keyboards/hfdkb/keyboard_sw/k83/config.h
deleted file mode 100644
index a4660c93be8e..000000000000
--- a/keyboards/hfdkb/keyboard_sw/k83/config.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright (C) 2022 jonylee@hfd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have 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
-
-/* encoder resolution */
-#define TAP_CODE_DELAY 15
-
-/* DIP switch */
-#define DIP_SWITCH_PINS \
-    { A9 }
-
-/* 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
-
-/* 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
-#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
-
-/* I2C Config for LED Driver */
-#define DRIVER_COUNT 2
-#define DRIVER_ADDR_1 0b1110100
-#define DRIVER_ADDR_2 0b1110111
-#define I2C1_SDA_PIN B7
-#define I2C1_SCL_PIN B6
-#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/hfdkb/keyboard_sw/k83/info.json b/keyboards/hfdkb/keyboard_sw/k83/info.json
deleted file mode 100644
index b31fd86f1f88..000000000000
--- a/keyboards/hfdkb/keyboard_sw/k83/info.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-    "keyboard_name": "KB83",
-    "manufacturer": "www.hfd.cn",
-    "maintainer": "hfd",
-    "usb": {
-        "vid": "0xFFFE",
-        "pid": "0x0007",
-        "device_version": "1.0.0",
-        "force_nkro": true
-    },
-    "rgb_matrix": {
-        "driver": "IS31FL3733"
-    },
-    "processor": "WB32FQ95",
-    "bootloader": "wb32-dfu",
-    "matrix_pins": {
-        "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"],
-        "rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
-    },
-    "diode_direction": "ROW2COL",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B14", "pin_b": "B13", "resolution": 4}
-        ]
-    },
-    "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, 15], "x": 15.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, 15], "x": 15.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": [2, 15], "x": 15.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": [3, 15], "x": 15.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 14], "x": 14.125, "y": 4.375},
-
-                {"matrix": [4, 15], "x": 15.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, 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, 13], "x": 13.125, "y": 5.375},
-                {"matrix": [5, 14], "x": 14.125, "y": 5.375},
-                {"matrix": [5, 15], "x": 15.125, "y": 5.375}
-            ]
-        }
-    }
-}
diff --git a/keyboards/hfdkb/keyboard_sw/k83/readme.md b/keyboards/hfdkb/keyboard_sw/k83/readme.md
deleted file mode 100644
index 871e9b893649..000000000000
--- a/keyboards/hfdkb/keyboard_sw/k83/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# k83
-
-A customizable 75% encoder keyboard.
-
-* Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986)
-* Hardware Supported: k83
-
-Make example for this keyboard (after setting up your build environment):
-
-    make hfdkb/keyboard_sw/k83:default
-
-Flashing example for this keyboard:
-
-    make hfdkb/keyboard_sw/k83:default:flash
-
-**Reset Key**: Hold down the key located at *K01*, which 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).
diff --git a/keyboards/hhkb/ansi/config.h b/keyboards/hhkb/ansi/config.h
index 723fe29479a1..7fe9f1f9dbc7 100644
--- a/keyboards/hhkb/ansi/config.h
+++ b/keyboards/hhkb/ansi/config.h
@@ -22,8 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8
 
-#define TAPPING_TERM    200
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/hhkb/jp/config.h b/keyboards/hhkb/jp/config.h
index 9de64724b78b..88b9c9b6cc8f 100644
--- a/keyboards/hhkb/jp/config.h
+++ b/keyboards/hhkb/jp/config.h
@@ -22,8 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 16
 #define MATRIX_COLS 8
 
-#define TAPPING_TERM    200
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/info.json
index bfff105e9073..24cd750e09c4 100644
--- a/keyboards/hhkb/yang/info.json
+++ b/keyboards/hhkb/yang/info.json
@@ -11,6 +11,9 @@
   "indicators": {
     "caps_lock": "F4"
   },
+  "bluetooth": {
+    "driver": "bluefruit_le"
+  },
   "processor": "atmega32u4",
   "bootloader": "lufa-ms",
   "debounce": 0,
diff --git a/keyboards/hhkb/yang/rules.mk b/keyboards/hhkb/yang/rules.mk
index 71ec705822b3..99f77d0c162e 100644
--- a/keyboards/hhkb/yang/rules.mk
+++ b/keyboards/hhkb/yang/rules.mk
@@ -11,9 +11,6 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = no            # USB Nkey Rollover
 
-# Disable bluetooth until the UART code is merged
-BLUETOOTH_DRIVER = BluefruitLE
-
 # Custom matrix file for the HHKB
 CUSTOM_MATRIX = lite
 SRC += matrix.c
diff --git a/keyboards/hidtech/bastyl/config.h b/keyboards/hidtech/bastyl/config.h
index 48ac76c74b7b..a033888b412e 100644
--- a/keyboards/hidtech/bastyl/config.h
+++ b/keyboards/hidtech/bastyl/config.h
@@ -18,19 +18,6 @@
 
 #pragma once
 
-#define RGBLED_NUM 38
-#define RGBLIGHT_SPLIT
-#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 LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 #define MASTER_RIGHT
diff --git a/keyboards/hidtech/bastyl/info.json b/keyboards/hidtech/bastyl/info.json
index 02b8854e3605..ee43e96bdd07 100644
--- a/keyboards/hidtech/bastyl/info.json
+++ b/keyboards/hidtech/bastyl/info.json
@@ -19,6 +19,22 @@
     "ws2812": {
         "pin": "D2"
     },
+    "rgblight": {
+        "led_count": 38,
+        "split": 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
+        }
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c b/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
index 8dbb31130913..e068f81a73f5 100644
--- a/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
+++ b/keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c
@@ -33,15 +33,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     //-------------------------------//
                     KC_LBRC, TD(LOCKS), TD(LAYERS), KC_RBRC),
 
-    [SYMB] = LAYOUT(_______, XP(IEX, SS1), X(SS2), X(SS3), XP(CUR, GBP), X(EUR), X(V14), X(V12), X(V34), XP(LSQ, LDQ), XP(RSQ, RDQ), _______,
+    [SYMB] = LAYOUT(_______, UP(IEX, SS1), UM(SS2), UM(SS3), UP(CUR, GBP), UM(EUR), UM(V14), UM(V12), UM(V34), UP(LSQ, LDQ), UP(RSQ, RDQ), _______,
                     //-------------------------------//
-                    _______, XP(A_D, AXD), XP(A_R, ACR), XP(E_A, ECA), XP(REG, CPL), X(THR), XP(U_D, UCD), XP(U_A, UCA), XP(I_A, ICA), XP(O_A, OCA), XP(O_D, OCD), _______,
+                    _______, UP(A_D, AXD), UP(A_R, ACR), UP(E_A, ECA), UP(REG, CPL), UM(THR), UP(U_D, UCD), UP(U_A, UCA), UP(I_A, ICA), UP(O_A, OCA), UP(O_D, OCD), _______,
                     //-------------------------------//
-                    _______, XP(A_A, ACA), XP(S_S, SEC), XP(ETH, ETC), X(EMD), _______, _______, _______, _______, XP(O_S, OCS), XP(PLC, DEG), XP(ACT, DIS),
+                    _______, UP(A_A, ACA), UP(S_S, SEC), UP(ETH, ETC), UM(EMD), _______, _______, _______, _______, UP(O_S, OCS), UP(PLC, DEG), UP(ACT, DIS),
                     //-------------------------------//
-                    _______, XP(AEL, AEC), _______, XP(CPR, CNT), _______, _______, _______, _______, XP(N_T, NCT), X(MCR), XP(C_C, CCC), _______,
+                    _______, UP(AEL, AEC), _______, UP(CPR, CNT), _______, _______, _______, _______, UP(N_T, NCT), UM(MCR), UP(C_C, CCC), _______,
                     //-------------------------------//
-                    X(IQM), XP(NOT, BKB), _______, _______, X(YEN), XP(MLT, DIV),
+                    UM(IQM), UP(NOT, BKB), _______, _______, UM(YEN), UP(MLT, DIV),
                     //-------------------------------//
                     _______, _______, _______, _______),
 
diff --git a/keyboards/hifumi/config.h b/keyboards/hifumi/config.h
deleted file mode 100644
index bcf040c6cb17..000000000000
--- a/keyboards/hifumi/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2019 zk-phi
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should 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 RGBLED_NUM 6
-#define RGBLIGHT_HUE_STEP 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_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/hifumi/info.json b/keyboards/hifumi/info.json
index a4aeccf83ad0..6c2f53aab83a 100644
--- a/keyboards/hifumi/info.json
+++ b/keyboards/hifumi/info.json
@@ -13,6 +13,22 @@
     "rows": ["D4", "C6"]
   },
   "diode_direction": "COL2ROW",
+  "rgblight": {
+    "hue_steps": 5,
+    "led_count": 6,
+    "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": "D3"
   },
diff --git a/keyboards/hillside/46/0_1/config.h b/keyboards/hillside/46/0_1/config.h
index 81736ff17598..20c4deca40c5 100644
--- a/keyboards/hillside/46/0_1/config.h
+++ b/keyboards/hillside/46/0_1/config.h
@@ -8,20 +8,18 @@
 #define SPLIT_HAND_MATRIX_GRID B5, F6
 #define MATRIX_MASKED
 
-#define RGBLIGHT_SLEEP
-
 /* Haptic hardware */
 // The Pimoroni is the likely hardware, for which these settings work
-#define FB_ERM_LRA 1
-#define FB_BRAKEFACTOR 3 /* 1x:0, 2x:1, 3x:2, 4x:3, 6:4, 8:5, 16:6, Disable:7 */
-#define FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
+#define DRV2605L_FB_ERM_LRA 1
+#define DRV2605L_FB_BRAKEFACTOR 3 /* 1x:0, 2x:1, 3x:2, 4x:3, 6:4, 8:5, 16:6, Disable:7 */
+#define DRV2605L_FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
 /* Please refer to your datasheet for optimal setting for your specific motor.*/
-#define RATED_VOLTAGE 2
-#define V_PEAK 2.8
-#define V_RMS 2.0
-#define F_LRA 205 /* resonance freq */
+#define DRV2605L_RATED_VOLTAGE 2
+#define DRV2605L_V_PEAK 2.8
+#define DRV2605L_V_RMS 2.0
+#define DRV2605L_F_LRA 205 /* resonance freq */
 
 /* Haptic waveforms */
 // Two mild waveforms
-#define DRV_GREETING alert_750ms
-#define DRV_MODE_DEFAULT sharp_tick3_60
+#define DRV2605L_GREETING DRV2605L_EFFECT_750_MS_ALERT_100
+#define DRV2605L_DEFAULT_MODE DRV2605L_EFFECT_SHARP_TICK_3_60
diff --git a/keyboards/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/info.json
index 8b5fa112f7ad..7512debabdf0 100644
--- a/keyboards/hillside/46/0_1/info.json
+++ b/keyboards/hillside/46/0_1/info.json
@@ -36,7 +36,8 @@
         "split": true,
         "hue_steps": 8,
         "saturation_steps": 8,
-        "brightness_steps": 8
+        "brightness_steps": 8,
+        "sleep": true
     },
     "ws2812": {
         "pin": "D3"
diff --git a/keyboards/hillside/46/0_1/rules.mk b/keyboards/hillside/46/0_1/rules.mk
index 2501147ea82e..3c12e55b581d 100644
--- a/keyboards/hillside/46/0_1/rules.mk
+++ b/keyboards/hillside/46/0_1/rules.mk
@@ -5,4 +5,4 @@ LTO_ENABLE = yes            # Use link time optimization for smaller firmware
 # enable it and set its driver here or in your keymap folder
 # The Pimoroni board's driver is DRV2605L 
 # HAPTIC_ENABLE = yes        # Enable haptic driver
-# HAPTIC_DRIVER = DRV2605L
+# HAPTIC_DRIVER = drv2605l
diff --git a/keyboards/hillside/48/0_1/config.h b/keyboards/hillside/48/0_1/config.h
index 72f1a842c775..150573c16558 100644
--- a/keyboards/hillside/48/0_1/config.h
+++ b/keyboards/hillside/48/0_1/config.h
@@ -3,20 +3,18 @@
 
 #pragma once
 
-#define RGBLIGHT_SLEEP
-
 /* Haptic hardware */
 // The Pimoroni is the likely hardware, for which these settings work
-#define FB_ERM_LRA 1
-#define FB_BRAKEFACTOR 3 /* 1x:0, 2x:1, 3x:2, 4x:3, 6:4, 8:5, 16:6, Disable:7 */
-#define FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
+#define DRV2605L_FB_ERM_LRA 1
+#define DRV2605L_FB_BRAKEFACTOR 3 /* 1x:0, 2x:1, 3x:2, 4x:3, 6:4, 8:5, 16:6, Disable:7 */
+#define DRV2605L_FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
 /* Please refer to your datasheet for optimal setting for your specific motor.*/
-#define RATED_VOLTAGE 2
-#define V_PEAK 2.8
-#define V_RMS 2.0
-#define F_LRA 205 /* resonance freq */
+#define DRV2605L_RATED_VOLTAGE 2
+#define DRV2605L_V_PEAK 2.8
+#define DRV2605L_V_RMS 2.0
+#define DRV2605L_F_LRA 205 /* resonance freq */
 
 /* Haptic waveforms */
 // Two mild waveforms
-#define DRV_GREETING alert_750ms
-#define DRV_MODE_DEFAULT sharp_tick3_60
+#define DRV2605L_GREETING DRV2605L_EFFECT_750_MS_ALERT_100
+#define DRV2605L_DEFAULT_MODE DRV2605L_EFFECT_SHARP_TICK_3_60
diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/info.json
index 19e38259d377..2159d1ca6876 100644
--- a/keyboards/hillside/48/0_1/info.json
+++ b/keyboards/hillside/48/0_1/info.json
@@ -37,7 +37,8 @@
         "split": true,
         "hue_steps": 8,
         "saturation_steps": 8,
-        "brightness_steps": 8
+        "brightness_steps": 8,
+        "sleep": true
     },
     "ws2812": {
         "pin": "D3"
diff --git a/keyboards/hillside/48/0_1/rules.mk b/keyboards/hillside/48/0_1/rules.mk
index 2501147ea82e..3c12e55b581d 100644
--- a/keyboards/hillside/48/0_1/rules.mk
+++ b/keyboards/hillside/48/0_1/rules.mk
@@ -5,4 +5,4 @@ LTO_ENABLE = yes            # Use link time optimization for smaller firmware
 # enable it and set its driver here or in your keymap folder
 # The Pimoroni board's driver is DRV2605L 
 # HAPTIC_ENABLE = yes        # Enable haptic driver
-# HAPTIC_DRIVER = DRV2605L
+# HAPTIC_DRIVER = drv2605l
diff --git a/keyboards/hillside/52/0_1/config.h b/keyboards/hillside/52/0_1/config.h
index 81736ff17598..20c4deca40c5 100644
--- a/keyboards/hillside/52/0_1/config.h
+++ b/keyboards/hillside/52/0_1/config.h
@@ -8,20 +8,18 @@
 #define SPLIT_HAND_MATRIX_GRID B5, F6
 #define MATRIX_MASKED
 
-#define RGBLIGHT_SLEEP
-
 /* Haptic hardware */
 // The Pimoroni is the likely hardware, for which these settings work
-#define FB_ERM_LRA 1
-#define FB_BRAKEFACTOR 3 /* 1x:0, 2x:1, 3x:2, 4x:3, 6:4, 8:5, 16:6, Disable:7 */
-#define FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
+#define DRV2605L_FB_ERM_LRA 1
+#define DRV2605L_FB_BRAKEFACTOR 3 /* 1x:0, 2x:1, 3x:2, 4x:3, 6:4, 8:5, 16:6, Disable:7 */
+#define DRV2605L_FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
 /* Please refer to your datasheet for optimal setting for your specific motor.*/
-#define RATED_VOLTAGE 2
-#define V_PEAK 2.8
-#define V_RMS 2.0
-#define F_LRA 205 /* resonance freq */
+#define DRV2605L_RATED_VOLTAGE 2
+#define DRV2605L_V_PEAK 2.8
+#define DRV2605L_V_RMS 2.0
+#define DRV2605L_F_LRA 205 /* resonance freq */
 
 /* Haptic waveforms */
 // Two mild waveforms
-#define DRV_GREETING alert_750ms
-#define DRV_MODE_DEFAULT sharp_tick3_60
+#define DRV2605L_GREETING DRV2605L_EFFECT_750_MS_ALERT_100
+#define DRV2605L_DEFAULT_MODE DRV2605L_EFFECT_SHARP_TICK_3_60
diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/info.json
index 8584ee15124c..63bbf3b2577a 100644
--- a/keyboards/hillside/52/0_1/info.json
+++ b/keyboards/hillside/52/0_1/info.json
@@ -36,7 +36,8 @@
         "split": true,
         "hue_steps": 8,
         "saturation_steps": 8,
-        "brightness_steps": 8
+        "brightness_steps": 8,
+        "sleep": true
     },
     "ws2812": {
         "pin": "D3"
diff --git a/keyboards/hillside/52/0_1/rules.mk b/keyboards/hillside/52/0_1/rules.mk
index 2501147ea82e..3c12e55b581d 100644
--- a/keyboards/hillside/52/0_1/rules.mk
+++ b/keyboards/hillside/52/0_1/rules.mk
@@ -5,4 +5,4 @@ LTO_ENABLE = yes            # Use link time optimization for smaller firmware
 # enable it and set its driver here or in your keymap folder
 # The Pimoroni board's driver is DRV2605L 
 # HAPTIC_ENABLE = yes        # Enable haptic driver
-# HAPTIC_DRIVER = DRV2605L
+# HAPTIC_DRIVER = drv2605l
diff --git a/keyboards/hineybush/h08_ocelot/config.h b/keyboards/hineybush/h08_ocelot/config.h
index e275779f4c7f..474c1d6701d7 100644
--- a/keyboards/hineybush/h08_ocelot/config.h
+++ b/keyboards/hineybush/h08_ocelot/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 7
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/hineybush/h08_ocelot/info.json b/keyboards/hineybush/h08_ocelot/info.json
index addd71a5a8ca..989e23e75748 100644
--- a/keyboards/hineybush/h08_ocelot/info.json
+++ b/keyboards/hineybush/h08_ocelot/info.json
@@ -17,7 +17,23 @@
         "pin": "F1"
     },
     "rgblight": {
-        "max_brightness": 220
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 7,
+        "max_brightness": 220,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/hineybush/h101/info.json b/keyboards/hineybush/h101/info.json
new file mode 100644
index 000000000000..d1f8fa32a084
--- /dev/null
+++ b/keyboards/hineybush/h101/info.json
@@ -0,0 +1,381 @@
+{
+    "manufacturer": "hiney",
+    "keyboard_name": "h101",
+    "maintainer": "hineybush",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B10", "B11", "B12", "A8", "A9", "A10", "A15", "B3", "B4", "B5", "B6", "B7", "B9", "A3", "F0", "F1", "A7", "A5", "A4"],
+        "rows": ["C13", "C14", "C15", "A0", "A1", "A2"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "vid": "0x4069",
+        "pid": "0x0002"
+    },
+    "indicators": {
+        "num_lock": "A6",
+        "caps_lock": "B14",
+        "scroll_lock": "B8",
+        "on_state": 0
+    },
+    "layouts": {
+        "LAYOUT_f13_tsangan": {
+            "layout": [
+                {"matrix": [0,0], "label":"Esc", "x":0, "y":0},
+                {"matrix": [0,1], "label":"F1", "x":1.25, "y":0},
+                {"matrix": [0,2], "label":"F2", "x":2.25, "y":0},
+                {"matrix": [0,3], "label":"F3", "x":3.25, "y":0},
+                {"matrix": [0,4], "label":"F4", "x":4.25, "y":0},
+                {"matrix": [0,5], "label":"F5", "x":5.5, "y":0},
+                {"matrix": [0,6], "label":"F6", "x":6.5, "y":0},
+                {"matrix": [0,7], "label":"F7", "x":7.5, "y":0},
+                {"matrix": [0,8], "label":"F8", "x":8.5, "y":0},
+                {"matrix": [0,9], "label":"F9", "x":9.75, "y":0},
+                {"matrix": [0,11], "label":"F10", "x":10.75, "y":0},
+                {"matrix": [0,12], "label":"F11", "x":11.75, "y":0},
+                {"matrix": [0,13], "label":"F12", "x":12.75, "y":0},
+                {"matrix": [0,14], "label":"F13", "x":14, "y":0},
+                {"matrix": [0,15], "label":"PrtSc", "x":15.25, "y":0},
+                {"matrix": [0,16], "label":"Scroll Lock", "x":16.25, "y":0},
+                {"matrix": [0,17], "label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0,18], "label":"KP 1", "x":18.5, "y":0},
+                {"matrix": [0,19], "label":"KP 2", "x":19.5, "y":0},
+                {"matrix": [0,20], "label":"KP 3", "x":20.5, "y":0},
+                {"matrix": [0,21], "label":"KP 4", "x":21.5, "y":0},
+                {"matrix": [1,0], "label":"~", "x":0, "y":1.25},
+                {"matrix": [1,1], "label":"!", "x":1, "y":1.25},
+                {"matrix": [1,2], "label":"@", "x":2, "y":1.25},
+                {"matrix": [1,3], "label":"#", "x":3, "y":1.25},
+                {"matrix": [1,4], "label":"$", "x":4, "y":1.25},
+                {"matrix": [1,5], "label":"%", "x":5, "y":1.25},
+                {"matrix": [1,6], "label":"^", "x":6, "y":1.25},
+                {"matrix": [1,7], "label":"&", "x":7, "y":1.25},
+                {"matrix": [1,8], "label":"*", "x":8, "y":1.25},
+                {"matrix": [1,9], "label":"(", "x":9, "y":1.25},
+                {"matrix": [1,10], "label":")", "x":10, "y":1.25},
+                {"matrix": [1,11], "label":"_", "x":11, "y":1.25},
+                {"matrix": [1,12], "label":"+", "x":12, "y":1.25},
+                {"matrix": [1,14], "label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"matrix": [1,15], "label":"Insert", "x":15.25, "y":1.25},
+                {"matrix": [1,16], "label":"Home", "x":16.25, "y":1.25},
+                {"matrix": [1,17], "label":"PgUp", "x":17.25, "y":1.25},
+                {"matrix": [1,18], "label":"Num Lock", "x":18.5, "y":1.25},
+                {"matrix": [1,19], "label":"/", "x":19.5, "y":1.25},
+                {"matrix": [1,20], "label":"*", "x":20.5, "y":1.25},
+                {"matrix": [1,21], "label":"-", "x":21.5, "y":1.25},
+                {"matrix": [2,0], "label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"matrix": [2,1], "label":"Q", "x":1.5, "y":2.25},
+                {"matrix": [2,2], "label":"W", "x":2.5, "y":2.25},
+                {"matrix": [2,3], "label":"E", "x":3.5, "y":2.25},
+                {"matrix": [2,4], "label":"R", "x":4.5, "y":2.25},
+                {"matrix": [2,5], "label":"T", "x":5.5, "y":2.25},
+                {"matrix": [2,6], "label":"Y", "x":6.5, "y":2.25},
+                {"matrix": [2,7], "label":"U", "x":7.5, "y":2.25},
+                {"matrix": [2,8], "label":"I", "x":8.5, "y":2.25},
+                {"matrix": [2,9], "label":"O", "x":9.5, "y":2.25},
+                {"matrix": [2,10], "label":"P", "x":10.5, "y":2.25},
+                {"matrix": [2,11], "label":"{", "x":11.5, "y":2.25},
+                {"matrix": [2,12], "label":"}", "x":12.5, "y":2.25},
+                {"matrix": [2,13], "label":"|", "x":13.5, "y":2.25, "w":1.5},
+                {"matrix": [2,15], "label":"Delete", "x":15.25, "y":2.25},
+                {"matrix": [2,16], "label":"End", "x":16.25, "y":2.25},
+                {"matrix": [2,17], "label":"PgDn", "x":17.25, "y":2.25},
+                {"matrix": [2,18], "label":"7", "x":18.5, "y":2.25},
+                {"matrix": [2,19], "label":"8", "x":19.5, "y":2.25},
+                {"matrix": [2,20], "label":"9", "x":20.5, "y":2.25},
+                {"matrix": [2,21], "label":"+", "x":21.5, "y":2.25, "h":2},
+                {"matrix": [3,0], "label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"matrix": [3,1], "label":"A", "x":1.75, "y":3.25},
+                {"matrix": [3,2], "label":"S", "x":2.75, "y":3.25},
+                {"matrix": [3,3], "label":"D", "x":3.75, "y":3.25},
+                {"matrix": [3,4], "label":"F", "x":4.75, "y":3.25},
+                {"matrix": [3,5], "label":"G", "x":5.75, "y":3.25},
+                {"matrix": [3,6], "label":"H", "x":6.75, "y":3.25},
+                {"matrix": [3,7], "label":"J", "x":7.75, "y":3.25},
+                {"matrix": [3,8], "label":"K", "x":8.75, "y":3.25},
+                {"matrix": [3,9], "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,13], "label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [3,18], "label":"4", "x":18.5, "y":3.25},
+                {"matrix": [3,19], "label":"5", "x":19.5, "y":3.25},
+                {"matrix": [3,20], "label":"6", "x":20.5, "y":3.25},
+                {"matrix": [4,0], "label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"matrix": [4,2], "label":"Z", "x":2.25, "y":4.25},
+                {"matrix": [4,3], "label":"X", "x":3.25, "y":4.25},
+                {"matrix": [4,4], "label":"C", "x":4.25, "y":4.25},
+                {"matrix": [4,5], "label":"V", "x":5.25, "y":4.25},
+                {"matrix": [4,6], "label":"B", "x":6.25, "y":4.25},
+                {"matrix": [4,7], "label":"N", "x":7.25, "y":4.25},
+                {"matrix": [4,8], "label":"M", "x":8.25, "y":4.25},
+                {"matrix": [4,9], "label":"<", "x":9.25, "y":4.25},
+                {"matrix": [4,10], "label":">", "x":10.25, "y":4.25},
+                {"matrix": [4,11], "label":"?", "x":11.25, "y":4.25},
+                {"matrix": [4,12], "label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"matrix": [4,16], "label":"Up Arrow", "x":16.25, "y":4.25},
+                {"matrix": [4,18], "label":"1", "x":18.5, "y":4.25},
+                {"matrix": [4,19], "label":"2", "x":19.5, "y":4.25},
+                {"matrix": [4,20], "label":"3", "x":20.5, "y":4.25},
+                {"matrix": [4,21], "label":"Enter", "x":21.5, "y":4.25, "h":2},
+                {"matrix": [5,0], "label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"matrix": [5,1], "label":"Win", "x":1.5, "y":5.25},
+                {"matrix": [5,2], "label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"matrix": [5,7], "label":"Space", "x":4, "y":5.25, "w":7},
+                {"matrix": [5,11], "label":"Alt", "x":11, "y":5.25, "w":1.5},
+                {"matrix": [5,12], "label":"Win", "x":12.5, "y":5.25},
+                {"matrix": [5,13], "label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"matrix": [5,15], "label":"Left Arrow", "x":15.25, "y":5.25},
+                {"matrix": [5,16], "label":"Down Arrow", "x":16.25, "y":5.25},
+                {"matrix": [5,17], "label":"Right Arrow", "x":17.25, "y":5.25},
+                {"matrix": [5,19], "label":"0", "x":18.5, "y":5.25, "w":2},
+                {"matrix": [5,20], "label":".", "x":20.5, "y":5.25}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0,0], "label":"Esc", "x":0, "y":0},
+                {"matrix": [0,1], "label":"F1", "x":1.25, "y":0},
+                {"matrix": [0,2], "label":"F2", "x":2.25, "y":0},
+                {"matrix": [0,3], "label":"F3", "x":3.25, "y":0},
+                {"matrix": [0,4], "label":"F4", "x":4.25, "y":0},
+                {"matrix": [0,5], "label":"F5", "x":5.5, "y":0},
+                {"matrix": [0,6], "label":"F6", "x":6.5, "y":0},
+                {"matrix": [0,7], "label":"F7", "x":7.5, "y":0},
+                {"matrix": [0,8], "label":"F8", "x":8.5, "y":0},
+                {"matrix": [0,9], "label":"F9", "x":9.75, "y":0},
+                {"matrix": [0,11], "label":"F10", "x":10.75, "y":0},
+                {"matrix": [0,12], "label":"F11", "x":11.75, "y":0},
+                {"matrix": [0,13], "label":"F12", "x":12.75, "y":0},
+                {"matrix": [0,14], "label":"F13", "x":14, "y":0},
+                {"matrix": [0,15], "label":"PrtSc", "x":15.25, "y":0},
+                {"matrix": [0,16], "label":"Scroll Lock", "x":16.25, "y":0},
+                {"matrix": [0,17], "label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0,18], "label":"KP 1", "x":18.5, "y":0},
+                {"matrix": [0,19], "label":"KP 2", "x":19.5, "y":0},
+                {"matrix": [0,20], "label":"KP 3", "x":20.5, "y":0},
+                {"matrix": [0,21], "label":"KP 4", "x":21.5, "y":0},
+                {"matrix": [1,0], "label":"~", "x":0, "y":1.25},
+                {"matrix": [1,1], "label":"!", "x":1, "y":1.25},
+                {"matrix": [1,2], "label":"@", "x":2, "y":1.25},
+                {"matrix": [1,3], "label":"#", "x":3, "y":1.25},
+                {"matrix": [1,4], "label":"$", "x":4, "y":1.25},
+                {"matrix": [1,5], "label":"%", "x":5, "y":1.25},
+                {"matrix": [1,6], "label":"^", "x":6, "y":1.25},
+                {"matrix": [1,7], "label":"&", "x":7, "y":1.25},
+                {"matrix": [1,8], "label":"*", "x":8, "y":1.25},
+                {"matrix": [1,9], "label":"(", "x":9, "y":1.25},
+                {"matrix": [1,10], "label":")", "x":10, "y":1.25},
+                {"matrix": [1,11], "label":"_", "x":11, "y":1.25},
+                {"matrix": [1,12], "label":"+", "x":12, "y":1.25},
+                {"matrix": [1,13], "label":"1U Split Bksp", "x":13, "y":1.25},
+                {"matrix": [1,14], "label":"Backspace", "x":14, "y":1.25},
+                {"matrix": [1,15], "label":"Insert", "x":15.25, "y":1.25},
+                {"matrix": [1,16], "label":"Home", "x":16.25, "y":1.25},
+                {"matrix": [1,17], "label":"PgUp", "x":17.25, "y":1.25},
+                {"matrix": [1,18], "label":"Num Lock", "x":18.5, "y":1.25},
+                {"matrix": [1,19], "label":"/", "x":19.5, "y":1.25},
+                {"matrix": [1,20], "label":"*", "x":20.5, "y":1.25},
+                {"matrix": [1,21], "label":"-", "x":21.5, "y":1.25},
+                {"matrix": [2,0], "label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"matrix": [2,1], "label":"Q", "x":1.5, "y":2.25},
+                {"matrix": [2,2], "label":"W", "x":2.5, "y":2.25},
+                {"matrix": [2,3], "label":"E", "x":3.5, "y":2.25},
+                {"matrix": [2,4], "label":"R", "x":4.5, "y":2.25},
+                {"matrix": [2,5], "label":"T", "x":5.5, "y":2.25},
+                {"matrix": [2,6], "label":"Y", "x":6.5, "y":2.25},
+                {"matrix": [2,7], "label":"U", "x":7.5, "y":2.25},
+                {"matrix": [2,8], "label":"I", "x":8.5, "y":2.25},
+                {"matrix": [2,9], "label":"O", "x":9.5, "y":2.25},
+                {"matrix": [2,10], "label":"P", "x":10.5, "y":2.25},
+                {"matrix": [2,11], "label":"{", "x":11.5, "y":2.25},
+                {"matrix": [2,12], "label":"}", "x":12.5, "y":2.25},
+                {"matrix": [2,13], "label":"|", "x":13.5, "y":2.25, "w":1.5},
+                {"matrix": [2,15], "label":"Delete", "x":15.25, "y":2.25},
+                {"matrix": [2,16], "label":"End", "x":16.25, "y":2.25},
+                {"matrix": [2,17], "label":"PgDn", "x":17.25, "y":2.25},
+                {"matrix": [2,18], "label":"7", "x":18.5, "y":2.25},
+                {"matrix": [2,19], "label":"8", "x":19.5, "y":2.25},
+                {"matrix": [2,20], "label":"9", "x":20.5, "y":2.25},
+                {"matrix": [2,21], "label":"+", "x":21.5, "y":2.25},
+                {"matrix": [3,0], "label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"matrix": [3,1], "label":"A", "x":1.75, "y":3.25},
+                {"matrix": [3,2], "label":"S", "x":2.75, "y":3.25},
+                {"matrix": [3,3], "label":"D", "x":3.75, "y":3.25},
+                {"matrix": [3,4], "label":"F", "x":4.75, "y":3.25},
+                {"matrix": [3,5], "label":"G", "x":5.75, "y":3.25},
+                {"matrix": [3,6], "label":"H", "x":6.75, "y":3.25},
+                {"matrix": [3,7], "label":"J", "x":7.75, "y":3.25},
+                {"matrix": [3,8], "label":"K", "x":8.75, "y":3.25},
+                {"matrix": [3,9], "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,13], "label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [3,18], "label":"4", "x":18.5, "y":3.25},
+                {"matrix": [3,19], "label":"5", "x":19.5, "y":3.25},
+                {"matrix": [3,20], "label":"6", "x":20.5, "y":3.25},
+                {"matrix": [3,21], "label":"+", "x":21.5, "y":3.25},
+                {"matrix": [4,0], "label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"matrix": [4,2], "label":"Z", "x":2.25, "y":4.25},
+                {"matrix": [4,3], "label":"X", "x":3.25, "y":4.25},
+                {"matrix": [4,4], "label":"C", "x":4.25, "y":4.25},
+                {"matrix": [4,5], "label":"V", "x":5.25, "y":4.25},
+                {"matrix": [4,6], "label":"B", "x":6.25, "y":4.25},
+                {"matrix": [4,7], "label":"N", "x":7.25, "y":4.25},
+                {"matrix": [4,8], "label":"M", "x":8.25, "y":4.25},
+                {"matrix": [4,9], "label":"<", "x":9.25, "y":4.25},
+                {"matrix": [4,10], "label":">", "x":10.25, "y":4.25},
+                {"matrix": [4,11], "label":"?", "x":11.25, "y":4.25},
+                {"matrix": [4,12], "label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"matrix": [4,13], "label":"Fn", "x":14, "y":4.25},
+                {"matrix": [4,16], "label":"Up Arrow", "x":16.25, "y":4.25},
+                {"matrix": [4,18], "label":"1", "x":18.5, "y":4.25},
+                {"matrix": [4,19], "label":"2", "x":19.5, "y":4.25},
+                {"matrix": [4,20], "label":"3", "x":20.5, "y":4.25},
+                {"matrix": [4,21], "label":"Enter", "x":21.5, "y":4.25},
+                {"matrix": [5,0], "label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"matrix": [5,1], "label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"matrix": [5,2], "label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"matrix": [5,7], "label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"matrix": [5,10], "label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"matrix": [5,11], "label":"Alt", "x":11.25, "y":5.25, "w":1.25},
+                {"matrix": [5,12], "label":"Win", "x":12.5, "y":5.25, "w":1.25},
+                {"matrix": [5,13], "label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"matrix": [5,15], "label":"Left Arrow", "x":15.25, "y":5.25},
+                {"matrix": [5,16], "label":"Down Arrow", "x":16.25, "y":5.25},
+                {"matrix": [5,17], "label":"Right Arrow", "x":17.25, "y":5.25},
+                {"matrix": [5,18], "label":"0", "x":18.5, "y":5.25},
+                {"matrix": [5,19], "label":"0", "x":19.5, "y":5.25},
+                {"matrix": [5,20], "label":".", "x":20.5, "y":5.25},
+                {"matrix": [5,21], "label":"Enter", "x":21.5, "y":5.25}
+            ]
+        },
+        "LAYOUT_f12_all": {
+            "layout": [
+                {"matrix": [0,0], "label":"Esc", "x":0, "y":0},
+                {"matrix": [0,1], "label":"F1", "x":1.25, "y":0},
+                {"matrix": [0,2], "label":"F2", "x":2.25, "y":0},
+                {"matrix": [0,3], "label":"F3", "x":3.25, "y":0},
+                {"matrix": [0,4], "label":"F4", "x":4.25, "y":0},
+                {"matrix": [0,5], "label":"F5", "x":5.5, "y":0},
+                {"matrix": [0,6], "label":"F6", "x":6.5, "y":0},
+                {"matrix": [0,7], "label":"F7", "x":7.5, "y":0},
+                {"matrix": [0,8], "label":"F8", "x":8.5, "y":0},
+                {"matrix": [0,9], "label":"F9", "x":9.75, "y":0},
+                {"matrix": [0,11], "label":"F10", "x":10.75, "y":0},
+                {"matrix": [0,12], "label":"F11", "x":11.75, "y":0},
+                {"matrix": [0,13], "label":"F12", "x":12.75, "y":0},
+                {"matrix": [0,15], "label":"PrtSc", "x":15.25, "y":0},
+                {"matrix": [0,16], "label":"Scroll Lock", "x":16.25, "y":0},
+                {"matrix": [0,17], "label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0,18], "label":"KP 1", "x":18.5, "y":0},
+                {"matrix": [0,19], "label":"KP 2", "x":19.5, "y":0},
+                {"matrix": [0,20], "label":"KP 3", "x":20.5, "y":0},
+                {"matrix": [0,21], "label":"KP 4", "x":21.5, "y":0},
+                {"matrix": [1,0], "label":"~", "x":0, "y":1.25},
+                {"matrix": [1,1], "label":"!", "x":1, "y":1.25},
+                {"matrix": [1,2], "label":"@", "x":2, "y":1.25},
+                {"matrix": [1,3], "label":"#", "x":3, "y":1.25},
+                {"matrix": [1,4], "label":"$", "x":4, "y":1.25},
+                {"matrix": [1,5], "label":"%", "x":5, "y":1.25},
+                {"matrix": [1,6], "label":"^", "x":6, "y":1.25},
+                {"matrix": [1,7], "label":"&", "x":7, "y":1.25},
+                {"matrix": [1,8], "label":"*", "x":8, "y":1.25},
+                {"matrix": [1,9], "label":"(", "x":9, "y":1.25},
+                {"matrix": [1,10], "label":")", "x":10, "y":1.25},
+                {"matrix": [1,11], "label":"_", "x":11, "y":1.25},
+                {"matrix": [1,12], "label":"+", "x":12, "y":1.25},
+                {"matrix": [1,13], "label":"1U Split Bksp", "x":13, "y":1.25},
+                {"matrix": [1,14], "label":"Backspace", "x":14, "y":1.25},
+                {"matrix": [1,15], "label":"Insert", "x":15.25, "y":1.25},
+                {"matrix": [1,16], "label":"Home", "x":16.25, "y":1.25},
+                {"matrix": [1,17], "label":"PgUp", "x":17.25, "y":1.25},
+                {"matrix": [1,18], "label":"Num Lock", "x":18.5, "y":1.25},
+                {"matrix": [1,19], "label":"/", "x":19.5, "y":1.25},
+                {"matrix": [1,20], "label":"*", "x":20.5, "y":1.25},
+                {"matrix": [1,21], "label":"-", "x":21.5, "y":1.25},
+                {"matrix": [2,0], "label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"matrix": [2,1], "label":"Q", "x":1.5, "y":2.25},
+                {"matrix": [2,2], "label":"W", "x":2.5, "y":2.25},
+                {"matrix": [2,3], "label":"E", "x":3.5, "y":2.25},
+                {"matrix": [2,4], "label":"R", "x":4.5, "y":2.25},
+                {"matrix": [2,5], "label":"T", "x":5.5, "y":2.25},
+                {"matrix": [2,6], "label":"Y", "x":6.5, "y":2.25},
+                {"matrix": [2,7], "label":"U", "x":7.5, "y":2.25},
+                {"matrix": [2,8], "label":"I", "x":8.5, "y":2.25},
+                {"matrix": [2,9], "label":"O", "x":9.5, "y":2.25},
+                {"matrix": [2,10], "label":"P", "x":10.5, "y":2.25},
+                {"matrix": [2,11], "label":"{", "x":11.5, "y":2.25},
+                {"matrix": [2,12], "label":"}", "x":12.5, "y":2.25},
+                {"matrix": [2,13], "label":"|", "x":13.5, "y":2.25, "w":1.5},
+                {"matrix": [2,15], "label":"Delete", "x":15.25, "y":2.25},
+                {"matrix": [2,16], "label":"End", "x":16.25, "y":2.25},
+                {"matrix": [2,17], "label":"PgDn", "x":17.25, "y":2.25},
+                {"matrix": [2,18], "label":"7", "x":18.5, "y":2.25},
+                {"matrix": [2,19], "label":"8", "x":19.5, "y":2.25},
+                {"matrix": [2,20], "label":"9", "x":20.5, "y":2.25},
+                {"matrix": [2,21], "label":"+", "x":21.5, "y":2.25},
+                {"matrix": [3,0], "label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"matrix": [3,1], "label":"A", "x":1.75, "y":3.25},
+                {"matrix": [3,2], "label":"S", "x":2.75, "y":3.25},
+                {"matrix": [3,3], "label":"D", "x":3.75, "y":3.25},
+                {"matrix": [3,4], "label":"F", "x":4.75, "y":3.25},
+                {"matrix": [3,5], "label":"G", "x":5.75, "y":3.25},
+                {"matrix": [3,6], "label":"H", "x":6.75, "y":3.25},
+                {"matrix": [3,7], "label":"J", "x":7.75, "y":3.25},
+                {"matrix": [3,8], "label":"K", "x":8.75, "y":3.25},
+                {"matrix": [3,9], "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,13], "label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [3,18], "label":"4", "x":18.5, "y":3.25},
+                {"matrix": [3,19], "label":"5", "x":19.5, "y":3.25},
+                {"matrix": [3,20], "label":"6", "x":20.5, "y":3.25},
+                {"matrix": [3,21], "label":"+", "x":21.5, "y":3.25},
+                {"matrix": [4,0], "label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"matrix": [4,2], "label":"Z", "x":2.25, "y":4.25},
+                {"matrix": [4,3], "label":"X", "x":3.25, "y":4.25},
+                {"matrix": [4,4], "label":"C", "x":4.25, "y":4.25},
+                {"matrix": [4,5], "label":"V", "x":5.25, "y":4.25},
+                {"matrix": [4,6], "label":"B", "x":6.25, "y":4.25},
+                {"matrix": [4,7], "label":"N", "x":7.25, "y":4.25},
+                {"matrix": [4,8], "label":"M", "x":8.25, "y":4.25},
+                {"matrix": [4,9], "label":"<", "x":9.25, "y":4.25},
+                {"matrix": [4,10], "label":">", "x":10.25, "y":4.25},
+                {"matrix": [4,11], "label":"?", "x":11.25, "y":4.25},
+                {"matrix": [4,12], "label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"matrix": [4,13], "label":"Fn", "x":14, "y":4.25},
+                {"matrix": [4,16], "label":"Up Arrow", "x":16.25, "y":4.25},
+                {"matrix": [4,18], "label":"1", "x":18.5, "y":4.25},
+                {"matrix": [4,19], "label":"2", "x":19.5, "y":4.25},
+                {"matrix": [4,20], "label":"3", "x":20.5, "y":4.25},
+                {"matrix": [4,21], "label":"Enter", "x":21.5, "y":4.25},
+                {"matrix": [5,0], "label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"matrix": [5,1], "label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"matrix": [5,2], "label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"matrix": [5,7], "label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"matrix": [5,10], "label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"matrix": [5,11], "label":"Alt", "x":11.25, "y":5.25, "w":1.25},
+                {"matrix": [5,12], "label":"Win", "x":12.5, "y":5.25, "w":1.25},
+                {"matrix": [5,13], "label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"matrix": [5,15], "label":"Left Arrow", "x":15.25, "y":5.25},
+                {"matrix": [5,16], "label":"Down Arrow", "x":16.25, "y":5.25},
+                {"matrix": [5,17], "label":"Right Arrow", "x":17.25, "y":5.25},
+                {"matrix": [5,18], "label":"0", "x":18.5, "y":5.25},
+                {"matrix": [5,19], "label":"0", "x":19.5, "y":5.25},
+                {"matrix": [5,20], "label":".", "x":20.5, "y":5.25},
+                {"matrix": [5,21], "label":"Enter", "x":21.5, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hineybush/h101/keymaps/default/keymap.c b/keyboards/hineybush/h101/keymaps/default/keymap.c
new file mode 100644
index 000000000000..bc0352003644
--- /dev/null
+++ b/keyboards/hineybush/h101/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 Josh Hinnebusch (@hineybush)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_f13_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_0,                    KC_PSCR, KC_SCRL, KC_PAUS,            KC_MPLY, KC_MNXT, KC_VOLU, KC_VOLD,
+    KC_GRV,  KC_1,    KC_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, MO(1),   KC_RCTL,                                                                                       KC_LEFT, KC_DOWN, KC_RGHT,            KC_P0,   KC_PDOT                   ),
+
+  [1] = LAYOUT_f13_tsangan(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, 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/h101/keymaps/via/keymap.c b/keyboards/hineybush/h101/keymaps/via/keymap.c
new file mode 100644
index 000000000000..020042b13a66
--- /dev/null
+++ b/keyboards/hineybush/h101/keymaps/via/keymap.c
@@ -0,0 +1,46 @@
+// Copyright 2023 Josh Hinnebusch (@hineybush)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/*
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+│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
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+*/
+#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_0,                             KC_PSCR, KC_SCRL, KC_PAUS,            KC_MPLY, KC_MNXT, KC_VOLU, KC_VOLD,
+    KC_GRV,  KC_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_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_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(1),                                                 KC_UP,                       KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, KC_LGUI, MO(1),   KC_RCTL,                                                                                       KC_LEFT, KC_DOWN, KC_RGHT,            KC_TRNS, KC_P0,   KC_PDOT, KC_TRNS),
+
+  [1] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,KC_TRNS, KC_TRNS, KC_TRNS,                                 KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, 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/h101/keymaps/via/rules.mk b/keyboards/hineybush/h101/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/hineybush/h101/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/hineybush/h101/readme.md b/keyboards/hineybush/h101/readme.md
new file mode 100644
index 000000000000..d28ce3507477
--- /dev/null
+++ b/keyboards/hineybush/h101/readme.md
@@ -0,0 +1,27 @@
+# h101
+
+![h101](https://i.imgur.com/LqmvjS1h.png)
+
+F13 full-size PCB with 1.25u function row Spacing.
+
+* Keyboard Maintainer: [hineybush](https://github.com/hineybush)
+* Hardware Supported: h101 using STM32F072
+* Hardware Availability: Fossil by Carolina Mech
+
+Make example for this keyboard (after setting up your build environment):
+
+    make hineybush/h101:default
+
+Flashing example for this keyboard:
+
+    make hineybush/h101: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/hineybush/h101/rules.mk b/keyboards/hineybush/h101/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/hineybush/h101/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/hineybush/h60/config.h b/keyboards/hineybush/h60/config.h
index a4d338b500d8..994b108d8e8a 100644
--- a/keyboards/hineybush/h60/config.h
+++ b/keyboards/hineybush/h60/config.h
@@ -17,33 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-   #define RGBLED_NUM 16
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
- /*== all animations 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
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
-
 /* 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/hineybush/h60/info.json b/keyboards/hineybush/h60/info.json
index 3069b4a4b37f..59820b17979d 100644
--- a/keyboards/hineybush/h60/info.json
+++ b/keyboards/hineybush/h60/info.json
@@ -17,6 +17,24 @@
         "pin": "B7",
         "levels": 12
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "B0"
     },
diff --git a/keyboards/hineybush/h65/config.h b/keyboards/hineybush/h65/config.h
index ae0ecc61cf37..474c1d6701d7 100644
--- a/keyboards/hineybush/h65/config.h
+++ b/keyboards/hineybush/h65/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 17
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/hineybush/h65/info.json b/keyboards/hineybush/h65/info.json
index dba8541b9916..f6fd12edaa02 100644
--- a/keyboards/hineybush/h65/info.json
+++ b/keyboards/hineybush/h65/info.json
@@ -20,6 +20,24 @@
     "indicators": {
         "caps_lock": "E6"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 17,
+        "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": "D2"
     },
diff --git a/keyboards/hineybush/h65_hotswap/config.h b/keyboards/hineybush/h65_hotswap/config.h
index ae0ecc61cf37..474c1d6701d7 100644
--- a/keyboards/hineybush/h65_hotswap/config.h
+++ b/keyboards/hineybush/h65_hotswap/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 17
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/hineybush/h65_hotswap/info.json b/keyboards/hineybush/h65_hotswap/info.json
index a4c09e02da31..63b780361711 100644
--- a/keyboards/hineybush/h65_hotswap/info.json
+++ b/keyboards/hineybush/h65_hotswap/info.json
@@ -20,6 +20,24 @@
     "indicators": {
         "caps_lock": "E6"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 17,
+        "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": "D2"
     },
diff --git a/keyboards/hineybush/h660s/config.h b/keyboards/hineybush/h660s/config.h
index e4d5a87a008c..373b97179ea8 100644
--- a/keyboards/hineybush/h660s/config.h
+++ b/keyboards/hineybush/h660s/config.h
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 16
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/hineybush/h660s/info.json b/keyboards/hineybush/h660s/info.json
index be6e28b26185..6c5d07cc835f 100644
--- a/keyboards/hineybush/h660s/info.json
+++ b/keyboards/hineybush/h660s/info.json
@@ -17,11 +17,26 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        }
+    },
     "ws2812": {
         "pin": "B0"
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "community_layouts": ["66_ansi", "66_iso"],
     "layouts": {
         "LAYOUT_66_ansi": {
             "layout": [
diff --git a/keyboards/hineybush/h75_singa/config.h b/keyboards/hineybush/h75_singa/config.h
index 760e5fdd7069..2e3e43042206 100644
--- a/keyboards/hineybush/h75_singa/config.h
+++ b/keyboards/hineybush/h75_singa/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-   #define RGBLED_NUM 22
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #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
-
 /* 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/hineybush/h75_singa/info.json b/keyboards/hineybush/h75_singa/info.json
index f4a94774f4cf..22a04e509da0 100644
--- a/keyboards/hineybush/h75_singa/info.json
+++ b/keyboards/hineybush/h75_singa/info.json
@@ -17,6 +17,24 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 22,
+        "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": "B3"
     },
diff --git a/keyboards/hineybush/h87a/config.h b/keyboards/hineybush/h87a/config.h
index 26b995ddd0fb..68b99c1a55d7 100644
--- a/keyboards/hineybush/h87a/config.h
+++ b/keyboards/hineybush/h87a/config.h
@@ -21,19 +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_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 24
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep
diff --git a/keyboards/hineybush/h87a/info.json b/keyboards/hineybush/h87a/info.json
index ee067e1f321b..9b2eb97e7c94 100644
--- a/keyboards/hineybush/h87a/info.json
+++ b/keyboards/hineybush/h87a/info.json
@@ -20,7 +20,23 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 24,
+        "max_brightness": 200,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c b/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
index 76fd4abae93e..6d064455b360 100644
--- a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
@@ -278,15 +278,16 @@ void led_init_ports(void) {
   DDRE |= (1<<6); // OUT
 }
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+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 (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
+  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/h88/config.h b/keyboards/hineybush/h88/config.h
index 0eb28d50c1e9..8099d5a0e416 100644
--- a/keyboards/hineybush/h88/config.h
+++ b/keyboards/hineybush/h88/config.h
@@ -21,19 +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_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 24
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep
diff --git a/keyboards/hineybush/h88/info.json b/keyboards/hineybush/h88/info.json
index 7c78582c7696..dfd7e8211c89 100644
--- a/keyboards/hineybush/h88/info.json
+++ b/keyboards/hineybush/h88/info.json
@@ -16,6 +16,24 @@
     "backlight": {
         "pin": "B7"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 24,
+        "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": "D3"
     },
diff --git a/keyboards/hineybush/hbcp/config.h b/keyboards/hineybush/hbcp/config.h
index ee8f76aafde4..f76948d482bc 100644
--- a/keyboards/hineybush/hbcp/config.h
+++ b/keyboards/hineybush/hbcp/config.h
@@ -35,25 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B1, B6, D0, C7, C6, C5 }
 #define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, B5, B4, B3, B2 }
 
-//EITHERWAY is supported through a custom matrix
-//#define DIODE_DIRECTION EITHERWAY
-
-   #define RGBLED_NUM 27
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #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
-
 /* 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/hineybush/hbcp/hbcp.c b/keyboards/hineybush/hbcp/hbcp.c
index d4601cd2e3c2..7d0f5ecf730b 100644
--- a/keyboards/hineybush/hbcp/hbcp.c
+++ b/keyboards/hineybush/hbcp/hbcp.c
@@ -45,32 +45,40 @@ void eeconfig_init_kb(void) {  // EEPROM is getting reset!
 
 #ifdef RGBLIGHT_ENABLE
 
-__attribute__ ((weak))
-void led_set_user(uint8_t usb_led) {
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-        sethsv_raw(HSV_CAPS, (LED_TYPE *)&led[0]);
-    } else {
-        sethsv(HSV_BLACK, (LED_TYPE *)&led[0]);
-    }
-    if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-        sethsv_raw(HSV_NLCK, (LED_TYPE *)&led[1]);
-    } else {
-        sethsv(HSV_BLACK, (LED_TYPE *)&led[1]);
-    }
-    if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-        sethsv_raw(HSV_SCRL, (LED_TYPE *)&led[2]);
-    } else {
-        sethsv(HSV_BLACK, (LED_TYPE *)&led[2]);
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (res) {
+        if (led_state.caps_lock) {
+            sethsv_raw(HSV_CAPS, (LED_TYPE *)&led[0]);
+        } else {
+            sethsv(HSV_BLACK, (LED_TYPE *)&led[0]);
+        }
+        if (led_state.num_lock) {
+            sethsv_raw(HSV_NLCK, (LED_TYPE *)&led[1]);
+        } else {
+            sethsv(HSV_BLACK, (LED_TYPE *)&led[1]);
+        }
+        if (led_state.scroll_lock) {
+            sethsv_raw(HSV_SCRL, (LED_TYPE *)&led[2]);
+        } else {
+            sethsv(HSV_BLACK, (LED_TYPE *)&led[2]);
+        }
+        rgblight_set();
     }
-    rgblight_set();
+    return false;
 }
 
 __attribute__ ((weak))
 void keyboard_post_init_user(void) {
     rgblight_set_effect_range(3, RGBLED_NUM-3);
-    led_set_user(_BV(USB_LED_CAPS_LOCK)|_BV(USB_LED_NUM_LOCK)|_BV(USB_LED_SCROLL_LOCK));
+    led_t led_state = {
+        .caps_lock = true,
+        .num_lock = true,
+        .scroll_lock = true
+    };
+    led_update_kb(led_state);
     wait_ms(300);
-    led_set_user(0);
+    led_update_kb((led_t){0});
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/hineybush/hbcp/info.json b/keyboards/hineybush/hbcp/info.json
index 45d52629ae62..ca92b3f4a526 100644
--- a/keyboards/hineybush/hbcp/info.json
+++ b/keyboards/hineybush/hbcp/info.json
@@ -16,7 +16,23 @@
         "pin": "B0"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 27,
+        "max_brightness": 200,
+        "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
+        }
     },
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/hineybush/hbcp/keymaps/hiney/keymap.c b/keyboards/hineybush/hbcp/keymaps/hiney/keymap.c
index 5f1d7700f603..26a67fe7ca8d 100644
--- a/keyboards/hineybush/hbcp/keymaps/hiney/keymap.c
+++ b/keyboards/hineybush/hbcp/keymaps/hiney/keymap.c
@@ -77,23 +77,24 @@ void matrix_scan_user(void) {
 
 #ifdef RGBLIGHT_ENABLE
 // The first three LEDs are used as indicators for CAPS_LOCK, NUM_LOCK and SCROLL_LOCK.
-void led_set_user(uint8_t usb_led) {
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         sethsv_raw(HSV_SOFT_RED, (LED_TYPE *)&led[0]);
     } else {
         sethsv(HSV_BLACK, (LED_TYPE *)&led[0]);
     }
-    if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
+    if (led_state.num_lock) {
         sethsv_raw(HSV_WARM_WHITE, (LED_TYPE *)&led[1]);
     } else {
         sethsv(HSV_BLACK, (LED_TYPE *)&led[1]);
     }
-    if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
+    if (led_state.scroll_lock) {
         sethsv_raw(HSV_SOFT_BLUE, (LED_TYPE *)&led[2]);
     } else {
         sethsv(HSV_BLACK, (LED_TYPE *)&led[2]);
     }
     rgblight_set();
+    return false;
 }
 
 #endif
diff --git a/keyboards/hineybush/physix/config.h b/keyboards/hineybush/physix/config.h
index 848c217499a9..2e3e43042206 100644
--- a/keyboards/hineybush/physix/config.h
+++ b/keyboards/hineybush/physix/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-   #define RGBLED_NUM 26
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #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
-
 /* 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/hineybush/physix/info.json b/keyboards/hineybush/physix/info.json
index 191621ff47d0..60d86fbebb78 100644
--- a/keyboards/hineybush/physix/info.json
+++ b/keyboards/hineybush/physix/info.json
@@ -17,6 +17,24 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 26,
+        "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": "E6"
     },
diff --git a/keyboards/hineybush/sm68/config.h b/keyboards/hineybush/sm68/config.h
index 98b32f8c37a1..2e3e43042206 100644
--- a/keyboards/hineybush/sm68/config.h
+++ b/keyboards/hineybush/sm68/config.h
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-   #define RGBLED_NUM 16
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #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
-
 /* 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/hineybush/sm68/info.json b/keyboards/hineybush/sm68/info.json
index 6029c4faf95f..234c595d481b 100644
--- a/keyboards/hineybush/sm68/info.json
+++ b/keyboards/hineybush/sm68/info.json
@@ -13,6 +13,19 @@
         "rows": ["B2", "B1", "B0", "D4", "D1"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "alternating": true
+        }
+    },
     "ws2812": {
         "pin": "D0"
     },
diff --git a/keyboards/hnahkb/freyr/info.json b/keyboards/hnahkb/freyr/info.json
index 0bc3c9a9c642..26d1fc52d8a2 100644
--- a/keyboards/hnahkb/freyr/info.json
+++ b/keyboards/hnahkb/freyr/info.json
@@ -24,7 +24,7 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
-    "community_layouts": ["tkl_ansi", "tkl_iso"],
+    "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": [
@@ -238,7 +238,7 @@
                 {"matrix": [6, 9], "x": 17.25, "y": 5.25}
             ]
         },
-        "LAYOUT_tkl_iso": {
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
 
@@ -274,7 +274,8 @@
                 {"matrix": [7, 0], "x": 10, "y": 1.25},
                 {"matrix": [7, 1], "x": 11, "y": 1.25},
                 {"matrix": [7, 2], "x": 12, "y": 1.25},
-                {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [7, 3], "x": 13, "y": 1.25},
+                {"matrix": [7, 4], "x": 14, "y": 1.25},
 
                 {"matrix": [7, 5], "x": 15.25, "y": 1.25},
                 {"matrix": [7, 6], "x": 16.25, "y": 1.25},
@@ -293,6 +294,7 @@
                 {"matrix": [8, 0], "x": 10.5, "y": 2.25},
                 {"matrix": [8, 1], "x": 11.5, "y": 2.25},
                 {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.25, "w": 1.5},
 
                 {"matrix": [7, 8], "x": 15.25, "y": 2.25},
                 {"matrix": [7, 7], "x": 16.25, "y": 2.25},
@@ -310,11 +312,9 @@
                 {"matrix": [3, 9], "x": 9.75, "y": 3.25},
                 {"matrix": [9, 0], "x": 10.75, "y": 3.25},
                 {"matrix": [9, 1], "x": 11.75, "y": 3.25},
-                {"matrix": [9, 2], "x": 12.75, "y": 3.25},
-                {"matrix": [8, 4], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [8, 4], "x": 12.75, "y": 3.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, 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},
@@ -325,7 +325,8 @@
                 {"matrix": [4, 9], "x": 9.25, "y": 4.25},
                 {"matrix": [9, 5], "x": 10.25, "y": 4.25},
                 {"matrix": [9, 4], "x": 11.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [8, 5], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 3], "x": 14, "y": 4.25},
 
                 {"matrix": [7, 9], "x": 16.25, "y": 4.25},
 
@@ -338,6 +339,1046 @@
                 {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
 
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 9], "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, 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": [6, 0], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [6, 4], "x": 15.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 6], "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": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [7, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "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": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [7, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 8], "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": [9, 0], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 4], "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": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [7, 9], "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, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 7], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 9], "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, 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": [6, 0], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [6, 4], "x": 15.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 6], "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": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25},
+                {"matrix": [7, 4], "x": 14, "y": 1.25},
+
+                {"matrix": [7, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "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": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [7, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 8], "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": [9, 0], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 4], "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": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 3], "x": 14, "y": 4.25},
+
+                {"matrix": [7, 9], "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, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 7], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 9], "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, 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": [6, 0], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [6, 4], "x": 15.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 6], "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": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [7, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "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": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [7, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 8], "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": [9, 0], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 4], "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": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [7, 9], "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, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 9], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl_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, 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": [6, 0], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [6, 4], "x": 15.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 6], "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": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25},
+                {"matrix": [7, 4], "x": 14, "y": 1.25},
+
+                {"matrix": [7, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "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": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [7, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 8], "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": [9, 0], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 4], "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": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 3], "x": 14, "y": 4.25},
+
+                {"matrix": [7, 9], "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, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 9], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "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, 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": [6, 0], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [6, 4], "x": 15.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 6], "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": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [7, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "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": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+
+                {"matrix": [7, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 8], "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": [9, 0], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 2], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 4], "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": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [7, 9], "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, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 9], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "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, 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": [6, 0], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [6, 4], "x": 15.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 6], "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": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25},
+                {"matrix": [7, 4], "x": 14, "y": 1.25},
+
+                {"matrix": [7, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "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": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+
+                {"matrix": [7, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 8], "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": [9, 0], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 2], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 4], "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": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 3], "x": 14, "y": 4.25},
+
+                {"matrix": [7, 9], "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, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 9], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_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, 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": [6, 0], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [6, 4], "x": 15.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 6], "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": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [7, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "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": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+
+                {"matrix": [7, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 8], "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": [9, 0], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 2], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 4], "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": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [7, 9], "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, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 7], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 9], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_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, 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": [6, 0], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [6, 4], "x": 15.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 6], "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": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25},
+                {"matrix": [7, 4], "x": 14, "y": 1.25},
+
+                {"matrix": [7, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "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": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+
+                {"matrix": [7, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 8], "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": [9, 0], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 2], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 4], "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": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 3], "x": 14, "y": 4.25},
+
+                {"matrix": [7, 9], "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, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 7], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 9], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_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, 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": [6, 0], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [6, 4], "x": 15.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 6], "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": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [7, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "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": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+
+                {"matrix": [7, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 8], "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": [9, 0], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 2], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 4], "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": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [7, 9], "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, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 9], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_wkl_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, 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": [6, 0], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [6, 4], "x": 15.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 6], "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": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.25},
+                {"matrix": [7, 3], "x": 13, "y": 1.25},
+                {"matrix": [7, 4], "x": 14, "y": 1.25},
+
+                {"matrix": [7, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "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": [8, 0], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+
+                {"matrix": [7, 8], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 8], "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": [9, 0], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 2], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 4], "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": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 3], "x": 14, "y": 4.25},
+
+                {"matrix": [7, 9], "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, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 13.5, "y": 5.25, "w": 1.5},
+
                 {"matrix": [5, 8], "x": 15.25, "y": 5.25},
                 {"matrix": [5, 9], "x": 16.25, "y": 5.25},
                 {"matrix": [6, 9], "x": 17.25, "y": 5.25}
diff --git a/keyboards/hnahkb/freyr/matrix_diagram.md b/keyboards/hnahkb/freyr/matrix_diagram.md
new file mode 100644
index 000000000000..643ee77f01c1
--- /dev/null
+++ b/keyboards/hnahkb/freyr/matrix_diagram.md
@@ -0,0 +1,30 @@
+# Matrix Diagram for HnahKB Freyr
+
+```
+┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+│00 │   │01 │02 │03 │04 │ │06 │07 │08 │09 │ │60 │61 │62 │63 ││64 │65 │66 │
+└───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐    ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │70 │71 │72 │73 │74 ││75 │76 │67 │    │73     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤    └─┬─────┤                ┌─────┐
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │80 │81 │82 │83   ││78 │77 │68 │      │     │                │83   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤└───┴───┴───┘   ┌──┴┐84  │ ISO Enter   ┌──┴─────┤ ANSI Enter
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │90 │91 │92 │84  │                │92 │    │             │84      │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤    ┌───┐       └───┴────┘             └────────┘
+│40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │95 │94 │85 │93    │    │79 │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬──┴─┬────┤┌───┼───┼───┐
+│50  │51  │52  │53                      │54  │55  │56  │57  ││58 │59 │69 │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+┌────────┐                                       ┌──────────┐
+│40      │ 2.25u LShift             2.75u RShift │93        │
+└────────┘                                       └──────────┘
+                                                 ┌──────┬───┐
+                                 1.75u/1u RShift │85    │93 │
+                                                 └──────┴───┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│50   │51 │52   │53                         │55   │56 │57   │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+┌────┬──┬────┬────┬───────────────────────┬────┬────┬──┬────┐
+│50  │  │51  │52  │53                     │55  │56  │  │57  │ 6u Centered Spacebar
+└────┘  └────┴────┴───────────────────────┴────┴────┘  └────┘
+```
diff --git a/keyboards/hnahkb/stella/config.h b/keyboards/hnahkb/stella/config.h
index 3589952afbda..9f9d81bea919 100644
--- a/keyboards/hnahkb/stella/config.h
+++ b/keyboards/hnahkb/stella/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 14
-
 /* 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/hnahkb/stella/info.json b/keyboards/hnahkb/stella/info.json
index 0c002b22c4d0..98f8f721f309 100644
--- a/keyboards/hnahkb/stella/info.json
+++ b/keyboards/hnahkb/stella/info.json
@@ -22,6 +22,9 @@
         "scroll_lock": "B7",
         "on_state": 0
     },
+    "rgblight": {
+        "led_count": 14,
+    },
     "ws2812": {
         "pin": "E2"
     },
diff --git a/keyboards/hnahkb/vn66/config.h b/keyboards/hnahkb/vn66/config.h
index 61b2d4967b57..0369461b6718 100644
--- a/keyboards/hnahkb/vn66/config.h
+++ b/keyboards/hnahkb/vn66/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 20
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/hnahkb/vn66/info.json b/keyboards/hnahkb/vn66/info.json
index aca010481050..cef3127be958 100644
--- a/keyboards/hnahkb/vn66/info.json
+++ b/keyboards/hnahkb/vn66/info.json
@@ -27,6 +27,24 @@
         "caps_lock": "E6",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "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": "E2"
     },
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/info.json b/keyboards/horrortroll/caticorn/rev1/hotswap/info.json
index d53b92ee8fbf..ecd3c8a0433d 100644
--- a/keyboards/horrortroll/caticorn/rev1/hotswap/info.json
+++ b/keyboards/horrortroll/caticorn/rev1/hotswap/info.json
@@ -1,20 +1,27 @@
 {
     "keyboard_name": "Caticorn Hotswap",
     "manufacturer": "HorrorTroll",
-    "url": "",
     "maintainer": "HorrorTroll",
     "usb": {
         "vid": "0x7516",
         "pid": "0x6002",
         "device_version": "0.0.1"
     },
+    "diode_direction": "COL2ROW",
     "matrix_pins": {
         "cols": ["GP6", "GP5", "GP4", "GP3", "GP2", "GP1", "GP20", "GP21", "GP16", "GP17", "GP18", "GP19", "GP15", "GP14", "GP13", "GP10", "GP9"],
         "rows": ["GP7", "GP0", "GP8", "GP25", "GP11", "GP12"]
     },
-    "diode_direction": "COL2ROW",
     "processor": "RP2040",
     "bootloader": "rp2040",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true
+    },
     "community_layouts": ["tkl_f13_ansi"],
     "layouts": {
         "LAYOUT_tkl_f13_ansi": {
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/default/keymap.c b/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/default/keymap.c
index 81ba8347ecb9..06819cffd118 100644
--- a/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/default/keymap.c
+++ b/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+/* 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
@@ -26,8 +26,6 @@ enum layer_names {
     _FN,
 };
 
-// enum layer_keycodes { };
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /*
@@ -86,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │    │    │    │                        │    │ Fn │    │    ││   │   │   │
        └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15       16      */
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15       16     */
     [_FN]   = LAYOUT_tkl_f13_ansi(
                 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, KC_MYCM, _______, _______, _______,
                 NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/config.h b/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/config.h
deleted file mode 100644
index 4a9ae9bdc284..000000000000
--- a/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/config.h
+++ /dev/null
@@ -1,19 +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
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/keymap.c b/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/keymap.c
index d98822de17e0..06819cffd118 100644
--- a/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/keymap.c
+++ b/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+/* 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
@@ -26,8 +26,6 @@ enum layer_names {
     _FN,
 };
 
-// enum layer_keycodes { };
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /*
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/readme.md b/keyboards/horrortroll/caticorn/rev1/hotswap/readme.md
index b9023e8c716e..167fbe4c4aa8 100644
--- a/keyboards/horrortroll/caticorn/rev1/hotswap/readme.md
+++ b/keyboards/horrortroll/caticorn/rev1/hotswap/readme.md
@@ -1,10 +1,12 @@
 # Caticorn Hotswap (Rev 1)
 
+![Caticorn](https://i.imgur.com/DPbDtwKh.png)
+
 A TKL keyboard, which controlled by an RP2040 chipset.
 
 * Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
 * Hardware Supported: RP2040
-* Hardware Availability: Prototype PCB
+* Hardware Availability: Private prototype (only 5 PCB available)
 
 Make example for this keyboard (after setting up your build environment):
 
@@ -21,5 +23,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 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 reset button**: Press and hold the button on the back of the PCB, then plug USB onto PC
+* **Physical reset button**: Press and hold the button on the back of the PCB, then plug in the keyboard
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk b/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk
index f8fe1f7dbb3c..6e7633bfe015 100644
--- a/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk
+++ b/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# EEPROM driver
-EEPROM_DRIVER = wear_leveling
-WEAR_LEVELING_DRIVER = rp2040_flash
\ No newline at end of file
+# This file intentionally left blank
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/info.json b/keyboards/horrortroll/caticorn/rev1/solder/info.json
index 30fb0f0eee90..d14278f98943 100644
--- a/keyboards/horrortroll/caticorn/rev1/solder/info.json
+++ b/keyboards/horrortroll/caticorn/rev1/solder/info.json
@@ -1,20 +1,27 @@
 {
     "keyboard_name": "Caticorn Solder",
     "manufacturer": "HorrorTroll",
-    "url": "",
     "maintainer": "HorrorTroll",
     "usb": {
         "vid": "0x7516",
         "pid": "0x6001",
         "device_version": "0.0.1"
     },
+    "diode_direction": "COL2ROW",
     "matrix_pins": {
         "cols": ["GP6", "GP5", "GP4", "GP3", "GP2", "GP1", "GP20", "GP21", "GP16", "GP17", "GP18", "GP19", "GP15", "GP14", "GP13", "GP10", "GP9"],
         "rows": ["GP7", "GP0", "GP8", "GP25", "GP11", "GP12"]
     },
-    "diode_direction": "COL2ROW",
     "processor": "RP2040",
     "bootloader": "rp2040",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true
+    },
     "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift", "tkl_f13_ansi", "tkl_f13_ansi_split_bs_rshift", "tkl_f13_ansi_tsangan", "tkl_f13_ansi_tsangan_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_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": {
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/keymaps/default/keymap.c b/keyboards/horrortroll/caticorn/rev1/solder/keymaps/default/keymap.c
index 5723984bf445..9bb6640f2f8a 100644
--- a/keyboards/horrortroll/caticorn/rev1/solder/keymaps/default/keymap.c
+++ b/keyboards/horrortroll/caticorn/rev1/solder/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+/* 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
@@ -22,231 +22,75 @@
 // entirely and just use numbers.
 
 enum layer_names {
-    _F12,
-    _F13,
-    _F12_7U,
-    _F13_7U,
+    _BASE,
     _FN,
 };
 
-enum layer_keycodes {
-    TOG_F12 = SAFE_RANGE, //Enable default layer for F12 layout
-    TOG_F13,              //Enable default layer for F13 layout
-    F12_TGN,              //Enable default layer for F12 Tsangan layout
-    F13_TGN,              //Enable default layer for F13 Tsangan layout
-};
-
 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 │ - │ = │ ¥ │Bks││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 │ ; │ ' │  Enter │
-       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
-       │LSft│ \ │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ Fn│    │ ↑ │
-       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
-       │LCrl│GUI │LAlt│         Space          │RAlt│ Fn │ GUI│RCrl││ ← │ ↓ │ → │
-       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
-       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
-       │   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   ││   │   │   │
-       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
-       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
-       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ | │   ││   │   │   │
-       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
-       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  ││   │   │   │
-       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
-       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
-       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
-       │LSft│ | │ 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       16     */
-    [_F12] = 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_INT3, 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, MO(_FN), KC_UP,
-                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_APP,           KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-            ),
-
 /*
        ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
        │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13││PSc│Scr│Pse│
        └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
-       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
-       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ¥ │Bks││Ins│Hom│PgU│
-       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+       │ ` │ 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 │ ; │ ' │  Enter │
-       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
-       │LSft│ \ │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ Fn│    │ ↑ │
-       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │  RShift  │    │ ↑ │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
        │LCrl│GUI │LAlt│         Space          │RAlt│ Fn │ GUI│RCrl││ ← │ ↓ │ → │
        └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
        ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
        │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   ││   │   │   │
        └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
-       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
-       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ | │   ││   │   │   │
-       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       ││   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
        │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  ││   │   │   │
        ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
        │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
-       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
-       │LSft│ | │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │   │    │   │
-       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │  RShift  │    │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
        │    │    │    │                        │    │    │    │    ││   │   │   │
        └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
-    [_F13] = 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_INT3, 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, MO(_FN), KC_UP,
-                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_APP,           KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-            ),
-
-/*
-       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
-       │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 │ - │ = │ ¥ │Bks││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 │ ; │ ' │  Enter │
-       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
-       │LSft│ \ │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ Fn│    │ ↑ │
-       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴───┼───┴─┬───┬┴───┤┌───┼───┼───┐
-       │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 │   │    │   │
-       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴───┼───┴─┬───┬┴───┤┌───┼───┼───┐
-       │     │   │     │                            │     │   │    ││   │   │   │
-       └─────┴───┴─────┴────────────────────────────┴─────┴───┴────┘└───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
-    [_F12_7U] = 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_INT3, 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, MO(_FN), KC_UP,
-                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             _______, KC_RALT, MO(_FN),          KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-            ),
-
-/*
-       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
-       │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13││PSc│Scr│Pse│
-       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
-       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
-       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ¥ │Bks││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 │ ; │ ' │  Enter │
-       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
-       │LSft│ \ │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ Fn│    │ ↑ │
-       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴───┼───┴─┬───┬┴───┤┌───┼───┼───┐
-       │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 │   │    │   │
-       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴───┼───┴─┬───┬┴───┤┌───┼───┼───┐
-       │     │   │     │                            │     │   │    ││   │   │   │
-       └─────┴───┴─────┴────────────────────────────┴─────┴───┴────┘└───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
-    [_F13_7U] = 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_INT3, 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, MO(_FN), KC_UP,
-                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             _______, KC_RALT, MO(_FN),          KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15       16     */
+    [_BASE] = LAYOUT_tkl_f13_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_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(_FN), KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
             ),
 
 /*
        ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
-       │Rst││   │MeP│VoD│VoU││Mut│Stp│Prv│Ply││Nxt│Mai│Hom│Cal││Sch││   │   │   │
+       │Rst││MeP│VoD│VoU││Mut│Stp│Prv│Ply││Nxt│Mai│Hom│Cal│Sch││   ││   │   │   │
        └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
-       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
-       │NKO│   │   │   │   │   │   │   │   │   │   │   │   │   │   ││   │   │   │
-       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+       │NKO│   │   │   │   │   │   │   │   │   │   │   │   │       ││   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
        │     │   │   │   │   │   │   │   │   │   │   │   │   │     ││   │   │   │
        ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘
        │      │   │   │   │   │   │   │   │   │   │   │   │        │
-       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
-       │    │   │   │   │   │   │   │   │   │   │   │   │      │   │    │   │
-       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐
+       │        │   │   │   │   │   │   │   │   │   │   │          │    │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
        │    │    │    │                        │    │ Fn │    │    ││   │   │   │
        └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
-    [_FN] = LAYOUT_all(
-                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, _______, _______, _______,
-                NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TOG_F12, TOG_F13, _______,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, F12_TGN, F13_TGN, _______,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______,
-                _______, _______, _______,                            _______,                            _______, _______, _______,          _______, _______, _______, _______
-            ),
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15       16     */
+    [_FN] = LAYOUT_tkl_f13_ansi(
+                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, _______, _______, _______, _______,
+                NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+                _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
+            )
 };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TOG_F12:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_F12);
-            }
-            return false;
-        case TOG_F13:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_F13);
-            }
-            return false;
-        case F12_TGN:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_F12_7U);
-            }
-            return false;
-        case F13_TGN:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_F13_7U);
-            }
-            return false;
-	}
-    return true;
-}
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/config.h b/keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/config.h
deleted file mode 100644
index 8fe93c228c4b..000000000000
--- a/keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/config.h
+++ /dev/null
@@ -1,19 +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
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 5
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/keymap.c b/keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/keymap.c
index 5723984bf445..a39ee0f6a8d5 100644
--- a/keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/keymap.c
+++ b/keyboards/horrortroll/caticorn/rev1/solder/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+/* 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
@@ -24,16 +24,8 @@
 enum layer_names {
     _F12,
     _F13,
-    _F12_7U,
-    _F13_7U,
-    _FN,
-};
-
-enum layer_keycodes {
-    TOG_F12 = SAFE_RANGE, //Enable default layer for F12 layout
-    TOG_F13,              //Enable default layer for F13 layout
-    F12_TGN,              //Enable default layer for F12 Tsangan layout
-    F13_TGN,              //Enable default layer for F13 Tsangan layout
+    _FN1,
+    _FN2,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -68,14 +60,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │    │    │    │                        │    │    │    │    ││   │   │   │
        └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11        12                13       14        15       16     */
     [_F12] = 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_INT3, 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, MO(_FN), KC_UP,
-                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_APP,           KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+                KC_ESC,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,           KC_F12,  KC_PSCR,  KC_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_TAB,  KC_Q,    KC_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, MO(_FN1), KC_UP,
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN1), KC_APP,           KC_RCTL, KC_LEFT,  KC_DOWN, KC_RGHT
             ),
 
 /*
@@ -108,99 +100,45 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │    │    │    │                        │    │    │    │    ││   │   │   │
        └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11        12                13       14        15       16     */
     [_F13] = 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_INT3, 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, MO(_FN), KC_UP,
-                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_APP,           KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-            ),
-
-/*
-       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
-       │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 │ - │ = │ ¥ │Bks││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 │ ; │ ' │  Enter │
-       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
-       │LSft│ \ │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ Fn│    │ ↑ │
-       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴───┼───┴─┬───┬┴───┤┌───┼───┼───┐
-       │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 │   │    │   │
-       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴───┼───┴─┬───┬┴───┤┌───┼───┼───┐
-       │     │   │     │                            │     │   │    ││   │   │   │
-       └─────┴───┴─────┴────────────────────────────┴─────┴───┴────┘└───┴───┴───┘
-*/
-    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
-    [_F12_7U] = 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_INT3, 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, MO(_FN), KC_UP,
-                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             _______, KC_RALT, MO(_FN),          KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,           KC_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_INT3, 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, MO(_FN2), KC_UP,
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN2), KC_APP,           KC_RCTL, KC_LEFT,  KC_DOWN, KC_RGHT
             ),
 
 /*
        ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
-       │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13││PSc│Scr│Pse│
-       └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
-       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
-       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ¥ │Bks││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 │ ; │ ' │  Enter │
-       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐
-       │LSft│ \ │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ Fn│    │ ↑ │
-       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴───┼───┴─┬───┬┴───┤┌───┼───┼───┐
-       │LCrl │GUI│LAlt │           Space            │RAlt │ Fn│RCrl││ ← │ ↓ │ → │
-       └─────┴───┴─────┴────────────────────────────┴─────┴───┴────┘└───┴───┴───┘
-       ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
-       │   ││   │   │   │   ││   │   │   │   ││   │   │   │   ││   ││   │   │   │
+       │Rst││   │MeP│VoD│VoU││Mut│Stp│Prv│Ply││Nxt│Mai│Hom│Cal││Sch││   │   │   │
        └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
        ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
-       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ | │   ││   │   │   │
+       │NKO│   │   │   │   │   │   │   │   │   │   │   │   │   │   ││   │   │   │
        ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤
-       │     │ 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 │   │    │   │
-       ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴───┼───┴─┬───┬┴───┤┌───┼───┼───┐
-       │     │   │     │                            │     │   │    ││   │   │   │
-       └─────┴───┴─────┴────────────────────────────┴─────┴───┴────┘└───┴───┴───┘
+       │    │   │   │   │   │   │   │   │   │   │   │   │      │   │    │   │
+       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+       │    │    │    │                        │    │ Fn │    │    ││   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
 */
     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
-    [_F13_7U] = 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_INT3, 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, MO(_FN), KC_UP,
-                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             _______, KC_RALT, MO(_FN),          KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    [_FN1] = LAYOUT_all(
+                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, _______, _______, TO(_F13),
+                NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______,
+                _______, _______, _______,                            _______,                            _______, _______, _______,          _______, _______, _______, _______
             ),
 
 /*
        ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
-       │Rst││   │MeP│VoD│VoU││Mut│Stp│Prv│Ply││Nxt│Mai│Hom│Cal││Sch││   │   │   │
+       │Rst││MeP│VoD│VoU│Mut││Stp│Prv│Ply│Nxt││Mai│Hom│Cal│Sch││   ││   │   │   │
        └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
        ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐
        │NKO│   │   │   │   │   │   │   │   │   │   │   │   │   │   ││   │   │   │
@@ -215,38 +153,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
 */
     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12                13       14       15       16     */
-    [_FN] = LAYOUT_all(
-                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, _______, _______, _______,
-                NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TOG_F12, TOG_F13, _______,
-                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, F12_TGN, F13_TGN, _______,
+    [_FN2] = LAYOUT_all(
+                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,          _______, _______, _______, TO(_F12),
+                NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______,
                 _______, _______, _______,                            _______,                            _______, _______, _______,          _______, _______, _______, _______
-            ),
+            )
 };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TOG_F12:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_F12);
-            }
-            return false;
-        case TOG_F13:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_F13);
-            }
-            return false;
-        case F12_TGN:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_F12_7U);
-            }
-            return false;
-        case F13_TGN:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_F13_7U);
-            }
-            return false;
-	}
-    return true;
-}
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/readme.md b/keyboards/horrortroll/caticorn/rev1/solder/readme.md
index e25e3bd5636b..7fcb4cac5b6c 100644
--- a/keyboards/horrortroll/caticorn/rev1/solder/readme.md
+++ b/keyboards/horrortroll/caticorn/rev1/solder/readme.md
@@ -1,10 +1,12 @@
 # Caticorn Solder (Rev 1)
 
+![Caticorn](https://i.imgur.com/g5aCKQUh.png)
+
 A TKL keyboard, which controlled by an RP2040 chipset.
 
 * Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
 * Hardware Supported: RP2040
-* Hardware Availability: Prototype PCB
+* Hardware Availability: Private prototype (only 5 PCB available)
 
 Make example for this keyboard (after setting up your build environment):
 
@@ -21,5 +23,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 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 reset button**: Press and hold the button on the back of the PCB, then plug USB onto PC
+* **Physical reset button**: Press and hold the button on the back of the PCB, then plug in the keyboard
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/rules.mk b/keyboards/horrortroll/caticorn/rev1/solder/rules.mk
index 4f873e37383d..6e7633bfe015 100644
--- a/keyboards/horrortroll/caticorn/rev1/solder/rules.mk
+++ b/keyboards/horrortroll/caticorn/rev1/solder/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# EEPROM driver
-EEPROM_DRIVER = wear_leveling
-WEAR_LEVELING_DRIVER = rp2040_flash
+# This file intentionally left blank
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/config.h b/keyboards/horrortroll/chinese_pcb/black_e65/config.h
deleted file mode 100644
index de5824e22234..000000000000
--- a/keyboards/horrortroll/chinese_pcb/black_e65/config.h
+++ /dev/null
@@ -1,34 +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 RGBLIGHT_ENABLE
-    /* RGB Lighting config */
-    #define RGBLED_NUM 24
-
-    /* RGB Lighting effect */
-    #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/horrortroll/chinese_pcb/black_e65/info.json b/keyboards/horrortroll/chinese_pcb/black_e65/info.json
index 2ceb38706f2a..7ee7b8b3f882 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/info.json
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/info.json
@@ -21,6 +21,21 @@
     "indicators": {
         "caps_lock": "C7"
     },
+    "rgblight": {
+        "led_count": 24,
+        "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": "E2"
     },
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
index 192e9285fc82..7f8a448d0779 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
@@ -10,7 +10,7 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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/info.json b/keyboards/horrortroll/handwired_k552/info.json
index 6bdd2ee2fce2..d137a03a5267 100644
--- a/keyboards/horrortroll/handwired_k552/info.json
+++ b/keyboards/horrortroll/handwired_k552/info.json
@@ -13,7 +13,7 @@
         "pin": "C14"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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/handwired_k552/rules.mk b/keyboards/horrortroll/handwired_k552/rules.mk
index 2d1a6e93ca43..fd1825af356d 100644
--- a/keyboards/horrortroll/handwired_k552/rules.mk
+++ b/keyboards/horrortroll/handwired_k552/rules.mk
@@ -26,15 +26,11 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
 
 # OLED enabled
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 
 # Wear-levelling driver
diff --git a/keyboards/horrortroll/lemon40/config.h b/keyboards/horrortroll/lemon40/config.h
deleted file mode 100644
index 90374871735e..000000000000
--- a/keyboards/horrortroll/lemon40/config.h
+++ /dev/null
@@ -1,35 +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
-
-/* RGB light config */
-#ifdef RGBLIGHT_ENABLE
-   
-    /* RGB light pin */
-    #define RGBLED_NUM 15
-
-    /* RGB light effect */
-    #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_ALTERNATING
-    #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/info.json
index f4b4c383c9a7..7162e2c2c7ad 100644
--- a/keyboards/horrortroll/lemon40/info.json
+++ b/keyboards/horrortroll/lemon40/info.json
@@ -9,6 +9,20 @@
         "device_version": "0.0.1",
         "force_nkro": true
     },
+    "rgblight": {
+        "led_count": 15,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
         "pin": "F4"
     },
diff --git a/keyboards/horrortroll/lemon40/rules.mk b/keyboards/horrortroll/lemon40/rules.mk
index 933affaa8634..9ac59719d8ee 100644
--- a/keyboards/horrortroll/lemon40/rules.mk
+++ b/keyboards/horrortroll/lemon40/rules.mk
@@ -15,7 +15,6 @@ AUDIO_ENABLE = no           # Audio output
 
 # OLED enabled
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 
 # Additional thing to reduce compiled size
diff --git a/keyboards/horrortroll/nyx/rev1/config.h b/keyboards/horrortroll/nyx/rev1/config.h
new file mode 100644
index 000000000000..9d891b2ff429
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/config.h
@@ -0,0 +1,23 @@
+/* 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_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/horrortroll/nyx/rev1/info.json b/keyboards/horrortroll/nyx/rev1/info.json
new file mode 100644
index 000000000000..f3b859de0a9c
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/info.json
@@ -0,0 +1,222 @@
+{
+    "keyboard_name": "Nyx",
+    "manufacturer": "HorrorTroll",
+    "maintainer": "HorrorTroll",
+    "usb": {
+        "vid": "0x7516",
+        "pid": "0x5005",
+        "device_version": "0.0.1"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["GP3", "GP23", "GP2", "GP1", "GP0", "GP4", "GP17", "GP11", "GP10", "GP19", "GP9", "GP8", "GP13", "GP15", "GP14"],
+        "rows": ["GP24", "GP25", "GP18", "GP12", "GP16"]
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP22"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 75,
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": 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,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": 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
+        },
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 119, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 134, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 149, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 164, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 179, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 202, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 4},
+
+            {"matrix": [1, 14], "x": 224, "y": 16, "flags": 4},
+            {"matrix": [1, 13], "x": 205, "y": 16, "flags": 4},
+            {"matrix": [1, 12], "x": 187, "y": 16, "flags": 4},
+            {"matrix": [1, 11], "x": 172, "y": 16, "flags": 4},
+            {"matrix": [1, 10], "x": 157, "y": 16, "flags": 4},
+            {"matrix": [1, 9], "x": 142, "y": 16, "flags": 4},
+            {"matrix": [1, 8], "x": 127, "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": 4, "y": 16, "flags": 1},
+
+            {"matrix": [2, 0], "x": 6, "y": 32, "flags": 8},
+            {"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": 71, "y": 32, "flags": 4},
+            {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 101, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
+            {"matrix": [2, 8], "x": 131, "y": 32, "flags": 4},
+            {"matrix": [2, 9], "x": 146, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 161, "y": 32, "flags": 4},
+            {"matrix": [2, 11], "x": 175, "y": 32, "flags": 4},
+            {"matrix": [2, 13], "x": 200, "y": 32, "flags": 1},
+            {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
+
+            {"matrix": [3, 14], "x": 224, "y": 48, "flags": 4},
+            {"matrix": [3, 13], "x": 209, "y": 48, "flags": 4},
+            {"matrix": [3, 12], "x": 189, "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": 49, "y": 48, "flags": 4},
+            {"matrix": [3, 2], "x": 34, "y": 48, "flags": 4},
+            {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
+
+            {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+            {"matrix": [4, 1], "x": 21, "y": 64, "flags": 1},
+            {"matrix": [4, 2], "x": 39, "y": 64, "flags": 1},
+            {"matrix": [4, 6], "x": 95, "y": 64, "flags": 4},
+            {"matrix": [4, 9], "x": 151, "y": 64, "flags": 1},
+            {"matrix": [4, 10], "x": 170, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x": 194, "y": 64, "flags": 4},
+            {"matrix": [4, 13], "x": 209, "y": 64, "flags": 4},
+            {"matrix": [4, 14], "x": 224, "y": 64, "flags": 4}
+        ]
+    },
+    "community_layouts": ["65_ansi_blocker"],
+    "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], "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, 13], "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.25, "x": 0, "y": 4},
+                {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+                {"matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4},
+                {"matrix": [4, 9], "w": 1.25, "x": 10, "y": 4},
+                {"matrix": [4, 10], "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/horrortroll/nyx/rev1/keymaps/default/keymap.c b/keyboards/horrortroll/nyx/rev1/keymaps/default/keymap.c
new file mode 100644
index 000000000000..d678f19b46ec
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/keymaps/default/keymap.c
@@ -0,0 +1,85 @@
+/* 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// 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
+};
+
+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 │PgU│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ ↑ │PgD│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │LCrl│GUI │LAlt│         Space          │ Fn │RCrl│ │ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │   │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │    │    │    │                        │    │    │ │   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14     */
+    [_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_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,                    MO(_FN), KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │Tog│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │Reset│   │MsU│   │   │   │   │   │   │Sad│Sai│Spd│Spi│     │Mod│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │      │MsL│MsD│MsR│   │   │   │   │   │   │   │   │        │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │        │   │   │Cal│   │   │NKO│   │VoD│VoU│Mut│      │Vai│   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │    │    │    │                        │    │    │ │Hud│Vad│Hui│
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14     */
+    [_FN]   = 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,  _______, RGB_TOG,
+                QK_BOOT, _______, KC_MS_U, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_SPD, RGB_SPI, _______, RGB_MOD,
+                _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+                _______,          _______, _______, KC_CALC, _______, _______, NK_TOGG, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, RGB_VAI, _______,
+                _______, _______, _______,                            _______,                   _______, _______,          RGB_HUD, RGB_VAD, RGB_HUI
+            )
+};
diff --git a/keyboards/horrortroll/nyx/rev1/keymaps/via/keymap.c b/keyboards/horrortroll/nyx/rev1/keymaps/via/keymap.c
new file mode 100644
index 000000000000..d678f19b46ec
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/keymaps/via/keymap.c
@@ -0,0 +1,85 @@
+/* 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// 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
+};
+
+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 │PgU│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ ↑ │PgD│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │LCrl│GUI │LAlt│         Space          │ Fn │RCrl│ │ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │   │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │    │    │    │                        │    │    │ │   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14     */
+    [_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_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,                    MO(_FN), KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │Tog│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │Reset│   │MsU│   │   │   │   │   │   │Sad│Sai│Spd│Spi│     │Mod│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │      │MsL│MsD│MsR│   │   │   │   │   │   │   │   │        │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │        │   │   │Cal│   │   │NKO│   │VoD│VoU│Mut│      │Vai│   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │    │    │    │                        │    │    │ │Hud│Vad│Hui│
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14     */
+    [_FN]   = 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,  _______, RGB_TOG,
+                QK_BOOT, _______, KC_MS_U, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_SPD, RGB_SPI, _______, RGB_MOD,
+                _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+                _______,          _______, _______, KC_CALC, _______, _______, NK_TOGG, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, RGB_VAI, _______,
+                _______, _______, _______,                            _______,                   _______, _______,          RGB_HUD, RGB_VAD, RGB_HUI
+            )
+};
diff --git a/keyboards/horrortroll/nyx/rev1/keymaps/via/rules.mk b/keyboards/horrortroll/nyx/rev1/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/horrortroll/nyx/rev1/lib/startup_swirl_anim.h b/keyboards/horrortroll/nyx/rev1/lib/startup_swirl_anim.h
new file mode 100644
index 000000000000..0cd0a54a8b5d
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/lib/startup_swirl_anim.h
@@ -0,0 +1,133 @@
+/* Copyright 2022 Jpe230 <https://github.com/Jpe230>
+ * 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 <string.h>
+#include <math.h>
+#include <lib/lib8tion/lib8tion.h>
+
+#define LED_TRAIL 10
+
+static int8_t top = 0;
+static int8_t bottom = MATRIX_ROWS - 1;
+static int8_t left = 0;
+static int8_t right = MATRIX_COLS - 1;
+static int8_t dir = 1;
+
+static int8_t i = 0;
+static int8_t j = 0;
+
+static bool traverse = true;
+
+static uint8_t v_values[RGB_MATRIX_LED_COUNT] = {0};
+
+static void traverse_matrix(void) {
+    if (dir == 1) {
+        // moving left->right
+        i++;
+        // Since we have traversed the whole first
+        // row, move down to the next row.
+        if (i > right) {
+            ++top;
+            dir = 2;
+            j = top;
+            i -= 1;
+        }
+    } else if (dir == 2) {
+        // moving top->bottom
+        j++;
+        // Since we have traversed the whole last
+        // column, move left to the previous column.
+        if (j > bottom) {
+            --right;
+            dir = 3;
+            i = right;
+            j -= 1;
+        }
+    } else if (dir == 3) {
+        // moving right->left
+        i--;
+        // Since we have traversed the whole last
+        // row, move up to the previous row.
+        if (i < left) {
+            --bottom;
+            dir = 4;
+            j = bottom;
+            i += 1;
+        }
+    } else if (dir == 4) {
+        // moving bottom->up
+        j--;
+        // Since we have traversed the whole first
+        // col, move right to the next column.
+        if (j < top) {
+            ++left;
+            dir = 1;
+            i = left;
+            j += 1;
+        }
+    }
+}
+
+static void swirl_set_color(HSV hsv) {
+    uint8_t index = g_led_config.matrix_co[j][i];
+
+    if(index != NO_LED){
+        v_values[index] = 75;
+    }
+
+    for(uint8_t v = 0; v < RGB_MATRIX_LED_COUNT; v++)
+    {
+        if(index != v) {
+            if(v_values[v] >= 20)
+                v_values[v] -= 20;
+            else
+                v_values[v] = 0;
+        }
+        hsv.v =  v_values[v];
+        RGB rgb = hsv_to_rgb(hsv);
+        rgb_matrix_set_color(v, rgb.r, rgb.g, rgb.b);
+    }
+
+    traverse_matrix();
+
+    if (!(top <= bottom && left <= right)) {
+        eeprom_read_block(&rgb_matrix_config, EECONFIG_RGB_MATRIX, sizeof(rgb_matrix_config));
+        rgb_matrix_mode_noeeprom(rgb_matrix_config.mode);
+        return;
+    }
+}
+
+static bool STARTUP_SWIRL_ANIM(effect_params_t* params) {
+    HSV      hsv = rgb_matrix_config.hsv;
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(24, 1));
+    hsv.h        = time;
+    RGB      rgb = hsv_to_rgb(hsv);
+
+    if (traverse) {
+        swirl_set_color(hsv);
+    }
+    traverse = !traverse;
+    return false;
+
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    for (int i = led_min; i < led_max; i++) {
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); // Clear matrix just in case
+    }
+
+    return rgb_matrix_check_finished_leds(led_max);
+}
diff --git a/keyboards/horrortroll/nyx/rev1/nyx.c b/keyboards/horrortroll/nyx/rev1/nyx.c
new file mode 100644
index 000000000000..fb4ce3183b06
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/nyx.c
@@ -0,0 +1,89 @@
+/* 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 "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+bool process_record_kb(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_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;
+        case RGB_MOD:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_mode()) {
+                    case RGB_MATRIX_SOLID_MULTISPLASH:
+                        rgb_matrix_mode(RGB_MATRIX_SOLID_COLOR);
+                        return false;
+                    default:
+                        rgb_matrix_step();
+                        return false;
+                }
+            }
+            return false;
+        case RGB_RMOD:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_mode()) {
+                    case RGB_MATRIX_SOLID_COLOR:
+                        rgb_matrix_mode(RGB_MATRIX_SOLID_MULTISPLASH);
+                        return false;
+                    default:
+                        rgb_matrix_step_reverse();
+                        return false;
+                }
+            }
+            return false;
+    }
+
+    return process_record_user(keycode, record);
+}
+
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(30, 0, 75, 75);
+    } else if (!(rgb_matrix_get_flags() & LED_FLAG_INDICATOR)) {
+        rgb_matrix_set_color(30, RGB_OFF);
+    }
+    return true;
+}
+
+void keyboard_post_init_kb(void) {
+    if (!(rgb_matrix_get_flags() & LED_FLAG_ALL)) {
+        rgb_matrix_set_color_all(0, 0, 0);
+    } else {
+        rgb_matrix_mode_noeeprom(RGB_MATRIX_CUSTOM_STARTUP_SWIRL_ANIM);
+    }
+
+    keyboard_post_init_user();
+}
+#endif
diff --git a/keyboards/horrortroll/nyx/rev1/readme.md b/keyboards/horrortroll/nyx/rev1/readme.md
new file mode 100644
index 000000000000..7fdbd0ed8f3b
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/readme.md
@@ -0,0 +1,27 @@
+# Nyx
+
+![Nyx](https://i.imgur.com/I202xevh.png)
+
+A 65% keyboard, which controlled by an RP2040 chipset. The keyboard feature RGB Matrix.
+
+* Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
+* Hardware Supported: RP2040
+* Hardware Availability: Private prototype (only 5 PCB available)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make horrortroll/nyx/rev1:default
+
+Flashing example for this keyboard:
+
+    make horrortroll/nyx/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 (Esc 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/horrortroll/nyx/rev1/rgb_matrix_kb.inc b/keyboards/horrortroll/nyx/rev1/rgb_matrix_kb.inc
new file mode 100644
index 000000000000..0912e3d956ae
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/rgb_matrix_kb.inc
@@ -0,0 +1,7 @@
+RGB_MATRIX_EFFECT(STARTUP_SWIRL_ANIM)
+
+#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+
+#include "lib/startup_swirl_anim.h"
+
+#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/horrortroll/nyx/rev1/rules.mk b/keyboards/horrortroll/nyx/rev1/rules.mk
new file mode 100644
index 000000000000..942ef4c5dbde
--- /dev/null
+++ b/keyboards/horrortroll/nyx/rev1/rules.mk
@@ -0,0 +1 @@
+RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/horrortroll/readme.md b/keyboards/horrortroll/readme.md
index 67347a3c1623..64bcdf0c654e 100644
--- a/keyboards/horrortroll/readme.md
+++ b/keyboards/horrortroll/readme.md
@@ -1,17 +1,18 @@
 # Welcome to my Keyboard Firmwares
 
 ## Keyboards Released by me:
-  | Keyboard name    | MCU           | Layout       | Vendor ID | Product ID | Features                                     |
-  | ---------------- | ------------- | ------------ | --------- | ---------- | -------------------------------------------- |
-  | Handwired K552   | STM32F103RCT6 | TKL          | 0x7516    | 0x5000     | Hotswap, RGB Underglow, OLED 128x32          |
-  | Paws 60          | ATMEGA32U4    | 60%          | 0x7516    | 0x5001     | Hotswap                                      |
+  | Keyboard name  | MCU           | Layout | Vendor ID | Product ID | Features                            |
+  | -------------- | ------------- | ------ | --------- | ---------- | ----------------------------------- |
+  | Handwired K552 | STM32F103RCT6 | TKL    | 0x7516    | 0x5000     | Hotswap, RGB Underglow, OLED 128x32 |
+  | Paws 60        | ATMEGA32U4    | 60%    | 0x7516    | 0x5001     | Hotswap                             |
+  | Nyx            | RP2040        | 65%    | 0x7516    | 0x5005     | Hotswap, RGB Matrix                 |
 
 ## Keyboards Completed has Collaboration with me:
-  | Keyboard name      | MCU           | Layout       | Vendor ID | Product ID | Features                           |
-  | ------------------ | ------------- | ------------ | --------- | ---------- | ---------------------------------- |
-  | Lemon40            | ATMEGA32U4    | 40% Alice    | 0x7516    | 0x6000     | Solder, RGB Underglow, OLED 128x32 |
-  | Caticorn (Solder)  | RP2040        | TKL          | 0x7516    | 0x6001     | Solder                             |
-  | Caticorn (Hotswap) | RP2040        | TKL          | 0x7516    | 0x6002     | Hotswap                            |
+  | Keyboard name      | MCU        | Layout    | Vendor ID | Product ID | Features                           |
+  | ------------------ | ---------- | --------- | --------- | ---------- | ---------------------------------- |
+  | Lemon40            | ATMEGA32U4 | 40% Alice | 0x7516    | 0x6000     | Solder, RGB Underglow, OLED 128x32 |
+  | Caticorn (Solder)  | RP2040     | TKL       | 0x7516    | 0x6001     | Solder                             |
+  | Caticorn (Hotswap) | RP2040     | TKL       | 0x7516    | 0x6002     | Hotswap                            |
 
 ## Keyboard Rewrited by me:
   | Keyboard name                                                                               | MCU           | Layout       | Vendor ID | Product ID | Features                                     |
diff --git a/keyboards/hotdox/config.h b/keyboards/hotdox/config.h
index 4e801399da21..60d9fe62174f 100644
--- a/keyboards/hotdox/config.h
+++ b/keyboards/hotdox/config.h
@@ -11,10 +11,6 @@
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY    0
 
-#define TAPPING_TOGGLE  1
-
-#define TAPPING_TERM    200
-
 /* 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/hotdox/info.json b/keyboards/hotdox/info.json
index 51c0465899a4..8184588e5d70 100644
--- a/keyboards/hotdox/info.json
+++ b/keyboards/hotdox/info.json
@@ -12,6 +12,9 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "tapping": {
+      "toggle": 1
+    },
     "community_layouts": ["ergodox"],
     "layouts": {
     "LAYOUT_ergodox": {
diff --git a/keyboards/hotdox76v2/info.json b/keyboards/hotdox76v2/info.json
index 007e7f23542f..c66bd5eb8a5c 100644
--- a/keyboards/hotdox76v2/info.json
+++ b/keyboards/hotdox76v2/info.json
@@ -19,7 +19,7 @@
         "lto": true
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "E6"],
diff --git a/keyboards/hp69/config.h b/keyboards/hp69/config.h
index cb64849d0686..02238ba61271 100644
--- a/keyboards/hp69/config.h
+++ b/keyboards/hp69/config.h
@@ -17,19 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 20
-#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 AUDIO_PIN A5
 #define AUDIO_PIN_ALT A4
 #define AUDIO_PIN_ALT_AS_NEGATIVE
diff --git a/keyboards/hp69/info.json b/keyboards/hp69/info.json
index 8484902252e0..e852321e8970 100644
--- a/keyboards/hp69/info.json
+++ b/keyboards/hp69/info.json
@@ -17,6 +17,22 @@
         "caps_lock": "A6",
         "scroll_lock": "A7"
     },
+    "rgblight": {
+        "led_count": 20,
+        "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": "A3"
     },
diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/info.json
index 798d889bd78b..c87ca19e3b8d 100644
--- a/keyboards/hs60/v1/info.json
+++ b/keyboards/hs60/v1/info.json
@@ -9,7 +9,7 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "IS31FL3731"
+    "driver": "is31fl3731"
   },
   "matrix_pins": {
     "cols": ["F1", "F4", "F5", "E6", "F0", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
diff --git a/keyboards/hub16/config.h b/keyboards/hub16/config.h
index a628c11ddc1f..68576635a8fc 100755
--- a/keyboards/hub16/config.h
+++ b/keyboards/hub16/config.h
@@ -26,25 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define RGBLED_NUM 11
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
-
-/* Tap Dance timing */
-#define TAPPING_TERM 200
-
 /* 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/hub16/info.json b/keyboards/hub16/info.json
index 4d8161d28d8e..920b42feec83 100644
--- a/keyboards/hub16/info.json
+++ b/keyboards/hub16/info.json
@@ -14,6 +14,24 @@
             {"pin_a": "B5", "pin_b": "B4"}
         ]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 11,
+        "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": "D1"
     },
diff --git a/keyboards/hub20/config.h b/keyboards/hub20/config.h
index 5fc99ecbf501..a72b1389ad61 100644
--- a/keyboards/hub20/config.h
+++ b/keyboards/hub20/config.h
@@ -18,10 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 27
-
 #define RGB_MATRIX_LED_COUNT 27
-    #define RGBLED_NUM 27
 
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
@@ -75,12 +72,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-/* Tap delay for tap vs hold */
-#define TAPPING_TERM 200
-
-/* Slow down key press speed to ensure computer picks it up */
-#define TAP_CODE_DELAY 10
-
 /* 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/hub20/info.json b/keyboards/hub20/info.json
index 994b9405d9be..92aa3605a96a 100644
--- a/keyboards/hub20/info.json
+++ b/keyboards/hub20/info.json
@@ -9,7 +9,7 @@
       "device_version": "0.0.1"
     },
     "rgb_matrix": {
-      "driver": "WS2812"
+      "driver": "ws2812"
     },
     "matrix_pins": {
       "cols": ["A6", "A7", "B7", "B6"],
@@ -22,6 +22,12 @@
         {"pin_a": "A8", "pin_b": "A9"}
       ]
     },
+    "qmk": {
+      "tap_keycode_delay": 10
+    },
+    "rgblight": {
+      "led_count": 27
+    },
     "ws2812": {
       "pin": "B15"
     },
diff --git a/keyboards/hub20/rules.mk b/keyboards/hub20/rules.mk
index 081ea9225a0f..f559246b9e39 100644
--- a/keyboards/hub20/rules.mk
+++ b/keyboards/hub20/rules.mk
@@ -13,5 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 ENCODER_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/hubble/config.h b/keyboards/hubble/config.h
deleted file mode 100644
index ad5e772c749e..000000000000
--- a/keyboards/hubble/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2022 Anton Chernenko (@ch3rny)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-
-/* rgb */
-#define RGBLED_NUM 7
-#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
diff --git a/keyboards/hubble/info.json b/keyboards/hubble/info.json
index b89647e5249f..735cf4237df9 100644
--- a/keyboards/hubble/info.json
+++ b/keyboards/hubble/info.json
@@ -14,6 +14,22 @@
         "rgblight": true,
         "velocikey": true
     },
+    "rgblight": {
+        "led_count": 7,
+        "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": "D2"
     },
diff --git a/keyboards/modelh/config.h b/keyboards/ibm/model_m/modelh/config.h
similarity index 100%
rename from keyboards/modelh/config.h
rename to keyboards/ibm/model_m/modelh/config.h
diff --git a/keyboards/modelh/info.json b/keyboards/ibm/model_m/modelh/info.json
similarity index 100%
rename from keyboards/modelh/info.json
rename to keyboards/ibm/model_m/modelh/info.json
diff --git a/keyboards/modelh/keymaps/default/keymap.c b/keyboards/ibm/model_m/modelh/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/modelh/keymaps/default/keymap.c
rename to keyboards/ibm/model_m/modelh/keymaps/default/keymap.c
diff --git a/keyboards/modelh/modelh.c b/keyboards/ibm/model_m/modelh/modelh.c
similarity index 100%
rename from keyboards/modelh/modelh.c
rename to keyboards/ibm/model_m/modelh/modelh.c
diff --git a/keyboards/ibm/model_m/modelh/readme.md b/keyboards/ibm/model_m/modelh/readme.md
new file mode 100644
index 000000000000..bed79619cea6
--- /dev/null
+++ b/keyboards/ibm/model_m/modelh/readme.md
@@ -0,0 +1,20 @@
+# Model H - A USB capable PCB for the IBM Model M keyboard
+
+![modelh](https://i.imgur.com/4ymGdkM.jpg)
+
+This conversion kit allows you to replace your IBM Model M's original internal controller board with a modern USB board. This aims to match the footprint of the original controller and plugs into the original keyboard matrix, but exposes a USB port through the original SDL connector.
+
+* Keyboard Maintainer: [John Hawthorn](https://github.com/jhawthorn)
+* Hardware Supported: IBM Model M
+* Hardware Availability: [www.modelh.club](www.modelh.club)
+* How to [build your own controller](https://github.com/jberclaz/modelh)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ibm/model_m/modelh:default
+
+Flashing example for this keyboard:
+
+    make ibm/model_m/modelh: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/ibm/model_m/modelh/rules.mk b/keyboards/ibm/model_m/modelh/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/ibm/model_m/mschwingen/config.h b/keyboards/ibm/model_m/mschwingen/config.h
index b1dc81b8c780..b34d29649ad4 100644
--- a/keyboards/ibm/model_m/mschwingen/config.h
+++ b/keyboards/ibm/model_m/mschwingen/config.h
@@ -69,9 +69,6 @@
 # error one of MODELM_LEDS_FFC, MODELM_LEDS_WIRED or MODELM_LEDS_WS2812 must be set!
 #endif
 
-// 3* WS2812 LEDs instead of singlecolor GPIO LEDs
-#define RGBLED_NUM 3
-
 // disabled, needs PCB patch.
 //#define AUDIO_PIN C6
 //#define NO_MUSIC_MODE
diff --git a/keyboards/ibm/model_m/mschwingen/info.json b/keyboards/ibm/model_m/mschwingen/info.json
index 1ba525de6c8f..ce740e4a5481 100644
--- a/keyboards/ibm/model_m/mschwingen/info.json
+++ b/keyboards/ibm/model_m/mschwingen/info.json
@@ -8,6 +8,9 @@
         "pid": "0x558E",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 3
+    },
     "ws2812": {
         "pin": "B6"
     },
diff --git a/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/keymap.c b/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/keymap.c
index f4a1acb0cefd..4ec0a0cbc080 100644
--- a/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/keymap.c
+++ b/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/keymap.c
@@ -25,19 +25,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,          KC_LALT,                           KC_SPC,                                      KC_RALT,          KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT,   KC_APP,           KC_PDOT
   ),
 };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/keymap.c b/keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/keymap.c
similarity index 100%
rename from keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/keymap.c
rename to keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/keymap.c
diff --git a/keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/readme.md b/keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/readme.md
similarity index 100%
rename from keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/readme.md
rename to keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/readme.md
diff --git a/keyboards/yugo_m/model_m_101/keymaps/via/keymap.c b/keyboards/ibm/model_m/yugo_m/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/yugo_m/model_m_101/keymaps/via/keymap.c
rename to keyboards/ibm/model_m/yugo_m/keymaps/via/keymap.c
diff --git a/keyboards/ibm/model_m/yugo_m/keymaps/via/rules.mk b/keyboards/ibm/model_m/yugo_m/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/ibm/model_m/yugo_m/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yugo_m/model_m_101/matrix_diagram.md b/keyboards/ibm/model_m/yugo_m/matrix_diagram.md
similarity index 100%
rename from keyboards/yugo_m/model_m_101/matrix_diagram.md
rename to keyboards/ibm/model_m/yugo_m/matrix_diagram.md
diff --git a/keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/keymap.c b/keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/keymap.c
index 8b992676500a..4e33b0af29f7 100644
--- a/keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/keymap.c
+++ b/keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/keymap.c
@@ -552,7 +552,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
   return true;
 }
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk
index 225317b36747..9131708828a4 100644
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk
@@ -14,4 +14,4 @@ AUDIO_ENABLE = no           # Audio output
 KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
 
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = SOLENOID
+HAPTIC_DRIVER = solenoid
diff --git a/keyboards/ibnuda/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h
index dc525a111d5d..ae358106eb04 100644
--- a/keyboards/ibnuda/gurindam/config.h
+++ b/keyboards/ibnuda/gurindam/config.h
@@ -17,17 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 10
-#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
-
 /* 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/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json
index 2b18d0417ecd..b4a4de5a7437 100644
--- a/keyboards/ibnuda/gurindam/info.json
+++ b/keyboards/ibnuda/gurindam/info.json
@@ -8,6 +8,20 @@
         "pid": "0x6974",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 10,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        }
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/idank/spankbd/config.h b/keyboards/idank/spankbd/config.h
new file mode 100644
index 000000000000..e926de7f5f8a
--- /dev/null
+++ b/keyboards/idank/spankbd/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 Idan Kamara (@idank)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define MASTER_RIGHT
diff --git a/keyboards/idank/spankbd/info.json b/keyboards/idank/spankbd/info.json
new file mode 100644
index 000000000000..fc9dce46313e
--- /dev/null
+++ b/keyboards/idank/spankbd/info.json
@@ -0,0 +1,76 @@
+{
+    "url": "https://github.com/idank/spankbd",
+    "maintainer": "idank",
+    "keyboard_name": "Span",
+    "manufacturer": "holykeebs",
+    "development_board": "promicro",
+    "usb": {
+        "vid": "0xC3AC",
+        "pid": "0x3140",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": [ "F4", "F5", "F6", "F7", "B1" ],
+        "rows": [ "D4", "C6", "D7", "E6" ]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "layouts": {
+        "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.375},
+
+                {"matrix": [4, 4], "x": 8, "y": 0.375},
+                {"matrix": [4, 3], "x": 9, "y": 0.125},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 1], "x": 11, "y": 0.125},
+                {"matrix": [4, 0], "x": 12, "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.375},
+
+                {"matrix": [5, 4], "x": 8, "y": 1.375},
+                {"matrix": [5, 3], "x": 9, "y": 1.125},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 1], "x": 11, "y": 1.125},
+                {"matrix": [5, 0], "x": 12, "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.375},
+
+                {"matrix": [6, 4], "x": 8, "y": 2.375},
+                {"matrix": [6, 3], "x": 9, "y": 2.125},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 1], "x": 11, "y": 2.125},
+                {"matrix": [6, 0], "x": 12, "y": 2.25},
+
+                {"matrix": [3, 2], "x": 2, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.625, "w": 1.5},
+                {"matrix": [3, 4], "x": 5, "y": 3.125, "h": 2},
+
+                {"matrix": [7, 4], "x": 7, "y": 3.125, "h": 2},
+                {"matrix": [7, 3], "x": 8.25, "y": 3.625, "w": 1.5},
+                {"matrix": [7, 2], "x": 10, "y": 3.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idank/spankbd/keymaps/default/keymap.json b/keyboards/idank/spankbd/keymaps/default/keymap.json
new file mode 100644
index 000000000000..10bb42e1089f
--- /dev/null
+++ b/keyboards/idank/spankbd/keymaps/default/keymap.json
@@ -0,0 +1,125 @@
+{
+    "version": 1,
+    "notes": "Span default 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": "idank/spankbd",
+    "keymap": "default",
+    "layout": "LAYOUT_split_3x5_3",
+    "layers": [
+        [
+          "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",
+          "LCTL_T(KC_SCLN)",
+          "RSFT_T(KC_Z)",
+          "KC_X",
+          "KC_C",
+          "KC_V",
+          "KC_B",
+          "KC_N",
+          "KC_M",
+          "KC_COMM",
+          "KC_DOT",
+          "RSFT_T(KC_SLSH)",
+          "LGUI_T(KC_ESC)",
+          "LALT_T(KC_ENT)",
+          "LT(1,KC_SPC)",
+          "LT(2,KC_SPC)",
+          "KC_LSFT",
+          "RSFT_T(KC_TAB)"
+        ],
+        [
+          "KC_EXLM",
+          "KC_AT",
+          "KC_LCBR",
+          "KC_RCBR",
+          "KC_PIPE",
+          "KC_GRV",
+          "KC_TILD",
+          "KC_TRNS",
+          "KC_TRNS",
+          "KC_BSLS",
+          "KC_HASH",
+          "KC_DLR",
+          "KC_LPRN",
+          "KC_RPRN",
+          "KC_BTN2",
+          "KC_PPLS",
+          "KC_MINS",
+          "KC_SLSH",
+          "KC_ASTR",
+          "KC_QUOT",
+          "KC_PERC",
+          "KC_CIRC",
+          "KC_LBRC",
+          "KC_RBRC",
+          "KC_BTN1",
+          "KC_AMPR",
+          "KC_EQL",
+          "KC_COMM",
+          "KC_DOT",
+          "KC_MINS",
+          "KC_BSPC",
+          "KC_SCLN",
+          "KC_TRNS",
+          "KC_TRNS",
+          "KC_SCLN",
+          "KC_DEL"
+        ],
+        [
+          "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_LEFT",
+          "KC_DOWN",
+          "KC_UP",
+          "KC_RGHT",
+          "KC_VOLU",
+          "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_F11",
+          "KC_F12",
+          "KC_TRNS",
+          "KC_TRNS",
+          "KC_MPLY",
+          "KC_MNXT"
+        ]
+      ],
+    "author": "idank"
+}
diff --git a/keyboards/idank/spankbd/keymaps/via/keymap.c b/keyboards/idank/spankbd/keymaps/via/keymap.c
new file mode 100644
index 000000000000..763631f59de8
--- /dev/null
+++ b/keyboards/idank/spankbd/keymaps/via/keymap.c
@@ -0,0 +1,81 @@
+// Copyright 2023 Idan Kamara (@idank)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum {
+    _ALPHA,   // default
+    _SPECIAL, // special characters
+    _NUMBERS  // numbers/function/motion
+};
+
+#define KC_CTL_A  MT(MOD_LCTL, KC_A)     // Tap for A, hold for Control
+#define KC_CTL_CL MT(MOD_LCTL, KC_SCLN)  // Tap for colon, 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_GUI_ESC MT(MOD_LGUI, KC_ESC)  // Tap for Esc, hold for GUI (Meta, Command, Win)
+#define KC_ALT_ENT MT(MOD_LALT, KC_ENT)  // Tap for Enter, hold for Alt (Option)
+#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
+#define KC_SFT_TAB MT(MOD_RSFT, KC_TAB)  // Tap for Tab, hold for Right Shift
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Keymap 0: Alpha 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 SPE |    | SPC NUM | SHFT | TAB |
+     *   '------------------------------'    '----------------------'
+     */
+    [_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_CTL_CL,
+         KC_SFT_Z, KC_X,   KC_C,   KC_V,   KC_B,          KC_N,   KC_M,   KC_COMMA, KC_DOT, KC_SFT_SL,
+             KC_GUI_ESC, KC_ALT_ENT, KC_SPE_SPC,          KC_NUM_SPC, KC_LSFT, KC_SFT_TAB),
+
+    /* Keymap 1: Special characters layer
+     *
+     * ,-------------------------------.      ,-------------------------------.
+     * |    !  |  @  |  {  |  }  |  |  |      |  `  |  ~  |     |     |   \   |
+     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
+     * |    #  |  $  |  (  |  )  | RMB |      |  +  |  -  |  /  |  *  |   '   |
+     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
+     * |    %  |  ^  |  [  |  ]  | LMB |      |  &  |  =  |  ,  |  .  |   -   |
+     * `-------------------------------'      `-------------------------------'
+     *              .------------------.      .-----------------.
+     *              | BSPC |  ;  |  =  |      |  =  |  ;  | DEL |
+     *              '------------------'      '-----------------'
+     */
+    [_SPECIAL] = LAYOUT_split_3x5_3(
+         KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE,          KC_GRV,  KC_TILD, KC_TRNS, KC_TRNS, KC_BSLS,
+         KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_BTN2,          KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_QUOT,
+         KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BTN1,          KC_AMPR, KC_EQL,  KC_COMM, KC_DOT,  KC_MINS,
+                            KC_BSPC, KC_SCLN, KC_EQL,          KC_EQL, KC_SCLN, KC_DEL),
+
+    /* Keymap 2: Numbers/Function/Motion 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 |
+     *               '-----------------'      '-----------------'
+     */
+    [_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_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_VOLU,
+         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_F11, KC_F12, KC_TRNS,         KC_TRNS,  KC_MPLY,  KC_MNXT)
+};
+
diff --git a/keyboards/idank/spankbd/keymaps/via/rules.mk b/keyboards/idank/spankbd/keymaps/via/rules.mk
new file mode 100644
index 000000000000..36b7ba9cbc98
--- /dev/null
+++ b/keyboards/idank/spankbd/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/idank/spankbd/readme.md b/keyboards/idank/spankbd/readme.md
new file mode 100644
index 000000000000..3d09ccbe42d5
--- /dev/null
+++ b/keyboards/idank/spankbd/readme.md
@@ -0,0 +1,28 @@
+# Span
+
+*Span is a 3x5+3 split keyboard, with 2u, 1.5u, 1u thumb clusters.*
+
+The keyboard layout Span uses is derived from GergoPlex, a keyboard that was originally available on gboards.ca
+(now defunct).
+
+* Keyboard Maintainer: [@idank](https://github.com/idank)
+* Hardware Supported: [spankbd](https://github.com/idank/spankbd)
+* Hardware Availability: *[holykeebs](https://holykeebs.com)*
+
+Make example for this keyboard (after setting up your build environment):
+
+    make idank/spankbd:default
+
+Flashing example for this keyboard:
+
+    make idank/spankbd: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 front of the PCB. Double tap for pro micro, 1 second press for Sea Picro / RP2040s.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/idank/spankbd/rules.mk b/keyboards/idank/spankbd/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/idank/spankbd/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/idank/spankbd/spankbd.c b/keyboards/idank/spankbd/spankbd.c
new file mode 100644
index 000000000000..7bfd41d2d83d
--- /dev/null
+++ b/keyboards/idank/spankbd/spankbd.c
@@ -0,0 +1,29 @@
+// Copyright 2023 Idan Kamara (@idank)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#ifdef OLED_ENABLE
+
+__attribute__((weak)) void oled_render_logo(void) {
+    // [span) logo
+    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,192,192,192,192,192,192,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,128,192,192,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,255,255,255,255,  1,  1,  1, 64,240,248,248,248,184, 56,120,120,  0,  0,  0,248,248,248,248, 56, 56,120,248,240,240,192,  0,  0, 24,120, 56, 56, 56,120,248,248,240,224,  0,  0,248,248,248,248, 56, 56,120,248,248,240,192,  0,  1,  7,127,255,255,252,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,255,255,255,255,  0,  0,  0, 96,121,123,115,119,119,127,127, 63, 30,  0,  0,255,255,255,255,112,112,120,127,127, 63, 15,  0, 28, 62,127,127,127,115,115,127,127,127,127,  0,  0,127,127,127,127,  0,  0,  0,127,127,127,127,  0,  0,192,252,255,255,127,  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,  7,  7,  7,  7,  7,  7,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  7,  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,  3,  7,  7,  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,
+    };
+    oled_write_raw_P(raw_logo, sizeof(raw_logo));
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+
+    oled_render_logo();
+
+    return false;
+}
+
+#endif
diff --git a/keyboards/idank/sweeq/config.h b/keyboards/idank/sweeq/config.h
new file mode 100644
index 000000000000..e926de7f5f8a
--- /dev/null
+++ b/keyboards/idank/sweeq/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 Idan Kamara (@idank)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define MASTER_RIGHT
diff --git a/keyboards/idank/sweeq/info.json b/keyboards/idank/sweeq/info.json
new file mode 100644
index 000000000000..0de9cd3aafac
--- /dev/null
+++ b/keyboards/idank/sweeq/info.json
@@ -0,0 +1,80 @@
+{
+    "url": "https://github.com/idank/keyboards/tree/main/sweeq",
+    "maintainer": "idank",
+    "keyboard_name": "Sweeq",
+    "manufacturer": "idank",
+    "development_board": "promicro",
+    "usb": {
+        "vid": "0xC3AB",
+        "pid": "0x3139",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": [ "F4", "F5", "F6", "F7", "B1" ],
+        "rows": [ "D4", "C6", "D7", "E6" ]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "community_layouts": ["split_3x5_2"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_2"
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                {"x": 0, "y": 0.93, "matrix": [0, 0]},
+                {"x": 1, "y": 0.31, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0.28, "matrix": [0, 3]},
+                {"x": 4, "y": 0.42, "matrix": [0, 4]},
+
+                {"x": 7, "y": 0.42, "matrix": [4, 4]},
+                {"x": 8, "y": 0.28, "matrix": [4, 3]},
+                {"x": 9, "y": 0, "matrix": [4, 2]},
+                {"x": 10, "y": 0.31, "matrix": [4, 1]},
+                {"x": 11, "y": 0.93, "matrix": [4, 0]},
+
+                {"x": 0, "y": 1.93, "matrix": [1, 0]},
+                {"x": 1, "y": 1.31, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1.28, "matrix": [1, 3]},
+                {"x": 4, "y": 1.42, "matrix": [1, 4]},
+
+                {"x": 7, "y": 1.42, "matrix": [5, 4]},
+                {"x": 8, "y": 1.28, "matrix": [5, 3]},
+                {"x": 9, "y": 1, "matrix": [5, 2]},
+                {"x": 10, "y": 1.31, "matrix": [5, 1]},
+                {"x": 11, "y": 1.93, "matrix": [5, 0]},
+
+                {"x": 0, "y": 2.93, "matrix": [2, 0]},
+                {"x": 1, "y": 2.31, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2.28, "matrix": [2, 3]},
+                {"x": 4, "y": 2.42, "matrix": [2, 4]},
+
+                {"x": 7, "y": 2.42, "matrix": [6, 4]},
+                {"x": 8, "y": 2.28, "matrix": [6, 3]},
+                {"x": 9, "y": 2, "matrix": [6, 2]},
+                {"x": 10, "y": 2.31, "matrix": [6, 1]},
+                {"x": 11, "y": 2.93, "matrix": [6, 0]},
+
+                {"x": 3.5, "y": 3.75, "matrix": [3, 3]},
+                {"x": 4.5, "y": 4, "matrix": [3, 4]},
+
+                {"x": 6.5, "y": 4, "matrix": [7, 4]},
+                {"x": 7.5, "y": 3.75, "matrix": [7, 3]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idank/sweeq/keymaps/default/config.h b/keyboards/idank/sweeq/keymaps/default/config.h
new file mode 100644
index 000000000000..e70efa40fa5f
--- /dev/null
+++ b/keyboards/idank/sweeq/keymaps/default/config.h
@@ -0,0 +1,21 @@
+// Copyright 2023 Idan Kamara (@idank)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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
+
+#define QUICK_TAP_TERM 0
diff --git a/keyboards/idank/sweeq/keymaps/default/keymap.json b/keyboards/idank/sweeq/keymaps/default/keymap.json
new file mode 100644
index 000000000000..a7845f6e2389
--- /dev/null
+++ b/keyboards/idank/sweeq/keymaps/default/keymap.json
@@ -0,0 +1,107 @@
+{
+    "version": 1,
+    "notes": "sweeq default 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": "idank/sweeq",
+    "keymap": "default",
+    "layout": "LAYOUT_split_3x5_2",
+    "layers": [
+        ["KC_Q"        , "KC_W"        , "KC_E"           , "KC_R"          , "KC_T",
+         "KC_Y"        , "KC_U"        , "KC_I"           , "KC_O"          , "KC_P",
+
+         "LSFT_T(KC_A)", "LT(5,KC_S)"  , "LT(1,KC_D)"     , "LT(3,KC_F)"    , "KC_G",
+         "KC_H"        , "LT(4,KC_J)"  , "LT(2,KC_K)"     , "LT(6,KC_L)"    , "LSFT_T(KC_SCLN)",
+
+         "KC_Z"        , "LCTL_T(KC_X)", "LALT_T(KC_C)"   , "KC_V"          , "KC_B",
+         "KC_N"        , "KC_M"        , "LALT_T(KC_COMM)", "LCTL_T(KC_DOT)", "KC_SLSH",
+
+         "KC_P0"       , "KC_BSPC",
+         "LT(7,KC_SPC)", "KC_P1"
+        ],
+        ["KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "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",
+
+         "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_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",
+
+         "KC_TRNS"     , "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_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",
+
+         "RGB_RMOD"    , "KC_TRNS",
+         "KC_TRNS"     , "RGB_MOD"
+        ],
+        ["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_NO"       , "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_TRNS"     , "KC_COLN"        , "KC_ESC"        , "KC_TRNS",
+         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_DEL",
+
+         "KC_TRNS"     , "KC_PERC"     , "KC_SLSH"        , "KC_ENT"        , "KC_TRNS",
+         "DF(1)"       , "KC_LGUI"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
+
+         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_EXLM"       , "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": "idank"
+}
diff --git a/keyboards/idank/sweeq/keymaps/default/readme.md b/keyboards/idank/sweeq/keymaps/default/readme.md
new file mode 100644
index 000000000000..4d08a5502aa2
--- /dev/null
+++ b/keyboards/idank/sweeq/keymaps/default/readme.md
@@ -0,0 +1 @@
+See the readme of the Ferris [default keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/ferris/keymaps/default).
diff --git a/keyboards/idank/sweeq/keymaps/via/config.h b/keyboards/idank/sweeq/keymaps/via/config.h
new file mode 100644
index 000000000000..12a4fc233fb3
--- /dev/null
+++ b/keyboards/idank/sweeq/keymaps/via/config.h
@@ -0,0 +1,7 @@
+// Copyright 2023 Idan Kamara (@idank)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Good defaults for home row modifiers
+#define TAPPING_TERM 230
diff --git a/keyboards/idank/sweeq/keymaps/via/keymap.c b/keyboards/idank/sweeq/keymaps/via/keymap.c
new file mode 100644
index 000000000000..18ef09f7bb93
--- /dev/null
+++ b/keyboards/idank/sweeq/keymaps/via/keymap.c
@@ -0,0 +1,36 @@
+// Copyright 2023 Idan Kamara (@idank)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#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] = {
+  [0] = LAYOUT(
+    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
+  ),
+
+  [1] = LAYOUT(
+    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
+  ),
+
+  [2] = LAYOUT(
+    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
+  )
+};
diff --git a/keyboards/idank/sweeq/keymaps/via/rules.mk b/keyboards/idank/sweeq/keymaps/via/rules.mk
new file mode 100644
index 000000000000..36b7ba9cbc98
--- /dev/null
+++ b/keyboards/idank/sweeq/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/idank/sweeq/readme.md b/keyboards/idank/sweeq/readme.md
new file mode 100644
index 000000000000..caaf5c705fac
--- /dev/null
+++ b/keyboards/idank/sweeq/readme.md
@@ -0,0 +1,31 @@
+# Sweeq
+
+![sweeq](https://i.imgur.com/TGSyHHxh.png)
+
+*Sweeq is a Ferris Sweep clone that uses diodes, instead of the latter's direct pin matrix.*
+
+The primary goal is to free up the SDA/SCL pins so they can be used by auxiliary devices such as a trackball, trackpoint or an OLED screen.
+
+Other than the diode changes and the ability to use hotswap sockets, this keyboard is identical to the original Sweep.
+
+* Keyboard Maintainer: [@idank](https://github.com/idank)
+* Hardware Supported: [sweeq](https://github.com/idank/keyboards/tree/main/sweeq)
+* Hardware Availability: *[holykeebs](https://holykeebs.com)*
+
+Make example for this keyboard (after setting up your build environment):
+
+    make idank/sweeq:default
+
+Flashing example for this keyboard:
+
+    make idank/sweeq: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/idank/sweeq/rules.mk b/keyboards/idank/sweeq/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/idank/sweeq/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/idobao/id42/config.h b/keyboards/idobao/id42/config.h
index 501fd1f996d1..bac9dbf1bd6f 100755
--- a/keyboards/idobao/id42/config.h
+++ b/keyboards/idobao/id42/config.h
@@ -3,10 +3,6 @@
 
 #pragma once
 
-/* Change the USB polling rate [default = 1000Hz (1ms)] and
- * use larger value of keys per scan for elite games */
-#define USB_POLLING_INTERVAL_MS  2  // 500Hz
-
 /* LED Matrix & Animations */
 #ifdef RGB_MATRIX_ENABLE
 
@@ -15,10 +11,6 @@
     #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 RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-
     #define RGB_MATRIX_KEYPRESSES              // enable key press effects
 
     #define ENABLE_RGB_MATRIX_SOLID_COLOR               // Static single color
diff --git a/keyboards/idobao/id42/info.json b/keyboards/idobao/id42/info.json
index cc896ff236c9..b874f51806eb 100644
--- a/keyboards/idobao/id42/info.json
+++ b/keyboards/idobao/id42/info.json
@@ -18,7 +18,7 @@
         "pin": "B3"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "F0", "F7", "F6", "F1", "F4", "F5"],
@@ -30,7 +30,8 @@
         "vid": "0x6964",
         "pid": "0x0042",
         "device_version": "1.0.0",
-        "force_nkro": true
+        "force_nkro": true,
+        "polling_interval": 2
       },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/idobao/id61/info.json b/keyboards/idobao/id61/info.json
index 57f9e520a388..cf7892ec9f06 100644
--- a/keyboards/idobao/id61/info.json
+++ b/keyboards/idobao/id61/info.json
@@ -18,7 +18,7 @@
         "pin": "F0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7"],
diff --git a/keyboards/idobao/id63/info.json b/keyboards/idobao/id63/info.json
index 048e1870184a..32651f918feb 100644
--- a/keyboards/idobao/id63/info.json
+++ b/keyboards/idobao/id63/info.json
@@ -18,7 +18,7 @@
         "pin": "B7"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["C7", "F6", "F5", "F4", "F1", "B3", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"],
diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/info.json
index 55f19ba9ccda..eff8333a8035 100644
--- a/keyboards/idobao/id67/info.json
+++ b/keyboards/idobao/id67/info.json
@@ -18,7 +18,7 @@
         "pin": "F0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"],
diff --git a/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c b/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c
deleted file mode 100644
index a79b03b80fc4..000000000000
--- a/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c
+++ /dev/null
@@ -1,140 +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;
-}
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h
index 2174e39bd226..d876570c808e 100644
--- a/keyboards/idobao/id75/v1/config.h
+++ b/keyboards/idobao/id75/v1/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-    #define RGBLIGHT_EFFECT_ALTERNATING
-    #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
-
-    #define RGBLED_NUM 16
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-
 /* 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/v1/info.json b/keyboards/idobao/id75/v1/info.json
index 1407d02c802c..545709475d30 100644
--- a/keyboards/idobao/id75/v1/info.json
+++ b/keyboards/idobao/id75/v1/info.json
@@ -12,6 +12,23 @@
     "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"],
     "rows": ["B0", "B3", "C7", "B6", "C6"]
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 16,
+    "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": "F0"
   },
diff --git a/keyboards/idobao/id75/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json b/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json
similarity index 100%
rename from keyboards/idobao/id75/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json
rename to keyboards/idobao/id75/v1/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json
diff --git a/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/keymap.c b/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/keymap.c
new file mode 100644
index 000000000000..84830e47c650
--- /dev/null
+++ b/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/keymap.c
@@ -0,0 +1,128 @@
+#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/keymaps/greenshadowmaker/readme.md b/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/readme.md
similarity index 100%
rename from keyboards/idobao/id75/keymaps/greenshadowmaker/readme.md
rename to keyboards/idobao/id75/v1/keymaps/greenshadowmaker/readme.md
diff --git a/keyboards/idobao/id75/keymaps/greenshadowmaker/rules.mk b/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/rules.mk
similarity index 100%
rename from keyboards/idobao/id75/keymaps/greenshadowmaker/rules.mk
rename to keyboards/idobao/id75/v1/keymaps/greenshadowmaker/rules.mk
diff --git a/keyboards/idobao/id75/v2/info.json b/keyboards/idobao/id75/v2/info.json
index 5275c54dbbfe..4cb46c2564d3 100644
--- a/keyboards/idobao/id75/v2/info.json
+++ b/keyboards/idobao/id75/v2/info.json
@@ -12,7 +12,7 @@
         "pin": "F0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"],
diff --git a/keyboards/idobao/id80/v2/config.h b/keyboards/idobao/id80/v2/config.h
deleted file mode 100644
index e45c0081aeff..000000000000
--- a/keyboards/idobao/id80/v2/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 Sergey Vlasov <sigprof@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-    #define RGBLED_NUM 20       /* 16 underglow LEDs, 4 top LEDs */
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
-    #define RGBLIGHT_EFFECT_ALTERNATING
-    #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
diff --git a/keyboards/idobao/id80/v2/info.json b/keyboards/idobao/id80/v2/info.json
index 26a5a7db819e..4d6e0773d804 100644
--- a/keyboards/idobao/id80/v2/info.json
+++ b/keyboards/idobao/id80/v2/info.json
@@ -19,7 +19,23 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 180
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "max_brightness": 180,
+        "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
+        }
     },
     "indicators": {
         "caps_lock": "C7",
diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/info.json
index 816e55208fe4..cf21d3abb156 100644
--- a/keyboards/idobao/id80/v3/ansi/info.json
+++ b/keyboards/idobao/id80/v3/ansi/info.json
@@ -15,7 +15,7 @@
         "rgblight": false
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F1", "F4", "F5", "F6", "F7"],
diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h
deleted file mode 100644
index 9b7459de6cb3..000000000000
--- a/keyboards/idobao/id87/v1/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2020 Tybera
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have 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_ALTERNATING
-    #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
-
-    #define RGBLED_NUM 22 /* 16 Bottom 6 top*/
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/info.json
index 1deaf6b270d9..9b84530637f1 100644
--- a/keyboards/idobao/id87/v1/info.json
+++ b/keyboards/idobao/id87/v1/info.json
@@ -19,6 +19,23 @@
     "indicators": {
         "caps_lock": "C7"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 22,
+        "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": "E2"
     },
diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json
index aace4915a107..783cd04a03f0 100644
--- a/keyboards/idobao/id87/v2/info.json
+++ b/keyboards/idobao/id87/v2/info.json
@@ -18,7 +18,7 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h
index a857f49125a3..23990f6ef9ef 100644
--- a/keyboards/idobao/id96/config.h
+++ b/keyboards/idobao/id96/config.h
@@ -23,18 +23,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 18
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/info.json
index f49337fc1498..1febd541e569 100644
--- a/keyboards/idobao/id96/info.json
+++ b/keyboards/idobao/id96/info.json
@@ -18,6 +18,23 @@
         "levels": 7,
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "E2"
     },
@@ -31,8 +48,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "community_layouts": ["96_ansi"],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 {"matrix": [5, 0], "x": 0, "y": 0},
                 {"matrix": [5, 1], "x": 1, "y": 0},
@@ -144,6 +165,115 @@
                 {"matrix": [6, 1], "x": 17, "y": 5},
                 {"matrix": [6, 0], "x": 18, "y": 5}
             ]
+        },
+        "LAYOUT_96_ansi": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "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": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [9, 0], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [7, 0], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5},
+                {"matrix": [0, 7], "x": 11, "y": 5},
+                {"matrix": [0, 5], "x": 12, "y": 5},
+                {"matrix": [0, 4], "x": 13, "y": 5},
+                {"matrix": [0, 3], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5},
+                {"matrix": [6, 2], "x": 16, "y": 5},
+                {"matrix": [6, 1], "x": 17, "y": 5}
+            ]
         }
     }
 }
diff --git a/keyboards/idobao/id96/keymaps/default/keymap.c b/keyboards/idobao/id96/keymaps/default/keymap.c
index 4bf52fff4dfe..90fdc03d1617 100644
--- a/keyboards/idobao/id96/keymaps/default/keymap.c
+++ b/keyboards/idobao/id96/keymaps/default/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     |__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________|
     */
 
-    [LAYER_0] = LAYOUT(
+    [LAYER_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_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,
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
 
-    [LAYER_1] = LAYOUT(
+    [LAYER_1] = LAYOUT_all(
         QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______, _______, _______, _______,
diff --git a/keyboards/idobao/id96/keymaps/via/keymap.c b/keyboards/idobao/id96/keymaps/via/keymap.c
index 19e38c111cbf..b42ae53c6d88 100644
--- a/keyboards/idobao/id96/keymaps/via/keymap.c
+++ b/keyboards/idobao/id96/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ enum {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [LAYER_0] = LAYOUT(
+    [LAYER_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_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,
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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),
 
-    [LAYER_1] = LAYOUT(
+    [LAYER_1] = LAYOUT_all(
         QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______, _______, _______, _______,
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______),
 
-    [LAYER_2] = LAYOUT(
+    [LAYER_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,
@@ -51,7 +51,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, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, 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(
+    [LAYER_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,
diff --git a/keyboards/idobao/id96/matrix_diagram.md b/keyboards/idobao/id96/matrix_diagram.md
new file mode 100644
index 000000000000..c89aaa7aa166
--- /dev/null
+++ b/keyboards/idobao/id96/matrix_diagram.md
@@ -0,0 +1,41 @@
+# Matrix Diagram for Idobao Id96
+
+```
+                                                    ┌───────┐
+                                                    │A6     │ 2u Backpsace
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│50 │51 │52 │53 │54 │55 │56 │57 │58 │B8 │B7 │B5 │B4 │B3 │B6 │B2 │B1 │B0 │63 │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│40 │41 │42 │43 │44 │45 │56 │47 │48 │A8 │A7 │A5 │A4 │A3 │A6 │A2 │A1 │A0 │64 │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┼───┼───┼───┤   ┌───┐
+│30   │31 │32 │33 │34 │35 │36 │37 │38 │98 │97 │95 │94 │84   │96 │92 │91 │90 │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┼───┤   │80 │ Numpad "+" 2u
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │88 │87 │85 │93      │86 │82 │81 │80 │   │   │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤   ├───┤
+│10  │11 │12 │13 │14 │15 │16 │17 │18 │78 │77 │75 │74    │73 │76 │72 │71 │70 │   │   │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┼───┼───┼───┤   │60 │ Numpad Enter 2U
+│00  │01  │02  │06                      │08 │07 │05 │04 │03 │66 │62 │61 │60 │   │   │
+└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┴───┴───┴───┘   └───┘
+┌────────┐                                       ┌──────────┐
+│10      │ 2.25u LShift             2.75u RShift │74        │
+└────────┘                                       └──────────┘
+                                                            ┌───────┐
+                                                            │62     │ Numpad 0 2u
+                                                            └───────┘
+┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
+│00  │01  │02  │06                      │08  │07  │04  │03  │ 4x1.25u Right Mod
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+┌─────┬─────┬───────────────────────────┬───┬───┬───┬───┬───┐
+│00   │01   │06                         │08 │07 │05 │04 │03 │ 2x1.5u Left Mod
+└─────┴─────┴───────────────────────────┴───┴───┴───┴───┴───┘
+┌─────┬───┬─────┬───────────────────────┬─────┬─────┬───┬───┐
+│00   │01 │02   │06                     │08   │05   │04 │03 │ Tsangan Left Mod, 2x1.5u-2x1u Right Mod
+└─────┴───┴─────┴───────────────────────┴─────┴─────┴───┴───┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│00   │01 │02   │06                         │07   │04 │03   │ Tsangan/WKL/HHKB
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+┌─────┬───┬─────┬───────────────────────────┬───┬───┬───┬───┐
+│00   │01 │02   │06                         │07 │05 │04 │03 │ 4x1u Right Mod
+└─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
+```
diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h
index 87ed689f6676..6cbdda8572d9 100644
--- a/keyboards/idobao/montex/v1/config.h
+++ b/keyboards/idobao/montex/v1/config.h
@@ -21,19 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-    #define RGBLIGHT_EFFECT_ALTERNATING
-    #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
-
-    #define RGBLED_NUM 4
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/info.json
index 666ffbdf89da..2abbef46ba6d 100644
--- a/keyboards/idobao/montex/v1/info.json
+++ b/keyboards/idobao/montex/v1/info.json
@@ -16,6 +16,23 @@
     "backlight": {
         "pin": "B6"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 4,
+        "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": "B1"
     },
diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json
index 5980cab11710..31c06d080902 100755
--- a/keyboards/idobao/montex/v1rgb/info.json
+++ b/keyboards/idobao/montex/v1rgb/info.json
@@ -7,7 +7,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D5", "D3", "D2", "D1", "D0"],
diff --git a/keyboards/idobao/montex/v2/info.json b/keyboards/idobao/montex/v2/info.json
index f034db3c03b0..74a69d60fe1b 100755
--- a/keyboards/idobao/montex/v2/info.json
+++ b/keyboards/idobao/montex/v2/info.json
@@ -18,7 +18,7 @@
         "pin": "B1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D5", "D3", "D2", "D1", "D0"],
diff --git a/keyboards/idyllic/tinny50_rgb/info.json b/keyboards/idyllic/tinny50_rgb/info.json
index fad9c3c73083..f02e88f45989 100644
--- a/keyboards/idyllic/tinny50_rgb/info.json
+++ b/keyboards/idyllic/tinny50_rgb/info.json
@@ -27,7 +27,7 @@
         "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP20", "GP19", "GP1", "GP6", "GP5"]
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "ws2812": {
         "pin": "GP10",
diff --git a/keyboards/ilumkb/simpler61/info.json b/keyboards/ilumkb/simpler61/info.json
index 4b3a067522a0..80a738f4cfaf 100644
--- a/keyboards/ilumkb/simpler61/info.json
+++ b/keyboards/ilumkb/simpler61/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "B7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
diff --git a/keyboards/ilumkb/simpler64/info.json b/keyboards/ilumkb/simpler64/info.json
index 0db9d79c2209..a7939071480c 100644
--- a/keyboards/ilumkb/simpler64/info.json
+++ b/keyboards/ilumkb/simpler64/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "B7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
diff --git a/keyboards/inett_studio/sqx/hotswap/config.h b/keyboards/inett_studio/sqx/hotswap/config.h
index 1eff584a8324..f698867ffb84 100644
--- a/keyboards/inett_studio/sqx/hotswap/config.h
+++ b/keyboards/inett_studio/sqx/hotswap/config.h
@@ -29,23 +29,6 @@
 /* disable print */
 //#define NO_PRINT
 
-
-//rgb light setting
-#define RGBLED_NUM          18
-#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
-
 //rgb matrix setting
 #define DRIVER_1_LED_TOTAL 33
 #define DRIVER_2_LED_TOTAL 31
@@ -92,18 +75,18 @@
 #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
+// #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 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/info.json b/keyboards/inett_studio/sqx/hotswap/info.json
index 8d4621a60846..90fe00d167f5 100644
--- a/keyboards/inett_studio/sqx/hotswap/info.json
+++ b/keyboards/inett_studio/sqx/hotswap/info.json
@@ -12,10 +12,25 @@
         "pin": "D7"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "rgblight": {
-        "max_brightness": 128
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "max_brightness": 128,
+        "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": ["C7", "C6", "B6", "B5", "B4", "F7", "F6", "F5", "E6", "B0", "D2", "D4", "D5", "D3"],
diff --git a/keyboards/inett_studio/sqx/universal/config.h b/keyboards/inett_studio/sqx/universal/config.h
index 92c9bedfc960..30903b58033b 100644
--- a/keyboards/inett_studio/sqx/universal/config.h
+++ b/keyboards/inett_studio/sqx/universal/config.h
@@ -29,23 +29,6 @@
 /* disable print */
 //#define NO_PRINT
 
-
-//rgb light setting
-#define RGBLED_NUM          18
-#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
-
 //rgb matrix setting
 #define DRIVER_1_LED_TOTAL 36
 #define DRIVER_2_LED_TOTAL 36
@@ -92,18 +75,18 @@
 #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
+// #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 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 9839aa10deb1..15744fbbbcdf 100644
--- a/keyboards/inett_studio/sqx/universal/info.json
+++ b/keyboards/inett_studio/sqx/universal/info.json
@@ -12,10 +12,25 @@
         "pin": "D7"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "rgblight": {
-        "max_brightness": 128
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "max_brightness": 128,
+        "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": ["C7", "C6", "B6", "B5", "B4", "F7", "F6", "F5", "E6", "B0", "D2", "D4", "D5", "D3"],
diff --git a/keyboards/inland/kb83/config.h b/keyboards/inland/kb83/config.h
new file mode 100644
index 000000000000..d1e7d11acc61
--- /dev/null
+++ b/keyboards/inland/kb83/config.h
@@ -0,0 +1,82 @@
+/* Copyright (C) 2022 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have 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
+
+/* DIP switch */
+#define DIP_SWITCH_PINS \
+    { A9 }
+
+/* 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
+
+/* 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
+#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
+
+/* I2C Config for LED Driver */
+#define DRIVER_COUNT 2
+#define DRIVER_ADDR_1 0b1110100
+#define DRIVER_ADDR_2 0b1110111
+#define I2C1_SDA_PIN B7
+#define I2C1_SCL_PIN B6
+#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/hfdkb/keyboard_sw/k83/halconf.h b/keyboards/inland/kb83/halconf.h
similarity index 100%
rename from keyboards/hfdkb/keyboard_sw/k83/halconf.h
rename to keyboards/inland/kb83/halconf.h
diff --git a/keyboards/inland/kb83/info.json b/keyboards/inland/kb83/info.json
new file mode 100644
index 000000000000..ce577fb029f5
--- /dev/null
+++ b/keyboards/inland/kb83/info.json
@@ -0,0 +1,133 @@
+{
+    "keyboard_name": "KB83",
+    "manufacturer": "www.hfd.cn",
+    "maintainer": "hfd",
+    "usb": {
+        "vid": "0xFFFE",
+        "pid": "0x0007",
+        "device_version": "1.0.0",
+        "force_nkro": true
+    },
+    "rgb_matrix": {
+        "driver": "is31fl3733"
+    },
+    "processor": "WB32FQ95",
+    "bootloader": "wb32-dfu",
+    "matrix_pins": {
+        "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"],
+        "rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
+    },
+    "diode_direction": "ROW2COL",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B14", "pin_b": "B13", "resolution": 4}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 15
+    },
+    "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, 15], "x": 15.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, 15], "x": 15.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": [2, 15], "x": 15.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": [3, 15], "x": 15.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 14.125, "y": 4.375},
+
+                {"matrix": [4, 15], "x": 15.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, 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, 13], "x": 13.125, "y": 5.375},
+                {"matrix": [5, 14], "x": 14.125, "y": 5.375},
+                {"matrix": [5, 15], "x": 15.125, "y": 5.375}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hfdkb/keyboard_sw/k83/k83.c b/keyboards/inland/kb83/kb83.c
similarity index 100%
rename from keyboards/hfdkb/keyboard_sw/k83/k83.c
rename to keyboards/inland/kb83/kb83.c
diff --git a/keyboards/hfdkb/keyboard_sw/k83/keymaps/default/keymap.c b/keyboards/inland/kb83/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/hfdkb/keyboard_sw/k83/keymaps/default/keymap.c
rename to keyboards/inland/kb83/keymaps/default/keymap.c
diff --git a/keyboards/hfdkb/keyboard_sw/k83/keymaps/via/keymap.c b/keyboards/inland/kb83/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/hfdkb/keyboard_sw/k83/keymaps/via/keymap.c
rename to keyboards/inland/kb83/keymaps/via/keymap.c
diff --git a/keyboards/inland/kb83/keymaps/via/rules.mk b/keyboards/inland/kb83/keymaps/via/rules.mk
new file mode 100644
index 000000000000..4253f570f0bb
--- /dev/null
+++ b/keyboards/inland/kb83/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/inland/kb83/mcuconf.h b/keyboards/inland/kb83/mcuconf.h
new file mode 100644
index 000000000000..0d16f4f04e46
--- /dev/null
+++ b/keyboards/inland/kb83/mcuconf.h
@@ -0,0 +1,24 @@
+/* Copyright (C) 2022 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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
+
+#undef WB32_I2C_USE_I2C1
+#define WB32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/inland/kb83/readme.md b/keyboards/inland/kb83/readme.md
new file mode 100644
index 000000000000..e6f1d45990b3
--- /dev/null
+++ b/keyboards/inland/kb83/readme.md
@@ -0,0 +1,19 @@
+# kb83
+
+A customizable 75% encoder keyboard.
+
+* Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986)
+* Hardware Supported: kb83
+* Hardware Availability:[inland](https://www.microcenter.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make inland/kb83:default
+
+Flashing example for this keyboard:
+
+    make inland/kb83:default:flash
+
+**Reset Key**: Hold down the key located at *K01*, which 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).
diff --git a/keyboards/hfdkb/keyboard_sw/k83/rgb_matrix_kb.inc b/keyboards/inland/kb83/rgb_matrix_kb.inc
similarity index 100%
rename from keyboards/hfdkb/keyboard_sw/k83/rgb_matrix_kb.inc
rename to keyboards/inland/kb83/rgb_matrix_kb.inc
diff --git a/keyboards/hfdkb/keyboard_sw/k83/rules.mk b/keyboards/inland/kb83/rules.mk
similarity index 100%
rename from keyboards/hfdkb/keyboard_sw/k83/rules.mk
rename to keyboards/inland/kb83/rules.mk
diff --git a/keyboards/inland/mk47/info.json b/keyboards/inland/mk47/info.json
index f88003b27f7f..45a11e913a20 100644
--- a/keyboards/inland/mk47/info.json
+++ b/keyboards/inland/mk47/info.json
@@ -26,7 +26,7 @@
         "rows": ["C6", "C7", "C8", "C9"]
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733",
+        "driver": "is31fl3733",
         "max_brightness": 200,
         "animations": {
             "breathing": true,
@@ -100,8 +100,14 @@
         ]
     },
     "diode_direction": "ROW2COL",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_planck_mit"
+    },
+    "community_layouts": [
+        "planck_mit"
+    ],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_planck_mit": {
             "layout": [
                 { "label": "Esc", "matrix": [0, 0],"x": 0, "y": 0 },
                 { "label": "Q", "matrix": [0, 1], "x": 1, "y": 0 },
diff --git a/keyboards/inland/mk47/keymaps/default/keymap.c b/keyboards/inland/mk47/keymaps/default/keymap.c
index f288d4e1feba..dab9c637826a 100644
--- a/keyboards/inland/mk47/keymaps/default/keymap.c
+++ b/keyboards/inland/mk47/keymaps/default/keymap.c
@@ -19,23 +19,27 @@
 // clang-format off
 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_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, MO(2), KC_LALT, KC_DEL, KC_PGDN, KC_SPC, KC_PGUP, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+    [0] = 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_UP,   KC_SLSH,
+        KC_LCTL, MO(2),   KC_LALT, KC_DEL,  KC_PGDN,     KC_SPC,       KC_PGUP, MO(1),   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, RGB_MOD,
-        KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+    [1] = LAYOUT_planck_mit(
+        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  RGB_MOD,
+        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_MSTP, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, RGB_VAI, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_TRNS, RGB_VAD, KC_TRNS
+    ),
+
+    [2] = 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_CAPS, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
+        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_NO,   KC_LALT, KC_DEL,  KC_PGDN,     KC_SPC,       KC_PGUP, KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT
+    )
 
-    [2] = 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_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
-        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_NO, KC_LALT, KC_DEL, KC_PGDN, KC_SPC, KC_PGUP, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT)
 };
 // clang-format on
 
diff --git a/keyboards/inland/mk47/keymaps/inland/keymap.c b/keyboards/inland/mk47/keymaps/inland/keymap.c
index ff5de15c47f3..e376211185ba 100644
--- a/keyboards/inland/mk47/keymaps/inland/keymap.c
+++ b/keyboards/inland/mk47/keymaps/inland/keymap.c
@@ -19,22 +19,26 @@
 // clang-format off
 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_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, MO(2), KC_LALT, KC_DEL, KC_PGDN, KC_SPC, KC_PGUP, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+    [0] = 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_UP,   KC_SLSH,
+        KC_LCTL, MO(2),   KC_LALT, KC_DEL,  KC_PGDN,     KC_SPC,       KC_PGUP, MO(1),   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, RGB_MOD,
-        RGB_HUI, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+    [1] = LAYOUT_planck_mit(
+        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  RGB_MOD,
+        RGB_HUI, 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_MSEL, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, RGB_VAI, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI),
+        KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR,  KC_TRNS,     KC_TRNS,      KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI
+    ),
+
+    [2] = 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_CAPS, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
+        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_NO,   KC_LALT, KC_DEL,  KC_PGDN,     KC_SPC,       KC_PGUP, KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT
+    )
 
-    [2] = 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_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
-        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_NO, KC_LALT, KC_DEL, KC_PGDN, KC_SPC, KC_PGUP, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT)
 };
 // clang-format on
diff --git a/keyboards/inland/mk47/keymaps/via/keymap.c b/keyboards/inland/mk47/keymaps/via/keymap.c
index 53cabcc4770e..0eb46e63a4a0 100644
--- a/keyboards/inland/mk47/keymaps/via/keymap.c
+++ b/keyboards/inland/mk47/keymaps/via/keymap.c
@@ -19,23 +19,27 @@
 // clang-format off
 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_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, MO(2), KC_LALT, KC_DEL, KC_PGDN, KC_SPC, KC_PGUP, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+    [0] = 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_UP,   KC_SLSH,
+        KC_LCTL, MO(2),   KC_LALT, KC_DEL,  KC_PGDN,     KC_SPC,       KC_PGUP, MO(1),   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, RGB_MOD,
-        RGB_HUI, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+    [1] = LAYOUT_planck_mit(
+        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  RGB_MOD,
+        RGB_HUI, 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_MSEL, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, RGB_VAI, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI),
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,      KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI
+    ),
+
+    [2] = 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_CAPS, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
+        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_NO,   KC_LALT, KC_DEL,  KC_PGDN,     KC_SPC,       KC_PGUP, KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT
+    )
 
-    [2] = 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_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
-        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_NO, KC_LALT, KC_DEL, KC_PGDN, KC_SPC, KC_PGUP, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT)
 };
 // clang-format on
 
diff --git a/keyboards/inland/v83p/config.h b/keyboards/inland/v83p/config.h
new file mode 100644
index 000000000000..c433b568dda5
--- /dev/null
+++ b/keyboards/inland/v83p/config.h
@@ -0,0 +1,36 @@
+// Copyright 2023 jonylee@hfd (@jonylee1986)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define ENCODER_DEFAULT_POS 0x3
+
+/* DIP switch */
+#define DIP_SWITCH_PINS \
+    { C11 }
+
+/* I2C Config for LED Driver */
+#define DRIVER_COUNT 2
+#define DRIVER_ADDR_1 0b1110100
+#define DRIVER_ADDR_2 0b1110111
+#define I2C1_SDA_PIN B7
+#define I2C1_SCL_PIN B6
+#define I2C1_SCL_PAL_MODE 4
+#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
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+#define SPI_MOSI_PAL_MODE 5
+
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
+#define WEAR_LEVELING_BACKING_SIZE (4 * 1024)
+
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/inland/v83p/halconf.h b/keyboards/inland/v83p/halconf.h
new file mode 100644
index 000000000000..fcd8b7216a67
--- /dev/null
+++ b/keyboards/inland/v83p/halconf.h
@@ -0,0 +1,11 @@
+// Copyright 2023 jonylee@hfd (@jonylee1986)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+#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/inland/v83p/info.json b/keyboards/inland/v83p/info.json
new file mode 100644
index 000000000000..d7a418bccfbe
--- /dev/null
+++ b/keyboards/inland/v83p/info.json
@@ -0,0 +1,253 @@
+{
+    "manufacturer": "Inland",
+    "keyboard_name": "V83P",
+    "maintainer": "jonylee@hfd",
+    "processor": "WB32FQ95",
+    "bootloader": "wb32-dfu",
+    "usb": {
+        "vid": "0xFFFE",
+        "pid": "0x001B",
+        "device_version": "1.0.3",
+        "force_nkro": true,
+        "suspend_wakeup_delay": 1000
+    },
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "dip_switch":true
+    },
+    "matrix_pins": {
+        "cols": ["C1","C2","C3","A0","A1","A2","A3","A4","A5","A6","A7","C4","C5","B0","B1","B2"],
+        "rows": ["B15", "C6", "C7", "C8", "C9", "B14"]
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "A8", "pin_b": "B13" }
+        ]
+    },
+    "rgb_matrix": {
+        "driver": "ckled2001",
+        "max_brightness": 180,
+        "animations": {
+            "solid_color": true,
+            "breathing": 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,
+            "raindrops": true,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "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":  29, "y": 0 },
+            { "flags": 4, "matrix": [0,3],  "x":  44, "y": 0 },
+            { "flags": 4, "matrix": [0,4],  "x":  59, "y": 0 },
+            { "flags": 4, "matrix": [0,5],  "x":  74, "y": 0 },
+            { "flags": 4, "matrix": [0,6],  "x":  89, "y": 0 },
+            { "flags": 4, "matrix": [0,7],  "x": 104, "y": 0 },
+            { "flags": 4, "matrix": [0,8],  "x": 119, "y": 0 },
+            { "flags": 4, "matrix": [0,9],  "x": 134, "y": 0 },
+            { "flags": 4, "matrix": [0,10], "x": 149, "y": 0 },
+            { "flags": 4, "matrix": [0,11], "x": 164, "y": 0 },
+            { "flags": 4, "matrix": [0,12], "x": 179, "y": 0 },
+            { "flags": 4, "matrix": [0,13], "x": 194, "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,15], "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,15], "x": 224, "y": 26},
+
+            { "flags": 1, "matrix": [3,0],  "x":   0, "y": 38},
+            { "flags": 4, "matrix": [3,1],  "x":  28, "y": 38},
+            { "flags": 4, "matrix": [3,2],  "x":  42, "y": 38},
+            { "flags": 4, "matrix": [3,3],  "x":  56, "y": 38},
+            { "flags": 4, "matrix": [3,4],  "x":  70, "y": 38},
+            { "flags": 4, "matrix": [3,5],  "x":  84, "y": 38},
+            { "flags": 4, "matrix": [3,6],  "x":  98, "y": 38},
+            { "flags": 4, "matrix": [3,7],  "x": 112, "y": 38},
+            { "flags": 4, "matrix": [3,8],  "x": 126, "y": 38},
+            { "flags": 4, "matrix": [3,9],  "x": 140, "y": 38},
+            { "flags": 4, "matrix": [3,10], "x": 154, "y": 38},
+            { "flags": 4, "matrix": [3,11], "x": 168, "y": 38},
+            { "flags": 1, "matrix": [3,13], "x": 182, "y": 38},
+            { "flags": 4, "matrix": [3,15], "x": 224, "y": 38},
+
+            { "flags": 1, "matrix": [4,0],  "x":   0, "y": 51},
+            { "flags": 4, "matrix": [4,1],  "x":  18, "y": 51},
+            { "flags": 4, "matrix": [4,2],  "x":  37, "y": 51},
+            { "flags": 4, "matrix": [4,3],  "x":  56, "y": 51},
+            { "flags": 4, "matrix": [4,4],  "x":  74, "y": 51},
+            { "flags": 4, "matrix": [4,5],  "x":  93, "y": 51},
+            { "flags": 4, "matrix": [4,6],  "x": 112, "y": 51},
+            { "flags": 4, "matrix": [4,7],  "x": 130, "y": 51},
+            { "flags": 4, "matrix": [4,8],  "x": 149, "y": 51},
+            { "flags": 4, "matrix": [4,9],  "x": 168, "y": 51},
+            { "flags": 4, "matrix": [4,10], "x": 186, "y": 51},
+            { "flags": 1, "matrix": [4,13], "x": 200, "y": 51},
+            { "flags": 1, "matrix": [4,14], "x": 214, "y": 51},
+            { "flags": 1, "matrix": [4,15], "x": 224, "y": 51},
+
+            { "flags": 1, "matrix": [5,0],  "x":   0, "y": 64},
+            { "flags": 1, "matrix": [5,1],  "x":  18, "y": 64},
+            { "flags": 1, "matrix": [5,2],  "x":  37, "y": 64},
+            { "flags": 4, "matrix": [5,5],  "x":  92, "y": 64},
+            { "flags": 1, "matrix": [5,9],  "x": 140, "y": 64},
+            { "flags": 1, "matrix": [5,10], "x": 154, "y": 64},
+            { "flags": 1, "matrix": [5,11], "x": 168, "y": 64},
+            { "flags": 1, "matrix": [5,13], "x": 196, "y": 64},
+            { "flags": 1, "matrix": [5,14], "x": 210, "y": 64},
+            { "flags": 1, "matrix": [5,15], "x": 224, "y": 64},
+
+            { "flags": 2, "x":   0, "y": 0 },
+            { "flags": 2, "x":   0, "y": 16},
+            { "flags": 2, "x":   0, "y": 32},
+            { "flags": 2, "x":   0, "y": 48},
+            { "flags": 2, "x":   0, "y": 64},
+
+            { "flags": 2, "x": 224, "y": 0 },
+            { "flags": 2, "x": 224, "y": 16},
+            { "flags": 2, "x": 224, "y": 32},
+            { "flags": 2, "x": 224, "y": 48},
+            { "flags": 2, "x": 224, "y": 64}
+        ]
+    },
+    "layouts": {
+        "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,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], "w": 2, "x": 13, "y": 1 },
+                { "matrix": [1,15], "x": 15.5, "y": 1 },
+
+                { "matrix": [2,0], "w": 1.5, "x": 0, "y": 2 },
+                { "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], "w": 1.5, "x": 13.5, "y": 2 },
+                { "matrix": [2,15], "x": 15.5, "y": 2 },
+
+                { "matrix": [3,0], "w": 1.75, "x": 0, "y": 3 },
+                { "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], "w": 2.25, "x": 12.75, "y": 3 },
+                { "matrix": [3,15], "x": 15.5, "y": 3 },
+
+                { "matrix": [4,0], "w": 2.25, "x": 0, "y": 4 },
+                { "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,13], "w": 1.75, "x": 12.25, "y": 4 },
+                { "matrix": [4,14], "x": 14.25, "y": 4.25 },
+                { "matrix": [4,15], "x": 15.5, "y": 4 },
+
+                { "matrix": [5,0], "w": 1.25, "x": 0, "y": 5 },
+                { "matrix": [5,1], "w": 1.25, "x": 1.25, "y": 5 },
+                { "matrix": [5,2], "w": 1.25, "x": 2.5, "y": 5 },
+                { "matrix": [5,5], "w": 6.25, "x": 3.75, "y": 5 },
+                { "matrix": [5,9], "x": 10, "y": 5 },
+                { "matrix": [5,10], "x": 11, "y": 5 },
+                { "matrix": [5,11], "x": 12, "y": 5 },
+                { "matrix": [5,13], "x": 13.25, "y": 5.25 },
+                { "matrix": [5,14], "x": 14.25, "y": 5.25 },
+                { "matrix": [5,15], "x": 15.25, "y": 5.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/inland/v83p/keymaps/default/keymap.c b/keyboards/inland/v83p/keymaps/default/keymap.c
new file mode 100644
index 000000000000..359939a01597
--- /dev/null
+++ b/keyboards/inland/v83p/keymaps/default/keymap.c
@@ -0,0 +1,55 @@
+// Copyright 2023 jonylee@hfd (@jonylee1986)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+// clang-format off
+enum __layers {
+    WIN_B,
+    WIN_FN,
+    MAC_B,
+    MAC_FN
+};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [WIN_B] = LAYOUT_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_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(WIN_FN),KC_RCTL,    KC_LEFT,  KC_DOWN, KC_RGHT),
+
+    [WIN_FN] = LAYOUT_ansi( /* FN */
+        EE_CLR,  KC_BRID, KC_BRIU, KC_MAIL, KC_WSCH, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______,       RGB_TOG,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD,       _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,               RGB_VAI,  RGB_HUD,
+        _______, GU_TOGG, _______,                   _______,                            _______, _______, _______,      RGB_SPD, RGB_VAD, RGB_SPI),
+
+    [MAC_B] = LAYOUT_ansi( /* Base */
+        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_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_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, MO(MAC_FN),KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi( /* FN */
+        EE_CLR,  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,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,                RGB_VAI, RGB_HUD,
+        _______, _______, _______,                   _______,                            _______, _______, _______,       RGB_SPD, RGB_VAD, RGB_SPI)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [WIN_FN] = { ENCODER_CCW_CW(RGB_SAI, RGB_SAD) },
+    [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [MAC_FN] = { ENCODER_CCW_CW(RGB_SAI, RGB_SAD) },
+};
+#endif
+
diff --git a/keyboards/inland/v83p/keymaps/default/rules.mk b/keyboards/inland/v83p/keymaps/default/rules.mk
new file mode 100644
index 000000000000..a40474b4d5c7
--- /dev/null
+++ b/keyboards/inland/v83p/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/inland/v83p/keymaps/via/keymap.c b/keyboards/inland/v83p/keymaps/via/keymap.c
new file mode 100644
index 000000000000..56b44997d031
--- /dev/null
+++ b/keyboards/inland/v83p/keymaps/via/keymap.c
@@ -0,0 +1,76 @@
+// Copyright 2023 jonylee@hfd (@jonylee1986)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+// clang-format off
+enum __layers {
+    WIN_B,
+    WIN_FN,
+    MAC_B,
+    MAC_FN
+};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [WIN_B] = LAYOUT_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_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(WIN_FN),KC_RCTL,    KC_LEFT,  KC_DOWN, KC_RGHT),
+
+    [WIN_FN] = LAYOUT_ansi( /* FN */
+        EE_CLR,  KC_BRID, KC_BRIU, KC_MAIL, KC_WSCH, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______,       RGB_TOG,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD,       _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,               RGB_VAI,  RGB_HUD,
+        _______, GU_TOGG, _______,                   _______,                            _______, _______, _______,      RGB_SPD, RGB_VAD, RGB_SPI),
+
+    [MAC_B] = LAYOUT_ansi( /* Base */
+        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_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_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, MO(MAC_FN),KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi( /* FN */
+        EE_CLR,  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,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,                RGB_VAI, RGB_HUD,
+        _______, _______, _______,                   _______,                            _______, _______, _______,       RGB_SPD, RGB_VAD, RGB_SPI)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [WIN_FN] = { ENCODER_CCW_CW(RGB_SAI, RGB_SAD) },
+    [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [MAC_FN] = { ENCODER_CCW_CW(RGB_SAI, RGB_SAD) },
+};
+#endif
+// clang-format on
+
+bool dip_switch_update_user(uint8_t index, bool active) {
+    if (index == 0) {
+        default_layer_set(1UL << (active ? 2 : 0));
+    }
+    if (active) {
+        keymap_config.no_gui = 0;
+    }
+    return true;
+}
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    // caps lock red
+    if ((host_keyboard_led_state().caps_lock)) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(44, 128, 0, 0);
+    }
+    // GUI lock red
+    if (keymap_config.no_gui) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(73, 128, 0, 0);
+    }
+    return true;
+}
diff --git a/keyboards/inland/v83p/keymaps/via/rules.mk b/keyboards/inland/v83p/keymaps/via/rules.mk
new file mode 100644
index 000000000000..4253f570f0bb
--- /dev/null
+++ b/keyboards/inland/v83p/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/inland/v83p/mcuconf.h b/keyboards/inland/v83p/mcuconf.h
new file mode 100644
index 000000000000..aa272655630f
--- /dev/null
+++ b/keyboards/inland/v83p/mcuconf.h
@@ -0,0 +1,12 @@
+// Copyright 2023 jonylee@hfd (@jonylee1986)
+// 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
+
+#undef WB32_I2C_USE_I2C1
+#define WB32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/inland/v83p/readme.md b/keyboards/inland/v83p/readme.md
new file mode 100644
index 000000000000..000e960d634d
--- /dev/null
+++ b/keyboards/inland/v83p/readme.md
@@ -0,0 +1,26 @@
+# v83p
+
+A customizable 75% encoder keyboard.
+
+* Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986)
+* Hardware Supported: v83p
+* Hardware Availability: [inland](https://www.microcenter.com/search/search_results.aspx?N=4294961018+4294822437)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make inland/v83p:default
+
+Flashing example for this keyboard:
+
+    make inland/v83p: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 available
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the top left key) and plug in the keyboard
+* **Physical BOOT contact**: Short circuit the BOOT contact located below the spacebar of the PCB and plug in the keyboard
diff --git a/keyboards/inland/v83p/rules.mk b/keyboards/inland/v83p/rules.mk
new file mode 100644
index 000000000000..24d5f6f52ecc
--- /dev/null
+++ b/keyboards/inland/v83p/rules.mk
@@ -0,0 +1,2 @@
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/inland/v83p/v83p.c b/keyboards/inland/v83p/v83p.c
new file mode 100644
index 000000000000..26ab62784aab
--- /dev/null
+++ b/keyboards/inland/v83p/v83p.c
@@ -0,0 +1,119 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+// clang-format off
+
+#ifdef RGB_MATRIX_ENABLE
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_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},
+
+    {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, 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, 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},
+
+    {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},
+};
+#endif
+
+
diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h
index 6d642e5d458f..7db6119a1cf0 100644
--- a/keyboards/input_club/ergodox_infinity/config.h
+++ b/keyboards/input_club/ergodox_infinity/config.h
@@ -23,10 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY 0
 
-#define TAPPING_TOGGLE  1
-
-#define TAPPING_TERM    200
-
 /* 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/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
index ca6aa92b5d87..d69aeb5d0cd8 100644
--- a/keyboards/input_club/ergodox_infinity/info.json
+++ b/keyboards/input_club/ergodox_infinity/info.json
@@ -7,7 +7,7 @@
         "device_version": "0.0.1"
     },
     "led_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "matrix_pins": {
         "cols": ["D1", "D4", "D5", "D6", "D7"],
@@ -17,6 +17,9 @@
     "processor": "MK20DX256",
     "bootloader": "kiibohd",
     "board": "IC_TEENSY_3_1",
+    "tapping": {
+        "toggle": 1
+    },
     "community_layouts": ["ergodox"],
     "layouts": {
         "LAYOUT_ergodox": {
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
index a345e075d9b3..a49fe882ea75 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
@@ -21,11 +21,6 @@ A layout based on neo2
 #endif
 #define LEADER_TIMEOUT 300
 
-#define TAP_ONCE(code)  \
-  register_code (code); \
-  unregister_code (code)
-
-
 // Automatic number generation of important keywords
 enum my_keycodes{
     // Layer numbers follow the neo2 terminology, i.e. base layer = layer 1
@@ -257,22 +252,11 @@ L06 -> <TBD>: UNSPECIFIED
 
 void leader_end_user(void) {
   if (leader_sequence_one_key(KC_1)) {
-    // ¯\_(ツ)_/¯
-    unicode_input_start(); register_hex(0xaf); unicode_input_finish();
-    register_code (KC_RALT); TAP_ONCE (KC_MINS); unregister_code (KC_RALT);
-    register_code (KC_RSFT); TAP_ONCE (KC_8); unregister_code (KC_RSFT);
-    unicode_input_start (); register_hex(0x30c4); unicode_input_finish();
-    register_code (KC_RSFT); TAP_ONCE (KC_9); TAP_ONCE(KC_7); unregister_code (KC_RSFT);
-    unicode_input_start (); register_hex(0xaf); unicode_input_finish();
+    send_unicode_string("¯\\_(ツ)_/¯");
   }
 
   if (leader_sequence_one_key(KC_2)) {
-    // 凸(ツ)凸
-    unicode_input_start(); register_hex(0x51F8); unicode_input_finish();
-    register_code (KC_RSFT); TAP_ONCE (KC_8); unregister_code (KC_RSFT);
-    unicode_input_start (); register_hex(0x30c4); unicode_input_finish();
-    register_code (KC_RSFT); TAP_ONCE (KC_9); unregister_code (KC_RSFT);
-    unicode_input_start (); register_hex(0x51F8); unicode_input_finish();
+    send_unicode_string("凸(ツ)凸");
   }
 }
 
diff --git a/keyboards/input_club/infinity60/led.c b/keyboards/input_club/infinity60/led.c
index 8effcea81ae5..33871bcc49ca 100644
--- a/keyboards/input_club/infinity60/led.c
+++ b/keyboards/input_club/infinity60/led.c
@@ -26,29 +26,33 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * both regular threads and ISRs, unlocked (during resume-from-sleep).
  * In particular, I2C functions (interrupt-driven) should NOT be called from here.
  */
-void led_set(uint8_t usb_led) {
-    msg_t msg;
-
-    if (usb_led & (1<<USB_LED_NUM_LOCK)) {
-        chSysUnconditionalLock();
-        msg=(1 << 8) | TOGGLE_NUM_LOCK;
-        chMBPostI(&led_mailbox, msg);
-        chSysUnconditionalUnlock();
-    } else {
-        chSysUnconditionalLock();
-        msg=(0 << 8) | TOGGLE_NUM_LOCK;
-        chMBPostI(&led_mailbox, msg);
-        chSysUnconditionalUnlock();
-    }
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        chSysUnconditionalLock();
-        msg=(1 << 8) | TOGGLE_CAPS_LOCK;
-        chMBPostI(&led_mailbox, msg);
-        chSysUnconditionalUnlock();
-    } else {
-        chSysUnconditionalLock();
-        msg=(0 << 8) | TOGGLE_CAPS_LOCK;
-        chMBPostI(&led_mailbox, msg);
-        chSysUnconditionalUnlock();
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (res) {
+        msg_t msg;
+
+        if (led_state.num_lock) {
+            chSysUnconditionalLock();
+            msg=(1 << 8) | TOGGLE_NUM_LOCK;
+            chMBPostI(&led_mailbox, msg);
+            chSysUnconditionalUnlock();
+        } else {
+            chSysUnconditionalLock();
+            msg=(0 << 8) | TOGGLE_NUM_LOCK;
+            chMBPostI(&led_mailbox, msg);
+            chSysUnconditionalUnlock();
+        }
+        if (led_state.caps_lock) {
+            chSysUnconditionalLock();
+            msg=(1 << 8) | TOGGLE_CAPS_LOCK;
+            chMBPostI(&led_mailbox, msg);
+            chSysUnconditionalUnlock();
+        } else {
+            chSysUnconditionalLock();
+            msg=(0 << 8) | TOGGLE_CAPS_LOCK;
+            chMBPostI(&led_mailbox, msg);
+            chSysUnconditionalUnlock();
+        }
     }
+    return false;
 }
diff --git a/keyboards/input_club/infinity60/led_controller.c b/keyboards/input_club/infinity60/led_controller.c
index cf3edf20ddd6..5ea0ae804cd7 100644
--- a/keyboards/input_club/infinity60/led_controller.c
+++ b/keyboards/input_club/infinity60/led_controller.c
@@ -187,8 +187,9 @@ static THD_FUNCTION(LEDthread, arg) {
   // initialize persistent variables
   pwm_step_status = 4; //full brightness
   page_status = 0; //start frame 0 (all off/on)
-  numlock_status = (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? 1 : 0;
-  capslock_status = (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? 1 : 0;
+  led_t led_state = host_keyboard_led_state();
+  numlock_status = led_state.num_lock ? 1 : 0;
+  capslock_status = led_state.caps_lock ? 1 : 0;
 
   while(true) {
     // wait for a message (asynchronous)
diff --git a/keyboards/input_club/infinity60/rules.mk b/keyboards/input_club/infinity60/rules.mk
index e47069dac9bf..5f885e119433 100644
--- a/keyboards/input_club/infinity60/rules.mk
+++ b/keyboards/input_club/infinity60/rules.mk
@@ -13,5 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 
 DEFAULT_FOLDER = input_club/infinity60/led
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/input_club/k_type/is31fl3733-dual.c b/keyboards/input_club/k_type/is31fl3733-dual.c
index 389801687523..2dec2b0a26f4 100644
--- a/keyboards/input_club/k_type/is31fl3733-dual.c
+++ b/keyboards/input_club/k_type/is31fl3733-dual.c
@@ -65,7 +65,7 @@ uint8_t g_twi_transfer_buffer[20];
 // 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
+// buffers and the transfers in is31fl3733_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
 uint8_t g_pwm_buffer[DRIVER_COUNT][192];
 bool    g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
@@ -73,7 +73,7 @@ bool    g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
 uint8_t g_led_control_registers[DRIVER_COUNT][24]             = {{0}, {0}};
 bool    g_led_control_registers_update_required[DRIVER_COUNT] = {false};
 
-bool IS31FL3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data) {
+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;
@@ -92,7 +92,7 @@ bool IS31FL3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t
     return true;
 }
 
-bool IS31FL3733_write_pwm_buffer(uint8_t index, uint8_t addr, uint8_t *pwm_buffer) {
+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.
     // Transmit PWM registers in 12 transfers of 16 bytes.
@@ -123,7 +123,7 @@ bool IS31FL3733_write_pwm_buffer(uint8_t index, uint8_t addr, uint8_t *pwm_buffe
     return true;
 }
 
-void IS31FL3733_init(uint8_t bus, uint8_t addr, uint8_t sync) {
+void is31fl3733_init(uint8_t bus, 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,
@@ -131,35 +131,35 @@ void IS31FL3733_init(uint8_t bus, uint8_t addr, uint8_t sync) {
     // Sync is passed so set it according to the datasheet.
 
     // Unlock the command register.
-    IS31FL3733_write_register(bus, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+    is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
     // Select PG0
-    IS31FL3733_write_register(bus, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
+    is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
     // Turn off all LEDs.
     for (int i = 0x00; i <= 0x17; i++) {
-        IS31FL3733_write_register(bus, addr, i, 0x00);
+        is31fl3733_write_register(bus, addr, i, 0x00);
     }
     // Unlock the command register.
-    IS31FL3733_write_register(bus, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+    is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
     // Select PG1
-    IS31FL3733_write_register(bus, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
+    is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
     // Set PWM on all LEDs to 0
     // No need to setup Breath registers to PWM as that is the default.
     for (int i = 0x00; i <= 0xBF; i++) {
-        IS31FL3733_write_register(bus, addr, i, 0x00);
+        is31fl3733_write_register(bus, addr, i, 0x00);
     }
     // Unlock the command register.
-    IS31FL3733_write_register(bus, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+    is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
     // Select PG3
-    IS31FL3733_write_register(bus, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION);
+    is31fl3733_write_register(bus, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION);
     // Set global current to maximum.
-    IS31FL3733_write_register(bus, addr, ISSI_REG_GLOBALCURRENT, 0xFF);
+    is31fl3733_write_register(bus, addr, ISSI_REG_GLOBALCURRENT, 0xFF);
     // Disable software shutdown.
-    IS31FL3733_write_register(bus, addr, ISSI_REG_CONFIGURATION, (sync << 6) | 0x01);
+    is31fl3733_write_register(bus, addr, ISSI_REG_CONFIGURATION, (sync << 6) | 0x01);
     // Wait 10ms to ensure the device has woken up.
     wait_ms(10);
 }
 
-void IS31FL3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+void is31fl3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         is31_led led = g_is31_leds[index];
 
@@ -170,13 +170,13 @@ 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) {
+void is31fl3733_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
     for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        IS31FL3733_set_color(i, red, green, blue);
+        is31fl3733_set_color(i, red, green, blue);
     }
 }
 
-void IS31FL3733_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
+void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
     is31_led led = g_is31_leds[index];
 
     uint8_t control_register_r = led.r / 8;
@@ -205,28 +205,28 @@ void IS31FL3733_set_led_control_register(uint8_t index, bool red, bool green, bo
     g_led_control_registers_update_required[led.driver] = true;
 }
 
-void IS31FL3733_update_pwm_buffers(uint8_t addr, uint8_t index) {
+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, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
-        IS31FL3733_write_register(index, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
+        is31fl3733_write_register(index, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+        is31fl3733_write_register(index, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_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])) {
+        if (!is31fl3733_write_pwm_buffer(index, 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) {
+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, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
-        IS31FL3733_write_register(index, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
+        is31fl3733_write_register(index, addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+        is31fl3733_write_register(index, addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
         for (int i = 0; i < 24; i++) {
-            IS31FL3733_write_register(index, addr, i, g_led_control_registers[index][i]);
+            is31fl3733_write_register(index, addr, i, g_led_control_registers[index][i]);
         }
     }
     g_led_control_registers_update_required[index] = false;
diff --git a/keyboards/input_club/k_type/is31fl3733-dual.h b/keyboards/input_club/k_type/is31fl3733-dual.h
index 16586714b8f3..1becefbf9367 100644
--- a/keyboards/input_club/k_type/is31fl3733-dual.h
+++ b/keyboards/input_club/k_type/is31fl3733-dual.h
@@ -31,21 +31,21 @@ typedef struct is31_led {
 
 extern const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT];
 
-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 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_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);
+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);
 
-void IS31FL3733_set_led_control_register(uint8_t index, bool red, bool green, bool blue);
+void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bool 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 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 addr, uint8_t index); // index is the driver index
+void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index);
 
 #define A_1 0x00
 #define A_2 0x01
diff --git a/keyboards/input_club/k_type/k_type-rgbdriver.c b/keyboards/input_club/k_type/k_type-rgbdriver.c
index e663c224c4a6..dc5d4abd6768 100644
--- a/keyboards/input_club/k_type/k_type-rgbdriver.c
+++ b/keyboards/input_club/k_type/k_type-rgbdriver.c
@@ -19,39 +19,38 @@
 #include "rgb_matrix.h"
 #include "i2c_master.h"
 #include "is31fl3733-dual.h"
-
-
+#include "gpio.h"
 
 static void init(void) {
     i2c_init(&I2CD1, I2C1_SCL_PIN, I2C1_SDA_PIN);
-    IS31FL3733_init(0, DRIVER_ADDR_1, 0);
+    is31fl3733_init(0, DRIVER_ADDR_1, 0);
 #    ifdef USE_I2C2
     i2c_init(&I2CD2, I2C2_SCL_PIN, I2C2_SDA_PIN);
-    IS31FL3733_init(1, DRIVER_ADDR_2, 0);
+    is31fl3733_init(1, DRIVER_ADDR_2, 0);
 #    endif
     for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
         bool enabled = true;
         // This only caches it for later
-        IS31FL3733_set_led_control_register(index, enabled, enabled, enabled);
+        is31fl3733_set_led_control_register(index, enabled, enabled, enabled);
     }
-    IS31FL3733_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3733_update_led_control_registers(DRIVER_ADDR_1, 0);
 #    ifdef USE_I2C2
-    IS31FL3733_update_led_control_registers(DRIVER_ADDR_2, 1);
+    is31fl3733_update_led_control_registers(DRIVER_ADDR_2, 1);
 #    endif
 }
 
 static void flush(void) {
-    IS31FL3733_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3733_update_pwm_buffers(DRIVER_ADDR_1, 0);
 #    ifdef USE_I2C2
-    IS31FL3733_update_pwm_buffers(DRIVER_ADDR_2, 1);
+    is31fl3733_update_pwm_buffers(DRIVER_ADDR_2, 1);
 #    endif
 }
 
 const rgb_matrix_driver_t rgb_matrix_driver = {
     .init = init,
     .flush = flush,
-    .set_color = IS31FL3733_set_color,
-    .set_color_all = IS31FL3733_set_color_all,
+    .set_color = is31fl3733_set_color,
+    .set_color_all = is31fl3733_set_color_all,
 };
 
 #endif
diff --git a/keyboards/input_club/k_type/keymaps/default/keymap.c b/keyboards/input_club/k_type/keymaps/default/keymap.c
index 790bd932906c..452791b13a44 100644
--- a/keyboards/input_club/k_type/keymaps/default/keymap.c
+++ b/keyboards/input_club/k_type/keymaps/default/keymap.c
@@ -1,3 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/input_club/k_type/rules.mk b/keyboards/input_club/k_type/rules.mk
index 450eb9a023d1..d7776bb755b6 100644
--- a/keyboards/input_club/k_type/rules.mk
+++ b/keyboards/input_club/k_type/rules.mk
@@ -18,5 +18,3 @@ RGB_MATRIX_ENABLE = no
 SRC += k_type-rgbdriver.c
 QUANTUM_LIB_SRC += i2c_master.c is31fl3733-dual.c
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/input_club/whitefox/info.json b/keyboards/input_club/whitefox/info.json
index 02dd9757528b..cb578e99b454 100644
--- a/keyboards/input_club/whitefox/info.json
+++ b/keyboards/input_club/whitefox/info.json
@@ -8,7 +8,7 @@
         "device_version": "0.0.1"
     },
     "led_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "matrix_pins": {
         "cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "C10", "C11"],
diff --git a/keyboards/input_club/whitefox/rules.mk b/keyboards/input_club/whitefox/rules.mk
index 9b9b2ed739f9..821041ea832f 100644
--- a/keyboards/input_club/whitefox/rules.mk
+++ b/keyboards/input_club/whitefox/rules.mk
@@ -12,5 +12,3 @@ AUDIO_ENABLE = no           # Audio output
 
 LED_MATRIX_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/irene/config.h b/keyboards/irene/config.h
index 3ee3ed631607..656deab55a6f 100644
--- a/keyboards/irene/config.h
+++ b/keyboards/irene/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 23
-//#    define RGBLIGHT_HUE_STEP 8
-//#    define RGBLIGHT_SAT_STEP 8
-//#    define RGBLIGHT_VAL_STEP 8
-//#    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
-
 /* 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/irene/info.json b/keyboards/irene/info.json
index 000a34364700..67f3457c5d19 100644
--- a/keyboards/irene/info.json
+++ b/keyboards/irene/info.json
@@ -8,6 +8,21 @@
         "pid": "0x3000",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 23,
+        "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": "F1"
     },
diff --git a/keyboards/iron180/rules.mk b/keyboards/iron180/rules.mk
index 488d0df4b9f2..6f5c5c3b7e5f 100644
--- a/keyboards/iron180/rules.mk
+++ b/keyboards/iron180/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h
index c432e839d03d..17cd8ea9ab02 100644
--- a/keyboards/jacky_studio/bear_65/config.h
+++ b/keyboards/jacky_studio/bear_65/config.h
@@ -10,19 +10,3 @@
 #define LOCKING_RESYNC_ENABLE
 
 #define RGBLIGHT_DEFAULT_VAL 50
-#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
-/* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json
index 77c0e44c0d46..325bc3c6d77a 100644
--- a/keyboards/jacky_studio/bear_65/rev1/info.json
+++ b/keyboards/jacky_studio/bear_65/rev1/info.json
@@ -11,7 +11,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
@@ -25,7 +25,23 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "max_brightness": 200,
+        "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
+        }
     },
     "indicators": {
         "caps_lock": "C7",
diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json
index 8e1779ceea61..d853b3a3208d 100644
--- a/keyboards/jacky_studio/bear_65/rev2/info.json
+++ b/keyboards/jacky_studio/bear_65/rev2/info.json
@@ -11,7 +11,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
@@ -25,7 +25,23 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "max_brightness": 200,
+        "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
+        }
     },
     "indicators": {
         "caps_lock": "C7",
diff --git a/keyboards/jacky_studio/piggy60/rev2/info.json b/keyboards/jacky_studio/piggy60/rev2/info.json
index f824945aa0ca..50f2849e7382 100644
--- a/keyboards/jacky_studio/piggy60/rev2/info.json
+++ b/keyboards/jacky_studio/piggy60/rev2/info.json
@@ -24,7 +24,7 @@
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "animations": {
             "alphas_mods": true,
             "gradient_up_down": true,
diff --git a/keyboards/jacky_studio/piggy60/rev2/rules.mk b/keyboards/jacky_studio/piggy60/rev2/rules.mk
index 47220e8853a9..edbd3dd71817 100644
--- a/keyboards/jacky_studio/piggy60/rev2/rules.mk
+++ b/keyboards/jacky_studio/piggy60/rev2/rules.mk
@@ -4,5 +4,3 @@ MCU_LDSCRIPT = STM32F103xB
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/config.h b/keyboards/jacky_studio/s7_elephant/rev1/config.h
index e2d6aed274b3..b9eeb3bf1522 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev1/config.h
@@ -16,22 +16,6 @@
 
 #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 RGBLED_NUM 2
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/jacky_studio/s7_elephant/rev1/info.json b/keyboards/jacky_studio/s7_elephant/rev1/info.json
index 3af975eb5cb9..bf8455ee4b5a 100644
--- a/keyboards/jacky_studio/s7_elephant/rev1/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev1/info.json
@@ -8,6 +8,24 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 2,
+        "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": "E6"
     },
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h
index 316658ad6da4..b9eeb3bf1522 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev2/config.h
@@ -16,22 +16,6 @@
 
 #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 RGBLED_NUM 2
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/info.json
index cc0c91dadcec..e98923fb45b4 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev2/info.json
@@ -12,6 +12,24 @@
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
         "rows": ["B0", "B1", "B2", "B3", "B7"]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 2,
+        "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": "E2"
     },
diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h
index a54e1e1fd3c4..8e0534fa2cb3 100644
--- a/keyboards/jadookb/jkb65/config.h
+++ b/keyboards/jadookb/jkb65/config.h
@@ -21,7 +21,6 @@
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_TIMEOUT 90000
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
diff --git a/keyboards/jadookb/jkb65/info.json b/keyboards/jadookb/jkb65/info.json
index e235e7bc4163..e097b47ce554 100644
--- a/keyboards/jadookb/jkb65/info.json
+++ b/keyboards/jadookb/jkb65/info.json
@@ -10,7 +10,8 @@
         "pin": "F0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812",
+        "timeout": 90000
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/jagdpietr/drakon/rules.mk b/keyboards/jagdpietr/drakon/rules.mk
index 94fd5ee9d13b..d670d935a0d4 100644
--- a/keyboards/jagdpietr/drakon/rules.mk
+++ b/keyboards/jagdpietr/drakon/rules.mk
@@ -14,5 +14,4 @@ AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
 WPM_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/jaykeeb/kamigakushi/info.json b/keyboards/jaykeeb/kamigakushi/info.json
index a421019a4a5e..7ab02d2c66c6 100644
--- a/keyboards/jaykeeb/kamigakushi/info.json
+++ b/keyboards/jaykeeb/kamigakushi/info.json
@@ -51,6 +51,9 @@
         "pid": "0x0765",
         "vid": "0x414C"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker_tsangan"
+    },
     "layouts": {
         "LAYOUT_65_ansi_blocker_tsangan": {
             "layout": [
diff --git a/keyboards/jaykeeb/kamigakushi/rules.mk b/keyboards/jaykeeb/kamigakushi/rules.mk
index 24f0fb91d3b8..161ec22b16e2 100644
--- a/keyboards/jaykeeb/kamigakushi/rules.mk
+++ b/keyboards/jaykeeb/kamigakushi/rules.mk
@@ -1,2 +1 @@
 SERIAL_DRIVER = vendor
-OLED_DRIVER = SSD1306
\ No newline at end of file
diff --git a/keyboards/jaykeeb/sebelas/info.json b/keyboards/jaykeeb/sebelas/info.json
index ac4202d820a8..e88607703ee9 100644
--- a/keyboards/jaykeeb/sebelas/info.json
+++ b/keyboards/jaykeeb/sebelas/info.json
@@ -47,6 +47,12 @@
         "pid": "0x0767",
         "vid": "0x414C"
     },
+    "layout_aliases": {
+        "LAYOUT_65_ansi_blocker": "LAYOUT_ansi_blocker",
+        "LAYOUT_65_ansi_blocker_split_bs": "LAYOUT_ansi_blocker_split_bs",
+        "LAYOUT_65_ansi_blocker_tsangan": "LAYOUT_ansi_blocker_tsangan",
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": "LAYOUT_ansi_blocker_tsangan_split_bs"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -124,7 +130,7 @@
                 {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
-        "LAYOUT_65_ansi_blocker": {
+        "LAYOUT_ansi_blocker": {
             "layout": [
                 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
                 {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
@@ -198,7 +204,7 @@
                 {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
-        "LAYOUT_65_ansi_blocker_split_bs": {
+        "LAYOUT_ansi_blocker_split_bs": {
             "layout": [
                 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
                 {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
@@ -273,7 +279,7 @@
                 {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
-        "LAYOUT_65_ansi_blocker_tsangan": {
+        "LAYOUT_ansi_blocker_tsangan": {
             "layout": [
                 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
                 {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
@@ -346,7 +352,7 @@
                 {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
-        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+        "LAYOUT_ansi_blocker_tsangan_split_bs": {
             "layout": [
                 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
                 {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
@@ -421,4 +427,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/jaykeeb/sebelas/keymaps/default/keymap.c b/keyboards/jaykeeb/sebelas/keymaps/default/keymap.c
index 4a525e7bd392..4a1a7db07df7 100644
--- a/keyboards/jaykeeb/sebelas/keymaps/default/keymap.c
+++ b/keyboards/jaykeeb/sebelas/keymaps/default/keymap.c
@@ -4,7 +4,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_65_ansi_blocker(
+    [0] = LAYOUT_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_TAB,  KC_Q,    KC_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,
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [1] = LAYOUT_65_ansi_blocker(
+    [1] = LAYOUT_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_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
diff --git a/keyboards/jaykeeb/sebelas/keymaps/via/keymap.c b/keyboards/jaykeeb/sebelas/keymaps/via/keymap.c
index 4a525e7bd392..4a1a7db07df7 100644
--- a/keyboards/jaykeeb/sebelas/keymaps/via/keymap.c
+++ b/keyboards/jaykeeb/sebelas/keymaps/via/keymap.c
@@ -4,7 +4,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_65_ansi_blocker(
+    [0] = LAYOUT_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_TAB,  KC_Q,    KC_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,
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [1] = LAYOUT_65_ansi_blocker(
+    [1] = LAYOUT_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_PSCR, KC_SCRL, KC_PAUS, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
diff --git a/keyboards/jc65/v32a/config.h b/keyboards/jc65/v32a/config.h
index 6abe1d446de6..1aef8d595ac8 100644
--- a/keyboards/jc65/v32a/config.h
+++ b/keyboards/jc65/v32a/config.h
@@ -17,18 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 16
-#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_EFFECT_KNIGHT_LED_NUM 8
diff --git a/keyboards/jc65/v32a/info.json b/keyboards/jc65/v32a/info.json
index 0c6413d58767..8083cb0bc1d6 100644
--- a/keyboards/jc65/v32a/info.json
+++ b/keyboards/jc65/v32a/info.json
@@ -16,6 +16,23 @@
   "backlight": {
     "pin": "D4"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 16,
+    "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": {
     "driver": "i2c"
   },
diff --git a/keyboards/jc65/v32u4/config.h b/keyboards/jc65/v32u4/config.h
deleted file mode 100644
index 35107f151831..000000000000
--- a/keyboards/jc65/v32u4/config.h
+++ /dev/null
@@ -1,33 +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 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/jc65/v32u4/info.json b/keyboards/jc65/v32u4/info.json
index 1c56cc00ee87..f173cc978354 100644
--- a/keyboards/jc65/v32u4/info.json
+++ b/keyboards/jc65/v32u4/info.json
@@ -16,6 +16,23 @@
   "backlight": {
     "pin": "B6"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 20,
+    "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": "E2"
   },
diff --git a/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c b/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
index b7349de55ae8..e0046073c64d 100644
--- a/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
+++ b/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
@@ -219,10 +219,6 @@ void matrix_init_user(void) {
     #endif
 }
 
-void matrix_scan_user(void) {
-
-}
-
 layer_state_t layer_state_set_user(layer_state_t state) {
     switch (get_highest_layer(state)) {
        case _BL:
@@ -260,7 +256,3 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     }
     return state;
 }
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/jd40/config.h b/keyboards/jd40/config.h
index cec546538a85..4e5969481849 100644
--- a/keyboards/jd40/config.h
+++ b/keyboards/jd40/config.h
@@ -21,18 +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_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 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/jd40/info.json b/keyboards/jd40/info.json
index 1e11f466a076..ff352a2216a6 100644
--- a/keyboards/jd40/info.json
+++ b/keyboards/jd40/info.json
@@ -8,6 +8,23 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 12,
+    "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": "D3"
   },
diff --git a/keyboards/jels/jels60/config.h b/keyboards/jels/jels60/config.h
deleted file mode 100644
index d78952f2611c..000000000000
--- a/keyboards/jels/jels60/config.h
+++ /dev/null
@@ -1,23 +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
-
-/* 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/jels/jels60/info.json b/keyboards/jels/jels60/info.json
index 7f3edd484360..7194542d48a2 100644
--- a/keyboards/jels/jels60/info.json
+++ b/keyboards/jels/jels60/info.json
@@ -8,16 +8,7 @@
         "pid": "0x0060",
         "device_version": "0.0.1"
     },
-    "matrix_pins": {
-        "cols": ["E6", "C7", "B4", "D7", "D6", "D4", "D5", "D3", "F5", "F6", "F7", "C6", "B6", "B5"],
-        "rows": ["B3", "D2", "F0", "F4", "F1"]
-    },
     "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "B7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/jels/jels60/keymaps/default/keymap.c b/keyboards/jels/jels60/keymaps/default/keymap.c
index 084f3d827550..b79cc89456ba 100644
--- a/keyboards/jels/jels60/keymaps/default/keymap.c
+++ b/keyboards/jels/jels60/keymaps/default/keymap.c
@@ -1,18 +1,18 @@
- /* 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/>.
- */
+/* 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/>.
+*/
 
 #include QMK_KEYBOARD_H
 
diff --git a/keyboards/jels/jels60/keymaps/via/keymap.c b/keyboards/jels/jels60/keymaps/via/keymap.c
index 084f3d827550..b79cc89456ba 100644
--- a/keyboards/jels/jels60/keymaps/via/keymap.c
+++ b/keyboards/jels/jels60/keymaps/via/keymap.c
@@ -1,18 +1,18 @@
- /* 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/>.
- */
+/* 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/>.
+*/
 
 #include QMK_KEYBOARD_H
 
diff --git a/keyboards/jels/jels60/rules.mk b/keyboards/jels/jels60/rules.mk
deleted file mode 100644
index 3b6a1809db18..000000000000
--- a/keyboards/jels/jels60/rules.mk
+++ /dev/null
@@ -1,12 +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 = 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/jels/jels60/v1/config.h b/keyboards/jels/jels60/v1/config.h
new file mode 100644
index 000000000000..92b3d3680155
--- /dev/null
+++ b/keyboards/jels/jels60/v1/config.h
@@ -0,0 +1,23 @@
+/* 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/jels/jels60/v1/info.json b/keyboards/jels/jels60/v1/info.json
new file mode 100644
index 000000000000..6dc88d7895f5
--- /dev/null
+++ b/keyboards/jels/jels60/v1/info.json
@@ -0,0 +1,19 @@
+{
+    "matrix_pins": {
+        "cols": ["E6", "C7", "B4", "D7", "D6", "D4", "D5", "D3", "F5", "F6", "F7", "C6", "B6", "B5"],
+        "rows": ["B3", "D2", "F0", "F4", "F1"]
+    },
+    "indicators": {
+        "caps_lock": "B7"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": false
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/jels/jels60/v1/rules.mk b/keyboards/jels/jels60/v1/rules.mk
new file mode 100644
index 000000000000..5566e1323fa5
--- /dev/null
+++ b/keyboards/jels/jels60/v1/rules.mk
@@ -0,0 +1 @@
+# left blank intentionally
diff --git a/keyboards/jels/jels60/v2/config.h b/keyboards/jels/jels60/v2/config.h
new file mode 100644
index 000000000000..02d9619a301c
--- /dev/null
+++ b/keyboards/jels/jels60/v2/config.h
@@ -0,0 +1,25 @@
+/* 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
+
+#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 */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/jels/jels60/v2/info.json b/keyboards/jels/jels60/v2/info.json
new file mode 100644
index 000000000000..1945b101cfcd
--- /dev/null
+++ b/keyboards/jels/jels60/v2/info.json
@@ -0,0 +1,39 @@
+{
+    "bootloader": "rp2040",
+    "processor": "RP2040",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["GP24", "GP25", "GP23", "GP21", "GP22", "GP2", "GP1", "GP0", "GP6", "GP18", "GP19", "GP20", "GP9", "GP8"],
+        "rows": ["GP26", "GP27", "GP3", "GP4", "GP5"]
+    },
+    "ws2812": {
+        "pin": "GP29",
+        "driver": "vendor"
+    },
+    "rgblight": {
+        "led_count": 22,
+        "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
+        }
+    },
+    "indicators": {
+        "caps_lock": "GP28"
+    }
+}
diff --git a/keyboards/jels/jels60/v2/rules.mk b/keyboards/jels/jels60/v2/rules.mk
new file mode 100644
index 000000000000..e0b4f1030fb5
--- /dev/null
+++ b/keyboards/jels/jels60/v2/rules.mk
@@ -0,0 +1 @@
+# left blank intentionally
\ No newline at end of file
diff --git a/keyboards/jels/jels88/config.h b/keyboards/jels/jels88/config.h
index 6ce24bfbde58..0b1d11549511 100644
--- a/keyboards/jels/jels88/config.h
+++ b/keyboards/jels/jels88/config.h
@@ -16,21 +16,7 @@
 
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 20  // Number of LEDs
-#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_DEFAULT_VAL 0  // start off
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/jels/jels88/info.json b/keyboards/jels/jels88/info.json
index 2dc7c2f2acd7..cc8e525525c7 100644
--- a/keyboards/jels/jels88/info.json
+++ b/keyboards/jels/jels88/info.json
@@ -20,7 +20,21 @@
         "pin": "B6"
     },
     "rgblight": {
-        "max_brightness": 225
+        "led_count": 20,
+        "max_brightness": 225,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h
index 5bd79d3ce09e..5025847259a8 100644
--- a/keyboards/jian/nsrev2/config.h
+++ b/keyboards/jian/nsrev2/config.h
@@ -19,22 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define PHYSICAL_LEDS_ENABLE
 
-/* ws2812 RGB LED */
 #define RGBLIGHT_TIMER
-#define RGBLED_NUM 7    // 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
-#define RGBLIGHT_SPLIT
 
 #ifndef IOS_DEVICE_ENABLE
 #if RGBLED_NUM <= 6
@@ -51,8 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #define RGBLIGHT_VAL_STEP 4
 #endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 #define USB_MAX_POWER_CONSUMPTION 400
diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json
index 955fc517deca..4ea315f51e00 100644
--- a/keyboards/jian/nsrev2/info.json
+++ b/keyboards/jian/nsrev2/info.json
@@ -13,6 +13,24 @@
         "levels": 5,
         "breathing": true
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 7,
+        "sleep": true,
+        "split": 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": "D4"
     },
diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h
index 11b99cc7399a..8f1a34c2ff44 100644
--- a/keyboards/jian/rev1/config.h
+++ b/keyboards/jian/rev1/config.h
@@ -71,41 +71,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define UPDATE_SCROLL_LOCK_LED() writePin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock)
 #endif // SCROLL_NMOSFET
 
-/* ws2812 RGB LED */
 #define RGBLIGHT_TIMER
-#define RGBLED_NUM 7    // 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
-#define RGBLIGHT_SPLIT
-
-#ifndef IOS_DEVICE_ENABLE
-#if RGBLED_NUM <= 6
-#define RGBLIGHT_LIMIT_VAL 255
-#else
-#define RGBLIGHT_LIMIT_VAL 130
-#endif
-#define RGBLIGHT_VAL_STEP 8
-#else
-#if RGBLED_NUM <= 6
-#define RGBLIGHT_LIMIT_VAL 90
-#else
-#define RGBLIGHT_LIMIT_VAL 45
-#endif
-#define RGBLIGHT_VAL_STEP 4
-#endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 #define USB_MAX_POWER_CONSUMPTION 400
diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json
index e7e386088a7b..27c5c957a6b3 100644
--- a/keyboards/jian/rev1/info.json
+++ b/keyboards/jian/rev1/info.json
@@ -12,6 +12,24 @@
         "pin": "B6",
         "levels": 5
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 7,
+        "sleep": true,
+        "split": 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": "D4"
     },
diff --git a/keyboards/jian/rev1/post_config.h b/keyboards/jian/rev1/post_config.h
new file mode 100644
index 000000000000..fade065e1923
--- /dev/null
+++ b/keyboards/jian/rev1/post_config.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#ifndef IOS_DEVICE_ENABLE
+#    if RGBLED_NUM <= 6
+#        define RGBLIGHT_LIMIT_VAL 255
+#    else
+#        define RGBLIGHT_LIMIT_VAL 130
+#    endif
+#    define RGBLIGHT_VAL_STEP 8
+#else
+#    if RGBLED_NUM <= 6
+#        define RGBLIGHT_LIMIT_VAL 90
+#    else
+#        define RGBLIGHT_LIMIT_VAL 45
+#    endif
+#    define RGBLIGHT_VAL_STEP 4
+#endif
diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h
index 147c2cf147bc..091605665e6a 100644
--- a/keyboards/jian/rev2/config.h
+++ b/keyboards/jian/rev2/config.h
@@ -23,40 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PHYSICAL_LEDS_ENABLE
 #define IOS_DEVICE_ENABLE
 
-/* ws2812 RGB LED */
 #define RGBLIGHT_TIMER
-#define RGBLED_NUM 7    // 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
-#define RGBLIGHT_SPLIT
-
-#ifndef IOS_DEVICE_ENABLE
-#if RGBLED_NUM <= 6
-#define RGBLIGHT_LIMIT_VAL 255
-#else
-#define RGBLIGHT_LIMIT_VAL 130
-#endif
-#define RGBLIGHT_VAL_STEP 8
-#else
-#if RGBLED_NUM <= 6
-#define RGBLIGHT_LIMIT_VAL 90
-#else
-#define RGBLIGHT_LIMIT_VAL 45
-#endif
-#define RGBLIGHT_VAL_STEP 4
-#endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 #define USB_MAX_POWER_CONSUMPTION 400
diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json
index 7fecaed1f09d..cfcfc8e2fa4d 100644
--- a/keyboards/jian/rev2/info.json
+++ b/keyboards/jian/rev2/info.json
@@ -12,6 +12,24 @@
         "pin": "C6",
         "levels": 5
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 7,
+        "sleep": true,
+        "split": 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": "D4"
     },
diff --git a/keyboards/jian/rev2/post_config.h b/keyboards/jian/rev2/post_config.h
new file mode 100644
index 000000000000..fade065e1923
--- /dev/null
+++ b/keyboards/jian/rev2/post_config.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#ifndef IOS_DEVICE_ENABLE
+#    if RGBLED_NUM <= 6
+#        define RGBLIGHT_LIMIT_VAL 255
+#    else
+#        define RGBLIGHT_LIMIT_VAL 130
+#    endif
+#    define RGBLIGHT_VAL_STEP 8
+#else
+#    if RGBLED_NUM <= 6
+#        define RGBLIGHT_LIMIT_VAL 90
+#    else
+#        define RGBLIGHT_LIMIT_VAL 45
+#    endif
+#    define RGBLIGHT_VAL_STEP 4
+#endif
diff --git a/keyboards/jiran/rev2/config.h b/keyboards/jiran/rev2/config.h
deleted file mode 100644
index ce78530cb76e..000000000000
--- a/keyboards/jiran/rev2/config.h
+++ /dev/null
@@ -1,35 +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 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 56
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 28, 28 }
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/jiran/rev2/info.json b/keyboards/jiran/rev2/info.json
index 8539b47652e2..8f52510ff760 100644
--- a/keyboards/jiran/rev2/info.json
+++ b/keyboards/jiran/rev2/info.json
@@ -1,4 +1,21 @@
 {
+   "rgblight": {
+       "hue_steps": 10,
+       "led_count": 56,
+       "split_count": [28, 28],
+       "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": "B6"
    },
diff --git a/keyboards/jkeys_design/gentleman65/config.h b/keyboards/jkeys_design/gentleman65/config.h
index 1b66b1bb25d5..70ddb0cf5a20 100644
--- a/keyboards/jkeys_design/gentleman65/config.h
+++ b/keyboards/jkeys_design/gentleman65/config.h
@@ -18,16 +18,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 14
-#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_LED_COUNT 14
diff --git a/keyboards/jkeys_design/gentleman65/info.json b/keyboards/jkeys_design/gentleman65/info.json
index 9624933b8dbf..bd929c6faa3c 100644
--- a/keyboards/jkeys_design/gentleman65/info.json
+++ b/keyboards/jkeys_design/gentleman65/info.json
@@ -8,11 +8,26 @@
         "pid": "0x2020",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 14,
+        "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": "F4"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "D5", "C7", "F0", "B2", "B1", "B3", "B0", "B7", "D0"],
diff --git a/keyboards/jkeys_design/gentleman65_se_s/config.h b/keyboards/jkeys_design/gentleman65_se_s/config.h
index 1b66b1bb25d5..70ddb0cf5a20 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/config.h
+++ b/keyboards/jkeys_design/gentleman65_se_s/config.h
@@ -18,16 +18,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 14
-#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_LED_COUNT 14
diff --git a/keyboards/jkeys_design/gentleman65_se_s/info.json b/keyboards/jkeys_design/gentleman65_se_s/info.json
index 6886f8f24b1b..76d6b445dc23 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/info.json
+++ b/keyboards/jkeys_design/gentleman65_se_s/info.json
@@ -8,11 +8,26 @@
         "pid": "0x2322",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 14,
+        "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": "F7"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D5", "D3", "D2", "D1", "D0", "B7", "B2", "B3", "D4", "D6", "D7", "C7", "C6", "B6", "B5", "B4"],
diff --git a/keyboards/jm60/rules.mk b/keyboards/jm60/rules.mk
index 47b3dc0faa61..5dbf13f5e780 100644
--- a/keyboards/jm60/rules.mk
+++ b/keyboards/jm60/rules.mk
@@ -20,5 +20,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/jolofsor/denial75/config.h b/keyboards/jolofsor/denial75/config.h
index a80552a780d6..785fdc3e5eeb 100644
--- a/keyboards/jolofsor/denial75/config.h
+++ b/keyboards/jolofsor/denial75/config.h
@@ -24,9 +24,4 @@
 
 
 /* RGB Definitions */
-
-#define RGBLED_NUM 84
 #define RGBLIGHT_MAX_LAYERS 32
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/jolofsor/denial75/info.json b/keyboards/jolofsor/denial75/info.json
index 6f1388f49e4b..545243e410b5 100644
--- a/keyboards/jolofsor/denial75/info.json
+++ b/keyboards/jolofsor/denial75/info.json
@@ -16,6 +16,8 @@
         "pin": "D2"
     },
     "rgblight": {
+        "hue_steps": 10,
+        "led_count": 84,
         "max_brightness": 200
     },
     "diode_direction": "COL2ROW",
diff --git a/keyboards/jones/v03/config.h b/keyboards/jones/v03/config.h
index 1d6b6e7ad913..4a7a933a7b84 100644
--- a/keyboards/jones/v03/config.h
+++ b/keyboards/jones/v03/config.h
@@ -37,10 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }
 #define MATRIX_COL_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }
 
-/* COL2ROW, ROW2COL*/
-// No need to define DIODE_DIRECTION for Jones' custom Round-Robin matrix.
-//#define DIODE_DIRECTION COL2ROW
-
 /* Audio */
 #ifdef AUDIO_ENABLE
   #define AUDIO_PIN C6
@@ -48,24 +44,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define AUDIO_CLICKY
 #endif
 
-  #define RGBLED_NUM 6 // Left(4) + Right(2)
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  // #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
   /*== Lighting Layers ==*/
   #define RGBLIGHT_LAYERS
   // #define RGBLIGHT_MAX_LAYERS 2
   #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
-  // #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
 
 /*
  * Feature disable options
diff --git a/keyboards/jones/v03/info.json b/keyboards/jones/v03/info.json
index 6b4dbb0884c4..2f8a7803d2f8 100644
--- a/keyboards/jones/v03/info.json
+++ b/keyboards/jones/v03/info.json
@@ -14,6 +14,15 @@
       {"pin_a": "B3", "pin_b": "B2"}
     ]
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 6,
+    "animations": {
+      "rainbow_swirl": true,
+      "knight": true
+    }
+  },
   "ws2812": {
     "pin": "B7"
   },
diff --git a/keyboards/jones/v03_1/config.h b/keyboards/jones/v03_1/config.h
index b3eb44a1566a..59eb4994142c 100644
--- a/keyboards/jones/v03_1/config.h
+++ b/keyboards/jones/v03_1/config.h
@@ -37,10 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }
 #define MATRIX_COL_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }
 
-/* COL2ROW, ROW2COL*/
-// No need to define DIODE_DIRECTION for Jones' custom Round-Robin matrix.
-//#define DIODE_DIRECTION COL2ROW
-
 /* Audio */
 #ifdef AUDIO_ENABLE
   #define AUDIO_PIN C6
@@ -48,25 +44,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define AUDIO_CLICKY
 #endif
 
-  #define RGBLED_NUM 14 // Left(4) + Right(2) + Under(8)
-  #define RGBLIGHT_LED_MAP {0,1,2,3,13,12,4,5,6,7,8,9,10,11} // Left --> Right --> Under
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  // #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
   /*== Lighting Layers ==*/
   #define RGBLIGHT_LAYERS
   // #define RGBLIGHT_MAX_LAYERS 2
   #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
-  // #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
 
 /*
  * Feature disable options
diff --git a/keyboards/jones/v03_1/info.json b/keyboards/jones/v03_1/info.json
index d0fec4e57167..9e46cdd40a29 100644
--- a/keyboards/jones/v03_1/info.json
+++ b/keyboards/jones/v03_1/info.json
@@ -14,6 +14,16 @@
       {"pin_a": "B3", "pin_b": "B2"}
     ]
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 14,
+    "led_map": [0, 1, 2, 3, 13, 12, 4, 5, 6, 7, 8, 9, 10, 11],
+    "animations": {
+      "rainbow_swirl": true,
+      "knight": true
+    }
+  },
   "ws2812": {
     "pin": "F0"
   },
diff --git a/keyboards/jones/v1/config.h b/keyboards/jones/v1/config.h
index 3017ca2ab0ad..e36574e56a8f 100644
--- a/keyboards/jones/v1/config.h
+++ b/keyboards/jones/v1/config.h
@@ -25,10 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 /* RGBLIGHT */
-  #define RGBLED_NUM 4 // Left(2) + Right(2)
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
   /*== Lighting Layers ==*/
   #define RGBLIGHT_LAYERS
   #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json
index cd0286ef6bfc..fdc5cbd31018 100644
--- a/keyboards/jones/v1/info.json
+++ b/keyboards/jones/v1/info.json
@@ -12,6 +12,11 @@
     "cols": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"],
     "rows": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"]
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 4
+  },
   "ws2812": {
     "pin": "F1"
   },
@@ -30,87 +35,81 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label": "k09", "matrix": [0, 9], "x": 0.5, "y": 0},
-        {"label": "k59", "matrix": [5, 9], "x": 1.5, "y": 0},
-        {"label": "k08", "matrix": [0, 8], "x": 2.5, "y": 0},
-        {"label": "k54", "matrix": [5, 4], "x": 3.5, "y": 0},
-        {"label": "k04", "matrix": [0, 4], "x": 4.5, "y": 0},
-        {"label": "k50", "matrix": [5, 0], "x": 5.5, "y": 0},
-        {"label": "k56", "matrix": [5, 6], "x": 6.5, "y": 0},
-        {"label": "k06", "matrix": [0, 6], "x": 7.5, "y": 0},
-        {"label": "k05", "matrix": [0, 5], "x": 8.5, "y": 0},
-        {"label": "k52", "matrix": [5, 2], "x": 9.5, "y": 0},
-        {"label": "k02", "matrix": [0, 2], "x": 10.5, "y": 0},
-        {"label": "k53", "matrix": [5, 3], "x": 11.5, "y": 0},
-        {"label": "k07", "matrix": [0, 7], "x": 12.5, "y": 0},
-        {"label": "k51", "matrix": [5, 1], "x": 13.5, "y": 0},
-        {"label": "k01", "matrix": [0, 1], "x": 14.5, "y": 0},
-
-        {"label": "k19", "matrix": [1, 9], "x": 0.5, "y": 1, "w": 1.5},
-        {"label": "k69", "matrix": [6, 9], "x": 2, "y": 1},
-        {"label": "k18", "matrix": [1, 8], "x": 3, "y": 1},
-        {"label": "k64", "matrix": [6, 4], "x": 4, "y": 1},
-        {"label": "k14", "matrix": [1, 4], "x": 5, "y": 1},
-        {"label": "k60", "matrix": [6, 0], "x": 6, "y": 1},
-        {"label": "k10", "matrix": [1, 0], "x": 7, "y": 1},
-        {"label": "k16", "matrix": [1, 6], "x": 8, "y": 1},
-        {"label": "k15", "matrix": [1, 5], "x": 9, "y": 1},
-        {"label": "k62", "matrix": [6, 2], "x": 10, "y": 1},
-        {"label": "k12", "matrix": [1, 2], "x": 11, "y": 1},
-        {"label": "k63", "matrix": [6, 3], "x": 12, "y": 1},
-        {"label": "k17", "matrix": [1, 7], "x": 13, "y": 1},
-        {"label": "k61", "matrix": [6, 1], "x": 14, "y": 1, "w": 1.5},
-
-        {"label": "k29", "matrix": [2, 9], "x": 0.5, "y": 2, "w": 1.5},
-        {"label": "k79", "matrix": [7, 9], "x": 2, "y": 2},
-        {"label": "k28", "matrix": [2, 8], "x": 3, "y": 2},
-        {"label": "k74", "matrix": [7, 4], "x": 4, "y": 2},
-        {"label": "k24", "matrix": [2, 4], "x": 5, "y": 2},
-        {"label": "k70", "matrix": [7, 0], "x": 6, "y": 2},
-        {"label": "k20", "matrix": [2, 0], "x": 7, "y": 2},
-        {"label": "k26", "matrix": [2, 6], "x": 8, "y": 2},
-        {"label": "k25", "matrix": [2, 5], "x": 9, "y": 2},
-        {"label": "k72", "matrix": [7, 2], "x": 10, "y": 2},
-        {"label": "k23", "matrix": [2, 3], "x": 11, "y": 2},
-        {"label": "k73", "matrix": [7, 3], "x": 12, "y": 2},
-        {"label": "k27", "matrix": [2, 7], "x": 13, "y": 2},
-        {"label": "k71", "matrix": [7, 1], "x": 14, "y": 2, "w": 1.5},
+        {"label": "k09", "matrix": [0, 9], "x": 0, "y": 0},
+        {"label": "k59", "matrix": [5, 9], "x": 1, "y": 0},
+        {"label": "k08", "matrix": [0, 8], "x": 2, "y": 0},
+        {"label": "k54", "matrix": [5, 4], "x": 3, "y": 0},
+        {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "k50", "matrix": [5, 0], "x": 5, "y": 0},
+        {"label": "k56", "matrix": [5, 6], "x": 6, "y": 0},
+        {"label": "k06", "matrix": [0, 6], "x": 7, "y": 0},
+        {"label": "k05", "matrix": [0, 5], "x": 8, "y": 0},
+        {"label": "k52", "matrix": [5, 2], "x": 9, "y": 0},
+        {"label": "k02", "matrix": [0, 2], "x": 10, "y": 0},
+        {"label": "k53", "matrix": [5, 3], "x": 11, "y": 0},
+        {"label": "k07", "matrix": [0, 7], "x": 12, "y": 0},
+        {"label": "k51", "matrix": [5, 1], "x": 13, "y": 0},
+        {"label": "k01", "matrix": [0, 1], "x": 14, "y": 0},
 
-        {"label": "k39", "matrix": [3, 9], "x": 0.5, "y": 3},
-        {"label": "k89", "matrix": [8, 9], "x": 1.5, "y": 3},
-        {"label": "k38", "matrix": [3, 8], "x": 2.5, "y": 3},
-        {"label": "k84", "matrix": [8, 4], "x": 3.5, "y": 3},
-        {"label": "k34", "matrix": [3, 4], "x": 4.5, "y": 3},
-        {"label": "k80", "matrix": [8, 0], "x": 5.5, "y": 3},
-        {"label": "k30", "matrix": [3, 0], "x": 6.5, "y": 3},
-        {"label": "k36", "matrix": [3, 6], "x": 7.5, "y": 3},
-        {"label": "k35", "matrix": [3, 5], "x": 8.5, "y": 3},
-        {"label": "k82", "matrix": [8, 2], "x": 9.5, "y": 3},
-        {"label": "k32", "matrix": [3, 2], "x": 10.5, "y": 3},
-        {"label": "k83", "matrix": [8, 3], "x": 11.5, "y": 3},
-        {"label": "k37", "matrix": [3, 7], "x": 12.5, "y": 3},
-        {"label": "k81", "matrix": [8, 1], "x": 13.5, "y": 3},
-        {"label": "k31", "matrix": [3, 1], "x": 14.5, "y": 3},
+        {"label": "k19", "matrix": [1, 9], "x": 0, "y": 1, "w": 1.5},
+        {"label": "k69", "matrix": [6, 9], "x": 1.5, "y": 1},
+        {"label": "k18", "matrix": [1, 8], "x": 2.5, "y": 1},
+        {"label": "k64", "matrix": [6, 4], "x": 3.5, "y": 1},
+        {"label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1},
+        {"label": "k60", "matrix": [6, 0], "x": 5.5, "y": 1},
+        {"label": "k10", "matrix": [1, 0], "x": 6.5, "y": 1},
+        {"label": "k16", "matrix": [1, 6], "x": 7.5, "y": 1},
+        {"label": "k15", "matrix": [1, 5], "x": 8.5, "y": 1},
+        {"label": "k62", "matrix": [6, 2], "x": 9.5, "y": 1},
+        {"label": "k12", "matrix": [1, 2], "x": 10.5, "y": 1},
+        {"label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1},
+        {"label": "k17", "matrix": [1, 7], "x": 12.5, "y": 1},
+        {"label": "k61", "matrix": [6, 1], "x": 13.5, "y": 1, "w": 1.5},
 
-        {"label": "k49", "matrix": [4, 9], "x": 0.5, "y": 4},
-        {"label": "k98", "matrix": [9, 8], "x": 1.5, "y": 4},
-        {"label": "k48", "matrix": [4, 8], "x": 2.5, "y": 4, "w": 1.25},
-        {"label": "k94", "matrix": [9, 4], "x": 3.75, "y": 4, "w": 1.25},
-        {"label": "k90", "matrix": [9, 0], "x": 5, "y": 4, "w": 1.5},
-        {"label": "k46", "matrix": [4, 6], "x": 6.5, "y": 4},
-        {"label": "k45", "matrix": [4, 5], "x": 7.5, "y": 4},
-        {"label": "k92", "matrix": [9, 2], "x": 8.5, "y": 4},
-        {"label": "k42", "matrix": [4, 2], "x": 9.5, "y": 4, "w": 1.5},
-        {"label": "k93", "matrix": [9, 3], "x": 11, "y": 4, "w": 1.25},
-        {"label": "k47", "matrix": [4, 7], "x": 12.25, "y": 4, "w": 1.25},
-        {"label": "k91", "matrix": [9, 1], "x": 13.5, "y": 4},
-        {"label": "k41", "matrix": [4, 1], "x": 14.5, "y": 4},
+        {"label": "k29", "matrix": [2, 9], "x": 0, "y": 2, "w": 1.5},
+        {"label": "k79", "matrix": [7, 9], "x": 1.5, "y": 2},
+        {"label": "k28", "matrix": [2, 8], "x": 2.5, "y": 2},
+        {"label": "k74", "matrix": [7, 4], "x": 3.5, "y": 2},
+        {"label": "k24", "matrix": [2, 4], "x": 4.5, "y": 2},
+        {"label": "k70", "matrix": [7, 0], "x": 5.5, "y": 2},
+        {"label": "k20", "matrix": [2, 0], "x": 6.5, "y": 2},
+        {"label": "k26", "matrix": [2, 6], "x": 7.5, "y": 2},
+        {"label": "k25", "matrix": [2, 5], "x": 8.5, "y": 2},
+        {"label": "k72", "matrix": [7, 2], "x": 9.5, "y": 2},
+        {"label": "k23", "matrix": [2, 3], "x": 10.5, "y": 2},
+        {"label": "k73", "matrix": [7, 3], "x": 11.5, "y": 2},
+        {"label": "k27", "matrix": [2, 7], "x": 12.5, "y": 2},
+        {"label": "k71", "matrix": [7, 1], "x": 13.5, "y": 2, "w": 1.5},
 
-        {"label": "k85", "matrix": [8, 5], "x": 0, "y": 5},
-        {"label": "k86", "matrix": [8, 6], "x": 1, "y": 5},
+        {"label": "k39", "matrix": [3, 9], "x": 0, "y": 3},
+        {"label": "k89", "matrix": [8, 9], "x": 1, "y": 3},
+        {"label": "k38", "matrix": [3, 8], "x": 2, "y": 3},
+        {"label": "k84", "matrix": [8, 4], "x": 3, "y": 3},
+        {"label": "k34", "matrix": [3, 4], "x": 4, "y": 3},
+        {"label": "k80", "matrix": [8, 0], "x": 5, "y": 3},
+        {"label": "k30", "matrix": [3, 0], "x": 6, "y": 3},
+        {"label": "k36", "matrix": [3, 6], "x": 7, "y": 3},
+        {"label": "k35", "matrix": [3, 5], "x": 8, "y": 3},
+        {"label": "k82", "matrix": [8, 2], "x": 9, "y": 3},
+        {"label": "k32", "matrix": [3, 2], "x": 10, "y": 3},
+        {"label": "k83", "matrix": [8, 3], "x": 11, "y": 3},
+        {"label": "k37", "matrix": [3, 7], "x": 12, "y": 3},
+        {"label": "k81", "matrix": [8, 1], "x": 13, "y": 3},
+        {"label": "k31", "matrix": [3, 1], "x": 14, "y": 3},
 
-        {"label": "k95", "matrix": [9, 5], "x": 14, "y": 5},
-        {"label": "k96", "matrix": [9, 6], "x": 15, "y": 5}
+        {"label": "k49", "matrix": [4, 9], "x": 0, "y": 4},
+        {"label": "k98", "matrix": [9, 8], "x": 1, "y": 4},
+        {"label": "k48", "matrix": [4, 8], "x": 2, "y": 4, "w": 1.25},
+        {"label": "k94", "matrix": [9, 4], "x": 3.25, "y": 4, "w": 1.25},
+        {"label": "k90", "matrix": [9, 0], "x": 4.5, "y": 4, "w": 1.5},
+        {"label": "k46", "matrix": [4, 6], "x": 6, "y": 4},
+        {"label": "k45", "matrix": [4, 5], "x": 7, "y": 4},
+        {"label": "k92", "matrix": [9, 2], "x": 8, "y": 4},
+        {"label": "k42", "matrix": [4, 2], "x": 9, "y": 4, "w": 1.5},
+        {"label": "k93", "matrix": [9, 3], "x": 10.5, "y": 4, "w": 1.25},
+        {"label": "k47", "matrix": [4, 7], "x": 11.75, "y": 4, "w": 1.25},
+        {"label": "k91", "matrix": [9, 1], "x": 13, "y": 4},
+        {"label": "k41", "matrix": [4, 1], "x": 14, "y": 4}
       ]
     }
   }
diff --git a/keyboards/jones/v1/keymaps/default/keymap.c b/keyboards/jones/v1/keymaps/default/keymap.c
index 04da840a777e..752c06f8159c 100644
--- a/keyboards/jones/v1/keymaps/default/keymap.c
+++ b/keyboards/jones/v1/keymaps/default/keymap.c
@@ -34,31 +34,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            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_SCLN,  KC_QUOT,  KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,    KC_ENT,
         KC_LSFT,  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_LEFT,  KC_RGHT,  KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_UP,    KC_SLSH,
-        KC_MUTE,  KC_LNG2, KC_LGUI,     KC_LALT,       SP_LOW,        SP_RAI,   KC_BSPC,     SP_RAI,KC_RALT,      KC_RALT,     KC_LEFT,  KC_DOWN,  KC_RGHT,
-        KC_VOLD,  KC_VOLU,                                                                                                                KC_VOLD,  KC_VOLU
+        KC_MUTE,  KC_LNG2, KC_LGUI,     KC_LALT,       SP_LOW,        SP_RAI,   KC_BSPC,     SP_RAI,KC_RALT,      KC_RALT,     KC_LEFT,  KC_DOWN,  KC_RGHT
     ),
     [_LOWER] = LAYOUT(
         _______,  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,
             KC_ESC,     KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  _______,  _______,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  KC_INS,
             _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_GRV,   KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_BSLS,
         _______,  _______,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,  KC_TILD,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_PIPE,
-        _______,  _______,  _______,     _______,        _______,      _______,  _______,     SP_ADJ,_______,      _______,     _______,  _______,  _______,
-        _______,  _______,                                                                                                                _______,  _______
+        _______,  _______,  _______,     _______,        _______,      _______,  _______,     SP_ADJ,_______,      _______,     _______,  _______,  _______
     ),
     [_RAISE] = LAYOUT(
         KC_GRV,   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,
             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_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    _______,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_SCLN,  KC_QUOT,
         _______,  _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,  _______,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_F11,   KC_F12,
-        _______,  _______,  _______,     _______,        SP_ADJ,       _______,  _______,      _______,_______,     _______,    _______,  KC_DOWN,  KC_UP,
-        _______,  _______,                                                                                                                _______,  _______
+        _______,  _______,  _______,     _______,        SP_ADJ,       _______,  _______,      _______,_______,     _______,    _______,  KC_DOWN,  KC_UP
     ),
     [_ADJUST] = LAYOUT(
         _______,   RGB_HUI,  RGB_SAI,  RGB_VAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,
             _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_HUI,  RGB_SAI,  RGB_VAI,  _______,  RGB_RMOD,  _______,
             _______,    AU_TOGG,  CK_TOGG,  MU_TOGG,  MU_NEXT,  _______,  _______,  _______,  RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_TOG,  RGB_MOD,   _______,
         KC_CAPS,  KC_CAPS,  CK_RST,   CK_DOWN,  CK_UP,    AU_PREV,  AU_NEXT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,     _______,        _______,      _______,  _______,      _______,_______,     _______,    _______,  _______,  _______,
-        _______,  _______,                                                                                                                _______,  _______
+        _______,  _______,  _______,     _______,        _______,      _______,  _______,      _______,_______,     _______,    _______,  _______,  _______
     )
 };
diff --git a/keyboards/jones/v1/keymaps/via/config.h b/keyboards/jones/v1/keymaps/via/config.h
deleted file mode 100644
index a66ab809048c..000000000000
--- a/keyboards/jones/v1/keymaps/via/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2021 Takeshi Nishio
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-//------------------------------------------------------------------------------
-// Rotary Encoder
-//------------------------------------------------------------------------------
-// Encoder triggers specific key matrix position,
-// when turn knob clockwise or counterclockwise.
-// This is handy to assign key codes by VIA.
-
-// Mappings of encoder rotation to key position in key matrix.
-// First encoder,  Left side  : k85, k86
-// Second encoder, Right side : k95, k96
-#define ENCODERS_CW_KEY  { { 6, 8 }, { 6, 9 } }
-#define ENCODERS_CCW_KEY { { 5, 8 }, { 5, 9 } }
diff --git a/keyboards/jones/v1/keymaps/via/keymap.c b/keyboards/jones/v1/keymaps/via/keymap.c
index 3b41c4017487..3f9b9faa86d3 100644
--- a/keyboards/jones/v1/keymaps/via/keymap.c
+++ b/keyboards/jones/v1/keymaps/via/keymap.c
@@ -37,48 +37,42 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_TAB,     JP_Q,     JP_W,     JP_E,     JP_R,     JP_T,     JP_AT,    JP_LBRC,  JP_Y,     JP_U,     JP_I,     JP_O,     JP_P,       KC_BSPC,
            KC_LCTL,    JP_A,     JP_S,     JP_D,     JP_F,     JP_G,     JP_COLN,  JP_RBRC,  JP_H,     JP_J,     JP_K,     JP_L,     JP_SCLN,    KC_ENT,
         KC_LSFT,  KC_LSFT,  JP_Z,     JP_X,     JP_C,     JP_V,     JP_B,     JP_SLSH,  JP_BSLS,  JP_N,     JP_M,     JP_COMM,  JP_DOT,   KC_DOWN,  KC_UP,
-        KC_MUTE,  KC_LGUI,  KC_LALT,     JP_MHEN,       SP_LOW,        SP_RAI,   KC_BSPC,     SP_RAI,SP_RAI,       JP_HENK,     JP_KANA,  KC_LEFT,  KC_RGHT,
-        KC_VOLD,  KC_VOLU,                                                                                                                KC_VOLD,  KC_VOLU
+        KC_MUTE,  KC_LGUI,  KC_LALT,     JP_MHEN,       SP_LOW,        SP_RAI,   KC_BSPC,     SP_RAI,SP_RAI,       JP_HENK,     JP_KANA,  KC_LEFT,  KC_RGHT
     ),
     [_BASE2] = 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_P0,       KC_PDOT,  _______,  _______,
-        _______,  _______,                                                                                                                _______,  _______
+        _______,  _______,  _______,     _______,        _______,      _______,  _______,      _______,_______,    KC_P0,       KC_PDOT,  _______,  _______
     ),
     [_BASE3] = LAYOUT(
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
            _______,     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,
            _______,     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,     _______,        _______,      _______,  _______,      _______,_______,     _______,    _______,  _______,  _______,
-        _______,  _______,                                                                                                                _______,  _______
+        _______,  _______,  _______,     _______,        _______,      _______,  _______,      _______,_______,     _______,    _______,  _______,  _______
     ),
     [_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_EXLM,  JP_DQUO,  JP_HASH,  JP_DLR,   JP_PERC,  JP_TILD,  JP_PIPE,  JP_AMPR,  JP_QUOT,  JP_LPRN,  JP_RPRN,  JP_EQL,   KC_INS,
             _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,     _______,        _______,      SP_ADJ,   _______,     SP_ADJ,SP_ADJ,       _______,     _______,  _______,  _______,
-        _______,  _______,                                                                                                                _______,  _______
+        _______,  _______,  _______,     _______,        _______,      SP_ADJ,   _______,     SP_ADJ,SP_ADJ,       _______,     _______,  _______,  _______
     ),
     [_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_ESC,     JP_1,     JP_2,     JP_3,     JP_4,     JP_5,     JP_CIRC,  JP_YEN,   JP_6,     JP_7,     JP_8,     JP_9,     JP_0,     KC_DEL,
             _______,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    _______,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,
         _______,  _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   _______,  _______,
-        _______,  _______,  _______,     _______,        SP_ADJ,       _______,  _______,      _______,_______,     _______,    _______,  KC_DOWN,  KC_UP,
-        _______,  _______,                                                                                                                _______,  _______
+        _______,  _______,  _______,     _______,        SP_ADJ,       _______,  _______,      _______,_______,     _______,    _______,  KC_DOWN,  KC_UP
     ),
     [_ADJUST] = LAYOUT(
         _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,
             _______,    DF(_BASE1),DF(_BASE2),DF(_BASE3),_______,  _______,  _______,  _______,  RGB_HUI,  RGB_SAI,  RGB_VAI,  _______,  RGB_RMOD,  _______,
             _______,    AU_TOGG,   CK_TOGG,  MU_TOGG,   MU_NEXT,   _______,  _______,  _______,  RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_TOG,  RGB_MOD,   _______,
         KC_CAPS,  KC_CAPS,  CK_RST,   CK_DOWN,  CK_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,     _______,        _______,      _______,  _______,      _______,_______,     _______,    _______,  _______,  _______,
-        _______,  _______,                                                                                                                _______,  _______
+        _______,  _______,  _______,     _______,        _______,      _______,  _______,      _______,_______,     _______,    _______,  _______,  _______
     ),
 };
 
@@ -164,50 +158,16 @@ bool led_update_user(led_t led_state) {
 }
 #endif
 
-
-//------------------------------------------------------------------------------
-// Rotary Encoder
-//------------------------------------------------------------------------------
-static uint8_t  encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS]    = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS]   = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
-
-void matrix_scan_kb(void) {
-    encoder_action_unregister();
-    matrix_scan_user();
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    encoder_action_register(index, clockwise);
-    return true;
+#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(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+    [4] = { ENCODER_CCW_CW(_______, _______) },
+    [5] = { ENCODER_CCW_CW(_______, _______) },
 };
-
+#endif
 
 //------------------------------------------------------------------------------
 // Keyboard Initialization
diff --git a/keyboards/jones/v1/keymaps/via/rules.mk b/keyboards/jones/v1/keymaps/via/rules.mk
index e1d2dc05828e..8dd8cb0c1580 100644
--- a/keyboards/jones/v1/keymaps/via/rules.mk
+++ b/keyboards/jones/v1/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
-# Use VIA
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+AUDIO_ENABLE = no
diff --git a/keyboards/jorne/rev1/config.h b/keyboards/jorne/rev1/config.h
index 73e2d8219ba4..623aaf149cc3 100644
--- a/keyboards/jorne/rev1/config.h
+++ b/keyboards/jorne/rev1/config.h
@@ -2,9 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#define RGBLED_SPLIT { 28, 28 }
-#define RGBLED_NUM 56
-
 /* 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/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json
index f07f99e4a691..1b1f156fa50b 100644
--- a/keyboards/jorne/rev1/info.json
+++ b/keyboards/jorne/rev1/info.json
@@ -16,6 +16,10 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "led_count": 56,
+        "split_count": [28, 28]
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/jukaie/jk01/config.h b/keyboards/jukaie/jk01/config.h
new file mode 100644
index 000000000000..8a7ea71db4e8
--- /dev/null
+++ b/keyboards/jukaie/jk01/config.h
@@ -0,0 +1,44 @@
+/* Copyright 2023 JUKAIE <lice@jukaie.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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 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
+#define SPI_SCK_PIN A5
+#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)
diff --git a/keyboards/jukaie/jk01/halconf.h b/keyboards/jukaie/jk01/halconf.h
new file mode 100644
index 000000000000..64a184eb924e
--- /dev/null
+++ b/keyboards/jukaie/jk01/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 2023 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#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/jukaie/jk01/info.json b/keyboards/jukaie/jk01/info.json
new file mode 100644
index 000000000000..87c787158c7f
--- /dev/null
+++ b/keyboards/jukaie/jk01/info.json
@@ -0,0 +1,270 @@
+{
+    "manufacturer": "Jukaie",
+    "keyboard_name": "JK01",
+    "maintainer": "Jukaie",
+    "bootloader": "wb32-dfu",
+    "bootmagic": {
+        "matrix": [1, 3]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C2", "pin_b": "C3"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "indicators": {
+        "caps_lock": "C14"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B12"]
+    },
+    "processor": "WB32FQ95",
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "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
+        },
+        "center_point": [76, 25],
+        "driver": "aw20216",
+        "layout": [
+            { "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 },
+            { "flags": 4, "matrix": [2, 6], "x": 20, "y": 0 },
+            { "flags": 4, "matrix": [3, 6], "x": 30, "y": 0 },
+            { "flags": 4, "matrix": [3, 1], "x": 40, "y": 0 },
+            { "flags": 4, "matrix": [3, 3], "x": 50, "y": 0 },
+            { "flags": 4, "matrix": [0, 7], "x": 60, "y": 0 },
+            { "flags": 4, "matrix": [6, 3], "x": 70, "y": 0 },
+            { "flags": 4, "matrix": [7, 1], "x": 80, "y": 0 },
+            { "flags": 4, "matrix": [7, 6], "x": 90, "y": 0 },
+            { "flags": 4, "matrix": [10, 6], "x": 100, "y": 0 },
+            { "flags": 4, "matrix": [10, 7], "x": 110, "y": 0 },
+            { "flags": 4, "matrix": [10, 3], "x": 120, "y": 0 },
+            { "flags": 4, "matrix": [10, 5], "x": 130, "y": 0 },
+            { "flags": 4, "matrix": [9, 7], "x": 140, "y": 0 },
+            { "flags": 4, "matrix": [0, 2], "x": 150, "y": 0 },
+            { "flags": 4, "matrix": [1, 6], "x": 0, "y": 10 },
+            { "flags": 4, "matrix": [1, 7], "x": 10, "y": 10 },
+            { "flags": 4, "matrix": [2, 7], "x": 20, "y": 10 },
+            { "flags": 4, "matrix": [3, 7], "x": 30, "y": 10 },
+            { "flags": 4, "matrix": [4, 7], "x": 40, "y": 10 },
+            { "flags": 4, "matrix": [4, 6], "x": 50, "y": 10 },
+            { "flags": 4, "matrix": [5, 6], "x": 60, "y": 10 },
+            { "flags": 4, "matrix": [5, 7], "x": 70, "y": 10 },
+            { "flags": 4, "matrix": [6, 7], "x": 80, "y": 10 },
+            { "flags": 4, "matrix": [7, 7], "x": 90, "y": 10 },
+            { "flags": 4, "matrix": [8, 7], "x": 100, "y": 10 },
+            { "flags": 4, "matrix": [8, 6], "x": 110, "y": 10 },
+            { "flags": 4, "matrix": [6, 6], "x": 120, "y": 10 },
+            { "flags": 4, "matrix": [10, 1], "x": 130, "y": 10 },
+            { "flags": 4, "matrix": [11, 6], "x": 150, "y": 10 },
+            { "flags": 4, "matrix": [1, 1], "x": 0, "y": 20 },
+            { "flags": 4, "matrix": [1, 0], "x": 15, "y": 20 },
+            { "flags": 4, "matrix": [2, 0], "x": 25, "y": 20 },
+            { "flags": 4, "matrix": [3, 0], "x": 35, "y": 20 },
+            { "flags": 4, "matrix": [4, 0], "x": 45, "y": 20 },
+            { "flags": 4, "matrix": [4, 1], "x": 55, "y": 20 },
+            { "flags": 4, "matrix": [5, 1], "x": 65, "y": 20 },
+            { "flags": 4, "matrix": [5, 0], "x": 75, "y": 20 },
+            { "flags": 4, "matrix": [6, 0], "x": 85, "y": 20 },
+            { "flags": 4, "matrix": [7, 0], "x": 95, "y": 20 },
+            { "flags": 4, "matrix": [8, 0], "x": 105, "y": 20 },
+            { "flags": 4, "matrix": [8, 1], "x": 115, "y": 20 },
+            { "flags": 4, "matrix": [6, 1], "x": 125, "y": 20 },
+            { "flags": 4, "matrix": [10, 2], "x": 135, "y": 20 },
+            { "flags": 4, "matrix": [6, 5], "x": 150, "y": 20 },
+            { "flags": 4, "matrix": [2, 1], "x": 0, "y": 30 },
+            { "flags": 4, "matrix": [1, 2], "x": 17, "y": 30 },
+            { "flags": 8, "matrix": [2, 2], "x": 27, "y": 30 },
+            { "flags": 4, "matrix": [3, 2], "x": 37, "y": 30 },
+            { "flags": 4, "matrix": [4, 2], "x": 47, "y": 30 },
+            { "flags": 4, "matrix": [4, 3], "x": 57, "y": 30 },
+            { "flags": 4, "matrix": [5, 3], "x": 67, "y": 30 },
+            { "flags": 4, "matrix": [5, 2], "x": 77, "y": 30 },
+            { "flags": 4, "matrix": [6, 2], "x": 87, "y": 30 },
+            { "flags": 4, "matrix": [7, 2], "x": 97, "y": 30 },
+            { "flags": 4, "matrix": [8, 2], "x": 107, "y": 30 },
+            { "flags": 4, "matrix": [8, 3], "x": 117, "y": 30 },
+            { "flags": 4, "matrix": [10, 4], "x": 127, "y": 30 },
+            { "flags": 4, "matrix": [1, 5], "x": 150, "y": 30 },
+            { "flags": 4, "matrix": [0, 0], "x": 0, "y": 40 },
+            { "flags": 4, "matrix": [1, 4], "x": 22, "y": 40 },
+            { "flags": 4, "matrix": [2, 4], "x": 32, "y": 40 },
+            { "flags": 4, "matrix": [3, 4], "x": 42, "y": 40 },
+            { "flags": 4, "matrix": [4, 4], "x": 52, "y": 40 },
+            { "flags": 4, "matrix": [4, 5], "x": 62, "y": 40 },
+            { "flags": 4, "matrix": [5, 5], "x": 72, "y": 40 },
+            { "flags": 4, "matrix": [5, 4], "x": 82, "y": 40 },
+            { "flags": 4, "matrix": [6, 4], "x": 92, "y": 40 },
+            { "flags": 4, "matrix": [7, 4], "x": 102, "y": 40 },
+            { "flags": 4, "matrix": [8, 5], "x": 112, "y": 40 },
+            { "flags": 4, "matrix": [9, 1], "x": 122, "y": 40 },
+            { "flags": 4, "matrix": [3, 5], "x": 140, "y": 40 },
+            { "flags": 4, "matrix": [2, 5], "x": 150, "y": 40 },
+            { "flags": 4, "matrix": [0, 6], "x": 0, "y": 50 },
+            { "flags": 4, "matrix": [9, 0], "x": 12, "y": 50 },
+            { "flags": 4, "matrix": [9, 3], "x": 25, "y": 50 },
+            { "flags": 4, "matrix": [9, 4], "x": 37, "y": 50 },
+            { "flags": 4, "matrix": [9, 5], "x": 100, "y": 50 },
+            { "flags": 4, "matrix": [9, 2], "x": 110, "y": 50 },
+            { "flags": 4, "matrix": [0, 4], "x": 120, "y": 50 },
+            { "flags": 4, "matrix": [0, 3], "x": 130, "y": 50 },
+            { "flags": 4, "matrix": [7, 3], "x": 140, "y": 50 },
+            { "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 }
+        ]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "0.0.2",
+        "pid": "0x0002",
+        "vid": "0x4141"
+    },
+    "eeprom": {
+        "driver": "wear_leveling"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "ESC", "matrix": [1, 3], "x": 0, "y": 0 },
+                { "label": "F1", "matrix": [2, 6], "x": 2, "y": 0 },
+                { "label": "F2", "matrix": [3, 6], "x": 3, "y": 0 },
+                { "label": "F3", "matrix": [3, 1], "x": 4, "y": 0 },
+                { "label": "F4", "matrix": [3, 3], "x": 5, "y": 0 },
+                { "label": "F5", "matrix": [0, 7], "x": 6, "y": 0 },
+                { "label": "F6", "matrix": [6, 3], "x": 7, "y": 0 },
+                { "label": "F7", "matrix": [7, 1], "x": 8, "y": 0 },
+                { "label": "F8", "matrix": [7, 6], "x": 9, "y": 0 },
+                { "label": "F9", "matrix": [10, 6], "x": 10, "y": 0 },
+                { "label": "F10", "matrix": [10, 7], "x": 11, "y": 0 },
+                { "label": "F11", "matrix": [10, 3], "x": 12, "y": 0 },
+                { "label": "F12", "matrix": [10, 5], "x": 13, "y": 0 },
+                { "label": "Printscreen", "matrix": [9, 7], "x": 14, "y": 0 },
+                { "label": "Del", "matrix": [0, 2], "x": 15, "y": 0 },
+                { "label": "`", "matrix": [1, 6], "x": 0, "y": 1 },
+                { "label": "1", "matrix": [1, 7], "x": 1, "y": 1 },
+                { "label": "2", "matrix": [2, 7], "x": 2, "y": 1 },
+                { "label": "3", "matrix": [3, 7], "x": 3, "y": 1 },
+                { "label": "4", "matrix": [4, 7], "x": 4, "y": 1 },
+                { "label": "5", "matrix": [4, 6], "x": 5, "y": 1 },
+                { "label": "6", "matrix": [5, 6], "x": 6, "y": 1 },
+                { "label": "7", "matrix": [5, 7], "x": 7, "y": 1 },
+                { "label": "8", "matrix": [6, 7], "x": 8, "y": 1 },
+                { "label": "9", "matrix": [7, 7], "x": 9, "y": 1 },
+                { "label": "0", "matrix": [8, 7], "x": 10, "y": 1 },
+                { "label": "-", "matrix": [8, 6], "x": 11, "y": 1 },
+                { "label": "=", "matrix": [6, 6], "x": 12, "y": 1 },
+                { "label": "Backspace", "matrix": [10, 1], "w": 2, "x": 13, "y": 1 },
+                { "label": "Home", "matrix": [11, 6], "x": 15, "y": 1 },
+                { "label": "Tab", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 2 },
+                { "label": "Q", "matrix": [1, 0], "x": 1.5, "y": 2 },
+                { "label": "W", "matrix": [2, 0], "x": 2.5, "y": 2 },
+                { "label": "E", "matrix": [3, 0], "x": 3.5, "y": 2 },
+                { "label": "R", "matrix": [4, 0], "x": 4.5, "y": 2 },
+                { "label": "T", "matrix": [4, 1], "x": 5.5, "y": 2 },
+                { "label": "Y", "matrix": [5, 1], "x": 6.5, "y": 2 },
+                { "label": "U", "matrix": [5, 0], "x": 7.5, "y": 2 },
+                { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 2 },
+                { "label": "O", "matrix": [7, 0], "x": 9.5, "y": 2 },
+                { "label": "P", "matrix": [8, 0], "x": 10.5, "y": 2 },
+                { "label": "[", "matrix": [8, 1], "x": 11.5, "y": 2 },
+                { "label": "]", "matrix": [6, 1], "x": 12.5, "y": 2 },
+                { "label": "\\", "matrix": [10, 2], "w": 1.5, "x": 13.5, "y": 2 },
+                { "label": "End", "matrix": [6, 5], "x": 15, "y": 2 },
+                { "label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 3 },
+                { "label": "A", "matrix": [1, 2], "x": 1.75, "y": 3 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 3 },
+                { "label": "D", "matrix": [3, 2], "x": 3.75, "y": 3 },
+                { "label": "F", "matrix": [4, 2], "x": 4.75, "y": 3 },
+                { "label": "G", "matrix": [4, 3], "x": 5.75, "y": 3 },
+                { "label": "H", "matrix": [5, 3], "x": 6.75, "y": 3 },
+                { "label": "J", "matrix": [5, 2], "x": 7.75, "y": 3 },
+                { "label": "K", "matrix": [6, 2], "x": 8.75, "y": 3 },
+                { "label": "L", "matrix": [7, 2], "x": 9.75, "y": 3 },
+                { "label": ";", "matrix": [8, 2], "x": 10.75, "y": 3 },
+                { "label": "'", "matrix": [8, 3], "x": 11.75, "y": 3 },
+                { "label": "Enter", "matrix": [10, 4], "w": 2.25, "x": 12.75, "y": 3 },
+                { "label": "PgUp", "matrix": [1, 5], "x": 15, "y": 3 },
+                { "label": "Shift", "matrix": [0, 0], "w": 2.25, "x": 0, "y": 4 },
+                { "label": "Z", "matrix": [1, 4], "x": 2.25, "y": 4 },
+                { "label": "X", "matrix": [2, 4], "x": 3.25, "y": 4 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 4 },
+                { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4 },
+                { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4 },
+                { "label": "N", "matrix": [5, 5], "x": 7.25, "y": 4 },
+                { "label": "M", "matrix": [5, 4], "x": 8.25, "y": 4 },
+                { "label": ",", "matrix": [6, 4], "x": 9.25, "y": 4 },
+                { "label": ".", "matrix": [7, 4], "x": 10.25, "y": 4 },
+                { "label": "/", "matrix": [8, 5], "x": 11.25, "y": 4 },
+                { "label": "Shift", "matrix": [9, 1], "w": 1.75, "x": 12.25, "y": 4 },
+                { "label": "Up", "matrix": [3, 5], "x": 14, "y": 4 },
+                { "label": "PgDn", "matrix": [2, 5], "x": 15, "y": 4 },
+                { "label": "Ctrl", "matrix": [0, 6], "w": 1.25, "x": 0, "y": 5 },
+                { "label": "Win", "matrix": [9, 0], "w": 1.25, "x": 1.25, "y": 5 },
+                { "label": "Alt", "matrix": [9, 3], "w": 1.25, "x": 2.5, "y": 5 },
+                { "label": "Space", "matrix": [9, 4], "w": 6.25, "x": 3.75, "y": 5 },
+                { "label": "Alt", "matrix": [9, 5], "x": 10, "y": 5 },
+                { "label": "FN", "matrix": [9, 2], "x": 11, "y": 5 },
+                { "label": "Ctrl", "matrix": [0, 4], "x": 12, "y": 5 },
+                { "label": "Left", "matrix": [0, 3], "x": 13, "y": 5 },
+                { "label": "Down", "matrix": [7, 3], "x": 14, "y": 5 },
+                { "label": "Right", "matrix": [0, 5], "x": 15, "y": 5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/jukaie/jk01/jk01.c b/keyboards/jukaie/jk01/jk01.c
new file mode 100644
index 000000000000..8f6941947609
--- /dev/null
+++ b/keyboards/jukaie/jk01/jk01.c
@@ -0,0 +1,173 @@
+/* Copyright 2023 JUKAIE <lice@jukaie.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "jk01.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const aw_led g_aw_leds[RGB_MATRIX_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
+};
+
+#endif
+
+#ifdef EEPROM_ENABLE
+
+#include "spi_master.h"
+
+void spi_init(void) {
+    static bool is_initialised = false;
+    if (!is_initialised) {
+        is_initialised = true;
+
+        // Try releasing special pins for a short time
+        setPinInput(SPI_SCK_PIN);
+        setPinInput(SPI_MOSI_PIN);
+        setPinInput(SPI_MISO_PIN);
+
+        chThdSleepMilliseconds(10);
+
+        palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_ALTERNATE(SPI_SCK_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST | PAL_WB32_CURRENT_LEVEL3);
+        palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_ALTERNATE(SPI_MOSI_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+        palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_ALTERNATE(SPI_MISO_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+    }
+}
+
+#endif
+
+void keyboard_pre_init_kb(void) {
+    setPinOutput(C0);
+    setPinOutput(C15);
+    keyboard_pre_init_user();
+};
+void housekeeping_task_kb(void) {
+    writePin(C15, keymap_config.no_gui);
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+    switch (keycode) {
+
+        case KC_SIRI:
+            if (record->event.pressed) {
+                host_consumer_send(0xCF);
+            } else {
+                host_consumer_send(0);
+            }
+            return false; /* Skip all further processing of this key */
+
+        default:
+            return true; /* Process all other keycodes normally */
+    }
+};
\ No newline at end of file
diff --git a/keyboards/jukaie/jk01/jk01.h b/keyboards/jukaie/jk01/jk01.h
new file mode 100644
index 000000000000..d4bf805c12d5
--- /dev/null
+++ b/keyboards/jukaie/jk01/jk01.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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"
+
+enum keyboard_keycodes {
+    KC_SIRI = QK_KB
+};
diff --git a/keyboards/jukaie/jk01/keymaps/default/keymap.c b/keyboards/jukaie/jk01/keymaps/default/keymap.c
new file mode 100644
index 000000000000..bdf509a8e899
--- /dev/null
+++ b/keyboards/jukaie/jk01/keymaps/default/keymap.c
@@ -0,0 +1,78 @@
+/* Copyright 2023 JUKAIE <lice@jukaie.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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 {
+    Win,
+    Mac,
+    Winfn,
+    Macfn,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[Win] = 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_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,   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(Winfn),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Mac] = LAYOUT(
+  KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_SIRI,  KC_F5,    KC_F6,    KC_MRWD,  KC_MPLY,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_PSCR,  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,   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(Macfn),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Winfn] = LAYOUT(
+  QK_BOOT,  KC_MYCM,  KC_MAIL,  KC_WSCH,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  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,  RGB_HUI,
+  KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_VAI,  KC_TRNS,
+  KC_TRNS,  GUI_TOG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+[Macfn] = LAYOUT(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_TRNS,  KC_TRNS,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   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,  RGB_HUI,
+  KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_VAI,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+};
+
+#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(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    writePin(C0, layer_state_cmp(state, 1));
+    return state;
+};
diff --git a/keyboards/jukaie/jk01/keymaps/default/rules.mk b/keyboards/jukaie/jk01/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/jukaie/jk01/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/jukaie/jk01/keymaps/via/keymap.c b/keyboards/jukaie/jk01/keymaps/via/keymap.c
new file mode 100644
index 000000000000..bdf509a8e899
--- /dev/null
+++ b/keyboards/jukaie/jk01/keymaps/via/keymap.c
@@ -0,0 +1,78 @@
+/* Copyright 2023 JUKAIE <lice@jukaie.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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 {
+    Win,
+    Mac,
+    Winfn,
+    Macfn,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[Win] = 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_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,   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(Winfn),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Mac] = LAYOUT(
+  KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_SIRI,  KC_F5,    KC_F6,    KC_MRWD,  KC_MPLY,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_PSCR,  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,   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(Macfn),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Winfn] = LAYOUT(
+  QK_BOOT,  KC_MYCM,  KC_MAIL,  KC_WSCH,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  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,  RGB_HUI,
+  KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_VAI,  KC_TRNS,
+  KC_TRNS,  GUI_TOG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+[Macfn] = LAYOUT(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_TRNS,  KC_TRNS,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   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,  RGB_HUI,
+  KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_VAI,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+};
+
+#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(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    writePin(C0, layer_state_cmp(state, 1));
+    return state;
+};
diff --git a/keyboards/jukaie/jk01/keymaps/via/rules.mk b/keyboards/jukaie/jk01/keymaps/via/rules.mk
new file mode 100644
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/jukaie/jk01/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/jukaie/jk01/mcuconf.h b/keyboards/jukaie/jk01/mcuconf.h
new file mode 100644
index 000000000000..e4b8d1f97328
--- /dev/null
+++ b/keyboards/jukaie/jk01/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright (C) 2023 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
+
+#undef WB32_SPI_USE_SPIM2
+#define WB32_SPI_USE_SPIM2 TRUE
diff --git a/keyboards/jukaie/jk01/readme.md b/keyboards/jukaie/jk01/readme.md
new file mode 100644
index 000000000000..a9dbac18acd3
--- /dev/null
+++ b/keyboards/jukaie/jk01/readme.md
@@ -0,0 +1,23 @@
+# jk01 
+
+An 83 keys keyboard, Equipped with the WestBerry Q95 microcontroller.
+
+* Keyboard Maintainer: [JUKAIE](https://github.com/jukaie)
+* Hardware Supported: JK01
+* Hardware Availability: [JUKAIE](https://github.com/jukaie/keyboard1)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make jukaie/jk01:default
+
+Flashing example for this keyboard:
+
+    make jukaie/jk01:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Hold the Reset switch mounted on the surface of the PCB back side after the USB cable is connected
+* Hold the Escape key while connecting the USB cable (also erases persistent settings)
+* Fn+ESC will reset the board to 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).
diff --git a/keyboards/jukaie/jk01/rules.mk b/keyboards/jukaie/jk01/rules.mk
new file mode 100644
index 000000000000..002458405eed
--- /dev/null
+++ b/keyboards/jukaie/jk01/rules.mk
@@ -0,0 +1 @@
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/junco/info.json b/keyboards/junco/info.json
index 9fd699ca4903..4c9b3ae6bae5 100644
--- a/keyboards/junco/info.json
+++ b/keyboards/junco/info.json
@@ -8,12 +8,33 @@
         "pid": "0x4A13",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7"],
+        "rows": ["GP8", "GP9", "GP10", "GP11", "GP12"]
+    },
+    "diode_direction": "COL2ROW",
     "ws2812": {
         "pin": "GP15",
         "driver": "vendor"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP16", "pin_b": "GP17"},
+            {"pin_a": "GP14", "pin_b": "GP13"}
+        ]
+    },
+    "split": {
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "GP14", "pin_b": "GP13"},
+                    {"pin_a": "GP16", "pin_b": "GP17"}
+                ]
+            }
+        }
     },
     "processor": "RP2040",
     "bootloader": "rp2040",
diff --git a/keyboards/junco/rev1/config.h b/keyboards/junco/rev1/config.h
index 95731fde01a0..713d651d4783 100644
--- a/keyboards/junco/rev1/config.h
+++ b/keyboards/junco/rev1/config.h
@@ -3,13 +3,6 @@
 
 #pragma once
 
-// Electrical Wiring Stuff
-#define MATRIX_ROW_PINS \
-    { GP8, GP9, GP10, GP11, GP12 }
-#define MATRIX_COL_PINS \
-    { GP2, GP3, GP4, GP5, GP6, GP7 }
-#define DIODE_DIRECTION COL2ROW
-
 // Split Keyboard Stuff
 #define EE_HANDS                 // Sets the keyboard’s handedness using EEPROM
 #define SERIAL_USART_FULL_DUPLEX // Use full duplex communication (TRRS)
@@ -24,19 +17,3 @@
         { 37, 37 } // 37 LEDs on each side
 
 #endif
-
-/* Rotary Encoders Definition */
-// Indexing goes from physical leftmost to rightmost
-// 0: left-half left | 1: left-half right | 2: right-half left | 3: right-half right
-#ifdef ENCODER_ENABLE
-
-#    define ENCODERS_PAD_A \
-        { GP16, GP14 }
-#    define ENCODERS_PAD_B \
-        { GP17, GP13 }
-#    define ENCODERS_PAD_A_RIGHT \
-        { GP14, GP16 }
-#    define ENCODERS_PAD_B_RIGHT \
-        { GP13, GP17 }
-
-#endif
diff --git a/keyboards/k34/info.json b/keyboards/k34/info.json
index 525a6e8dcdc2..715cb9060bd8 100644
--- a/keyboards/k34/info.json
+++ b/keyboards/k34/info.json
@@ -13,10 +13,10 @@
         "rows": ["F4", "B2", "E6", "B4"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
+    "development_board": "promicro",
+    "community_layouts": ["split_3x5_2"],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_split_3x5_2": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0.3},
                 {"matrix": [0, 1], "x": 1, "y": 0.1},
diff --git a/keyboards/k34/keymaps/default/config.h b/keyboards/k34/keymaps/default/config.h
index f16dbc00423e..5d7e44f7593f 100644
--- a/keyboards/k34/keymaps/default/config.h
+++ b/keyboards/k34/keymaps/default/config.h
@@ -1,16 +1,5 @@
- /* Copyright Wong Jing Ping <@wongjingping>
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  */
+// Copyright 2021 jp_smasher (@jp_smasher)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
diff --git a/keyboards/k34/keymaps/default/keymap.c b/keyboards/k34/keymaps/default/keymap.c
index ae8b7dc34000..4d09b121dd56 100644
--- a/keyboards/k34/keymaps/default/keymap.c
+++ b/keyboards/k34/keymaps/default/keymap.c
@@ -37,25 +37,25 @@ combo_t key_combos[] = {COMBO(jk_combo, KC_ESC)};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-  [_BASE] = LAYOUT(
-    KC_Q,     KC_W,     KC_E,     KC_R,      KC_T,               KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,
-    G_A,      KC_S,     KC_D,     KC_F,      KC_G,               KC_H,     KC_J,     KC_K,     KC_L,     G_SC,
-    S_Z,      A_X,      C_C,      KC_V,      KC_B,               KC_N,     KC_M,     C_COMM,   A_DOT,    S_SLSH,
-				  L1,        KC_SPC,             KC_SPC,   L2
+  [_BASE] = LAYOUT_split_3x5_2(
+    KC_Q, KC_W, KC_E, KC_R, KC_T,        KC_Y,   KC_U, KC_I,   KC_O,  KC_P,
+    G_A,  KC_S, KC_D, KC_F, KC_G,        KC_H,   KC_J, KC_K,   KC_L,  G_SC,
+    S_Z,  A_X,  C_C,  KC_V, KC_B,        KC_N,   KC_M, C_COMM, A_DOT, S_SLSH,
+				              L1,   KC_SPC,      KC_SPC, L2
   ),
 
 
-  [_L1] = LAYOUT(
-    KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,            KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_MINS,  KC_EQL,
-    KC_LPRN,  KC_RPRN,  KC_LCBR,  KC_RCBR,  KC_GRV,             KC_QUOT,  KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_PIPE,
-    _______,  _______,  _______,  KC_TAB,   _______,            KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_MPLY,  KC_MNXT,
-				  _______,  _______,            _______,  _______
+  [_L1] = LAYOUT_split_3x5_2(
+    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,      KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,
+    KC_LPRN, KC_RPRN, KC_LCBR, KC_RCBR, KC_GRV,       KC_QUOT, KC_LBRC, KC_RBRC, KC_BSLS, KC_PIPE,
+    _______, _______, _______, KC_TAB,  _______,      KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT,
+				                       _______, _______,      _______, _______
   ),
 
-  [_L2] = LAYOUT(
-    KC_1,     KC_2,     KC_3,     KC_4,      KC_5,               KC_6,     KC_7,     KC_8,    KC_9,     KC_0,
-    _______,  _______,  _______,  _______,   KC_DOT,             KC_LEFT,  KC_DOWN,  KC_UP,   KC_RIGHT, KC_BSPC,
-    _______,  _______,  _______,  _______,   _______,            A_SLSH,   SG_LBRC,  SG_RBRC, G_LBRC,   G_RBRC,
-				  KC_LALT,  KC_LGUI,             _______,    _______
+  [_L2] = LAYOUT_split_3x5_2(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,         KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
+    _______, _______, _______, _______, KC_DOT,       KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_BSPC,
+    _______, _______, _______, _______, _______,      A_SLSH,  SG_LBRC, SG_RBRC, G_LBRC,   G_RBRC,
+				                       KC_LALT, KC_LGUI,      _______, _______
   ),
 };
diff --git a/keyboards/k34/readme.md b/keyboards/k34/readme.md
index 8576def9471b..282bfeeceb9a 100644
--- a/keyboards/k34/readme.md
+++ b/keyboards/k34/readme.md
@@ -22,4 +22,3 @@ Flashing example for this keyboard:
     make k34: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/kabedon/kabedon78s/config.h b/keyboards/kabedon/kabedon78s/config.h
deleted file mode 100644
index 57f829e692b5..000000000000
--- a/keyboards/kabedon/kabedon78s/config.h
+++ /dev/null
@@ -1,33 +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 RGBLED_NUM 20
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/kabedon/kabedon78s/info.json b/keyboards/kabedon/kabedon78s/info.json
index 8ec6b5270545..4e8ca04aa5c6 100644
--- a/keyboards/kabedon/kabedon78s/info.json
+++ b/keyboards/kabedon/kabedon78s/info.json
@@ -8,6 +8,23 @@
         "pid": "0x3738",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "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"
     },
diff --git a/keyboards/kabedon/kabedon980/config.h b/keyboards/kabedon/kabedon980/config.h
index 655a8af4a95d..3623c508ccae 100644
--- a/keyboards/kabedon/kabedon980/config.h
+++ b/keyboards/kabedon/kabedon980/config.h
@@ -18,18 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
-  #define RGBLED_NUM 20
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/kabedon/kabedon980/info.json b/keyboards/kabedon/kabedon980/info.json
index 95781f0581f0..ae15a51ea357 100644
--- a/keyboards/kabedon/kabedon980/info.json
+++ b/keyboards/kabedon/kabedon980/info.json
@@ -8,6 +8,23 @@
         "pid": "0x3938",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "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"
     },
diff --git a/keyboards/kabedon/kabedon98e/config.h b/keyboards/kabedon/kabedon98e/config.h
index c8ae65099baf..64013a3a7fb8 100644
--- a/keyboards/kabedon/kabedon98e/config.h
+++ b/keyboards/kabedon/kabedon98e/config.h
@@ -15,18 +15,6 @@
  */
 #pragma once
 
-#define RGBLED_NUM 24
-#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 WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 1
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM3
@@ -37,7 +25,4 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define ENCODERS_CW_KEY  { { 0, 0 },{ 2, 0 } }
-#define ENCODERS_CCW_KEY { { 6, 0 },{ 8, 0 } }
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/kabedon/kabedon98e/info.json b/keyboards/kabedon/kabedon98e/info.json
index cbe83c98eed3..42f0796a5330 100644
--- a/keyboards/kabedon/kabedon98e/info.json
+++ b/keyboards/kabedon/kabedon98e/info.json
@@ -9,6 +9,21 @@
         "device_version": "0.0.2",
         "force_nkro": true
     },
+    "rgblight": {
+        "led_count": 24,
+        "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": "B4",
         "driver": "pwm"
@@ -32,124 +47,120 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [1, 0], "x": 0, "y": 0.5},
-
-                {"matrix": [0, 1], "x": 1.667, "y": 0.5},
-                {"matrix": [1, 1], "x": 2.667, "y": 0.5},
-                {"matrix": [0, 2], "x": 3.667, "y": 0.5},
-                {"matrix": [1, 2], "x": 4.667, "y": 0.5},
-
-                {"matrix": [0, 3], "x": 6.333, "y": 0.5},
-                {"matrix": [1, 3], "x": 7.333, "y": 0.5},
-                {"matrix": [0, 4], "x": 8.333, "y": 0.5},
-                {"matrix": [1, 4], "x": 9.333, "y": 0.5},
-
-                {"matrix": [0, 5], "x": 11, "y": 0.5},
-                {"matrix": [1, 5], "x": 12, "y": 0.5},
-                {"matrix": [1, 6], "x": 13, "y": 0.5},
-                {"matrix": [1, 7], "x": 14, "y": 0.5},
-
-                {"matrix": [5, 7], "x": 15.5, "y": 0.5},
-                {"matrix": [0, 0], "x": 16.9, "y": 0, "w": 0.6, "h": 0.5},
-                {"matrix": [4, 8], "x": 17, "y": 0.5},
-                {"matrix": [2, 0], "x": 17.5, "y": 0, "w": 0.6, "h": 0.5},
-                {"matrix": [6, 0], "x": 18.4, "y": 0, "w": 0.6, "h": 0.5},
-
-                {"matrix": [4, 0], "x": 18.5, "y": 0.5},
-                {"matrix": [8, 0], "x": 19, "y": 0, "w": 0.6, "h": 0.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 1.75},
-                {"matrix": [2, 1], "x": 1, "y": 1.75},
-                {"matrix": [3, 1], "x": 2, "y": 1.75},
-                {"matrix": [2, 2], "x": 3, "y": 1.75},
-                {"matrix": [3, 2], "x": 4, "y": 1.75},
-                {"matrix": [2, 3], "x": 5, "y": 1.75},
-                {"matrix": [3, 3], "x": 6, "y": 1.75},
-                {"matrix": [2, 4], "x": 7, "y": 1.75},
-                {"matrix": [3, 4], "x": 8, "y": 1.75},
-                {"matrix": [2, 5], "x": 9, "y": 1.75},
-                {"matrix": [3, 5], "x": 10, "y": 1.75},
-                {"matrix": [2, 6], "x": 11, "y": 1.75},
-                {"matrix": [3, 6], "x": 12, "y": 1.75},
-                {"matrix": [3, 7], "x": 13, "y": 1.75, "w": 2},
-
-                {"matrix": [3, 9], "x": 15.5, "y": 1.75},
-                {"matrix": [4, 9], "x": 16.5, "y": 1.75},
-                {"matrix": [4, 10], "x": 17.5, "y": 1.75},
-                {"matrix": [5, 10], "x": 18.5, "y": 1.75},
-
-                {"matrix": [5, 0], "x": 0, "y": 2.75, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 2.75},
-                {"matrix": [5, 1], "x": 2.5, "y": 2.75},
-                {"matrix": [4, 2], "x": 3.5, "y": 2.75},
-                {"matrix": [5, 2], "x": 4.5, "y": 2.75},
-                {"matrix": [4, 3], "x": 5.5, "y": 2.75},
-                {"matrix": [5, 3], "x": 6.5, "y": 2.75},
-                {"matrix": [4, 4], "x": 7.5, "y": 2.75},
-                {"matrix": [5, 4], "x": 8.5, "y": 2.75},
-                {"matrix": [4, 5], "x": 9.5, "y": 2.75},
-                {"matrix": [5, 5], "x": 10.5, "y": 2.75},
-                {"matrix": [4, 6], "x": 11.5, "y": 2.75},
-                {"matrix": [5, 6], "x": 12.5, "y": 2.75},
-                {"matrix": [4, 7], "x": 13.5, "y": 2.75, "w": 1.5},
-
-                {"matrix": [5, 9], "x": 15.5, "y": 2.75},
-                {"matrix": [6, 9], "x": 16.5, "y": 2.75},
-                {"matrix": [6, 10], "x": 17.5, "y": 2.75},
-
-                {"matrix": [7, 0], "x": 0, "y": 3.75, "w": 1.75},
-                {"matrix": [6, 1], "x": 1.75, "y": 3.75},
-                {"matrix": [7, 1], "x": 2.75, "y": 3.75},
-                {"matrix": [6, 2], "x": 3.75, "y": 3.75},
-                {"matrix": [7, 2], "x": 4.75, "y": 3.75},
-                {"matrix": [6, 3], "x": 5.75, "y": 3.75},
-                {"matrix": [7, 3], "x": 6.75, "y": 3.75},
-                {"matrix": [6, 4], "x": 7.75, "y": 3.75},
-                {"matrix": [7, 4], "x": 8.75, "y": 3.75},
-                {"matrix": [6, 5], "x": 9.75, "y": 3.75},
-                {"matrix": [7, 5], "x": 10.75, "y": 3.75},
-                {"matrix": [6, 6], "x": 11.75, "y": 3.75},
-                {"matrix": [7, 7], "x": 12.75, "y": 3.75, "w": 2.25},
-
-                {"matrix": [7, 9], "x": 15.5, "y": 3.75},
-                {"matrix": [8, 9], "x": 16.5, "y": 3.75},
-                {"matrix": [8, 10], "x": 17.5, "y": 3.75},
-                {"matrix": [7, 10], "x": 18.5, "y": 2.75, "h": 2},
-
-                {"matrix": [9, 0], "x": 0, "y": 4.75, "w": 2.25},
-                {"matrix": [9, 1], "x": 2.25, "y": 4.75},
-                {"matrix": [8, 2], "x": 3.25, "y": 4.75},
-                {"matrix": [9, 2], "x": 4.25, "y": 4.75},
-                {"matrix": [8, 3], "x": 5.25, "y": 4.75},
-                {"matrix": [9, 3], "x": 6.25, "y": 4.75},
-                {"matrix": [8, 4], "x": 7.25, "y": 4.75},
-                {"matrix": [9, 4], "x": 8.25, "y": 4.75},
-                {"matrix": [8, 5], "x": 9.25, "y": 4.75},
-                {"matrix": [9, 5], "x": 10.25, "y": 4.75},
-                {"matrix": [8, 6], "x": 11.25, "y": 4.75},
-                {"matrix": [9, 7], "x": 12.25, "y": 4.75, "w": 1.75},
-
-                {"matrix": [8, 8], "x": 14.25, "y": 5},
-
-                {"matrix": [9, 9], "x": 15.5, "y": 4.75},
-                {"matrix": [10, 9], "x": 16.5, "y": 4.75},
-                {"matrix": [9, 10], "x": 17.5, "y": 4.75},
-
-                {"matrix": [11, 0], "x": 0, "y": 5.75, "w": 1.25},
-                {"matrix": [10, 1], "x": 1.25, "y": 5.75},
-                {"matrix": [11, 1], "x": 2.25, "y": 5.75},
-                {"matrix": [11, 3], "x": 3.25, "y": 5.75},
-                {"matrix": [11, 2], "x": 4.25, "y": 5.75, "w": 6.25},
-                {"matrix": [11, 5], "x": 10.5, "y": 5.75, "w": 1.25},
-                {"matrix": [10, 7], "x": 11.75, "y": 5.75, "w": 1.25},
-
-                {"matrix": [11, 7], "x": 13.25, "y": 6},
-                {"matrix": [10, 8], "x": 14.25, "y": 6},
-                {"matrix": [11, 8], "x": 15.25, "y": 6},
-
-                {"matrix": [11, 9], "x": 16.5, "y": 5.75},
-                {"matrix": [10, 10], "x": 17.5, "y": 5.75},
-                {"matrix": [11, 10], "x": 18.5, "y": 4.75, "h": 2}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.667, "y": 0},
+                {"matrix": [1, 1], "x": 2.667, "y": 0},
+                {"matrix": [0, 2], "x": 3.667, "y": 0},
+                {"matrix": [1, 2], "x": 4.667, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.333, "y": 0},
+                {"matrix": [1, 3], "x": 7.333, "y": 0},
+                {"matrix": [0, 4], "x": 8.333, "y": 0},
+                {"matrix": [1, 4], "x": 9.333, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+
+                {"matrix": [5, 7], "x": 15.5, "y": 0},
+                {"matrix": [4, 8], "x": 17, "y": 0},
+
+                {"matrix": [4, 0], "x": 18.5, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1.25},
+                {"matrix": [2, 1], "x": 1, "y": 1.25},
+                {"matrix": [3, 1], "x": 2, "y": 1.25},
+                {"matrix": [2, 2], "x": 3, "y": 1.25},
+                {"matrix": [3, 2], "x": 4, "y": 1.25},
+                {"matrix": [2, 3], "x": 5, "y": 1.25},
+                {"matrix": [3, 3], "x": 6, "y": 1.25},
+                {"matrix": [2, 4], "x": 7, "y": 1.25},
+                {"matrix": [3, 4], "x": 8, "y": 1.25},
+                {"matrix": [2, 5], "x": 9, "y": 1.25},
+                {"matrix": [3, 5], "x": 10, "y": 1.25},
+                {"matrix": [2, 6], "x": 11, "y": 1.25},
+                {"matrix": [3, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 7], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 9], "x": 15.5, "y": 1.25},
+                {"matrix": [4, 9], "x": 16.5, "y": 1.25},
+                {"matrix": [4, 10], "x": 17.5, "y": 1.25},
+                {"matrix": [5, 10], "x": 18.5, "y": 1.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 5.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 11.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 9], "x": 15.5, "y": 2.25},
+                {"matrix": [6, 9], "x": 16.5, "y": 2.25},
+                {"matrix": [6, 10], "x": 17.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [6, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 5.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 7], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [7, 9], "x": 15.5, "y": 3.25},
+                {"matrix": [8, 9], "x": 16.5, "y": 3.25},
+                {"matrix": [8, 10], "x": 17.5, "y": 3.25},
+                {"matrix": [7, 10], "x": 18.5, "y": 2.25, "h": 2},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 7], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [8, 8], "x": 14.25, "y": 4.5},
+
+                {"matrix": [9, 9], "x": 15.5, "y": 4.25},
+                {"matrix": [10, 9], "x": 16.5, "y": 4.25},
+                {"matrix": [9, 10], "x": 17.5, "y": 4.25},
+
+                {"matrix": [11, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 1.25, "y": 5.25},
+                {"matrix": [11, 1], "x": 2.25, "y": 5.25},
+                {"matrix": [11, 3], "x": 3.25, "y": 5.25},
+                {"matrix": [11, 2], "x": 4.25, "y": 5.25, "w": 6.25},
+                {"matrix": [11, 5], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 11.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 13.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 14.25, "y": 5.5},
+                {"matrix": [11, 8], "x": 15.25, "y": 5.5},
+
+                {"matrix": [11, 9], "x": 16.5, "y": 5.25},
+                {"matrix": [10, 10], "x": 17.5, "y": 5.25},
+                {"matrix": [11, 10], "x": 18.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/kabedon/kabedon98e/kabedon98e.c b/keyboards/kabedon/kabedon98e/kabedon98e.c
deleted file mode 100644
index 9fd34b58af32..000000000000
--- a/keyboards/kabedon/kabedon98e/kabedon98e.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2021 KDon<370490639@qq.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You 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"
-
-static uint8_t encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
-
-void matrix_scan_kb(void) {
-    encoder_action_unregister();
-    matrix_scan_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    encoder_action_register(index, clockwise);
-    return true;
-};
diff --git a/keyboards/kabedon/kabedon98e/keymaps/default/keymap.c b/keyboards/kabedon/kabedon98e/keymaps/default/keymap.c
index f730ee95b2d5..3dcdbf83779e 100644
--- a/keyboards/kabedon/kabedon98e/keymaps/default/keymap.c
+++ b/keyboards/kabedon/kabedon98e/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ 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_HOME, KC_INS,  KC_END,  KC_PGUP, KC_MUTE, 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_DEL,  KC_INS,  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_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,
@@ -53,19 +53,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT, MO(1),                     KC_SPC,                             KC_RALT, KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,      KC_P0,   KC_PDOT, KC_PENT),
 
 [_FN] = 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,     RGB_VAI,      KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            RGB_TOG, RGB_MOD,     RGB_HUI, RGB_VAD, RGB_HUD,      KC_TRNS, KC_TRNS, KC_TRNS),
-
-[_FN1] = 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, KC_TRNS,                   KC_TRNS,                            RGB_TOG, RGB_MOD,     RGB_HUI, RGB_VAD, RGB_HUD,      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), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  },
 };
+#endif
diff --git a/keyboards/kabedon/kabedon98e/keymaps/default/rules.mk b/keyboards/kabedon/kabedon98e/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/kabedon/kabedon98e/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/kabedon/kabedon98e/keymaps/via/keymap.c b/keyboards/kabedon/kabedon98e/keymaps/via/keymap.c
index f730ee95b2d5..6cb85164c001 100644
--- a/keyboards/kabedon/kabedon98e/keymaps/via/keymap.c
+++ b/keyboards/kabedon/kabedon98e/keymaps/via/keymap.c
@@ -45,7 +45,7 @@ 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_HOME, KC_INS,  KC_END,  KC_PGUP, KC_MUTE, 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_DEL,  KC_INS,  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_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,
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT, MO(1),                     KC_SPC,                             KC_RALT, KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,      KC_P0,   KC_PDOT, KC_PENT),
 
 [_FN] = 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,
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            RGB_TOG, RGB_MOD,     RGB_HUI, RGB_VAD, RGB_HUD,      KC_TRNS, KC_TRNS, KC_TRNS),
 
 [_FN1] = 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,
@@ -69,3 +69,11 @@ 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, KC_TRNS)
 
 };
+
+#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)  },
+    [1] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  },
+    [2] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  },
+};
+#endif
diff --git a/keyboards/kabedon/kabedon98e/keymaps/via/rules.mk b/keyboards/kabedon/kabedon98e/keymaps/via/rules.mk
index 1e5b99807cb7..f1adcab005e8 100644
--- a/keyboards/kabedon/kabedon98e/keymaps/via/rules.mk
+++ b/keyboards/kabedon/kabedon98e/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/kagizaraya/chidori/keymaps/oled_sample/rules.mk b/keyboards/kagizaraya/chidori/keymaps/oled_sample/rules.mk
index 7a7b1acc03aa..80b82b2a5cca 100644
--- a/keyboards/kagizaraya/chidori/keymaps/oled_sample/rules.mk
+++ b/keyboards/kagizaraya/chidori/keymaps/oled_sample/rules.mk
@@ -1,3 +1,2 @@
 # Enable SSD1306 OLED
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/kagizaraya/halberd/config.h b/keyboards/kagizaraya/halberd/config.h
index 9b42731f8451..aa3ac65cea9b 100644
--- a/keyboards/kagizaraya/halberd/config.h
+++ b/keyboards/kagizaraya/halberd/config.h
@@ -16,21 +16,6 @@ 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 RGBLED_NUM 40
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -51,5 +36,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 TAPPING_TERM    100
diff --git a/keyboards/kagizaraya/halberd/info.json b/keyboards/kagizaraya/halberd/info.json
index 790db40f6dd0..b8e092524149 100644
--- a/keyboards/kagizaraya/halberd/info.json
+++ b/keyboards/kagizaraya/halberd/info.json
@@ -8,6 +8,26 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 40,
+        "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
+        }
+    },
+    "tapping": {
+        "term": 100
+    },
     "ws2812": {
         "pin": "F0"
     },
diff --git a/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c b/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c
index d75b5b607907..a5c017336a4a 100644
--- a/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c
+++ b/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c
@@ -146,15 +146,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
   return true;
 }
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/kagizaraya/scythe/config.h b/keyboards/kagizaraya/scythe/config.h
index 96e966904698..026950e1c702 100644
--- a/keyboards/kagizaraya/scythe/config.h
+++ b/keyboards/kagizaraya/scythe/config.h
@@ -16,22 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLIGHT_SPLIT 1
-#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 9
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -57,5 +41,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define EE_HANDS
 #define I2C_MASTER_LEFT
 //#define I2C_MASTER_RIGHT
-
-#define TAPPING_TERM    120
diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json
index 8198cd001764..6603e790c457 100644
--- a/keyboards/kagizaraya/scythe/info.json
+++ b/keyboards/kagizaraya/scythe/info.json
@@ -19,6 +19,27 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 9,
+        "split": 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
+        }
+    },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "F0"
     },
diff --git a/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c b/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
index 437be945bdd3..024bc9d952df 100644
--- a/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
+++ b/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
@@ -191,15 +191,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
   return true;
 }
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/kakunpc/angel17/rev1/config.h b/keyboards/kakunpc/angel17/rev1/config.h
index 227e0d529498..f79d81247591 100644
--- a/keyboards/kakunpc/angel17/rev1/config.h
+++ b/keyboards/kakunpc/angel17/rev1/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-   #define RGBLED_NUM 17
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
 /* 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/kakunpc/angel17/rev1/info.json b/keyboards/kakunpc/angel17/rev1/info.json
index 9454cc5ffd10..8395cf391c05 100644
--- a/keyboards/kakunpc/angel17/rev1/info.json
+++ b/keyboards/kakunpc/angel17/rev1/info.json
@@ -3,6 +3,12 @@
         "cols": ["F4", "F5", "F6", "F7", "B1"],
         "rows": ["D4", "C6", "D7", "E6"]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 17,
+        "sleep": true
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/kakunpc/angel64/alpha/config.h b/keyboards/kakunpc/angel64/alpha/config.h
index 4f068a9a7d10..4d51ac0f1afd 100644
--- a/keyboards/kakunpc/angel64/alpha/config.h
+++ b/keyboards/kakunpc/angel64/alpha/config.h
@@ -29,22 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
 
-   #define RGBLED_NUM 64
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #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
-
 /* 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/kakunpc/angel64/alpha/info.json b/keyboards/kakunpc/angel64/alpha/info.json
index 93748b736c8d..cfa52eb172ec 100644
--- a/keyboards/kakunpc/angel64/alpha/info.json
+++ b/keyboards/kakunpc/angel64/alpha/info.json
@@ -12,7 +12,23 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 25
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 64,
+        "max_brightness": 25,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/kakunpc/angel64/rev1/config.h b/keyboards/kakunpc/angel64/rev1/config.h
index 4f068a9a7d10..4d51ac0f1afd 100644
--- a/keyboards/kakunpc/angel64/rev1/config.h
+++ b/keyboards/kakunpc/angel64/rev1/config.h
@@ -29,22 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
 
-   #define RGBLED_NUM 64
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #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
-
 /* 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/kakunpc/angel64/rev1/info.json b/keyboards/kakunpc/angel64/rev1/info.json
index 59e7152e0d99..46f619462aa1 100644
--- a/keyboards/kakunpc/angel64/rev1/info.json
+++ b/keyboards/kakunpc/angel64/rev1/info.json
@@ -12,7 +12,23 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 25
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 64,
+        "max_brightness": 25,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/kakunpc/angel64/rules.mk b/keyboards/kakunpc/angel64/rules.mk
index e10619259c73..213576dfbd54 100644
--- a/keyboards/kakunpc/angel64/rules.mk
+++ b/keyboards/kakunpc/angel64/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 CUSTOM_MATRIX = yes
 
 SRC += matrix.c
diff --git a/keyboards/kakunpc/business_card/alpha/config.h b/keyboards/kakunpc/business_card/alpha/config.h
index ebe746b7ce68..f79d81247591 100644
--- a/keyboards/kakunpc/business_card/alpha/config.h
+++ b/keyboards/kakunpc/business_card/alpha/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-   #define RGBLED_NUM 6
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
 /* 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/kakunpc/business_card/alpha/info.json b/keyboards/kakunpc/business_card/alpha/info.json
index 17fda49030d4..3270f8e4bccf 100644
--- a/keyboards/kakunpc/business_card/alpha/info.json
+++ b/keyboards/kakunpc/business_card/alpha/info.json
@@ -8,6 +8,12 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "sleep": true
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/kakunpc/business_card/alpha/rules.mk b/keyboards/kakunpc/business_card/alpha/rules.mk
index fa42618a3b04..6744c64e1ba4 100644
--- a/keyboards/kakunpc/business_card/alpha/rules.mk
+++ b/keyboards/kakunpc/business_card/alpha/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/kakunpc/business_card/beta/config.h b/keyboards/kakunpc/business_card/beta/config.h
index ebe746b7ce68..f79d81247591 100644
--- a/keyboards/kakunpc/business_card/beta/config.h
+++ b/keyboards/kakunpc/business_card/beta/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-   #define RGBLED_NUM 6
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
 /* 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/kakunpc/business_card/beta/info.json b/keyboards/kakunpc/business_card/beta/info.json
index 9886b2aa6cf7..ef09a0ac9069 100644
--- a/keyboards/kakunpc/business_card/beta/info.json
+++ b/keyboards/kakunpc/business_card/beta/info.json
@@ -8,6 +8,12 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "sleep": true
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/kakunpc/business_card/beta/rules.mk b/keyboards/kakunpc/business_card/beta/rules.mk
index fa42618a3b04..6744c64e1ba4 100644
--- a/keyboards/kakunpc/business_card/beta/rules.mk
+++ b/keyboards/kakunpc/business_card/beta/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/kakunpc/rabbit_capture_plan/config.h b/keyboards/kakunpc/rabbit_capture_plan/config.h
index 6a6c2678bf37..617b0deeb492 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/config.h
+++ b/keyboards/kakunpc/rabbit_capture_plan/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_SPLIT {32, 37}
-#    define RGBLED_NUM 69
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/kakunpc/rabbit_capture_plan/info.json b/keyboards/kakunpc/rabbit_capture_plan/info.json
index d988e940341f..ac7732e7ca53 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/info.json
+++ b/keyboards/kakunpc/rabbit_capture_plan/info.json
@@ -12,7 +12,24 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 69,
+        "max_brightness": 200,
+        "sleep": true,
+        "split_count": [32, 37],
+        "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": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
diff --git a/keyboards/kakunpc/suihankey/alpha/config.h b/keyboards/kakunpc/suihankey/alpha/config.h
index 2e4fa2625f04..f79d81247591 100644
--- a/keyboards/kakunpc/suihankey/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/alpha/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-   #define RGBLED_NUM 18
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -53,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 RGBLED_SPLIT {18,18}
diff --git a/keyboards/kakunpc/suihankey/alpha/info.json b/keyboards/kakunpc/suihankey/alpha/info.json
index b48aab842270..fb9249ab8372 100644
--- a/keyboards/kakunpc/suihankey/alpha/info.json
+++ b/keyboards/kakunpc/suihankey/alpha/info.json
@@ -8,6 +8,24 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "D3"
     },
diff --git a/keyboards/kakunpc/suihankey/rev1/config.h b/keyboards/kakunpc/suihankey/rev1/config.h
index 2e4fa2625f04..f79d81247591 100644
--- a/keyboards/kakunpc/suihankey/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/rev1/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-   #define RGBLED_NUM 18
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -53,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 RGBLED_SPLIT {18,18}
diff --git a/keyboards/kakunpc/suihankey/rev1/info.json b/keyboards/kakunpc/suihankey/rev1/info.json
index 4f5caa6c634f..37215632cf42 100644
--- a/keyboards/kakunpc/suihankey/rev1/info.json
+++ b/keyboards/kakunpc/suihankey/rev1/info.json
@@ -8,6 +8,24 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "D3"
     },
diff --git a/keyboards/kakunpc/suihankey/rules.mk b/keyboards/kakunpc/suihankey/rules.mk
index 85df4231d509..80475ea69aac 100644
--- a/keyboards/kakunpc/suihankey/rules.mk
+++ b/keyboards/kakunpc/suihankey/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 SPLIT_KEYBOARD = no
 
 DEFAULT_FOLDER = kakunpc/suihankey/rev1
diff --git a/keyboards/kakunpc/suihankey/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h
index 1fda3473f375..a2f226445785 100644
--- a/keyboards/kakunpc/suihankey/split/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/split/alpha/config.h
@@ -21,12 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SPLIT_HAND_PIN D2
 
-   #define RGBLED_NUM 18
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -47,5 +41,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 RGBLED_SPLIT {18,18}
diff --git a/keyboards/kakunpc/suihankey/split/alpha/info.json b/keyboards/kakunpc/suihankey/split/alpha/info.json
index 72aaf72967e7..fb7a619d0e1b 100644
--- a/keyboards/kakunpc/suihankey/split/alpha/info.json
+++ b/keyboards/kakunpc/suihankey/split/alpha/info.json
@@ -1,4 +1,10 @@
 {
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "sleep": true
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/kakunpc/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h
index 86e33438b5e4..a2f226445785 100644
--- a/keyboards/kakunpc/suihankey/split/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/split/rev1/config.h
@@ -21,22 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SPLIT_HAND_PIN D2
 
-   #define RGBLED_NUM 18
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -57,5 +41,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 RGBLED_SPLIT {18,18}
diff --git a/keyboards/kakunpc/suihankey/split/rev1/info.json b/keyboards/kakunpc/suihankey/split/rev1/info.json
index 2c414b31167a..4410ad5bb104 100644
--- a/keyboards/kakunpc/suihankey/split/rev1/info.json
+++ b/keyboards/kakunpc/suihankey/split/rev1/info.json
@@ -1,4 +1,22 @@
 {
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "D3"
     },
diff --git a/keyboards/kakunpc/thedogkeyboard/config.h b/keyboards/kakunpc/thedogkeyboard/config.h
index 80e1c060148a..30b7b606c084 100644
--- a/keyboards/kakunpc/thedogkeyboard/config.h
+++ b/keyboards/kakunpc/thedogkeyboard/config.h
@@ -35,12 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B4, B5 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6 }
 
-   #define RGBLED_NUM 111
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
 /* 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/kakunpc/thedogkeyboard/info.json b/keyboards/kakunpc/thedogkeyboard/info.json
index a958fd52a6a1..79ed132f68c2 100644
--- a/keyboards/kakunpc/thedogkeyboard/info.json
+++ b/keyboards/kakunpc/thedogkeyboard/info.json
@@ -12,7 +12,11 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 50
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 111,
+        "max_brightness": 50,
+        "sleep": true
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/kaly/kaly42/config.h b/keyboards/kaly/kaly42/config.h
new file mode 100644
index 000000000000..e97f0a8aa45b
--- /dev/null
+++ b/keyboards/kaly/kaly42/config.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Kael Soares Augusto (@Dwctor)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define SERIAL_USART_FULL_DUPLEX   // Enable full duplex operation mode.
+
+#define SERIAL_USART_TX_PIN B6     // USART TX pin
+#define SERIAL_USART_RX_PIN B7     // USART RX pin
diff --git a/keyboards/kaly/kaly42/halconf.h b/keyboards/kaly/kaly42/halconf.h
new file mode 100644
index 000000000000..7cbbf5961036
--- /dev/null
+++ b/keyboards/kaly/kaly42/halconf.h
@@ -0,0 +1,7 @@
+// Copyright 2023 Kael Soares Augusto (@Dwctor)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SERIAL TRUE
+#include_next <halconf.h>
diff --git a/keyboards/kaly/kaly42/info.json b/keyboards/kaly/kaly42/info.json
new file mode 100644
index 000000000000..38de4ccea50d
--- /dev/null
+++ b/keyboards/kaly/kaly42/info.json
@@ -0,0 +1,93 @@
+{
+    "manufacturer": "Dwctor",
+    "keyboard_name": "kaly/kaly42",
+    "maintainer": "Dwctor",
+    "development_board": "blackpill_f401",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["B1", "B10", "A8", "B15", "B14", "B13"],
+            ["B9", "B8", "B5", "B4", "B3", "A15"],
+            ["A4", "A3", "A5", "A6", "A7", "B0"],
+            ["A2", "A1", "A0", "NO_PIN", "NO_PIN", "NO_PIN"]
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "bootmagic": {
+            "matrix": [4, 5]
+        },
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["B13", "B14", "B15", "A8", "B10", "B1"],
+                    ["A15", "B3", "B4", "B5", "B8", "B9"],
+                    ["B0", "A7", "A6", "A5", "A3", "A4"],
+                    ["A0", "A1", "A2", "NO_PIN", "NO_PIN", "NO_PIN"]
+                ]
+            }
+        }
+    },
+    "url": "https://github.com/Dwctor/Kaly",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "community_layouts": ["split_3x6_3"],
+    "layouts": {
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"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": [4, 0], "x": 8, "y": 0.25},
+                {"matrix": [4, 1], "x": 9, "y": 0.125},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 3], "x": 11, "y": 0.125},
+                {"matrix": [4, 4], "x": 12, "y": 0.25},
+                {"matrix": [4, 5], "x": 13, "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.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": [5, 0], "x": 8, "y": 1.25},
+                {"matrix": [5, 1], "x": 9, "y": 1.125},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 3], "x": 11, "y": 1.125},
+                {"matrix": [5, 4], "x": 12, "y": 1.25},
+                {"matrix": [5, 5], "x": 13, "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.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": [6, 0], "x": 8, "y": 2.25},
+                {"matrix": [6, 1], "x": 9, "y": 2.125},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 3], "x": 11, "y": 2.125},
+                {"matrix": [6, 4], "x": 12, "y": 2.25},
+                {"matrix": [6, 5], "x": 13, "y": 2.25},
+                {"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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kaly/kaly42/keymaps/default/keymap.c b/keyboards/kaly/kaly42/keymaps/default/keymap.c
new file mode 100644
index 000000000000..54d46c54dbb7
--- /dev/null
+++ b/keyboards/kaly/kaly42/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2023 Kael Soares Augusto (@Dwctor)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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│
+      * ├───┼───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┼───┤
+      * │Ctl│ A │ S │ D │ F │ G │       │ H │ J │ K │ L │ ; │ ' │
+      * ├───┼───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┼───┤
+      * │Sft│ Z │ X │ C │ V │ B │       │ N │ M │ , │ . │ / │Sft│
+      * └───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┘
+      *               ┌───┐                   ┌───┐
+      *               │GUI├───┐           ┌───┤Alt│
+      *               └───┤Bsp├───┐   ┌───┤Ent├───┘
+      *                   └───┤   │   │   ├───┘
+      *                       └───┘   └───┘
+      */
+    [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,
+                                            KC_LGUI, KC_BSPC, KC_SPC,           KC_SPC,  KC_ENT,  KC_RALT
+    )
+};
diff --git a/keyboards/kaly/kaly42/mcuconf.h b/keyboards/kaly/kaly42/mcuconf.h
new file mode 100644
index 000000000000..6db1e6072a67
--- /dev/null
+++ b/keyboards/kaly/kaly42/mcuconf.h
@@ -0,0 +1,10 @@
+// Copyright 2023 Kael Soares Augusto (@Dwctor)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SERIAL_USE_USART1
+
+#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/kaly/kaly42/readme.md b/keyboards/kaly/kaly42/readme.md
new file mode 100644
index 000000000000..d3b0ff7a3d56
--- /dev/null
+++ b/keyboards/kaly/kaly42/readme.md
@@ -0,0 +1,27 @@
+# kaly/kaly42
+
+![kaly/kaly42](https://i.imgur.com/wSmUjFUh.jpeg)
+
+The Kaly is a split, ergonomic keyboard inspired by the [Ferris](https://github.com/pierrechevalier83/ferris) and the [Cantor](https://github.com/diepala/cantor) with the main goals of comfort, affordability and cuteness! The stand-out features of the Kaly is the ease-to-solder and the natural thumb cluster that allow users to confortably reach all keys of the keyboard! To see more of the Kaly, visit [this video](https://www.youtube.com/watch?v=PhxM8o__9Xo) outlining the journey of making this keybord.
+
+* Keyboard Maintainer: [Kael Soares Augusto](https://github.com/Dwctor)
+* Hardware Supported: Blackpill STM32F401
+* Hardware Availability: [https://github.com/Dwctor/Kaly](https://github.com/Dwctor/Kaly)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kaly/kaly42:default
+
+Flashing example for this keyboard:
+
+    make kaly/kaly42: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/kaly/kaly42/rules.mk b/keyboards/kaly/kaly42/rules.mk
new file mode 100644
index 000000000000..c6e298832137
--- /dev/null
+++ b/keyboards/kaly/kaly42/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = usart
diff --git a/keyboards/kapcave/arya/config.h b/keyboards/kapcave/arya/config.h
index 282b98a9781e..942207631595 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 TAP_CODE_DELAY 25 
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 
 /*
diff --git a/keyboards/kapcave/arya/info.json b/keyboards/kapcave/arya/info.json
index 0125b834fb53..ebcb70015009 100644
--- a/keyboards/kapcave/arya/info.json
+++ b/keyboards/kapcave/arya/info.json
@@ -20,10 +20,90 @@
             {"pin_a": "C15", "pin_b": "C14", "resolution": 2}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 25
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
-    "community_layouts": ["alice_split_bs"],
+    "community_layouts": ["alice", "alice_split_bs"],
     "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [8, 1], "x": 0.4, "y": 0},
+                {"matrix": [3, 6], "x": 1.55, "y": 0.1},
+                {"matrix": [3, 7], "x": 2.55, "y": 0.1},
+                {"matrix": [4, 6], "x": 3.55, "y": 0},
+                {"matrix": [4, 7], "x": 4.55, "y": 0.1},
+                {"matrix": [5, 6], "x": 5.55, "y": 0.1},
+                {"matrix": [5, 7], "x": 6.55, "y": 0.1},
+                {"matrix": [6, 6], "x": 7.55, "y": 0.1},
+
+                {"matrix": [6, 7], "x": 9.75, "y": 0.1},
+                {"matrix": [7, 6], "x": 10.75, "y": 0.1},
+                {"matrix": [7, 7], "x": 11.75, "y": 0.1},
+                {"matrix": [0, 6], "x": 12.75, "y": 0.1},
+                {"matrix": [0, 7], "x": 13.75, "y": 0},
+                {"matrix": [1, 7], "x": 14.75, "y": 0.1},
+                {"matrix": [2, 7], "x": 15.75, "y": 0.1, "w": 2},
+
+                {"matrix": [8, 0], "x": 0.2, "y": 1},
+                {"matrix": [3, 4], "x": 1.35, "y": 1.1, "w": 1.5},
+                {"matrix": [3, 5], "x": 2.85, "y": 1.1},
+                {"matrix": [4, 4], "x": 3.85, "y": 1.1},
+                {"matrix": [4, 5], "x": 4.85, "y": 1.1},
+                {"matrix": [5, 4], "x": 5.85, "y": 1.1},
+                {"matrix": [5, 5], "x": 6.85, "y": 1.1},
+
+                {"matrix": [6, 4], "x": 9.45, "y": 1.1},
+                {"matrix": [6, 5], "x": 10.45, "y": 1.1},
+                {"matrix": [7, 5], "x": 11.45, "y": 1.1},
+                {"matrix": [0, 5], "x": 12.45, "y": 1.1},
+                {"matrix": [1, 5], "x": 13.45, "y": 1.1},
+                {"matrix": [1, 6], "x": 14.45, "y": 1.1},
+                {"matrix": [2, 5], "x": 15.45, "y": 1.1},
+                {"matrix": [2, 4], "x": 16.45, "y": 1.1, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 2},
+                {"matrix": [3, 2], "x": 1.15, "y": 2.1, "w": 1.75},
+                {"matrix": [3, 3], "x": 2.9, "y": 2.1},
+                {"matrix": [4, 3], "x": 3.9, "y": 2.1},
+                {"matrix": [5, 2], "x": 4.9, "y": 2.1},
+                {"matrix": [5, 3], "x": 5.9, "y": 2.1},
+                {"matrix": [6, 3], "x": 6.9, "y": 2.1},
+
+                {"matrix": [7, 3], "x": 9.9, "y": 2.1},
+                {"matrix": [7, 4], "x": 10.9, "y": 2.1},
+                {"matrix": [0, 3], "x": 11.9, "y": 2.1},
+                {"matrix": [0, 4], "x": 12.9, "y": 2.1},
+                {"matrix": [1, 3], "x": 13.9, "y": 2.1},
+                {"matrix": [1, 4], "x": 14.9, "y": 2.1},
+                {"matrix": [2, 3], "x": 15.9, "y": 2.1, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 0.95, "y": 3.1, "w": 2.25},
+                {"matrix": [4, 1], "x": 3.2, "y": 3.1},
+                {"matrix": [4, 2], "x": 4.2, "y": 3.1},
+                {"matrix": [5, 1], "x": 5.2, "y": 3.1},
+                {"matrix": [6, 1], "x": 6.2, "y": 3.1},
+                {"matrix": [6, 2], "x": 7.2, "y": 3.1},
+
+                {"matrix": [7, 1], "x": 9.6, "y": 3.1},
+                {"matrix": [7, 2], "x": 10.6, "y": 3.1},
+                {"matrix": [0, 1], "x": 11.6, "y": 3.1},
+                {"matrix": [0, 2], "x": 12.6, "y": 3.1},
+                {"matrix": [1, 1], "x": 13.6, "y": 3.1},
+                {"matrix": [1, 2], "x": 14.6, "y": 3.1},
+                {"matrix": [2, 1], "x": 15.6, "y": 3.1, "w": 1.75},
+                {"matrix": [2, 2], "x": 17.35, "y": 3.1},
+
+                {"matrix": [3, 0], "x": 0.95, "y": 4.1, "w": 1.5},
+                {"matrix": [4, 0], "x": 3.85, "y": 4.1, "w": 1.5},
+                {"matrix": [5, 0], "x": 5.35, "y": 4.1, "w": 2},
+                {"matrix": [6, 0], "x": 7.35, "y": 4.1, "w": 1.25},
+                {"matrix": [0, 0], "x": 9.6, "y": 4.1, "w": 2.75},
+                {"matrix": [1, 0], "x": 12.35, "y": 4.1, "w": 1.5},
+                {"matrix": [2, 0], "x": 16.65, "y": 4.1, "w": 1.5}
+            ]
+        },
         "LAYOUT_alice_split_bs": {
             "layout": [
                 {"matrix": [8, 1], "x": 0.4, "y": 0},
diff --git a/keyboards/kapcave/arya/matrix_diagram.md b/keyboards/kapcave/arya/matrix_diagram.md
new file mode 100644
index 000000000000..245cb9a079cf
--- /dev/null
+++ b/keyboards/kapcave/arya/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for Kapcave Arya
+
+```
+                                                                       ┌───────┐
+                                                          2u Backspace │27     │
+                                                                       └───────┘
+  ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+  │81 │  │36 │37 │46 │47 │56 │57 │66 │         │67 │76 │77 │06 │07 │17 │26 │27 │
+ ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
+ │80 │  │34   │35 │44 │45 │54 │55 │          │64 │65 │75 │05 │15 │16 │25 │24    │
+┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤          └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐
+│82 │  │32    │33 │43 │52 │53 │63 │           │73 │74 │03 │04 │13 │14 │23        │
+└───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐
+      │31      │41 │42 │51 │61 │62 │        │71 │72 │01 │02 │11 │12 │21       │22 │
+      ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴──┐     ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘
+      │30   │     │40   │50     │60   │     │00        │10   │             │20   │
+      └─────┘     └─────┴───────┴─────┘     └──────────┴─────┘             └─────┘
+                                                                     ┌────────────┐
+                                                        2.75u RShift │21          │
+                                                                     └────────────┘
+                        ┌─────────┬───┐
+                        │50       │60 │ 2.25u-1u Left Space
+                        └─────────┴───┘
+```
diff --git a/keyboards/kapcave/arya/rules.mk b/keyboards/kapcave/arya/rules.mk
index bfdeb0e3ec94..73bb6b769ba0 100644
--- a/keyboards/kapcave/arya/rules.mk
+++ b/keyboards/kapcave/arya/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c b/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c
index 105fd75a926c..9b17187d05c7 100755
--- a/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c
+++ b/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c
@@ -35,48 +35,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, RGB_TOG)
 
 };
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-	if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-		
-	} else {
-		
-	}
-
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-		
-	} else {
-		
-	}
-
-	if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-		
-	} else {
-		
-	}
-
-	if (usb_led & (1 << USB_LED_COMPOSE)) {
-		
-	} else {
-		
-	}
-
-	if (usb_led & (1 << USB_LED_KANA)) {
-		
-	} else {
-		
-	}
-
-}
-
diff --git a/keyboards/kapcave/paladinpad/rev1/config.h b/keyboards/kapcave/paladinpad/rev1/config.h
deleted file mode 100644
index 386e4b0a0c34..000000000000
--- a/keyboards/kapcave/paladinpad/rev1/config.h
+++ /dev/null
@@ -1,32 +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/>.
-*/
-#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 RGBLED_NUM 8
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/kapcave/paladinpad/rev1/info.json b/keyboards/kapcave/paladinpad/rev1/info.json
index 0fec9260a900..994d66417baf 100644
--- a/keyboards/kapcave/paladinpad/rev1/info.json
+++ b/keyboards/kapcave/paladinpad/rev1/info.json
@@ -2,6 +2,23 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "brightness_steps": 12,
+        "led_count": 8,
+        "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": "D0"
     },
diff --git a/keyboards/kapcave/paladinpad/rev2/config.h b/keyboards/kapcave/paladinpad/rev2/config.h
index 239a873384e6..c985581ecf14 100644
--- a/keyboards/kapcave/paladinpad/rev2/config.h
+++ b/keyboards/kapcave/paladinpad/rev2/config.h
@@ -17,18 +17,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define AUDIO_PIN C6
-
-#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 7
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/kapcave/paladinpad/rev2/info.json b/keyboards/kapcave/paladinpad/rev2/info.json
index 699cdde82d00..554845840a9d 100644
--- a/keyboards/kapcave/paladinpad/rev2/info.json
+++ b/keyboards/kapcave/paladinpad/rev2/info.json
@@ -2,6 +2,23 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "brightness_steps": 12,
+        "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": "D0"
     },
diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h
index 8dc6718d1a03..c5c9ada22baa 100644
--- a/keyboards/kapl/rev1/config.h
+++ b/keyboards/kapl/rev1/config.h
@@ -5,32 +5,12 @@
 /* Select hand configuration */
 #define MASTER_LEFT
 
-#define RGBLED_NUM 88
-#define RGBLED_SPLIT { 44, 44 }
-#define RGBLIGHT_SPLIT
-
 #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.
 #define SPLIT_TRANSPORT_MIRROR
 
-#ifdef RGBLIGHT_ENABLE
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 16
-#define RGBLIGHT_VAL_STEP 16
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_TWINKLE
-#endif
-
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_HUE_STEP 8
-#define RGB_MATRIX_SAT_STEP 16
-#define RGB_MATRIX_VAL_STEP 16
-#define RGB_MATRIX_SPD_STEP 10
 // EFFECTS
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json
index ad310fa87cef..5ef44ccaaa30 100644
--- a/keyboards/kapl/rev1/info.json
+++ b/keyboards/kapl/rev1/info.json
@@ -12,10 +12,23 @@
     "pin": "D4"
   },
   "rgb_matrix": {
-    "driver": "WS2812"
+    "driver": "ws2812",
+    "speed_steps": 10
   },
   "rgblight": {
-    "max_brightness": 120
+    "saturation_steps": 16,
+    "brightness_steps": 16,
+    "led_count": 88,
+    "max_brightness": 120,
+    "split_count": [44, 44],
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "christmas": true,
+      "static_gradient": true,
+      "twinkle": true
+    }
   },
   "matrix_pins": {
     "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
diff --git a/keyboards/kb_elmo/isolation/config.h b/keyboards/kb_elmo/isolation/config.h
deleted file mode 100644
index 37a293fb199f..000000000000
--- a/keyboards/kb_elmo/isolation/config.h
+++ /dev/null
@@ -1,34 +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
-
-/* RGB backlight */
-#    define RGBLED_NUM 3
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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_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/kb_elmo/isolation/info.json b/keyboards/kb_elmo/isolation/info.json
index 817a8db4128d..c381c62f7028 100644
--- a/keyboards/kb_elmo/isolation/info.json
+++ b/keyboards/kb_elmo/isolation/info.json
@@ -8,6 +8,23 @@
         "pid": "0x4EE6",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 3,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
         "pin": "B2"
     },
diff --git a/keyboards/kb_elmo/noah_avr/config.h b/keyboards/kb_elmo/noah_avr/config.h
index 08501c982b8e..5c6669f675b1 100644
--- a/keyboards/kb_elmo/noah_avr/config.h
+++ b/keyboards/kb_elmo/noah_avr/config.h
@@ -17,17 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB */
-#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 7
-#define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_BGR // RGB on the Noah is different order
diff --git a/keyboards/kb_elmo/noah_avr/info.json b/keyboards/kb_elmo/noah_avr/info.json
index 8db5edb6b6d6..edc75f2b1f1e 100644
--- a/keyboards/kb_elmo/noah_avr/info.json
+++ b/keyboards/kb_elmo/noah_avr/info.json
@@ -8,6 +8,22 @@
         "pid": "0x1DB0",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 7,
+        "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": "B5"
     },
diff --git a/keyboards/kbdcraft/adam64/info.json b/keyboards/kbdcraft/adam64/info.json
index cc33c26cc168..be24ef4c1914 100644
--- a/keyboards/kbdcraft/adam64/info.json
+++ b/keyboards/kbdcraft/adam64/info.json
@@ -25,7 +25,7 @@
         "rgb_matrix": true
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741",
+        "driver": "is31fl3741",
         "max_brightness": 150,
         "animations": {
             "alphas_mods": true,
diff --git a/keyboards/kbdcraft/adam64/rules.mk b/keyboards/kbdcraft/adam64/rules.mk
index 094c6b058e88..8b137891791f 100644
--- a/keyboards/kbdcraft/adam64/rules.mk
+++ b/keyboards/kbdcraft/adam64/rules.mk
@@ -1,2 +1 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE 
+
diff --git a/keyboards/kbdfans/baguette66/rgb/config.h b/keyboards/kbdfans/baguette66/rgb/config.h
index ee3574ac9cdd..c989f1b12141 100644
--- a/keyboards/kbdfans/baguette66/rgb/config.h
+++ b/keyboards/kbdfans/baguette66/rgb/config.h
@@ -19,18 +19,7 @@
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
 
-#define RGBLED_NUM 66
-#define RGB_MATRIX_LED_COUNT 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 RGB_MATRIX_LED_COUNT 66
 #define RGB_MATRIX_KEYPRESSES
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
@@ -62,7 +51,3 @@
 #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 RGB_MATRIX_HUE_STEP 8
-#define RGB_MATRIX_SAT_STEP 8
-#define RGB_MATRIX_VAL_STEP 8
-#define RGB_MATRIX_SPD_STEP 10
diff --git a/keyboards/kbdfans/baguette66/rgb/info.json b/keyboards/kbdfans/baguette66/rgb/info.json
index 5f8faf89ae04..c5ed4717a52c 100644
--- a/keyboards/kbdfans/baguette66/rgb/info.json
+++ b/keyboards/kbdfans/baguette66/rgb/info.json
@@ -7,11 +7,29 @@
         "pid": "0x0106",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 66,
+        "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": "E6"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812",
+        "sat_steps": 8,
+        "val_steps": 8,
+        "speed_steps": 10
     },
     "matrix_pins": {
         "cols": ["C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6"],
diff --git a/keyboards/kbdfans/bella/rgb/info.json b/keyboards/kbdfans/bella/rgb/info.json
index ba3962868887..b3b4e385f193 100644
--- a/keyboards/kbdfans/bella/rgb/info.json
+++ b/keyboards/kbdfans/bella/rgb/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "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/info.json b/keyboards/kbdfans/bella/rgb_iso/info.json
index ffdf11155a56..d407cb0f7b9d 100644
--- a/keyboards/kbdfans/bella/rgb_iso/info.json
+++ b/keyboards/kbdfans/bella/rgb_iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
diff --git a/keyboards/kbdfans/boop65/rgb/info.json b/keyboards/kbdfans/boop65/rgb/info.json
index 8f9028305ed8..cc780177dc1e 100644
--- a/keyboards/kbdfans/boop65/rgb/info.json
+++ b/keyboards/kbdfans/boop65/rgb/info.json
@@ -9,7 +9,7 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "IS31FL3741"
+    "driver": "is31fl3741"
   },
  "matrix_pins": {
     "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
diff --git a/keyboards/kbdfans/bounce/75/hotswap/config.h b/keyboards/kbdfans/bounce/75/hotswap/config.h
index 29f510620b6c..79f79fdf505c 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/config.h
+++ b/keyboards/kbdfans/bounce/75/hotswap/config.h
@@ -16,22 +16,7 @@
 
 #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_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD +8 ) 
 #define RGBLIGHT_DEFAULT_SPD 15
-#define RGBLED_NUM 4
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
-#define RGBLIGHT_SLEEP
 
 #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 444a5addaead..ee6f380e4e06 100644
--- a/keyboards/kbdfans/bounce/75/hotswap/info.json
+++ b/keyboards/kbdfans/bounce/75/hotswap/info.json
@@ -16,6 +16,25 @@
         "caps_lock": "C6",
         "on_state": 0
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "saturation_steps": 10,
+        "brightness_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": "F0"
     },
diff --git a/keyboards/kbdfans/bounce/75/soldered/config.h b/keyboards/kbdfans/bounce/75/soldered/config.h
index 29f510620b6c..79f79fdf505c 100644
--- a/keyboards/kbdfans/bounce/75/soldered/config.h
+++ b/keyboards/kbdfans/bounce/75/soldered/config.h
@@ -16,22 +16,7 @@
 
 #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_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD +8 ) 
 #define RGBLIGHT_DEFAULT_SPD 15
-#define RGBLED_NUM 4
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
-#define RGBLIGHT_SLEEP
 
 #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 9dbb3712ceb1..8dd809d5c833 100644
--- a/keyboards/kbdfans/bounce/75/soldered/info.json
+++ b/keyboards/kbdfans/bounce/75/soldered/info.json
@@ -17,6 +17,25 @@
         "caps_lock": "C6",
         "on_state": 0
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "saturation_steps": 10,
+        "brightness_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"
     },
diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h
index b18438ab4e6a..99c25201ad62 100644
--- a/keyboards/kbdfans/kbd19x/config.h
+++ b/keyboards/kbdfans/kbd19x/config.h
@@ -17,22 +17,6 @@ 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 RGBLED_NUM 18
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-
 /* 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/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json
index 3fb10600eeec..c37e3587e252 100644
--- a/keyboards/kbdfans/kbd19x/info.json
+++ b/keyboards/kbdfans/kbd19x/info.json
@@ -22,6 +22,24 @@
         "scroll_lock": "B1",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "E2"
     },
diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h
index d08ecf7f9835..e347de775998 100644
--- a/keyboards/kbdfans/kbd4x/config.h
+++ b/keyboards/kbdfans/kbd4x/config.h
@@ -17,22 +17,6 @@ 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 RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-
 /* 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/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json
index 21d1428f0d72..44c9daceb74b 100644
--- a/keyboards/kbdfans/kbd4x/info.json
+++ b/keyboards/kbdfans/kbd4x/info.json
@@ -17,6 +17,24 @@
         "pin": "B6",
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "E2"
     },
diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h
index dfbc40e0a03a..b5b661bef2ab 100644
--- a/keyboards/kbdfans/kbd67/hotswap/config.h
+++ b/keyboards/kbdfans/kbd67/hotswap/config.h
@@ -17,24 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 8
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  // #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations 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_SLEEP
-
 /* 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/kbdfans/kbd67/hotswap/info.json b/keyboards/kbdfans/kbd67/hotswap/info.json
index edbbf6638ea9..32ac10767d0c 100644
--- a/keyboards/kbdfans/kbd67/hotswap/info.json
+++ b/keyboards/kbdfans/kbd67/hotswap/info.json
@@ -17,6 +17,24 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "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": "B4"
     },
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
index cd4a32ff41c6..33245acc51d5 100644
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
@@ -163,14 +163,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 void eeconfig_init_user(void) {
   set_unicode_input_mode(UNICODE_MODE_MACOS);
 }
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/info.json b/keyboards/kbdfans/kbd67/mkiirgb/info.json
index 023c6ff5dba1..683503b4ee9b 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/info.json
@@ -5,5 +5,8 @@
   "usb": {
     "vid": "0x4B42"
   },
-  "community_layouts": ["65_ansi_blocker"]
+  "community_layouts": ["65_ansi_blocker"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_65_ansi_blocker"
+  }
 }
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
index 733d68cc595e..7b6795f07f6d 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json
@@ -5,7 +5,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "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/v2/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
index 441c54391399..e0fe90b6f3f8 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
@@ -5,7 +5,7 @@
         "device_version": "0.0.2"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "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/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
index 378ffa784558..165db9629369 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
@@ -5,7 +5,7 @@
         "device_version": "0.0.3"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "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/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
index 8b79d929d662..10f0bc0ec2d7 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
@@ -18,18 +18,7 @@
 
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 
-#define RGBLED_NUM 68
-#define RGB_MATRIX_LED_COUNT 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 RGB_MATRIX_LED_COUNT 68
 
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_KEYPRESSES           // reacts to keypresses
@@ -37,10 +26,6 @@
 #    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 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
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
index f7d5ab552f0a..a1ec2a18334d 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json
@@ -4,11 +4,29 @@
         "pid": "0x1227",
         "device_version": "0.0.4"
     },
+    "rgblight": {
+        "led_count": 68,
+        "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": "C7"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812",
+        "sat_steps": 8,
+        "val_steps": 8,
+        "speed_steps": 10
     },
     "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 ede122f3f21a..10f0bc0ec2d7 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
@@ -26,10 +26,6 @@
 #    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 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
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
index 4c7d09aa8e4c..cb8912f9a469 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
@@ -12,7 +12,10 @@
         "pin": "C7"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812",
+        "sat_steps": 8,
+        "val_steps": 8,
+        "speed_steps": 10
     },
     "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/config.h b/keyboards/kbdfans/kbd67/rev1/config.h
index 20e3b8f0dfba..d876570c808e 100644
--- a/keyboards/kbdfans/kbd67/rev1/config.h
+++ b/keyboards/kbdfans/kbd67/rev1/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 20
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  // #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-  #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
-
 /* 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/kbdfans/kbd67/rev1/info.json b/keyboards/kbdfans/kbd67/rev1/info.json
index e34cbb87e2e3..911947758451 100644
--- a/keyboards/kbdfans/kbd67/rev1/info.json
+++ b/keyboards/kbdfans/kbd67/rev1/info.json
@@ -25,7 +25,23 @@
     "pin": "E2"
   },
   "rgblight": {
-    "max_brightness": 180
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 20,
+    "max_brightness": 180,
+    "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
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c
index 5c307a31b126..228f64831977 100644
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c
@@ -85,15 +85,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
   return true;
 }
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h
deleted file mode 100644
index 1aa30c01cd80..000000000000
--- a/keyboards/kbdfans/kbd67/rev2/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2019 Vorror
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have 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 RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/kbdfans/kbd67/rev2/info.json b/keyboards/kbdfans/kbd67/rev2/info.json
index bf83ad4af3b6..7bd48689be7a 100644
--- a/keyboards/kbdfans/kbd67/rev2/info.json
+++ b/keyboards/kbdfans/kbd67/rev2/info.json
@@ -24,7 +24,23 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 240
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "max_brightness": 240,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
index 682f15c4455e..88fe681f1426 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c
@@ -69,22 +69,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,       _______,        _______,         _______,          _______, _______, XXXXXXX, _______, _______, _______),
     };
 
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-
-void matrix_init_user(void) {
-    
-}
-
-void matrix_scan_user(void) {
-    
-}
-
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+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/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h
index d29b1e494aad..d876570c808e 100644
--- a/keyboards/kbdfans/kbd6x/config.h
+++ b/keyboards/kbdfans/kbd6x/config.h
@@ -17,22 +17,6 @@ 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 RGBLED_NUM 14
-#define RGBLIGHT_HUE_STEP 12
-#define RGBLIGHT_SAT_STEP 12
-#define RGBLIGHT_VAL_STEP 12
-#define RGBLIGHT_SLEEP
-
 /* 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/kbdfans/kbd6x/info.json b/keyboards/kbdfans/kbd6x/info.json
index 782da6bc64ce..654c01c0eca7 100644
--- a/keyboards/kbdfans/kbd6x/info.json
+++ b/keyboards/kbdfans/kbd6x/info.json
@@ -17,6 +17,25 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 12,
+        "brightness_steps": 12,
+        "led_count": 14,
+        "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": "F0"
     },
diff --git a/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
index 8f2305ed4c7e..a8a369a6110c 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
@@ -43,8 +43,8 @@ static void check_light_layer(layer_state_t state) {
     last_checked_layer = true;
 }
 
-static void check_light_led(uint8_t leds) {
-    if (IS_LED_ON(leds, USB_LED_CAPS_LOCK)) {
+static void check_light_led(led_t led_state) {
+    if (led_state.caps_lock) {
         caps_light();
     } else if (IS_LAYER_ON(L_FN)) {
         fn_light();
@@ -57,7 +57,7 @@ static void check_light_led(uint8_t leds) {
 static void inline check_light(void) {
     last_checked_layer
         ? check_light_layer(layer_state)
-        : check_light_led(host_keyboard_leds());
+        : check_light_led(host_keyboard_led_state());
 }
 
 void eeconfig_init_keymap(void) {
diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h
index 38d9bacad964..805f9ad0542b 100644
--- a/keyboards/kbdfans/kbd75/config.h
+++ b/keyboards/kbdfans/kbd75/config.h
@@ -8,20 +8,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-/* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
index 88272e3c7216..c7f05a4e9437 100644
--- a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c
@@ -79,11 +79,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void led_set_user(uint8_t usb_led) {
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+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/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json
index ab56fc90d1ad..d9d149f1e1ac 100644
--- a/keyboards/kbdfans/kbd75/rev1/info.json
+++ b/keyboards/kbdfans/kbd75/rev1/info.json
@@ -21,6 +21,24 @@
         "caps_lock": "B2",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "E2"
     },
diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json
index 11eb19b72995..7cf43b93a767 100644
--- a/keyboards/kbdfans/kbd75/rev2/info.json
+++ b/keyboards/kbdfans/kbd75/rev2/info.json
@@ -21,6 +21,24 @@
         "caps_lock": "B2",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "E2"
     },
diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h
index 4bc0c6dcff9e..6a5b35b5b65c 100644
--- a/keyboards/kbdfans/kbd75hs/config.h
+++ b/keyboards/kbdfans/kbd75hs/config.h
@@ -16,22 +16,7 @@
 
 #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_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) 
 #define RGBLIGHT_DEFAULT_SPD 15
-#define RGBLED_NUM 18
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
-#define RGBLIGHT_SLEEP
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/kbd75hs/info.json b/keyboards/kbdfans/kbd75hs/info.json
index fef9c5a8c29b..fc2310993cea 100644
--- a/keyboards/kbdfans/kbd75hs/info.json
+++ b/keyboards/kbdfans/kbd75hs/info.json
@@ -16,6 +16,25 @@
     "indicators": {
         "caps_lock": "C6"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "saturation_steps": 10,
+        "brightness_steps": 10,
+        "led_count": 18,
+        "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": "F0"
     },
diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h
index 6d1273875d7f..a8b20051ecfc 100644
--- a/keyboards/kbdfans/kbd75rgb/config.h
+++ b/keyboards/kbdfans/kbd75rgb/config.h
@@ -19,18 +19,7 @@
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
 
-#define RGBLED_NUM 84
-#define RGB_MATRIX_LED_COUNT 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 RGB_MATRIX_LED_COUNT 84
 #define RGB_MATRIX_KEYPRESSES
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
@@ -62,7 +51,3 @@
 #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 RGB_MATRIX_HUE_STEP 8
-#define RGB_MATRIX_SAT_STEP 8
-#define RGB_MATRIX_VAL_STEP 8
-#define RGB_MATRIX_SPD_STEP 10
diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json
index 231f13f4122e..f50196534836 100644
--- a/keyboards/kbdfans/kbd75rgb/info.json
+++ b/keyboards/kbdfans/kbd75rgb/info.json
@@ -8,11 +8,29 @@
         "pid": "0x6063",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 84,
+        "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": "C7"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812",
+        "sat_steps": 8,
+        "val_steps": 8,
+        "speed_steps": 10
     },
     "matrix_pins": {
         "cols": ["F7", "F6", "F5", "F4", "E6", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"],
diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h
index 655b83f0e30b..32ab8df83753 100644
--- a/keyboards/kbdfans/kbd8x/config.h
+++ b/keyboards/kbdfans/kbd8x/config.h
@@ -17,22 +17,6 @@ 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 RGBLED_NUM 20
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-
 /* 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/kbdfans/kbd8x/info.json b/keyboards/kbdfans/kbd8x/info.json
index eeda61ac3562..4dc48901ddd7 100644
--- a/keyboards/kbdfans/kbd8x/info.json
+++ b/keyboards/kbdfans/kbd8x/info.json
@@ -22,6 +22,24 @@
     "num_lock": "B1",
     "scroll_lock": "B2"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 20,
+    "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": "E2"
   },
diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h
index 74fad03a87b7..50001e978cc4 100644
--- a/keyboards/kbdfans/kbd8x_mk2/config.h
+++ b/keyboards/kbdfans/kbd8x_mk2/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 20
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/kbdfans/kbd8x_mk2/info.json b/keyboards/kbdfans/kbd8x_mk2/info.json
index 5c15e9e2d52d..e6e2e5c168fc 100644
--- a/keyboards/kbdfans/kbd8x_mk2/info.json
+++ b/keyboards/kbdfans/kbd8x_mk2/info.json
@@ -21,7 +21,23 @@
         "pin": "B3"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "max_brightness": 200,
+        "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
+        }
     },
     "indicators": {
         "caps_lock": "E6",
diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/keymap.c
index 8049c4ef5c6e..2e91933f442a 100644
--- a/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/keymap.c
+++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/keymap.c
@@ -35,19 +35,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) {
-  return true;
-}
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/kbdfans/kbdmini/info.json b/keyboards/kbdfans/kbdmini/info.json
index 533f52f01229..99aa4a4113cb 100644
--- a/keyboards/kbdfans/kbdmini/info.json
+++ b/keyboards/kbdfans/kbdmini/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["B3", "B2", "B1", "B0", "F1", "F0", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
diff --git a/keyboards/kbdfans/kbdpad/mk1/config.h b/keyboards/kbdfans/kbdpad/mk1/config.h
deleted file mode 100644
index a3a9a993df27..000000000000
--- a/keyboards/kbdfans/kbdpad/mk1/config.h
+++ /dev/null
@@ -1,30 +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
-
-#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
diff --git a/keyboards/kbdfans/kbdpad/mk1/info.json b/keyboards/kbdfans/kbdpad/mk1/info.json
index 3527370e4c03..fbb5649a8f71 100644
--- a/keyboards/kbdfans/kbdpad/mk1/info.json
+++ b/keyboards/kbdfans/kbdpad/mk1/info.json
@@ -17,6 +17,21 @@
         "pin": "D4",
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 6,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h
index 9457b2076679..50001e978cc4 100644
--- a/keyboards/kbdfans/kbdpad/mk2/config.h
+++ b/keyboards/kbdfans/kbdpad/mk2/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 16
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json
index dc47064feed5..8c773f43e1c3 100644
--- a/keyboards/kbdfans/kbdpad/mk2/info.json
+++ b/keyboards/kbdfans/kbdpad/mk2/info.json
@@ -18,6 +18,24 @@
         "levels": 5,
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "B5"
     },
diff --git a/keyboards/kbdfans/kbdpad/mk3/info.json b/keyboards/kbdfans/kbdpad/mk3/info.json
index 01837a1d8211..8ba02f8fa188 100644
--- a/keyboards/kbdfans/kbdpad/mk3/info.json
+++ b/keyboards/kbdfans/kbdpad/mk3/info.json
@@ -23,7 +23,7 @@
     },
     "processor": "atmega32u4",
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
             {"flags": 4, "matrix": [0, 1], "x": 75, "y": 0},
diff --git a/keyboards/kbdfans/maja/info.json b/keyboards/kbdfans/maja/info.json
index 68dc1d16e6a5..8ee6118452fa 100644
--- a/keyboards/kbdfans/maja/info.json
+++ b/keyboards/kbdfans/maja/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "matrix_pins": {
         "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
diff --git a/keyboards/kbdfans/niu_mini/config.h b/keyboards/kbdfans/niu_mini/config.h
index fb154031a058..69c6b57a35bc 100644
--- a/keyboards/kbdfans/niu_mini/config.h
+++ b/keyboards/kbdfans/niu_mini/config.h
@@ -23,21 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 14
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kbdfans/niu_mini/info.json b/keyboards/kbdfans/niu_mini/info.json
index 4ba2f3851633..32ecfd33c649 100644
--- a/keyboards/kbdfans/niu_mini/info.json
+++ b/keyboards/kbdfans/niu_mini/info.json
@@ -17,6 +17,23 @@
         "pin": "B6",
         "levels": 4
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "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": "E2"
     },
diff --git a/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c
index 523b6cf1a08c..7f6f89589bde 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c
@@ -56,48 +56,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
     )
 };
-
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-    if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-
-    } else {
-
-    }
-
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-
-    } else {
-
-    }
-
-    if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-
-    } else {
-
-    }
-
-    if (IS_LED_ON(usb_led, USB_LED_COMPOSE)) {
-
-    } else {
-
-    }
-
-    if (IS_LED_ON(usb_led, USB_LED_KANA)) {
-
-    } else {
-
-    }
-
-}
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
index 0631ceb185d7..8c7d3b8e0e0d 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
@@ -377,37 +377,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
  */
 
 
-void led_set_user(uint8_t usb_led) {
-
-    if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-        bnumlock = true;
-
-    } else {
-        bnumlock = false;
-    }
-
-    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-
-    } else {
-
-    }
-
-    if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-
-    } else {
-
-    }
-
-    if (usb_led & (1 << USB_LED_COMPOSE)) {
-
-    } else {
-
-    }
-
-    if (usb_led & (1 << USB_LED_KANA)) {
-
-    } else {
-
-    }
-
+bool led_update_user(led_t led_state) {
+  bnumlock = led_state.num_lock;
+  return false;
 }
diff --git a/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
index b4f75a9d1e2e..e4f2eb44cfdc 100644
--- a/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
+++ b/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
@@ -112,22 +112,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
-
-void matrix_init_user(void) {
-    
-}
-
-void matrix_scan_user(void) {
-    
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     if (!process_record_dynamic_macro(keycode, record)) {
         return false;
     }
     return true;
 }
-
-void led_set_user(uint8_t usb_led) {
-    
-}
diff --git a/keyboards/kbdfans/odin/rgb/config.h b/keyboards/kbdfans/odin/rgb/config.h
index 54794e66be19..9cc883891ada 100644
--- a/keyboards/kbdfans/odin/rgb/config.h
+++ b/keyboards/kbdfans/odin/rgb/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#define RGBLED_NUM 104
 #define RGB_MATRIX_LED_COUNT 104
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/kbdfans/odin/rgb/info.json b/keyboards/kbdfans/odin/rgb/info.json
index 46d9756ae932..308e9870cc40 100644
--- a/keyboards/kbdfans/odin/rgb/info.json
+++ b/keyboards/kbdfans/odin/rgb/info.json
@@ -12,7 +12,7 @@
         "pin": "B15"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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/rgb/rules.mk b/keyboards/kbdfans/odin/rgb/rules.mk
index b7807ae4185d..c49a369dd025 100644
--- a/keyboards/kbdfans/odin/rgb/rules.mk
+++ b/keyboards/kbdfans/odin/rgb/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h
index b55a5586284c..3586d1d96a4d 100644
--- a/keyboards/kbdfans/odin/soldered/config.h
+++ b/keyboards/kbdfans/odin/soldered/config.h
@@ -16,21 +16,6 @@
 
 #pragma once
 
-#define RGBLED_NUM 4
-#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_EFFECT_RAINBOW_MOOD + 8)
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/odin/soldered/info.json b/keyboards/kbdfans/odin/soldered/info.json
index acbdc574bfdd..9eaa340a4b32 100644
--- a/keyboards/kbdfans/odin/soldered/info.json
+++ b/keyboards/kbdfans/odin/soldered/info.json
@@ -22,7 +22,23 @@
         "pin": "B15"
     },
     "rgblight": {
-        "max_brightness": 180
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 4,
+        "max_brightness": 180,
+        "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
+        }
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/kbdfans/odin/soldered/rules.mk b/keyboards/kbdfans/odin/soldered/rules.mk
index 9e42693cb694..c3b8e77d77a9 100644
--- a/keyboards/kbdfans/odin/soldered/rules.mk
+++ b/keyboards/kbdfans/odin/soldered/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/kbdfans/odin/v2/config.h b/keyboards/kbdfans/odin/v2/config.h
index a753f00c6ad7..e47ec47523b6 100644
--- a/keyboards/kbdfans/odin/v2/config.h
+++ b/keyboards/kbdfans/odin/v2/config.h
@@ -16,17 +16,4 @@
 
 #pragma once
 
-    #define RGBLED_NUM 4
-    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-    #define RGBLIGHT_EFFECT_CHRISTMAS
-    #define RGBLIGHT_EFFECT_SNAKE
-    #define RGBLIGHT_EFFECT_BREATHING
-
     #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP
diff --git a/keyboards/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/info.json
index 59d2dde7ac39..7714d2407f2a 100644
--- a/keyboards/kbdfans/odin/v2/info.json
+++ b/keyboards/kbdfans/odin/v2/info.json
@@ -22,7 +22,19 @@
         "pin": "B15"
     },
     "rgblight": {
-        "max_brightness": 180
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 4,
+        "max_brightness": 180,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "christmas": true,
+            "static_gradient": true
+        }
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/kbdfans/odin/v2/rules.mk b/keyboards/kbdfans/odin/v2/rules.mk
index 0f15f10b2081..0098dc473ac4 100644
--- a/keyboards/kbdfans/odin/v2/rules.mk
+++ b/keyboards/kbdfans/odin/v2/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/kbdfans/odinmini/info.json b/keyboards/kbdfans/odinmini/info.json
index ea82309e85a4..19a854c4ce4c 100644
--- a/keyboards/kbdfans/odinmini/info.json
+++ b/keyboards/kbdfans/odinmini/info.json
@@ -54,6 +54,95 @@
         "vid": "0x4B42"
     },
     "layouts": {
+        "LAYOUT_all": {
+            "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": "Backspace", "matrix": [2, 13], "x": 13, "y": 0},
+                {"label": "Del", "matrix": [2, 17], "x": 14, "y": 0},
+                {"label": "Insert", "matrix": [0, 13], "x": 15.25, "y": 0},
+                {"label": "Num Lock", "matrix": [0, 14], "x": 16.5, "y": 0},
+                {"label": "/", "matrix": [0, 15], "x": 17.5, "y": 0},
+                {"label": "*", "matrix": [0, 16], "x": 18.5, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 19.5, "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": [3, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Delete", "matrix": [1, 13], "x": 15.25, "y": 1},
+                {"label": "7", "matrix": [1, 14], "x": 16.5, "y": 1},
+                {"label": "8", "matrix": [1, 15], "x": 17.5, "y": 1},
+                {"label": "9", "matrix": [1, 16], "x": 18.5, "y": 1},
+                {"h": 2, "label": "+", "matrix": [1, 17], "x": 19.5, "y": 1},
+                {"label": "Caps Lock", "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, 12], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "4", "matrix": [2, 14], "x": 16.5, "y": 2},
+                {"label": "5", "matrix": [2, 15], "x": 17.5, "y": 2},
+                {"label": "6", "matrix": [2, 16], "x": 18.5, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
+                {"matrix": [4, 3], "w": 2.25, "x": 1.25, "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": "Shift", "matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": "Fn", "matrix": [4, 4], "x": 14, "y": 3},
+                {"label": "1", "matrix": [3, 12], "x": 16.5, "y": 3},
+                {"label": "2", "matrix": [3, 14], "x": 17.5, "y": 3},
+                {"label": "3", "matrix": [3, 15], "x": 18.5, "y": 3},
+                {"h": 2, "label": "Enter", "matrix": [3, 16], "x": 19.5, "y": 3},
+                {"label": "\u2191", "matrix": [3, 17], "x": 15.25, "y": 3.25},
+                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+                {"label": "k45", "matrix": [4, 5], "w": 7, "x": 3.75, "y": 4},
+                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 10.75, "y": 4},
+                {"label": "Menu", "matrix": [4, 9], "w": 1.5, "x": 12.25, "y": 4},
+                {"label": "0", "matrix": [4, 10], "x": 17.5, "y": 4},
+                {"label": ".", "matrix": [4, 11], "x": 18.5, "y": 4},
+                {"label": "\u2190", "matrix": [4, 12], "x": 14.25, "y": 4.25},
+                {"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4.25},
+                {"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4.25}
+            ]
+        },
         "LAYOUT": {
             "layout": [
                 {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/kbdfans/phaseone/config.h b/keyboards/kbdfans/phaseone/config.h
index a8e7f41e17e9..2dba9f5d3578 100644
--- a/keyboards/kbdfans/phaseone/config.h
+++ b/keyboards/kbdfans/phaseone/config.h
@@ -20,22 +20,8 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) 
 #define RGBLIGHT_DEFAULT_SPD 15
-#define RGBLED_NUM 4
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
-#define RGBLIGHT_SLEEP
 
 #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 0b4bf2e19f66..14150a1cdd19 100644
--- a/keyboards/kbdfans/phaseone/info.json
+++ b/keyboards/kbdfans/phaseone/info.json
@@ -18,6 +18,25 @@
         "num_lock": "D7",
         "on_state": 0
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "saturation_steps": 10,
+        "brightness_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": "B6"
     },
diff --git a/keyboards/kbnordic/nordic60/rev_a/config.h b/keyboards/kbnordic/nordic60/rev_a/config.h
deleted file mode 100644
index 5298868bcf1c..000000000000
--- a/keyboards/kbnordic/nordic60/rev_a/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2021 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/>.
-*/
-#pragma once
-
-#define RGBLED_NUM 16
-
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/kbnordic/nordic60/rev_a/info.json b/keyboards/kbnordic/nordic60/rev_a/info.json
index 126de687b8bf..1d6b6eae8615 100644
--- a/keyboards/kbnordic/nordic60/rev_a/info.json
+++ b/keyboards/kbnordic/nordic60/rev_a/info.json
@@ -8,6 +8,23 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "D3"
     },
diff --git a/keyboards/kc60/config.h b/keyboards/kc60/config.h
index 5f542b7ade47..b9449c4714bf 100644
--- a/keyboards/kc60/config.h
+++ b/keyboards/kc60/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 16
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/kc60/info.json b/keyboards/kc60/info.json
index ca8580ad1a90..ea0e7998b819 100644
--- a/keyboards/kc60/info.json
+++ b/keyboards/kc60/info.json
@@ -18,6 +18,24 @@
         "levels": 5,
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "F5"
     },
diff --git a/keyboards/kc60se/info.json b/keyboards/kc60se/info.json
index afca6764460d..ff9fa3516519 100644
--- a/keyboards/kc60se/info.json
+++ b/keyboards/kc60se/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "F5",
         "levels": 6
     },
diff --git a/keyboards/keebformom/config.h b/keyboards/keebformom/config.h
deleted file mode 100644
index 315e8e0bc6f2..000000000000
--- a/keyboards/keebformom/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2022 Sandipratama <https://github.com/nendezkombet>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGBLED_NUM 40
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/keebformom/info.json b/keyboards/keebformom/info.json
index afb2058f438e..8262b4bf4ee1 100644
--- a/keyboards/keebformom/info.json
+++ b/keyboards/keebformom/info.json
@@ -12,7 +12,16 @@
         "pin": "F4"
     },
     "rgblight": {
-        "max_brightness": 150
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 40,
+        "max_brightness": 150,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true
+        }
     },
     "matrix_pins": {
         "cols": ["B3", "B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h
index c8587e1efb7c..6fd93072f527 100644
--- a/keyboards/keebio/bamfk1/config.h
+++ b/keyboards/keebio/bamfk1/config.h
@@ -8,23 +8,6 @@
 #    define STARTUP_SONG SONG(STARTUP_SOUND)
 #endif
 
-#define ENCODERS_CW_KEY  { { 1, 1 }, { 3, 1 } }
-#define ENCODERS_CCW_KEY { { 0, 1 }, { 2, 1 } }
-
-#    define RGBLED_NUM 16
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json
index 77dcc1f7dd38..4fa563f0e888 100644
--- a/keyboards/keebio/bamfk1/info.json
+++ b/keyboards/keebio/bamfk1/info.json
@@ -8,6 +8,23 @@
         "pid": "0x1111",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "D3"
     },
@@ -21,21 +38,15 @@
     "bootloader": "atmel-dfu",
     "matrix_pins": {
         "direct": [
-            ["E6", "B6", "D6", null],
-            [null, null, null, null]
+            ["E6", "B6", "D6"]
         ]
     },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 1.5, "y": 0, "h": 2, "w": 2, "matrix": [0, 0]},
-                {"x": 0.5, "y": 2.25, "matrix": [0, 1]},
-                {"x": 3.5, "y": 2.25, "matrix": [0, 2]},
-
-                {"x": 0, "y": 3.5, "matrix": [1, 0]},
-                {"x": 1, "y": 3.5, "matrix": [1, 1]},
-                {"x": 3, "y": 3.5, "matrix": [1, 2]},
-                {"x": 4, "y": 3.5, "matrix": [1, 3]}
+                {"x": 1, "y": 0, "h": 2, "w": 2, "matrix": [0, 0]},
+                {"x": 0, "y": 2.25, "matrix": [0, 1]},
+                {"x": 3, "y": 2.25, "matrix": [0, 2]}
             ]
         }
     }
diff --git a/keyboards/keebio/bamfk1/keymaps/default/keymap.c b/keyboards/keebio/bamfk1/keymaps/default/keymap.c
index aa0780eafc1f..8ff3f794a583 100644
--- a/keyboards/keebio/bamfk1/keymaps/default/keymap.c
+++ b/keyboards/keebio/bamfk1/keymaps/default/keymap.c
@@ -13,27 +13,28 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_MAIN] = LAYOUT(
-        KC_A,               // Big Switch
-        MO(1),   KC_MUTE,   // Encoder presses
-        KC_DOWN, KC_UP,     // Left encoder turns
-        KC_VOLD, KC_VOLU     // Right encoder turns
+        RGB_MOD,            // Big Switch
+        TL_LOWR, KC_MUTE    // Encoder presses
     ),
     [_FN1] = LAYOUT(
         KC_B,               // Big Switch
-        _______, KC_C,      // Encoder presses
-        KC_PGDN, KC_PGUP,   // Left encoder turns
-        KC_VOLU, KC_VOLD    // Right encoder turns
+        _______, KC_C       // Encoder presses
     ),
     [_FN2] = LAYOUT(
         _______,            // Big Switch
-        _______, _______,   // Encoder presses
-        _______, _______,   // Left encoder turns
-        _______, _______    // Right encoder turns
+        _______, _______    // Encoder presses
     ),
     [_FN3] = LAYOUT(
         _______,            // Big Switch
-        _______, _______,   // Encoder presses
-        _______, _______,   // Left encoder turns
-        _______, _______    // Right encoder turns
+        _______, _______    // Encoder presses
     )
 };
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =   { ENCODER_CCW_CW(KC_DOWN, KC_UP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] =   { ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(_______, _______)  },
+    [2] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  },
+    [3] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  }
+};
+#endif
diff --git a/keyboards/keebio/bamfk1/keymaps/default/rules.mk b/keyboards/keebio/bamfk1/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/keebio/bamfk1/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keebio/bamfk1/keymaps/via/keymap.c b/keyboards/keebio/bamfk1/keymaps/via/keymap.c
index 80ada5d8aa32..8ff3f794a583 100644
--- a/keyboards/keebio/bamfk1/keymaps/via/keymap.c
+++ b/keyboards/keebio/bamfk1/keymaps/via/keymap.c
@@ -14,26 +14,27 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_MAIN] = LAYOUT(
         RGB_MOD,            // Big Switch
-        TL_LOWR, KC_MUTE,   // Encoder presses
-        KC_DOWN, KC_UP,     // Left encoder turns
-        KC_VOLD, KC_VOLU    // Right encoder turns
+        TL_LOWR, KC_MUTE    // Encoder presses
     ),
     [_FN1] = LAYOUT(
         KC_B,               // Big Switch
-        _______, KC_C,      // Encoder presses
-        KC_PGDN, KC_PGUP,   // Left encoder turns
-        KC_VOLU, KC_VOLD    // Right encoder turns
+        _______, KC_C       // Encoder presses
     ),
     [_FN2] = LAYOUT(
         _______,            // Big Switch
-        _______, _______,   // Encoder presses
-        _______, _______,   // Left encoder turns
-        _______, _______    // Right encoder turns
+        _______, _______    // Encoder presses
     ),
     [_FN3] = LAYOUT(
         _______,            // Big Switch
-        _______, _______,   // Encoder presses
-        _______, _______,   // Left encoder turns
-        _______, _______    // Right encoder turns
+        _______, _______    // Encoder presses
     )
 };
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =   { ENCODER_CCW_CW(KC_DOWN, KC_UP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [1] =   { ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(_______, _______)  },
+    [2] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  },
+    [3] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  }
+};
+#endif
diff --git a/keyboards/keebio/bamfk1/keymaps/via/rules.mk b/keyboards/keebio/bamfk1/keymaps/via/rules.mk
index 36b7ba9cbc98..1189f4ad1927 100644
--- a/keyboards/keebio/bamfk1/keymaps/via/rules.mk
+++ b/keyboards/keebio/bamfk1/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keebio/bamfk1/rules.mk b/keyboards/keebio/bamfk1/rules.mk
index 514d88831acd..21df40039e99 100644
--- a/keyboards/keebio/bamfk1/rules.mk
+++ b/keyboards/keebio/bamfk1/rules.mk
@@ -2,9 +2,9 @@
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
+MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
+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
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
-
-SRC += encoder_actions.c
diff --git a/keyboards/keebio/bamfk4/config.h b/keyboards/keebio/bamfk4/config.h
index a28636c8b660..aac4d9d9d6d8 100644
--- a/keyboards/keebio/bamfk4/config.h
+++ b/keyboards/keebio/bamfk4/config.h
@@ -3,22 +3,6 @@
 
 #pragma once
 
-#    define RGBLED_NUM 32
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== enabled 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
 #    define RGBLIGHT_DEFAULT_VAL 120
 #    define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 // RGB Matrix
@@ -62,7 +46,7 @@
 #        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
 #        define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#        define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#        define RGB_MATRIX_LED_COUNT 32
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
 #        define RGB_MATRIX_KEYPRESSES
 //#    endif
diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/info.json
index 40128e082044..8bb320c6c9e0 100644
--- a/keyboards/keebio/bamfk4/info.json
+++ b/keyboards/keebio/bamfk4/info.json
@@ -12,10 +12,26 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "rgblight": {
-        "max_brightness": 120
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 32,
+        "max_brightness": 120,
+        "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": ["E6", "D5", "B6", "B7"],
diff --git a/keyboards/keebio/bdn9/rev1/config.h b/keyboards/keebio/bdn9/rev1/config.h
index 64879bca490b..3ed1c2ed30f0 100644
--- a/keyboards/keebio/bdn9/rev1/config.h
+++ b/keyboards/keebio/bdn9/rev1/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 4
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/rev1/info.json b/keyboards/keebio/bdn9/rev1/info.json
index 4a346fd56471..0167052f6d74 100644
--- a/keyboards/keebio/bdn9/rev1/info.json
+++ b/keyboards/keebio/bdn9/rev1/info.json
@@ -15,6 +15,24 @@
         "pin": "B5",
         "levels": 7
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "D3"
     },
diff --git a/keyboards/keebio/bdn9/rev2/config.h b/keyboards/keebio/bdn9/rev2/config.h
index 70f785d37b32..1974d81f75f4 100644
--- a/keyboards/keebio/bdn9/rev2/config.h
+++ b/keyboards/keebio/bdn9/rev2/config.h
@@ -17,26 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
-#    define RGBLED_NUM 11
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
 // RGB Matrix
 #    ifdef RGB_MATRIX_ENABLE
-#        define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#        define RGB_MATRIX_LED_COUNT 11
 #        define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #        define RGB_MATRIX_KEYPRESSES
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/keebio/bdn9/rev2/info.json b/keyboards/keebio/bdn9/rev2/info.json
index 5a33976f835c..324a4000413b 100644
--- a/keyboards/keebio/bdn9/rev2/info.json
+++ b/keyboards/keebio/bdn9/rev2/info.json
@@ -4,11 +4,29 @@
         "pid": "0x2133",
         "device_version": "2.0.0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 11,
+        "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": "B15"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "encoder": {
         "rotary": [
@@ -17,6 +35,9 @@
             {"pin_a": "A10", "pin_b": "A9"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "matrix_pins": {
diff --git a/keyboards/keebio/bdn9/rev2/rules.mk b/keyboards/keebio/bdn9/rev2/rules.mk
index de8fd9fc26ba..e40776914716 100644
--- a/keyboards/keebio/bdn9/rev2/rules.mk
+++ b/keyboards/keebio/bdn9/rev2/rules.mk
@@ -13,5 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/keebio/bfo9000/config.h b/keyboards/keebio/bfo9000/config.h
index 48fd0aaf0cba..0b8941e77606 100644
--- a/keyboards/keebio/bfo9000/config.h
+++ b/keyboards/keebio/bfo9000/config.h
@@ -23,10 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGBLED_NUM 20    // Number of LEDs
-#define RGBLED_SPLIT { 10, 10 }
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/info.json
index 9900dbe951d5..5738ac695305 100644
--- a/keyboards/keebio/bfo9000/info.json
+++ b/keyboards/keebio/bfo9000/info.json
@@ -16,6 +16,10 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+      "led_count": 20,
+      "split_count": [10, 10]
+    },
     "ws2812": {
       "pin": "B4"
     },
diff --git a/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c b/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c
index 4af086df3a2e..637a7e044005 100644
--- a/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c
+++ b/keyboards/keebio/bfo9000/keymaps/abstractkb/keymap.c
@@ -56,12 +56,13 @@ layer_state_t layer_state_set_user(layer_state_t state) {
   return state;
 }
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+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) {
diff --git a/keyboards/keebio/cepstrum/rev1/config.h b/keyboards/keebio/cepstrum/rev1/config.h
index 91e31d2caa8e..3ca3bef3444b 100644
--- a/keyboards/keebio/cepstrum/rev1/config.h
+++ b/keyboards/keebio/cepstrum/rev1/config.h
@@ -56,7 +56,6 @@
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#define WS2812_DI_PIN GP18
 #define RGB_MATRIX_LED_COUNT 96
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/keebio/cepstrum/rev1/info.json b/keyboards/keebio/cepstrum/rev1/info.json
index 75cbd41bd3e6..b5bf188c92f1 100644
--- a/keyboards/keebio/cepstrum/rev1/info.json
+++ b/keyboards/keebio/cepstrum/rev1/info.json
@@ -120,8 +120,11 @@
             ]
         }
     },
+    "ws2812": {
+        "pin": "GP18"
+    },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "split_count": [48, 48],
         "layout": [
             {"flags":2, "x":46, "y":0},
diff --git a/keyboards/keebio/choconum/rules.mk b/keyboards/keebio/choconum/rules.mk
index f3805c2acc5f..67d4dee2c767 100644
--- a/keyboards/keebio/choconum/rules.mk
+++ b/keyboards/keebio/choconum/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/keebio/chocopad/rev2/info.json b/keyboards/keebio/chocopad/rev2/info.json
index cb29d0e83cb0..a615aac7ad24 100644
--- a/keyboards/keebio/chocopad/rev2/info.json
+++ b/keyboards/keebio/chocopad/rev2/info.json
@@ -21,7 +21,7 @@
       "driver": "vendor"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "animations": {
             "alphas_mods": true,
             "gradient_up_down": true,
diff --git a/keyboards/keebio/convolution/rev1/info.json b/keyboards/keebio/convolution/rev1/info.json
index 7a8b88e7dc02..5255f00ab9c6 100644
--- a/keyboards/keebio/convolution/rev1/info.json
+++ b/keyboards/keebio/convolution/rev1/info.json
@@ -29,7 +29,7 @@
         "driver": "vendor"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 2, "x": 12, "y": 13},
             {"flags": 2, "x": 40, "y": 13},
diff --git a/keyboards/keebio/dilly/config.h b/keyboards/keebio/dilly/config.h
index b2727f1ab247..5f360813239b 100644
--- a/keyboards/keebio/dilly/config.h
+++ b/keyboards/keebio/dilly/config.h
@@ -5,19 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 10
diff --git a/keyboards/keebio/dilly/info.json b/keyboards/keebio/dilly/info.json
index 29322a804433..b229ca021f22 100644
--- a/keyboards/keebio/dilly/info.json
+++ b/keyboards/keebio/dilly/info.json
@@ -16,6 +16,23 @@
   "backlight": {
     "pin": "B5"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 10,
+    "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": "D3"
   },
diff --git a/keyboards/keebio/dsp40/rev1/config.h b/keyboards/keebio/dsp40/rev1/config.h
index 7e6c613ebd72..390ac98a2310 100644
--- a/keyboards/keebio/dsp40/rev1/config.h
+++ b/keyboards/keebio/dsp40/rev1/config.h
@@ -16,28 +16,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 1
 #define BACKLIGHT_PAL_MODE 1
 
-  #define RGBLED_NUM 4
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/dsp40/rev1/info.json b/keyboards/keebio/dsp40/rev1/info.json
index efb1bc9551ac..cc8fa692cdfa 100644
--- a/keyboards/keebio/dsp40/rev1/info.json
+++ b/keyboards/keebio/dsp40/rev1/info.json
@@ -18,10 +18,31 @@
             {"pin_a": "A1", "pin_b": "A2"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "backlight": {
         "pin": "A6",
         "levels": 7
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "D3"
     },
diff --git a/keyboards/keebio/encoder_actions.c b/keyboards/keebio/encoder_actions.c
deleted file mode 100644
index b02881de5f30..000000000000
--- a/keyboards/keebio/encoder_actions.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- * Copyright 2021 drashna jael're (@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 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 "encoder_actions.h"
-
-#if defined(ENCODER_ENABLE)
-static uint8_t  encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS]    = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS]   = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
-
-void matrix_scan_kb(void) {
-    encoder_action_unregister();
-    matrix_scan_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    encoder_action_register(index, clockwise);
-    // don't return user actions, because they are in the keymap
-    // encoder_update_user(index, clockwise);
-    return true;
-};
-
-#endif
diff --git a/keyboards/keebio/encoder_actions.h b/keyboards/keebio/encoder_actions.h
deleted file mode 100644
index 1a7fb72014de..000000000000
--- a/keyboards/keebio/encoder_actions.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can 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 "quantum.h"
-
-void encoder_action_unregister(void);
-
-void encoder_action_register(uint8_t index, bool clockwise);
diff --git a/keyboards/keebio/ergodicity/config.h b/keyboards/keebio/ergodicity/config.h
index c423ca19aa10..64b776e9f4ac 100644
--- a/keyboards/keebio/ergodicity/config.h
+++ b/keyboards/keebio/ergodicity/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 12
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/ergodicity/info.json b/keyboards/keebio/ergodicity/info.json
index c6a9f2d6a3cb..94c94193edcd 100644
--- a/keyboards/keebio/ergodicity/info.json
+++ b/keyboards/keebio/ergodicity/info.json
@@ -18,6 +18,24 @@
         "levels": 7,
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "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": "B2"
     },
diff --git a/keyboards/keebio/foldkb/rev1/config.h b/keyboards/keebio/foldkb/rev1/config.h
index 30154273b736..73521bc53523 100644
--- a/keyboards/keebio/foldkb/rev1/config.h
+++ b/keyboards/keebio/foldkb/rev1/config.h
@@ -23,18 +23,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#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    // Number of LEDs
-#define RGBLED_SPLIT { 8, 8 }
-#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 12, 13, 14, 15, 4, 5, 6, 7, 8, 9, 10, 11 }
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/info.json
index e17389cc2c55..e826f34e3292 100644
--- a/keyboards/keebio/foldkb/rev1/info.json
+++ b/keyboards/keebio/foldkb/rev1/info.json
@@ -24,6 +24,23 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "led_count": 16,
+        "led_map": [0, 1, 2, 3, 12, 13, 14, 15, 4, 5, 6, 7, 8, 9, 10, 11],
+        "split_count": [8, 8],
+        "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": "E6"
     },
diff --git a/keyboards/keebio/fourier/config.h b/keyboards/keebio/fourier/config.h
index 904658ff8ad5..d1797c83d57c 100644
--- a/keyboards/keebio/fourier/config.h
+++ b/keyboards/keebio/fourier/config.h
@@ -26,20 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#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    // Number of LEDs
-#define RGBLED_SPLIT { 7, 7 }
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json
index a9b37bda0081..8631fd584115 100644
--- a/keyboards/keebio/fourier/info.json
+++ b/keyboards/keebio/fourier/info.json
@@ -22,6 +22,22 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "led_count": 14,
+        "split_count": [7, 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": "D3"
     },
diff --git a/keyboards/keebio/iris/keymaps/johnstegeman/rules.mk b/keyboards/keebio/iris/keymaps/johnstegeman/rules.mk
index 73761f8e6fb1..56c422e572c9 100644
--- a/keyboards/keebio/iris/keymaps/johnstegeman/rules.mk
+++ b/keyboards/keebio/iris/keymaps/johnstegeman/rules.mk
@@ -18,7 +18,7 @@ CONSOLE_ENABLE = no        # Console for debug
 RGBLIGHT_ENABLE = yes 
 RGB_MATRIX_ENABLE = no 
 #RGB_MATRIX_ENABLE = yes
-#RGB_MATRIX_DRIVER = WS2812
+#RGB_MATRIX_DRIVER = ws2812
 LTO_ENABLE = yes
 VIA_ENABLE = yes
 KEY_OVERRIDE_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/nstickney/keymap.c b/keyboards/keebio/iris/keymaps/nstickney/keymap.c
index cc4c5bf37539..cf53ffd93485 100644
--- a/keyboards/keebio/iris/keymaps/nstickney/keymap.c
+++ b/keyboards/keebio/iris/keymaps/nstickney/keymap.c
@@ -27,11 +27,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		),
 
     [SYMB] = LAYOUT(
-        _______, XP(IEX, SS1), X(SS2), X(SS3), XP(CUR, GBP), X(EUR), X(V14), X(V12), X(V34), XP(LSQ, LDQ), XP(RSQ, RDQ), _______,
-        _______, XP(A_D, AXD), XP(A_R, ACR), XP(E_A, ECA), XP(REG, CPL), X(THR), XP(U_D, UCD), XP(U_A, UCA), XP(I_A, ICA), XP(O_A, OCA), XP(O_D, OCD), _______,
-        _______, XP(A_A, ACA), XP(S_S, SEC), XP(ETH, ETC), X(EMD), _______, _______, _______, _______, XP(O_S, OCS), XP(PLC, DEG), XP(ACT, DIS),
-        _______, XP(AEL, AEC), _______, XP(CPR, CNT), _______, _______, _______, _______, XP(N_T, NCT), X(MCR), XP(C_C, CCC), _______, _______, _______,
-        X(IQM), XP(NOT, BKB), _______, _______, X(YEN), XP(MLT, DIV)
+        _______, UP(IEX, SS1), UM(SS2), UM(SS3), UP(CUR, GBP), UM(EUR), UM(V14), UM(V12), UM(V34), UP(LSQ, LDQ), UP(RSQ, RDQ), _______,
+        _______, UP(A_D, AXD), UP(A_R, ACR), UP(E_A, ECA), UP(REG, CPL), UM(THR), UP(U_D, UCD), UP(U_A, UCA), UP(I_A, ICA), UP(O_A, OCA), UP(O_D, OCD), _______,
+        _______, UP(A_A, ACA), UP(S_S, SEC), UP(ETH, ETC), UM(EMD), _______, _______, _______, _______, UP(O_S, OCS), UP(PLC, DEG), UP(ACT, DIS),
+        _______, UP(AEL, AEC), _______, UP(CPR, CNT), _______, _______, _______, _______, UP(N_T, NCT), UM(MCR), UP(C_C, CCC), _______, _______, _______,
+        UM(IQM), UP(NOT, BKB), _______, _______, UM(YEN), UP(MLT, DIV)
         ),
 
     [NUMP] = LAYOUT(
diff --git a/keyboards/keebio/iris/rev1/config.h b/keyboards/keebio/iris/rev1/config.h
index 7fd5c0ff951e..824ba0bfe4c2 100644
--- a/keyboards/keebio/iris/rev1/config.h
+++ b/keyboards/keebio/iris/rev1/config.h
@@ -21,16 +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
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12    // 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
diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json
index af3c7acd426f..f5efce863a8d 100644
--- a/keyboards/keebio/iris/rev1/info.json
+++ b/keyboards/keebio/iris/rev1/info.json
@@ -10,12 +10,28 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "D2",
         "levels": 5
     },
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "led_count": 12,
+        "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": "D3"
     },
diff --git a/keyboards/keebio/iris/rev1_led/config.h b/keyboards/keebio/iris/rev1_led/config.h
index 7fd5c0ff951e..824ba0bfe4c2 100644
--- a/keyboards/keebio/iris/rev1_led/config.h
+++ b/keyboards/keebio/iris/rev1_led/config.h
@@ -21,16 +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
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12    // 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
diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json
index bc19a0cc8be6..fb5db92913a6 100644
--- a/keyboards/keebio/iris/rev1_led/info.json
+++ b/keyboards/keebio/iris/rev1_led/info.json
@@ -16,6 +16,21 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "led_count": 12,
+        "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": "D3"
     },
diff --git a/keyboards/keebio/iris/rev2/config.h b/keyboards/keebio/iris/rev2/config.h
index 59867e6ef907..824ba0bfe4c2 100644
--- a/keyboards/keebio/iris/rev2/config.h
+++ b/keyboards/keebio/iris/rev2/config.h
@@ -21,17 +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
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12    // Number of LEDs
-#define RGBLED_SPLIT { 6, 6 }
-#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/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json
index 80e65aa8e2e3..aa41d0ebffac 100644
--- a/keyboards/keebio/iris/rev2/info.json
+++ b/keyboards/keebio/iris/rev2/info.json
@@ -16,6 +16,22 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6],
+        "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": "D3"
     },
diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h
index c7a7222fdcf9..e6ddc94df939 100644
--- a/keyboards/keebio/iris/rev3/config.h
+++ b/keyboards/keebio/iris/rev3/config.h
@@ -23,17 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12    // Number of LEDs
-#define RGBLED_SPLIT { 6, 6 }
-#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/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json
index adc4b713548f..39bf9dcfb5cd 100644
--- a/keyboards/keebio/iris/rev3/info.json
+++ b/keyboards/keebio/iris/rev3/info.json
@@ -18,6 +18,22 @@
         "pin": "B6",
         "levels": 5
     },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6],
+        "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": "F7"
     },
diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h
index eaeca3a4b98d..5586f5890dd3 100644
--- a/keyboards/keebio/iris/rev4/config.h
+++ b/keyboards/keebio/iris/rev4/config.h
@@ -23,17 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12    // Number of LEDs
-#define RGBLED_SPLIT { 6, 6 }
-#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/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json
index 6ddb257d21be..cc01dab3ec62 100644
--- a/keyboards/keebio/iris/rev4/info.json
+++ b/keyboards/keebio/iris/rev4/info.json
@@ -18,6 +18,22 @@
         "pin": "B5",
         "levels": 5
     },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6],
+        "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": "D6"
     },
diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h
index 12ff3a2a4d17..63610ecac507 100644
--- a/keyboards/keebio/iris/rev5/config.h
+++ b/keyboards/keebio/iris/rev5/config.h
@@ -21,18 +21,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_DEFAULT_LEVEL 3
 
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12    // Number of LEDs
-#define RGBLED_SPLIT { 6, 6 }
-#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_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 98c0d3bf2dea..72b8da80d09d 100644
--- a/keyboards/keebio/iris/rev5/info.json
+++ b/keyboards/keebio/iris/rev5/info.json
@@ -18,6 +18,22 @@
         "pin": "B5",
         "levels": 5
     },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6],
+        "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": "D6"
     },
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index 79f92b75a939..01cef3c9232b 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -19,24 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SPLIT_HAND_PIN D5
 
-/* ws2812 RGB LED */
-#    define RGBLED_NUM 68
-#    define RGBLED_SPLIT { 34, 34 }
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== enabled 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
 #    define RGBLIGHT_DEFAULT_VAL 120
 #    define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 // RGB Matrix
@@ -80,7 +62,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
 #        define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#        define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#        define RGB_MATRIX_LED_COUNT 68
 #        define RGB_MATRIX_SPLIT { 34, 34 }
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
 #        define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json
index 632b5f10d89a..94c30211a1b4 100644
--- a/keyboards/keebio/iris/rev6/info.json
+++ b/keyboards/keebio/iris/rev6/info.json
@@ -5,7 +5,7 @@
         "device_version": "6.2.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
@@ -21,7 +21,24 @@
         "pin": "E6"
     },
     "rgblight": {
-        "max_brightness": 120
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 68,
+        "max_brightness": 120,
+        "sleep": true,
+        "split_count": [34, 34],
+        "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
+        }
     },
     "split": {
         "soft_serial_pin": "D0",
diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h
index dd4284cb9b2a..73398bcaf6b3 100644
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/config.h
@@ -19,24 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SPLIT_HAND_PIN D5
 
-/* ws2812 RGB LED */
-#    define RGBLED_NUM 68
-#    define RGBLED_SPLIT { 34, 34 }
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== enabled 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
 #    define RGBLIGHT_DEFAULT_VAL 120
 #    define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 // RGB Matrix
@@ -80,7 +62,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #        define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#        define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#        define RGB_MATRIX_LED_COUNT 68
 #        define RGB_MATRIX_SPLIT { 34, 34 }
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
 #        define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json
index 7ed57fb873bf..08d6c8cd19e2 100644
--- a/keyboards/keebio/iris/rev7/info.json
+++ b/keyboards/keebio/iris/rev7/info.json
@@ -5,7 +5,7 @@
         "device_version": "7.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F1", "F4", "B5", "C7", "D4", "D6"],
@@ -22,7 +22,24 @@
         "pin": "E6"
     },
     "rgblight": {
-        "max_brightness": 120
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 68,
+        "max_brightness": 120,
+        "sleep": true,
+        "split_count": [34, 34],
+        "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
+        }
     },
     "split": {
         "soft_serial_pin": "D0",
diff --git a/keyboards/keebio/iris/rev8/info.json b/keyboards/keebio/iris/rev8/info.json
index 198e4fd56f58..7d75640801fc 100644
--- a/keyboards/keebio/iris/rev8/info.json
+++ b/keyboards/keebio/iris/rev8/info.json
@@ -156,7 +156,7 @@
             "solid_splash": true,
             "solid_multisplash": true
         },
-        "driver": "WS2812",
+        "driver": "ws2812",
         "split_count": [34, 34],
         "max_brightness": 120,
         "layout": [
diff --git a/keyboards/keebio/kbo5000/rev1/config.h b/keyboards/keebio/kbo5000/rev1/config.h
index f02c15c4a78c..e1d3f968bef5 100644
--- a/keyboards/keebio/kbo5000/rev1/config.h
+++ b/keyboards/keebio/kbo5000/rev1/config.h
@@ -26,18 +26,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#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    // Number of LEDs
-#define RGBLED_SPLIT { 8, 8 }
-#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/info.json
index d40c12b52d64..da7fbfb40f52 100644
--- a/keyboards/keebio/kbo5000/rev1/info.json
+++ b/keyboards/keebio/kbo5000/rev1/info.json
@@ -21,6 +21,23 @@
     "backlight": {
         "pin": "B5"
     },
+    "rgblight": {
+        "led_count": 16,
+        "led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
+        "split_count": [8, 8],
+        "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": "E6"
     },
diff --git a/keyboards/keebio/laplace/config.h b/keyboards/keebio/laplace/config.h
deleted file mode 100644
index 93ef4c9130c4..000000000000
--- a/keyboards/keebio/laplace/config.h
+++ /dev/null
@@ -1,33 +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
-
-/* WS2812 RGB LED */
-#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 TAPPING_TERM 200
diff --git a/keyboards/keebio/laplace/info.json b/keyboards/keebio/laplace/info.json
index 1899e882369c..6a81a6e89916 100644
--- a/keyboards/keebio/laplace/info.json
+++ b/keyboards/keebio/laplace/info.json
@@ -8,6 +8,21 @@
         "pid": "0x1147",
         "device_version": "1.0.0"
     },
+    "rgblight": {
+        "led_count": 14,
+        "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": "D4"
     },
diff --git a/keyboards/keebio/levinson/rev1/config.h b/keyboards/keebio/levinson/rev1/config.h
index b1922fb9c3b1..2fd8b7d4d04b 100644
--- a/keyboards/keebio/levinson/rev1/config.h
+++ b/keyboards/keebio/levinson/rev1/config.h
@@ -23,7 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12    // Number of LEDs
-#define RGBLED_SPLIT { 6, 6 }
diff --git a/keyboards/keebio/levinson/rev1/info.json b/keyboards/keebio/levinson/rev1/info.json
index c23887a49f2c..0a98e032d46d 100644
--- a/keyboards/keebio/levinson/rev1/info.json
+++ b/keyboards/keebio/levinson/rev1/info.json
@@ -16,6 +16,10 @@
         "pin": "C6",
         "levels": 7
     },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6]
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/keebio/levinson/rev2/config.h b/keyboards/keebio/levinson/rev2/config.h
index b1922fb9c3b1..2fd8b7d4d04b 100644
--- a/keyboards/keebio/levinson/rev2/config.h
+++ b/keyboards/keebio/levinson/rev2/config.h
@@ -23,7 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12    // Number of LEDs
-#define RGBLED_SPLIT { 6, 6 }
diff --git a/keyboards/keebio/levinson/rev2/info.json b/keyboards/keebio/levinson/rev2/info.json
index aab339166e6a..962f555e1280 100644
--- a/keyboards/keebio/levinson/rev2/info.json
+++ b/keyboards/keebio/levinson/rev2/info.json
@@ -16,6 +16,10 @@
         "pin": "B5",
         "levels": 7
     },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6]
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/keebio/levinson/rev3/config.h b/keyboards/keebio/levinson/rev3/config.h
index d2e19703c106..e1c73cd56eef 100644
--- a/keyboards/keebio/levinson/rev3/config.h
+++ b/keyboards/keebio/levinson/rev3/config.h
@@ -25,7 +25,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12    // Number of LEDs
-#define RGBLED_SPLIT { 6, 6 }
diff --git a/keyboards/keebio/levinson/rev3/info.json b/keyboards/keebio/levinson/rev3/info.json
index e5e479ba7ae1..cac1c3ac351b 100644
--- a/keyboards/keebio/levinson/rev3/info.json
+++ b/keyboards/keebio/levinson/rev3/info.json
@@ -22,6 +22,10 @@
         "pin": "B6",
         "levels": 7
     },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6]
+    },
     "ws2812": {
         "pin": "D7"
     },
diff --git a/keyboards/keebio/nyquist/keymaps/bramver/keymap.c b/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
index 04433c41cde8..4518cb326d88 100644
--- a/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/bramver/keymap.c
@@ -232,9 +232,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_EMOJI] = LAYOUT(
     TO(0)   , XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     , /**/  QK_BOOT       ,   XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     ,   XXXXXXX     ,   _______   ,
-    _______ , X(CLAP)     ,   X(CUM)      ,   X(BNIS)     ,   X(BUTT)     ,   X(CAR)      , /**/  X(FIRE)     ,   X(REDB)     ,   X(MONY)     ,   X(HNDR)     ,   X(SOS)      ,   _______   ,
-    XXXXXXX , X(CELE)     ,   X(PRAY)     ,   X(NAIL)     ,   X(OK)       ,   X(THNK)     , /**/  X(UNAM)     ,   X(HEYE)     ,   X(COOL)     ,   X(EYES)     ,   X(SMIR)     ,   KC_DEL    ,
-    _______ , X(TRIU)     ,   X(SCRM)     ,   X(VOMI)     ,   X(DTIV)     ,   X(EXPL)     , /**/  X(HAIR)     ,   X(DANC)     ,   X(STRN)     ,   X(LEFT)     ,   X(RGHT)     ,   _______   ,
+    _______ , 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     ,   _______
   ),
 
diff --git a/keyboards/keebio/nyquist/rev1/config.h b/keyboards/keebio/nyquist/rev1/config.h
index ab1c967e70d2..6fdc15c582de 100644
--- a/keyboards/keebio/nyquist/rev1/config.h
+++ b/keyboards/keebio/nyquist/rev1/config.h
@@ -22,10 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12
-#define RGBLED_SPLIT { 6, 6 }
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/keebio/nyquist/rev1/info.json b/keyboards/keebio/nyquist/rev1/info.json
index 64d613dccf0d..cd729aa87b76 100644
--- a/keyboards/keebio/nyquist/rev1/info.json
+++ b/keyboards/keebio/nyquist/rev1/info.json
@@ -12,6 +12,10 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6]
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/keebio/nyquist/rev2/config.h b/keyboards/keebio/nyquist/rev2/config.h
index ab1c967e70d2..6fdc15c582de 100644
--- a/keyboards/keebio/nyquist/rev2/config.h
+++ b/keyboards/keebio/nyquist/rev2/config.h
@@ -22,10 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12
-#define RGBLED_SPLIT { 6, 6 }
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/info.json
index 05b4ea0b7ef1..f6b80cb9460d 100644
--- a/keyboards/keebio/nyquist/rev2/info.json
+++ b/keyboards/keebio/nyquist/rev2/info.json
@@ -13,6 +13,10 @@
         "pin": "B6",
         "levels": 7
     },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6]
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/keebio/nyquist/rev3/config.h b/keyboards/keebio/nyquist/rev3/config.h
index 7b014e4fc563..f7bc4f8b9232 100644
--- a/keyboards/keebio/nyquist/rev3/config.h
+++ b/keyboards/keebio/nyquist/rev3/config.h
@@ -24,20 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#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 RGBLED_SPLIT { 6, 6 }
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/info.json
index eb17350d6399..9b3cc6d15aa9 100644
--- a/keyboards/keebio/nyquist/rev3/info.json
+++ b/keyboards/keebio/nyquist/rev3/info.json
@@ -16,6 +16,22 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6],
+        "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": "B4"
     },
diff --git a/keyboards/keebio/nyquist/rev4/info.json b/keyboards/keebio/nyquist/rev4/info.json
index 1788f3427f4c..d18af71952e7 100644
--- a/keyboards/keebio/nyquist/rev4/info.json
+++ b/keyboards/keebio/nyquist/rev4/info.json
@@ -180,7 +180,7 @@
         }
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "split_count": [36, 36],
         "max_brightness": 120,
         "animations": {
diff --git a/keyboards/keebio/nyquistpad/info.json b/keyboards/keebio/nyquistpad/info.json
index 2e077caed348..d999482ef03b 100644
--- a/keyboards/keebio/nyquistpad/info.json
+++ b/keyboards/keebio/nyquistpad/info.json
@@ -32,8 +32,11 @@
         "pin": "GP28"
     },
 
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_5x6"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_5x6": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -41,24 +44,28 @@
                 {"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},
+
                 {"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": [4, 0], "x": 0, "y": 4},
                 {"matrix": [4, 1], "x": 1, "y": 4},
                 {"matrix": [4, 2], "x": 2, "y": 4},
@@ -66,10 +73,47 @@
                 {"matrix": [4, 4], "x": 4, "y": 4},
                 {"matrix": [4, 5], "x": 5, "y": 4}
             ]
+        },
+        "LAYOUT_ortho_5x6_1x2u": {
+            "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},
+
+                {"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": [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, "w": 2}
+            ]
         }
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "animations": {
             "alphas_mods": true,
             "gradient_up_down": true,
@@ -123,7 +167,6 @@
             { "flags": 4, "matrix": [0, 3], "x": 130, "y": 6 },
             { "flags": 4, "matrix": [0, 4], "x": 168, "y": 6 },
             { "flags": 4, "matrix": [0, 5], "x": 204, "y": 6 },
-
             { "flags": 4, "matrix": [1, 5], "x": 204, "y": 19 },
             { "flags": 2, "x": 186, "y": 12 },
             { "flags": 4, "matrix": [1, 4], "x": 168, "y": 19 },
@@ -132,14 +175,12 @@
             { "flags": 4, "matrix": [1, 1], "x": 56, "y": 19 },
             { "flags": 2, "x": 36, "y": 12 },
             { "flags": 4, "matrix": [1, 0], "x": 18, "y": 19 },
-
             { "flags": 4, "matrix": [2, 0], "x": 18, "y": 32 },
             { "flags": 4, "matrix": [2, 1], "x": 56, "y": 32 },
             { "flags": 4, "matrix": [2, 2], "x": 92, "y": 32 },
             { "flags": 4, "matrix": [2, 3], "x": 130, "y": 32 },
             { "flags": 4, "matrix": [2, 4], "x": 168, "y": 32 },
             { "flags": 4, "matrix": [2, 5], "x": 204, "y": 32 },
-
             { "flags": 4, "matrix": [3, 5], "x": 204, "y": 44 },
             { "flags": 2, "x": 186, "y": 44 },
             { "flags": 4, "matrix": [3, 4], "x": 168, "y": 44 },
@@ -149,7 +190,6 @@
             { "flags": 4, "matrix": [3, 1], "x": 56, "y": 44 },
             { "flags": 2, "x": 36, "y": 44 },
             { "flags": 4, "matrix": [3, 0], "x": 18, "y": 44 },
-
             { "flags": 4, "matrix": [4, 0], "x": 18, "y": 57 },
             { "flags": 4, "matrix": [4, 1], "x": 56, "y": 57 },
             { "flags": 4, "matrix": [4, 2], "x": 92, "y": 57 },
diff --git a/keyboards/keebio/nyquistpad/keymaps/default/keymap.c b/keyboards/keebio/nyquistpad/keymaps/default/keymap.c
index 42b049facda1..42c036556d12 100644
--- a/keyboards/keebio/nyquistpad/keymaps/default/keymap.c
+++ b/keyboards/keebio/nyquistpad/keymaps/default/keymap.c
@@ -5,21 +5,21 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT(
+    [0] = LAYOUT_ortho_5x6(
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
         KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
         MO(2),   KC_LCTL, KC_LGUI, KC_LALT, MO(1),   KC_SPC
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_ortho_5x6(
         RGB_MOD, _______, _______, _______, _______, _______,
         _______, _______, KC_UP,   _______, KC_VOLU, KC_PGUP,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_PGDN,
         _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______
     ),
-    [2] = LAYOUT(
+    [2] = LAYOUT_ortho_5x6(
         KC_F6,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
         KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
         _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keebio/nyquistpad/keymaps/via/keymap.c b/keyboards/keebio/nyquistpad/keymaps/via/keymap.c
index 42b049facda1..42c036556d12 100644
--- a/keyboards/keebio/nyquistpad/keymaps/via/keymap.c
+++ b/keyboards/keebio/nyquistpad/keymaps/via/keymap.c
@@ -5,21 +5,21 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT(
+    [0] = LAYOUT_ortho_5x6(
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
         KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
         MO(2),   KC_LCTL, KC_LGUI, KC_LALT, MO(1),   KC_SPC
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_ortho_5x6(
         RGB_MOD, _______, _______, _______, _______, _______,
         _______, _______, KC_UP,   _______, KC_VOLU, KC_PGUP,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_PGDN,
         _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______
     ),
-    [2] = LAYOUT(
+    [2] = LAYOUT_ortho_5x6(
         KC_F6,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
         KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
         _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keebio/quefrency/keymaps/bramver/README.md b/keyboards/keebio/quefrency/keymaps/bramver/README.md
index 547e2686f88b..1665e4fd3eb9 100644
--- a/keyboards/keebio/quefrency/keymaps/bramver/README.md
+++ b/keyboards/keebio/quefrency/keymaps/bramver/README.md
@@ -51,9 +51,9 @@ Mostly based off of my other XD75 and Nyquist layouts.
 /* EMOJ
  *
  *   _______ , _______ , _______ , _______ , _______ , _______ , _______ ,   /**/  _______ , _______ , _______ , _______ , _______ , _______ , _______ ,  _______ ,
- *   _______ , X(CLAP) , X(CUM)  , X(BNIS) , X(BUTT) , X(CAR)  ,   /**/  X(FIRE) , X(REDB) , X(MONY) , X(HNDR) , X(SOS)  , _______ , _______ , _______ ,
- *   _______ , X(CELE) , X(PRAY) , X(NAIL) , X(OK)   , X(THNK) ,   /**/  X(UNAM) , X(HEYE) , X(COOL) , X(EYES) , X(SMIR) , _______ , _______ ,
- *   _______ , X(TRIU) , X(SCRM) , X(VOMI) , X(DTIV) , X(EXPL) ,   /**/  X(HAIR) , X(DANC) , X(STRN) , X(LEFT) , X(RGHT) , _______ , _______ ,
+ *   _______ , 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) , _______ , _______ ,
  *   _______ , _______ , _______ , _______ , _______ ,             /**/  _______ , _______ , _______ , _______ , _______ , _______ , _______ 
  *
  */
diff --git a/keyboards/keebio/quefrency/keymaps/bramver/keymap.c b/keyboards/keebio/quefrency/keymaps/bramver/keymap.c
index f855425ec018..9c6729e91e2f 100644
--- a/keyboards/keebio/quefrency/keymaps/bramver/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/bramver/keymap.c
@@ -118,9 +118,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_EMOJ] = LAYOUT(
     _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,  _______ ,
-    _______ , X(CLAP) , X(CUM)  , X(BNIS) , X(BUTT) , X(CAR)  , X(FIRE) , X(REDB) , X(MONY) , X(HNDR) , X(SOS)  , _______ , _______ , _______ ,
-    _______ , X(CELE) , X(PRAY) , X(NAIL) , X(OK)   , X(THNK) , X(UNAM) , X(HEYE) , X(COOL) , X(EYES) , X(SMIR) , _______ , _______ ,
-    _______ , X(TRIU) , X(SCRM) , X(VOMI) , X(DTIV) , X(EXPL) , X(HAIR) , X(DANC) , X(STRN) , X(LEFT) , X(RGHT) , _______ , _______ ,
+    _______ , 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) , _______ , _______ ,
     _______ , _______ , _______ , _______ , _______ ,           _______ , _______ , _______ , _______ , _______ , _______ , _______
   ),
 
diff --git a/keyboards/keebio/quefrency/rev1/config.h b/keyboards/keebio/quefrency/rev1/config.h
index 83fcd1fe0ac9..84cfc9006946 100644
--- a/keyboards/keebio/quefrency/rev1/config.h
+++ b/keyboards/keebio/quefrency/rev1/config.h
@@ -25,19 +25,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#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    // Number of LEDs
-#define RGBLED_SPLIT { 8, 8 }
-
 // Set 65% column (option 1) and Macro (option 2) on by default
 #define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x60
diff --git a/keyboards/keebio/quefrency/rev1/info.json b/keyboards/keebio/quefrency/rev1/info.json
index 7fb5ca8153d4..0bce37ad78bd 100644
--- a/keyboards/keebio/quefrency/rev1/info.json
+++ b/keyboards/keebio/quefrency/rev1/info.json
@@ -8,6 +8,22 @@
         "pid": "0x1257",
         "device_version": "1.0.0"
     },
+    "rgblight": {
+        "led_count": 16,
+        "split_count": [8, 8],
+        "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": "D3"
     },
diff --git a/keyboards/keebio/quefrency/rev2/config.h b/keyboards/keebio/quefrency/rev2/config.h
index e7774432dfa3..60db14d5fbd3 100644
--- a/keyboards/keebio/quefrency/rev2/config.h
+++ b/keyboards/keebio/quefrency/rev2/config.h
@@ -22,21 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define CAPS_LOCK_LED_PIN B6
 
-/* ws2812 RGB LED */
-#define RGBLED_NUM 16    // Number of LEDs
-#define RGBLED_SPLIT { 8, 8 }
-#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 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
-
 // Set 65% column (option 3) and Macro (option 4) on by default
 #define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/keebio/quefrency/rev2/info.json b/keyboards/keebio/quefrency/rev2/info.json
index d73c1af308f0..26df29e3f0d7 100644
--- a/keyboards/keebio/quefrency/rev2/info.json
+++ b/keyboards/keebio/quefrency/rev2/info.json
@@ -21,6 +21,23 @@
     "backlight": {
         "pin": "B5"
     },
+    "rgblight": {
+        "led_count": 16,
+        "led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
+        "split_count": [8, 8],
+        "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": "E6"
     },
diff --git a/keyboards/keebio/quefrency/rev3/config.h b/keyboards/keebio/quefrency/rev3/config.h
index e7774432dfa3..60db14d5fbd3 100644
--- a/keyboards/keebio/quefrency/rev3/config.h
+++ b/keyboards/keebio/quefrency/rev3/config.h
@@ -22,21 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define CAPS_LOCK_LED_PIN B6
 
-/* ws2812 RGB LED */
-#define RGBLED_NUM 16    // Number of LEDs
-#define RGBLED_SPLIT { 8, 8 }
-#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 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
-
 // Set 65% column (option 3) and Macro (option 4) on by default
 #define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/keebio/quefrency/rev3/info.json b/keyboards/keebio/quefrency/rev3/info.json
index fb204ab91072..dac80973ae92 100644
--- a/keyboards/keebio/quefrency/rev3/info.json
+++ b/keyboards/keebio/quefrency/rev3/info.json
@@ -21,6 +21,23 @@
     "backlight": {
         "pin": "B5"
     },
+    "rgblight": {
+        "led_count": 16,
+        "led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
+        "split_count": [8, 8],
+        "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": "E6"
     },
diff --git a/keyboards/keebio/quefrency/rev4/config.h b/keyboards/keebio/quefrency/rev4/config.h
index b27ba56d538c..73521bc53523 100644
--- a/keyboards/keebio/quefrency/rev4/config.h
+++ b/keyboards/keebio/quefrency/rev4/config.h
@@ -23,18 +23,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGBLED_NUM 16    // Number of LEDs
-#define RGBLED_SPLIT { 8, 8 }
-#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 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
diff --git a/keyboards/keebio/quefrency/rev4/info.json b/keyboards/keebio/quefrency/rev4/info.json
index 55fb4adda497..4eb4275f7af2 100644
--- a/keyboards/keebio/quefrency/rev4/info.json
+++ b/keyboards/keebio/quefrency/rev4/info.json
@@ -18,6 +18,23 @@
             {"pin_a": "F5", "pin_b": "F6"}
         ]
     },
+    "rgblight": {
+        "led_count": 16,
+        "led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
+        "split_count": [8, 8],
+        "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": "E6"
     },
diff --git a/keyboards/keebio/quefrency/rev5/config.h b/keyboards/keebio/quefrency/rev5/config.h
index b27ba56d538c..73521bc53523 100644
--- a/keyboards/keebio/quefrency/rev5/config.h
+++ b/keyboards/keebio/quefrency/rev5/config.h
@@ -23,18 +23,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGBLED_NUM 16    // Number of LEDs
-#define RGBLED_SPLIT { 8, 8 }
-#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 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
diff --git a/keyboards/keebio/quefrency/rev5/info.json b/keyboards/keebio/quefrency/rev5/info.json
index 78a44dfc8019..94d77ec8dd4b 100644
--- a/keyboards/keebio/quefrency/rev5/info.json
+++ b/keyboards/keebio/quefrency/rev5/info.json
@@ -18,6 +18,23 @@
             {"pin_a": "F5", "pin_b": "F6"}
         ]
     },
+    "rgblight": {
+        "led_count": 16,
+        "led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
+        "split_count": [8, 8],
+        "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": "E6"
     },
diff --git a/keyboards/keebio/rorschach/rev1/config.h b/keyboards/keebio/rorschach/rev1/config.h
index 979899d54727..53c95d722d3d 100644
--- a/keyboards/keebio/rorschach/rev1/config.h
+++ b/keyboards/keebio/rorschach/rev1/config.h
@@ -21,19 +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
-
-/* WS2812 RGB LED */
-#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/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/info.json
index a0b1188a7c9c..55fcae838735 100644
--- a/keyboards/keebio/rorschach/rev1/info.json
+++ b/keyboards/keebio/rorschach/rev1/info.json
@@ -17,6 +17,23 @@
     "pin": "B5",
     "levels": 5
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 12,
+    "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": "D3"
   },
diff --git a/keyboards/keebio/sinc/rev1/config.h b/keyboards/keebio/sinc/rev1/config.h
index c394777a8f82..8894354d4313 100644
--- a/keyboards/keebio/sinc/rev1/config.h
+++ b/keyboards/keebio/sinc/rev1/config.h
@@ -26,8 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Synchronize Caps Lock LED across halves */
 #define SPLIT_LED_STATE_ENABLE
 
-/* ws2812 RGB LED */
-#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/info.json
index d9b09568bdad..5ddb54ee6038 100644
--- a/keyboards/keebio/sinc/rev1/info.json
+++ b/keyboards/keebio/sinc/rev1/info.json
@@ -49,6 +49,7 @@
     },
     "rgblight": {
         "led_count": 16,
+        "led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
         "split_count": [8, 8],
         "animations": {
             "alternating": true,
diff --git a/keyboards/keebio/sinc/rev2/config.h b/keyboards/keebio/sinc/rev2/config.h
index c394777a8f82..8894354d4313 100644
--- a/keyboards/keebio/sinc/rev2/config.h
+++ b/keyboards/keebio/sinc/rev2/config.h
@@ -26,8 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Synchronize Caps Lock LED across halves */
 #define SPLIT_LED_STATE_ENABLE
 
-/* ws2812 RGB LED */
-#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/info.json
index d9372d9e9479..0c86727abeda 100644
--- a/keyboards/keebio/sinc/rev2/info.json
+++ b/keyboards/keebio/sinc/rev2/info.json
@@ -49,6 +49,7 @@
     },
     "rgblight": {
         "led_count": 16,
+        "led_map": [1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8],
         "split_count": [8, 8],
         "animations": {
             "alternating": true,
diff --git a/keyboards/keebio/sinc/rev3/info.json b/keyboards/keebio/sinc/rev3/info.json
index 76dfd88b3eee..8ba35fd15840 100644
--- a/keyboards/keebio/sinc/rev3/info.json
+++ b/keyboards/keebio/sinc/rev3/info.json
@@ -44,7 +44,7 @@
         "driver": "vendor"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "split_count": [56, 57],
         "layout": [
             {"flags": 4, "matrix": [5, 2], "x": 30, "y": 0},
diff --git a/keyboards/keebio/sinc/rev4/info.json b/keyboards/keebio/sinc/rev4/info.json
index f985f64e48fe..31d402c42e30 100644
--- a/keyboards/keebio/sinc/rev4/info.json
+++ b/keyboards/keebio/sinc/rev4/info.json
@@ -42,7 +42,7 @@
         "driver": "vendor"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "split_count": [58, 59],
         "layout": [
             {"flags": 4, "matrix": [5, 2], "x": 30, "y": 0},
diff --git a/keyboards/keebio/stick/config.h b/keyboards/keebio/stick/config.h
index d36d39703b43..b7df7925abde 100644
--- a/keyboards/keebio/stick/config.h
+++ b/keyboards/keebio/stick/config.h
@@ -17,25 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* WS2812 RGB LED */
-#    define RGBLED_NUM 12
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
 // RGB Matrix
 #    ifdef RGB_MATRIX_ENABLE
-#        define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#        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
@@ -85,5 +69,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #    endif
-
-#define TAPPING_TERM 200
diff --git a/keyboards/keebio/stick/info.json b/keyboards/keebio/stick/info.json
index d566e3df7456..cc151647a021 100644
--- a/keyboards/keebio/stick/info.json
+++ b/keyboards/keebio/stick/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "encoder": {
         "rotary": [
@@ -17,6 +17,24 @@
             {"pin_a": "D4", "pin_b": "C6"}
         ]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "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": "D3"
     },
diff --git a/keyboards/keebio/tukey/config.h b/keyboards/keebio/tukey/config.h
index 54d3f668a73b..436f111fcf87 100644
--- a/keyboards/keebio/tukey/config.h
+++ b/keyboards/keebio/tukey/config.h
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-    #define RGBLED_NUM 8
-    #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
-
 /* 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/tukey/info.json b/keyboards/keebio/tukey/info.json
index 3c4951b407e0..9df46b0c1e15 100644
--- a/keyboards/keebio/tukey/info.json
+++ b/keyboards/keebio/tukey/info.json
@@ -8,6 +8,23 @@
       "pid": "0x1112",
       "device_version": "1.0.0"
     },
+    "rgblight": {
+      "saturation_steps": 8,
+      "brightness_steps": 8,
+      "led_count": 8,
+      "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": "D3"
     },
diff --git a/keyboards/keebio/viterbi/rev1/config.h b/keyboards/keebio/viterbi/rev1/config.h
index 1dfed1a82f42..18b5d426e432 100644
--- a/keyboards/keebio/viterbi/rev1/config.h
+++ b/keyboards/keebio/viterbi/rev1/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
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 14
-#define RGBLED_SPLIT { 7, 7 }
diff --git a/keyboards/keebio/viterbi/rev1/info.json b/keyboards/keebio/viterbi/rev1/info.json
index 01ec06bc512c..a003331f25d7 100644
--- a/keyboards/keebio/viterbi/rev1/info.json
+++ b/keyboards/keebio/viterbi/rev1/info.json
@@ -7,6 +7,10 @@
         "pid": "0x1157",
         "device_version": "1.0.0"
     },
+    "rgblight": {
+        "led_count": 14,
+        "split_count": [7, 7]
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/keebio/viterbi/rev2/config.h b/keyboards/keebio/viterbi/rev2/config.h
index 56151a002818..010fcffc9ba3 100644
--- a/keyboards/keebio/viterbi/rev2/config.h
+++ b/keyboards/keebio/viterbi/rev2/config.h
@@ -23,7 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 14
-#define RGBLED_SPLIT { 7, 7 }
diff --git a/keyboards/keebio/viterbi/rev2/info.json b/keyboards/keebio/viterbi/rev2/info.json
index 10f36652ab2c..88ab2cd13749 100644
--- a/keyboards/keebio/viterbi/rev2/info.json
+++ b/keyboards/keebio/viterbi/rev2/info.json
@@ -16,6 +16,10 @@
         "pin": "B6",
         "levels": 7
     },
+    "rgblight": {
+        "led_count": 14,
+        "split_count": [7, 7]
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/keebio/wavelet/config.h b/keyboards/keebio/wavelet/config.h
index b6d4d6471922..2fd8b7d4d04b 100644
--- a/keyboards/keebio/wavelet/config.h
+++ b/keyboards/keebio/wavelet/config.h
@@ -23,6 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12    // Number of LEDs
diff --git a/keyboards/keebio/wavelet/info.json b/keyboards/keebio/wavelet/info.json
index c40265fc5b45..3b88fcdd7711 100644
--- a/keyboards/keebio/wavelet/info.json
+++ b/keyboards/keebio/wavelet/info.json
@@ -17,6 +17,9 @@
     "pin": "B5",
     "levels": 7
   },
+  "rgblight": {
+    "led_count": 12
+  },
   "ws2812": {
     "pin": "D3"
   },
diff --git a/keyboards/keebio/wtf60/config.h b/keyboards/keebio/wtf60/config.h
index 70343a376399..44151100a025 100644
--- a/keyboards/keebio/wtf60/config.h
+++ b/keyboards/keebio/wtf60/config.h
@@ -18,22 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define AUDIO_PIN C6
 
-    #define RGBLED_NUM 16
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-
 /* 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/wtf60/info.json b/keyboards/keebio/wtf60/info.json
index ebac7096f7aa..a7eb64633c3b 100644
--- a/keyboards/keebio/wtf60/info.json
+++ b/keyboards/keebio/wtf60/info.json
@@ -8,6 +8,24 @@
         "pid": "0x1337",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "E6"
     },
diff --git a/keyboards/keebmonkey/kbmg68/config.h b/keyboards/keebmonkey/kbmg68/config.h
deleted file mode 100644
index 2d3b3feef7e8..000000000000
--- a/keyboards/keebmonkey/kbmg68/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2022 Your Mom Loves My Keyboard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 68
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/keebmonkey/kbmg68/info.json b/keyboards/keebmonkey/kbmg68/info.json
index 89bb9f7690ea..b56a61f4804a 100644
--- a/keyboards/keebmonkey/kbmg68/info.json
+++ b/keyboards/keebmonkey/kbmg68/info.json
@@ -8,6 +8,24 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 68,
+        "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": "B0"
     },
diff --git a/keyboards/keebsforall/coarse60/config.h b/keyboards/keebsforall/coarse60/config.h
index 20493f173c5d..a9cd3b03b066 100644
--- a/keyboards/keebsforall/coarse60/config.h
+++ b/keyboards/keebsforall/coarse60/config.h
@@ -25,23 +25,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 14
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
 #define WS2812_SPI_SCK_PIN B13
 
-#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
-
 // 2 bits for 4 layout options
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
 
diff --git a/keyboards/keebsforall/coarse60/info.json b/keyboards/keebsforall/coarse60/info.json
index 11ec69872f86..11ef47d2cc67 100644
--- a/keyboards/keebsforall/coarse60/info.json
+++ b/keyboards/keebsforall/coarse60/info.json
@@ -23,6 +23,21 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 14,
+        "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"
diff --git a/keyboards/keebsforall/coarse60/rules.mk b/keyboards/keebsforall/coarse60/rules.mk
index e353d7863f1f..33b9c9f15910 100644
--- a/keyboards/keebsforall/coarse60/rules.mk
+++ b/keyboards/keebsforall/coarse60/rules.mk
@@ -13,5 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/keebwerk/mega/ansi/ansi.c b/keyboards/keebwerk/mega/ansi/ansi.c
index 532cdec9aa98..4494ffd9ffef 100755
--- a/keyboards/keebwerk/mega/ansi/ansi.c
+++ b/keyboards/keebwerk/mega/ansi/ansi.c
@@ -36,7 +36,7 @@ uint8_t B = 0;
 //         } else {
 //             G = 0;
 //         }
-//         IS31FL3733_set_color( 6+64-1, R, G, B );
+//         is31fl3733_set_color( 6+64-1, R, G, B );
 //     }
 //     return res;
 // }
@@ -54,6 +54,6 @@ __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
     if (IS_LAYER_ON_STATE(layer_state, 3)) {
         B = 255;
     }
-    IS31FL3733_set_color( 6+64-1, R, G, B );
+    is31fl3733_set_color( 6+64-1, R, G, B );
   return state;
 }
diff --git a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c b/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c
index a9b1dec281c5..2b5d658f02a3 100644
--- a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c
+++ b/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c
@@ -77,25 +77,25 @@ bool bootAnimation(void){
                 G = 255;
                 R = 0;
                 B = 0;
-                IS31FL3733_set_color( 6+64-1, R, G, B );
+                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 );
+                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 );
+                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 );
+                is31fl3733_set_color( 6+64-1, R, G, B );
                 ledTimer = timer_read();
                 bootFirst--;
             }
@@ -105,13 +105,13 @@ bool bootAnimation(void){
                 G = 255;
                 R = 255;
                 B = 255;
-                IS31FL3733_set_color( 6+64-1, R, G, B );
+                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 );
+                is31fl3733_set_color( 6+64-1, R, G, B );
                 ledTimer = timer_read();
                 bootSec--;
             }
@@ -129,7 +129,7 @@ void breathing(void) {
             G+=fadeStep;
             R+=fadeStep;
             B+=fadeStep;
-            IS31FL3733_set_color( 6+64-1, R, G, B );
+            is31fl3733_set_color( 6+64-1, R, G, B );
             previousTime = time;
         }
     }
@@ -139,7 +139,7 @@ void breathing(void) {
             G-=fadeStep;
             R-=fadeStep;
             B-=fadeStep;
-            IS31FL3733_set_color( 6+64-1, R, G, B );
+            is31fl3733_set_color( 6+64-1, R, G, B );
             previousTime = time;
         } 
     }
@@ -147,7 +147,7 @@ void breathing(void) {
         R=0;
         G=0;
         B=0;
-        IS31FL3733_set_color( 6+64-1, R, G, B );
+        is31fl3733_set_color( 6+64-1, R, G, B );
         previousTime = 0;
         time = 0;
         ledTimer=timer_read();
@@ -169,7 +169,7 @@ void matrix_scan_user(void){
             G = 0;
             R = 0;
             B = 0;
-            IS31FL3733_set_color( 6+64-1, R, G, B );
+            is31fl3733_set_color( 6+64-1, R, G, B );
             prevCapsState = capsState; 
         }
     }
diff --git a/keyboards/keebwerk/nano_slider/config.h b/keyboards/keebwerk/nano_slider/config.h
index 2d9f98c167bb..b5a1f0e3e527 100644
--- a/keyboards/keebwerk/nano_slider/config.h
+++ b/keyboards/keebwerk/nano_slider/config.h
@@ -19,23 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SLIDER_PIN D4
 
-#    define RGBLED_NUM 4
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-                                   /*== all animations 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
-
 /* 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/keebwerk/nano_slider/info.json b/keyboards/keebwerk/nano_slider/info.json
index 7c067c6f999d..fffbd7701bc1 100644
--- a/keyboards/keebwerk/nano_slider/info.json
+++ b/keyboards/keebwerk/nano_slider/info.json
@@ -17,6 +17,24 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "F6"
     },
diff --git a/keyboards/kegen/gboy/config.h b/keyboards/kegen/gboy/config.h
deleted file mode 100644
index 2b008e5ca75a..000000000000
--- a/keyboards/kegen/gboy/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2022 Matt 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 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 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/kegen/gboy/info.json b/keyboards/kegen/gboy/info.json
index f66eefd2da9b..0e9f0f753d0c 100644
--- a/keyboards/kegen/gboy/info.json
+++ b/keyboards/kegen/gboy/info.json
@@ -17,6 +17,23 @@
         "pin": "B7",
         "levels": 15
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "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": "D1"
     },
diff --git a/keyboards/kelwin/utopia88/info.json b/keyboards/kelwin/utopia88/info.json
new file mode 100644
index 000000000000..406642d41c75
--- /dev/null
+++ b/keyboards/kelwin/utopia88/info.json
@@ -0,0 +1,131 @@
+{
+    "keyboard_name": "Utopia88",
+    "manufacturer": "Kelwin Studio",
+    "maintainer": "Kelwin Studio",
+    "bootloader": "atmel-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B2", "B3", "B1"],
+        "rows": ["B7", "D5", "D3", "D2", "D1", "D0"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x4B53"
+    },
+    "community_layouts": ["tkl_f13_ansi_tsangan"],
+    "layouts": {
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "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,6], "x":5.5, "y":0}, 
+                {"matrix":[0,7], "x":6.5, "y":0}, 
+                {"matrix":[0,8], "x":7.5, "y":0}, 
+                {"matrix":[0,9], "x":8.5, "y":0}, 
+                {"matrix":[0,10], "x":9.75, "y":0}, 
+                {"matrix":[0,11], "x":10.75, "y":0}, 
+                {"matrix":[0,12], "x":11.75, "y":0}, 
+                {"matrix":[0,13], "x":12.75, "y":0}, 
+                {"matrix":[0,14], "x":14, "y":0}, 
+                {"matrix":[0,15], "x":15.25, "y":0}, 
+                {"matrix":[0,16], "x":16.25, "y":0}, 
+                {"matrix":[0,17], "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":[1,17], "x":17.25, "y":1.25},
+ 
+                {"matrix":[2,0], "x":0, "y":2.25, "w":1.5}, 
+                {"matrix":[2,2], "x":1.5, "y":2.25}, 
+                {"matrix":[2,3], "x":2.5, "y":2.25}, 
+                {"matrix":[2,4], "x":3.5, "y":2.25}, 
+                {"matrix":[2,5], "x":4.5, "y":2.25}, 
+                {"matrix":[2,6], "x":5.5, "y":2.25}, 
+                {"matrix":[2,7], "x":6.5, "y":2.25}, 
+                {"matrix":[2,8], "x":7.5, "y":2.25}, 
+                {"matrix":[2,9], "x":8.5, "y":2.25}, 
+                {"matrix":[2,10], "x":9.5, "y":2.25}, 
+                {"matrix":[2,11], "x":10.5, "y":2.25}, 
+                {"matrix":[2,12], "x":11.5, "y":2.25}, 
+                {"matrix":[2,13], "x":12.5, "y":2.25}, 
+                {"matrix":[2,14], "x":13.5, "y":2.25, "w":1.5}, 
+                {"matrix":[2,15], "x":15.25, "y":2.25}, 
+                {"matrix":[2,16], "x":16.25, "y":2.25}, 
+                {"matrix":[2,17], "x":17.25, "y":2.25}, 
+
+                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75}, 
+                {"matrix":[3,2], "x":1.75, "y":3.25}, 
+                {"matrix":[3,3], "x":2.75, "y":3.25}, 
+                {"matrix":[3,4], "x":3.75, "y":3.25}, 
+                {"matrix":[3,5], "x":4.75, "y":3.25}, 
+                {"matrix":[3,6], "x":5.75, "y":3.25}, 
+                {"matrix":[3,7], "x":6.75, "y":3.25}, 
+                {"matrix":[3,8], "x":7.75, "y":3.25}, 
+                {"matrix":[3,9], "x":8.75, "y":3.25}, 
+                {"matrix":[3,10], "x":9.75, "y":3.25}, 
+                {"matrix":[3,11], "x":10.75, "y":3.25}, 
+                {"matrix":[3,12], "x":11.75, "y":3.25}, 
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix":[4,1], "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":2.75}, 
+                {"matrix":[4,16], "x":16.25, "y":4.25},
+
+                {"matrix":[5,0], "x":0, "y":5.25, "w":1.5}, 
+                {"matrix":[5,2], "x":1.5, "y":5.25}, 
+                {"matrix":[5,3], "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,13], "x":12.5, "y":5.25}, 
+                {"matrix":[5,14], "x":13.5, "y":5.25, "w":1.5}, 
+                {"matrix":[5,15], "x":15.25, "y":5.25}, 
+                {"matrix":[5,16], "x":16.25, "y":5.25}, 
+                {"matrix":[5,17], "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
+ 
\ No newline at end of file
diff --git a/keyboards/kelwin/utopia88/keymaps/default/keymap.c b/keyboards/kelwin/utopia88/keymaps/default/keymap.c
new file mode 100644
index 000000000000..d7afaf0877ae
--- /dev/null
+++ b/keyboards/kelwin/utopia88/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2023 kelwin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along 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_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_NO,      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_RGUI, KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_tkl_f13_ansi_tsangan(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,          _______,              _______,         
+        _______, _______, _______,                            _______,                                     _______, _______, _______,     _______, _______, _______
+    )
+};
diff --git a/keyboards/kelwin/utopia88/keymaps/via/keymap.c b/keyboards/kelwin/utopia88/keymaps/via/keymap.c
new file mode 100644
index 000000000000..d7afaf0877ae
--- /dev/null
+++ b/keyboards/kelwin/utopia88/keymaps/via/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2023 kelwin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along 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_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_NO,      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_RGUI, KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_tkl_f13_ansi_tsangan(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,          _______,              _______,         
+        _______, _______, _______,                            _______,                                     _______, _______, _______,     _______, _______, _______
+    )
+};
diff --git a/keyboards/kelwin/utopia88/keymaps/via/rules.mk b/keyboards/kelwin/utopia88/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/kelwin/utopia88/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kelwin/utopia88/readme.md b/keyboards/kelwin/utopia88/readme.md
new file mode 100644
index 000000000000..f34e3540ec89
--- /dev/null
+++ b/keyboards/kelwin/utopia88/readme.md
@@ -0,0 +1,25 @@
+# Utopia88
+
+![Utopia88](https://i.imgur.com/pRKQIIHh.jpeg)
+
+* Keyboard Maintainer: [kelwin](https://github.com/Kelwin0313)
+* Hardware Supported: Utopia88 PCBs, atmega32u4
+* Hardware Availability: Private Group-Buy
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kelwin/utopia88:default
+
+Flashing example for this keyboard:
+
+    make kelwin/utopia88: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/kelwin/utopia88/rules.mk b/keyboards/kelwin/utopia88/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/kelwin/utopia88/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/keybage/radpad/config.h b/keyboards/keybage/radpad/config.h
index 5146b6ee13e8..83fd7fcb3f7e 100644
--- a/keyboards/keybage/radpad/config.h
+++ b/keyboards/keybage/radpad/config.h
@@ -17,19 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-    #define RGBLED_NUM 16
-    #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
-
 /* OLED Configuration */
 #ifdef OLED_ENABLE
     #define OLED_TIMEOUT	    60000
diff --git a/keyboards/keybage/radpad/info.json b/keyboards/keybage/radpad/info.json
index 2d8e566a7928..4ee89e9b1849 100644
--- a/keyboards/keybage/radpad/info.json
+++ b/keyboards/keybage/radpad/info.json
@@ -22,6 +22,22 @@
     "bootmagic": {
         "matrix": [1, 3]
     },
+    "rgblight": {
+        "led_count": 16,
+        "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": "F4"
     },
diff --git a/keyboards/keybage/radpad/rules.mk b/keyboards/keybage/radpad/rules.mk
index 18b77f249ec1..f1e31ddbdcc0 100644
--- a/keyboards/keybage/radpad/rules.mk
+++ b/keyboards/keybage/radpad/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
diff --git a/keyboards/keybee/keybee65/config.h b/keyboards/keybee/keybee65/config.h
index 9e32a8b1699c..5c89632272c8 100644
--- a/keyboards/keybee/keybee65/config.h
+++ b/keyboards/keybee/keybee65/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 68
-#define RGB_VAL_STEP 12
 
 #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 af92a14a6816..7ec1979c0882 100644
--- a/keyboards/keybee/keybee65/info.json
+++ b/keyboards/keybee/keybee65/info.json
@@ -12,7 +12,7 @@
         "pin": "B0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "rgblight": {
         "max_brightness": 96
diff --git a/keyboards/keyboardio/model01/config.h b/keyboards/keyboardio/model01/config.h
index b53235f324c6..2e4101537fea 100644
--- a/keyboards/keyboardio/model01/config.h
+++ b/keyboards/keyboardio/model01/config.h
@@ -58,18 +58,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
+// #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 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/keycapsss/kimiko/keymaps/default/glcdfont.c b/keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c
index 19d45a75c706..c3c79d76ee31 100644
--- a/keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c
+++ b/keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c
@@ -1,3 +1,7 @@
+// Copyright 2019 MechMerlin
+// Copyright 2020 @ben_roe (keycapsss.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "progmem.h"
 
 // Corne 8x6 font
diff --git a/keyboards/keycapsss/kimiko/keymaps/default/keymap.c b/keyboards/keycapsss/kimiko/keymaps/default/keymap.c
index 0515b96dfec8..74da1ce9732a 100644
--- a/keyboards/keycapsss/kimiko/keymaps/default/keymap.c
+++ b/keyboards/keycapsss/kimiko/keymaps/default/keymap.c
@@ -334,11 +334,11 @@ bool oled_task_user(void) {
 
 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_QWERTY] =   { ENCODER_CCW_CW(KC_UP, KC_DOWN), ENCODER_CCW_CW(KC_RGHT, KC_LEFT)  },
-    [_LOWER] =  { ENCODER_CCW_CW(KC_TAB, RGB_HUI),           ENCODER_CCW_CW(KC_VOLU, KC_VOLD)  },
-    [_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(RGB_HUI, RGB_HUD) },
+    [_QWERTY] = { ENCODER_CCW_CW(KC_DOWN, KC_UP),          ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
+    [_LOWER] =  { ENCODER_CCW_CW(RGB_HUI, KC_TAB),         ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_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(RGB_SAD, RGB_SAI) },
 };
-#endif // ENCODER_MAP_ENABLE 
+#endif // ENCODER_MAP_ENABLE
 
 
diff --git a/keyboards/keycapsss/kimiko/keymaps/default/rules.mk b/keyboards/keycapsss/kimiko/keymaps/default/rules.mk
index 75655f2bd5ec..ef4f0c0b43a2 100644
--- a/keyboards/keycapsss/kimiko/keymaps/default/rules.mk
+++ b/keyboards/keycapsss/kimiko/keymaps/default/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # ENables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 
@@ -8,4 +7,3 @@ RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 # This does not affect QMK Macros and Layers
 LTO_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
-
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk b/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk
index 0229490d4422..46cb8d8a947b 100644
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk
+++ b/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # ENables the use of one or more encoders
 RGBLIGHT_ENABLE = no      # Disable keyboard RGB underglow
 
@@ -10,7 +9,7 @@ LTO_ENABLE = yes
 
 #ENABLE RGB MATRIX WITH DRIVER WS2812
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
+RGB_MATRIX_DRIVER = ws2812
 
 #DEFINE SPLIT KEYBOARD AND SPLIT TRANSPORT MIRROR
 SPLIT_KEYBOARD = yes
@@ -18,4 +17,3 @@ SPLIT_KEYBOARD = yes
 #DEACTIVATED FOR MEMORY SAVING
 MOUSEKEY_ENABLE = no
 CONSOLE_ENABLE = no
-
diff --git a/keyboards/keycapsss/kimiko/rev1/config.h b/keyboards/keycapsss/kimiko/rev1/config.h
index 27049500bc13..8e44b27ace9f 100644
--- a/keyboards/keycapsss/kimiko/rev1/config.h
+++ b/keyboards/keycapsss/kimiko/rev1/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-#   define RGBLED_NUM 60  // Total number of LEDs
-#   define RGBLED_SPLIT { 30, 30 } // LEDs per side
-#   define RGBLIGHT_SPLIT
-#endif
-
 // Limit the power draw
 #ifdef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 40
diff --git a/keyboards/keycapsss/kimiko/rev1/info.json b/keyboards/keycapsss/kimiko/rev1/info.json
index 56028f3f81ae..1a7f62b2c8f3 100644
--- a/keyboards/keycapsss/kimiko/rev1/info.json
+++ b/keyboards/keycapsss/kimiko/rev1/info.json
@@ -15,11 +15,22 @@
     "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
-            {"pin_a": "F4", "pin_b": "F5"}
+            {"pin_a": "F5", "pin_b": "F4"}
         ]
     },
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F4", "pin_b": "F5"}
+                ]
+            }
+        }
+    },
+    "rgblight": {
+        "led_count": 60,
+        "split_count": [30, 30]
     },
     "ws2812": {
         "pin": "D3"
diff --git a/keyboards/keycapsss/o4l_5x12/config.h b/keyboards/keycapsss/o4l_5x12/config.h
index 804dabbf6d04..7bc78f68d698 100644
--- a/keyboards/keycapsss/o4l_5x12/config.h
+++ b/keyboards/keycapsss/o4l_5x12/config.h
@@ -1,21 +1,5 @@
 #pragma once
 
-#    define RGBLED_NUM 12
-#    define RGBLIGHT_HUE_STEP 4
-#    define RGBLIGHT_SAT_STEP 4
-#    define RGBLIGHT_VAL_STEP 4
-//#    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
-
 /* 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/keycapsss/o4l_5x12/info.json b/keyboards/keycapsss/o4l_5x12/info.json
index 0766e0a2e483..91dc0564683c 100644
--- a/keyboards/keycapsss/o4l_5x12/info.json
+++ b/keyboards/keycapsss/o4l_5x12/info.json
@@ -8,6 +8,24 @@
         "pid": "0x0512",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 4,
+        "saturation_steps": 4,
+        "brightness_steps": 4,
+        "led_count": 12,
+        "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": "D3"
     },
diff --git a/keyboards/keycapsss/plaid_pad/config.h b/keyboards/keycapsss/plaid_pad/config.h
deleted file mode 100644
index 984323f63c9e..000000000000
--- a/keyboards/keycapsss/plaid_pad/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 Ben Roesner (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/>.
- */
-
-#pragma once
-
-// Fix for volume controll with encoder (steadily in/decrease)
-#define TAP_CODE_DELAY 60
diff --git a/keyboards/keycapsss/plaid_pad/info.json b/keyboards/keycapsss/plaid_pad/info.json
index 9fe02448d02a..c66bd05f1bc6 100644
--- a/keyboards/keycapsss/plaid_pad/info.json
+++ b/keyboards/keycapsss/plaid_pad/info.json
@@ -7,6 +7,9 @@
         "pid": "0x5050",
         "max_power": 100
     },
+    "qmk": {
+        "tap_keycode_delay": 60
+    },
     "matrix_pins": {
         "cols": ["B0", "D7", "D6", "D5"],
         "rows": ["C0", "C1", "C2", "C3"]
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk b/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk
index 9ce6e078db2b..dc3e29cf8b2a 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk
+++ b/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk
@@ -1,3 +1,2 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 COMBO_ENABLE = yes
diff --git a/keyboards/keycapsss/plaid_pad/rev3/rules.mk b/keyboards/keycapsss/plaid_pad/rev3/rules.mk
index e72f11863f7e..5ec06e960911 100644
--- a/keyboards/keycapsss/plaid_pad/rev3/rules.mk
+++ b/keyboards/keycapsss/plaid_pad/rev3/rules.mk
@@ -1,3 +1,2 @@
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
diff --git a/keyboards/keychron/c1_pro/ansi/rgb/info.json b/keyboards/keychron/c1_pro/ansi/rgb/info.json
index e5f964a96a4c..c6011a28370a 100644
--- a/keyboards/keychron/c1_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/c1_pro/ansi/rgb/info.json
@@ -105,7 +105,7 @@
         }
     },
     "rgb_matrix": {
-        "driver": "CKLED2001",
+        "driver": "ckled2001",
         "animations": {
             "breathing": true,
             "band_spiral_val": true,
diff --git a/keyboards/keychron/c1_pro/ansi/rgb/rules.mk b/keyboards/keychron/c1_pro/ansi/rgb/rules.mk
index 414ee38bbd3d..7307f9f9e79a 100644
--- a/keyboards/keychron/c1_pro/ansi/rgb/rules.mk
+++ b/keyboards/keychron/c1_pro/ansi/rgb/rules.mk
@@ -1,3 +1 @@
 # Build Options
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/keychron/c1_pro/ansi/white/info.json b/keyboards/keychron/c1_pro/ansi/white/info.json
index 78c672ac893e..070ed6c4270f 100644
--- a/keyboards/keychron/c1_pro/ansi/white/info.json
+++ b/keyboards/keychron/c1_pro/ansi/white/info.json
@@ -105,7 +105,7 @@
         }
     },
     "led_matrix": {
-        "driver": "CKLED2001",
+        "driver": "ckled2001",
         "animations": {
             "none": true,
             "solid": true,
diff --git a/keyboards/keychron/c1_pro/ansi/white/rules.mk b/keyboards/keychron/c1_pro/ansi/white/rules.mk
index 414ee38bbd3d..7307f9f9e79a 100644
--- a/keyboards/keychron/c1_pro/ansi/white/rules.mk
+++ b/keyboards/keychron/c1_pro/ansi/white/rules.mk
@@ -1,3 +1 @@
 # Build Options
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/keychron/c2_pro/ansi/rgb/info.json b/keyboards/keychron/c2_pro/ansi/rgb/info.json
index eab0e9bdc4df..e527af3371c1 100644
--- a/keyboards/keychron/c2_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/c2_pro/ansi/rgb/info.json
@@ -122,7 +122,7 @@
         }
     },
     "rgb_matrix": {
-        "driver": "CKLED2001",
+        "driver": "ckled2001",
         "animations": {
             "breathing": true,
             "band_spiral_val": true,
diff --git a/keyboards/keychron/c2_pro/ansi/rgb/rules.mk b/keyboards/keychron/c2_pro/ansi/rgb/rules.mk
index 7c43bc28cdb2..dab155104922 100644
--- a/keyboards/keychron/c2_pro/ansi/rgb/rules.mk
+++ b/keyboards/keychron/c2_pro/ansi/rgb/rules.mk
@@ -1,5 +1,2 @@
 # Build Options
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 SRC += matrix.c
diff --git a/keyboards/keychron/c2_pro/ansi/white/info.json b/keyboards/keychron/c2_pro/ansi/white/info.json
index 3248e7c38a9d..dc58d1943bbd 100644
--- a/keyboards/keychron/c2_pro/ansi/white/info.json
+++ b/keyboards/keychron/c2_pro/ansi/white/info.json
@@ -122,7 +122,7 @@
         }
     },
     "led_matrix": {
-        "driver": "CKLED2001",
+        "driver": "ckled2001",
         "animations": {
             "none": true,
             "solid": true,
diff --git a/keyboards/keychron/c2_pro/ansi/white/rules.mk b/keyboards/keychron/c2_pro/ansi/white/rules.mk
index 7c43bc28cdb2..dab155104922 100644
--- a/keyboards/keychron/c2_pro/ansi/white/rules.mk
+++ b/keyboards/keychron/c2_pro/ansi/white/rules.mk
@@ -1,5 +1,2 @@
 # Build Options
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 SRC += matrix.c
diff --git a/keyboards/keychron/c2_pro/config.h b/keyboards/keychron/c2_pro/config.h
index f107dadf48da..6971ebd1aa8c 100644
--- a/keyboards/keychron/c2_pro/config.h
+++ b/keyboards/keychron/c2_pro/config.h
@@ -41,4 +41,4 @@
 #define HC595_SHCP A1
 #define HC595_DS C15
 #define SHIFT_COL_START 11
-#define SHIFT_COL_END 19
+#define SHIFT_COL_END 18
diff --git a/keyboards/keychron/c2_pro/matrix.c b/keyboards/keychron/c2_pro/matrix.c
index af7514c5adb8..5065f97aa7d4 100644
--- a/keyboards/keychron/c2_pro/matrix.c
+++ b/keyboards/keychron/c2_pro/matrix.c
@@ -24,10 +24,10 @@
 #endif
 
 #if defined(SHIFT_COL_START) && defined(SHIFT_COL_END)
-#    if ((SHIFT_COL_END - SHIFT_COL_START) > 16)
+#    if ((SHIFT_COL_END - SHIFT_COL_START + 1) > 16)
 #        define SIZE_T uint32_t
 #        define UNSELECT_ALL_COL 0xFFFFFFFF
-#    elif ((SHIFT_COL_END - SHIFT_COL_START) > 8)
+#    elif ((SHIFT_COL_END - SHIFT_COL_START + 1) > 8)
 #        define SIZE_T uint16_t
 #        define UNSELECT_ALL_COL 0xFFFF
 #    else
diff --git a/keyboards/keychron/q0/rev_0130/info.json b/keyboards/keychron/q0/rev_0130/info.json
index bb901c422022..f6225c884a94 100644
--- a/keyboards/keychron/q0/rev_0130/info.json
+++ b/keyboards/keychron/q0/rev_0130/info.json
@@ -29,7 +29,7 @@
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "rgb_matrix": {
-        "driver": "CKLED2001",
+        "driver": "ckled2001",
         "animations": {
             "band_spiral_val": true,
             "breathing": true,
diff --git a/keyboards/keychron/q0/rev_0130/rules.mk b/keyboards/keychron/q0/rev_0130/rules.mk
index 4eebc3343764..f6868e88e334 100644
--- a/keyboards/keychron/q0/rev_0130/rules.mk
+++ b/keyboards/keychron/q0/rev_0130/rules.mk
@@ -1,5 +1,3 @@
 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
diff --git a/keyboards/keychron/q0/rev_0131/info.json b/keyboards/keychron/q0/rev_0131/info.json
index 5f8d6219dea3..c569e498f404 100644
--- a/keyboards/keychron/q0/rev_0131/info.json
+++ b/keyboards/keychron/q0/rev_0131/info.json
@@ -38,7 +38,7 @@
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "rgb_matrix": {
-        "driver": "CKLED2001",
+        "driver": "ckled2001",
         "animations": {
             "band_spiral_val": true,
             "breathing": true,
diff --git a/keyboards/keychron/q0/rev_0131/rules.mk b/keyboards/keychron/q0/rev_0131/rules.mk
index 4eebc3343764..f6868e88e334 100644
--- a/keyboards/keychron/q0/rev_0131/rules.mk
+++ b/keyboards/keychron/q0/rev_0131/rules.mk
@@ -1,5 +1,3 @@
 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
diff --git a/keyboards/keychron/q1/ansi/info.json b/keyboards/keychron/q1/ansi/info.json
index b48eaee03e43..8ff2075747c3 100644
--- a/keyboards/keychron/q1/ansi/info.json
+++ b/keyboards/keychron/q1/ansi/info.json
@@ -10,7 +10,7 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
diff --git a/keyboards/keychron/q1/ansi_encoder/info.json b/keyboards/keychron/q1/ansi_encoder/info.json
index f520724989c8..ef361257f054 100644
--- a/keyboards/keychron/q1/ansi_encoder/info.json
+++ b/keyboards/keychron/q1/ansi_encoder/info.json
@@ -10,7 +10,7 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
diff --git a/keyboards/keychron/q1/iso/info.json b/keyboards/keychron/q1/iso/info.json
index 9caf6d618387..424ed021e102 100644
--- a/keyboards/keychron/q1/iso/info.json
+++ b/keyboards/keychron/q1/iso/info.json
@@ -10,7 +10,7 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
diff --git a/keyboards/keychron/q1/iso/keymaps/victorsavu3/keymap.c b/keyboards/keychron/q1/iso/keymaps/victorsavu3/keymap.c
index b97e6bfb9224..5256c97dca7b 100644
--- a/keyboards/keychron/q1/iso/keymaps/victorsavu3/keymap.c
+++ b/keyboards/keychron/q1/iso/keymaps/victorsavu3/keymap.c
@@ -55,8 +55,8 @@ 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),
 
 [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,   X(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,            X(GRIN),
+     KC_ESC,             KC_F1,    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,
diff --git a/keyboards/keychron/q1/iso_encoder/info.json b/keyboards/keychron/q1/iso_encoder/info.json
index a3aba1aed32b..250cd1ffb436 100644
--- a/keyboards/keychron/q1/iso_encoder/info.json
+++ b/keyboards/keychron/q1/iso_encoder/info.json
@@ -10,7 +10,7 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
diff --git a/keyboards/keychron/q10/ansi_encoder/info.json b/keyboards/keychron/q10/ansi_encoder/info.json
index 6b44fdbfdb05..8a8a624154ac 100644
--- a/keyboards/keychron/q10/ansi_encoder/info.json
+++ b/keyboards/keychron/q10/ansi_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/q10/ansi_encoder/rules.mk b/keyboards/keychron/q10/ansi_encoder/rules.mk
index 5df3cbccaf16..7da353fbd162 100644
--- a/keyboards/keychron/q10/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q10/ansi_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q10/iso_encoder/info.json b/keyboards/keychron/q10/iso_encoder/info.json
index 14910d293981..d7e1bf288539 100644
--- a/keyboards/keychron/q10/iso_encoder/info.json
+++ b/keyboards/keychron/q10/iso_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/q10/iso_encoder/rules.mk b/keyboards/keychron/q10/iso_encoder/rules.mk
index 5df3cbccaf16..7da353fbd162 100644
--- a/keyboards/keychron/q10/iso_encoder/rules.mk
+++ b/keyboards/keychron/q10/iso_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q11/ansi_encoder/rules.mk b/keyboards/keychron/q11/ansi_encoder/rules.mk
old mode 100755
new mode 100644
index ac78b227d602..60d5c6bea2f9
--- a/keyboards/keychron/q11/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q11/ansi_encoder/rules.mk
@@ -1,4 +1,6 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
+# Build Options
+#   change yes to no to disable
+#
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
 SERIAL_DRIVER = usart
diff --git a/keyboards/keychron/q11/info.json b/keyboards/keychron/q11/info.json
index 43029ebbc372..cd2864979d17 100755
--- a/keyboards/keychron/q11/info.json
+++ b/keyboards/keychron/q11/info.json
@@ -59,7 +59,7 @@
         ]
     },
     "rgb_matrix": {
-        "driver": "CKLED2001",
+        "driver": "ckled2001",
         "animations": {
             "breathing": true,
             "band_spiral_val": true,
diff --git a/keyboards/keychron/q12/ansi_encoder/info.json b/keyboards/keychron/q12/ansi_encoder/info.json
index 007c2cafeacd..97c1334ffdfc 100644
--- a/keyboards/keychron/q12/ansi_encoder/info.json
+++ b/keyboards/keychron/q12/ansi_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/q12/ansi_encoder/rules.mk b/keyboards/keychron/q12/ansi_encoder/rules.mk
index 9958a466f6d6..80a3f300bd22 100644
--- a/keyboards/keychron/q12/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q12/ansi_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q12/iso_encoder/info.json b/keyboards/keychron/q12/iso_encoder/info.json
index 33c719f26bec..cd848c86b60a 100644
--- a/keyboards/keychron/q12/iso_encoder/info.json
+++ b/keyboards/keychron/q12/iso_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/q12/iso_encoder/rules.mk b/keyboards/keychron/q12/iso_encoder/rules.mk
index df920055a087..986772495755 100644
--- a/keyboards/keychron/q12/iso_encoder/rules.mk
+++ b/keyboards/keychron/q12/iso_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q1v2/ansi/ansi.c b/keyboards/keychron/q1v2/ansi/ansi.c
new file mode 100644
index 000000000000..ea6c6278d1cf
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/ansi.c
@@ -0,0 +1,117 @@
+/* Copyright 2023 @ 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 "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to CKLED2001 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, 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, 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},
+
+    {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, 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, 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},
+};
+
+#endif
diff --git a/keyboards/keychron/q1v2/ansi/config.h b/keyboards/keychron/q1v2/ansi/config.h
new file mode 100644
index 000000000000..05ace3177834
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2023 @ 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 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/info.json b/keyboards/keychron/q1v2/ansi/info.json
new file mode 100644
index 000000000000..a72d202d816d
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/info.json
@@ -0,0 +1,190 @@
+{
+   "usb": {
+        "pid": "0x0106",
+        "device_version": "2.0.0"
+    },
+    "layouts": {
+        "LAYOUT_ansi_82": {
+            "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,15], "x":15.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,15], "x":15.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":[2,15], "x":15.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":[3,15], "x":15.25, "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,13], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4,14], "x":14.25, "y":4.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,6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25},
+                {"matrix":[5,11], "x":11, "y":5.25},
+                {"matrix":[5,12], "x":12, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.5},
+                {"matrix":[5,14], "x":14.25, "y":5.5},
+                {"matrix":[5,15], "x":15.25, "y":5.5}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":1, "x":18,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":33,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":48,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":62,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":81,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":95,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":110, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":125, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":143, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":158, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":173, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":187, "y":0},
+            {"matrix":[0, 13], "flags":1, "x":206, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":0,   "y":15},
+            {"matrix":[1, 1],  "flags":4, "x":15,  "y":15},
+            {"matrix":[1, 2],  "flags":4, "x":29,  "y":15},
+            {"matrix":[1, 3],  "flags":4, "x":44,  "y":15},
+            {"matrix":[1, 4],  "flags":4, "x":59,  "y":15},
+            {"matrix":[1, 5],  "flags":4, "x":73,  "y":15},
+            {"matrix":[1, 6],  "flags":4, "x":88,  "y":15},
+            {"matrix":[1, 7],  "flags":4, "x":103, "y":15},
+            {"matrix":[1, 8],  "flags":4, "x":118, "y":15},
+            {"matrix":[1, 9],  "flags":4, "x":132, "y":15},
+            {"matrix":[1, 10], "flags":4, "x":147, "y":15},
+            {"matrix":[1, 11], "flags":4, "x":162, "y":15},
+            {"matrix":[1, 12], "flags":4, "x":176, "y":15},
+            {"matrix":[1, 13], "flags":1, "x":198, "y":15},
+            {"matrix":[1, 15], "flags":1, "x":224, "y":15},
+
+            {"matrix":[2, 0],  "flags":1, "x":4,   "y":26},
+            {"matrix":[2, 1],  "flags":4, "x":22,  "y":26},
+            {"matrix":[2, 2],  "flags":4, "x":37,  "y":26},
+            {"matrix":[2, 3],  "flags":4, "x":51,  "y":26},
+            {"matrix":[2, 4],  "flags":4, "x":66,  "y":26},
+            {"matrix":[2, 5],  "flags":4, "x":81,  "y":26},
+            {"matrix":[2, 6],  "flags":4, "x":95,  "y":26},
+            {"matrix":[2, 7],  "flags":4, "x":110, "y":26},
+            {"matrix":[2, 8],  "flags":4, "x":125, "y":26},
+            {"matrix":[2, 9],  "flags":4, "x":140, "y":26},
+            {"matrix":[2, 10], "flags":4, "x":154, "y":26},
+            {"matrix":[2, 11], "flags":4, "x":169, "y":26},
+            {"matrix":[2, 12], "flags":4, "x":184, "y":26},
+            {"matrix":[2, 13], "flags":4, "x":202, "y":26},
+            {"matrix":[2, 15], "flags":1, "x":224, "y":26},
+
+            {"matrix":[3, 0],  "flags":9, "x":6,   "y":38},
+            {"matrix":[3, 1],  "flags":4, "x":26,  "y":38},
+            {"matrix":[3, 2],  "flags":4, "x":40,  "y":38},
+            {"matrix":[3, 3],  "flags":4, "x":55,  "y":38},
+            {"matrix":[3, 4],  "flags":4, "x":70,  "y":38},
+            {"matrix":[3, 5],  "flags":4, "x":84,  "y":38},
+            {"matrix":[3, 6],  "flags":4, "x":99,  "y":38},
+            {"matrix":[3, 7],  "flags":4, "x":114, "y":38},
+            {"matrix":[3, 8],  "flags":4, "x":129, "y":38},
+            {"matrix":[3, 9],  "flags":4, "x":143, "y":38},
+            {"matrix":[3, 10], "flags":4, "x":158, "y":38},
+            {"matrix":[3, 11], "flags":4, "x":173, "y":38},
+            {"matrix":[3, 13], "flags":1, "x":196, "y":38},
+            {"matrix":[3, 15], "flags":1, "x":224, "y":38},
+
+            {"matrix":[4, 0],  "flags":1, "x":9,   "y":49},
+            {"matrix":[4, 2],  "flags":4, "x":33,  "y":49},
+            {"matrix":[4, 3],  "flags":4, "x":48,  "y":49},
+            {"matrix":[4, 4],  "flags":4, "x":62,  "y":49},
+            {"matrix":[4, 5],  "flags":4, "x":77,  "y":49},
+            {"matrix":[4, 6],  "flags":4, "x":92,  "y":49},
+            {"matrix":[4, 7],  "flags":4, "x":106, "y":49},
+            {"matrix":[4, 8],  "flags":4, "x":121, "y":49},
+            {"matrix":[4, 9],  "flags":4, "x":136, "y":49},
+            {"matrix":[4, 10], "flags":4, "x":151, "y":49},
+            {"matrix":[4, 11], "flags":4, "x":165, "y":49},
+            {"matrix":[4, 13], "flags":1, "x":185, "y":49},
+            {"matrix":[4, 14], "flags":1, "x":209, "y":52},
+
+            {"matrix":[5, 0],  "flags":1, "x":2,   "y":61},
+            {"matrix":[5, 1],  "flags":1, "x":20,  "y":61},
+            {"matrix":[5, 2],  "flags":1, "x":39,  "y":61},
+            {"matrix":[5, 6],  "flags":4, "x":94,  "y":61},
+            {"matrix":[5, 10], "flags":1, "x":147, "y":61},
+            {"matrix":[5, 11], "flags":1, "x":162, "y":61},
+            {"matrix":[5, 12], "flags":1, "x":176, "y":61},
+            {"matrix":[5, 13], "flags":1, "x":195, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":209, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/q1v2/ansi/keymaps/default/keymap.c b/keyboards/keychron/q1v2/ansi/keymaps/default/keymap.c
new file mode 100644
index 000000000000..383a43cdb2a5
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/keymaps/default/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN,
+};
+
+#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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_82(
+        _______,  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,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), 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,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/q1v2/ansi/keymaps/keychron/keymap.c b/keyboards/keychron/q1v2/ansi/keymaps/keychron/keymap.c
new file mode 100644
index 000000000000..3a6676196f8a
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/keymaps/keychron/keymap.c
@@ -0,0 +1,74 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+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_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_82(
+        _______,  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,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), 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,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+    return true;
+}
diff --git a/keyboards/keychron/q1v2/ansi/keymaps/keychron/rules.mk b/keyboards/keychron/q1v2/ansi/keymaps/keychron/rules.mk
new file mode 100644
index 000000000000..495e8907b48c
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/keymaps/keychron/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q1v2/ansi/keymaps/via/keymap.c b/keyboards/keychron/q1v2/ansi/keymaps/via/keymap.c
new file mode 100644
index 000000000000..ad35cfb78e3f
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/keymaps/via/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_82(
+        _______,  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,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), 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,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/q1v2/ansi/keymaps/via/rules.mk b/keyboards/keychron/q1v2/ansi/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/q1v2/ansi/rules.mk b/keyboards/keychron/q1v2/ansi/rules.mk
new file mode 100644
index 000000000000..36ee49ccb093
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi/rules.mk
@@ -0,0 +1 @@
+SRC += matrix.c
diff --git a/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c
new file mode 100644
index 000000000000..ea6c6278d1cf
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c
@@ -0,0 +1,117 @@
+/* Copyright 2023 @ 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 "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to CKLED2001 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, 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, 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},
+
+    {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, 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, 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},
+};
+
+#endif
diff --git a/keyboards/keychron/q1v2/ansi_encoder/config.h b/keyboards/keychron/q1v2/ansi_encoder/config.h
new file mode 100644
index 000000000000..0dce301c3cef
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/config.h
@@ -0,0 +1,28 @@
+/* Copyright 2023 @ 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 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
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 45
diff --git a/keyboards/keychron/q1v2/ansi_encoder/info.json b/keyboards/keychron/q1v2/ansi_encoder/info.json
new file mode 100644
index 000000000000..616c44489131
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/info.json
@@ -0,0 +1,199 @@
+{
+    "usb": {
+        "pid": "0x0107",
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "encoder": true
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A8", "resolution": 4}
+        ]
+    },
+    "layouts": {
+        "LAYOUT_ansi_82": {
+            "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,15], "x":15.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,15], "x":15.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":[2,15], "x":15.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":[3,15], "x":15.25, "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,13], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix":[4,14], "x":14.25, "y":4.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,6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25},
+                {"matrix":[5,11], "x":11, "y":5.25},
+                {"matrix":[5,12], "x":12, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.5},
+                {"matrix":[5,14], "x":14.25, "y":5.5},
+                {"matrix":[5,15], "x":15.25, "y":5.5}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":1, "x":18,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":33,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":48,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":62,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":81,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":95,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":110, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":125, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":143, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":158, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":173, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":187, "y":0},
+            {"matrix":[0, 13], "flags":1, "x":206, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":0,   "y":15},
+            {"matrix":[1, 1],  "flags":4, "x":15,  "y":15},
+            {"matrix":[1, 2],  "flags":4, "x":29,  "y":15},
+            {"matrix":[1, 3],  "flags":4, "x":44,  "y":15},
+            {"matrix":[1, 4],  "flags":4, "x":59,  "y":15},
+            {"matrix":[1, 5],  "flags":4, "x":73,  "y":15},
+            {"matrix":[1, 6],  "flags":4, "x":88,  "y":15},
+            {"matrix":[1, 7],  "flags":4, "x":103, "y":15},
+            {"matrix":[1, 8],  "flags":4, "x":118, "y":15},
+            {"matrix":[1, 9],  "flags":4, "x":132, "y":15},
+            {"matrix":[1, 10], "flags":4, "x":147, "y":15},
+            {"matrix":[1, 11], "flags":4, "x":162, "y":15},
+            {"matrix":[1, 12], "flags":4, "x":176, "y":15},
+            {"matrix":[1, 13], "flags":1, "x":198, "y":15},
+            {"matrix":[1, 15], "flags":1, "x":224, "y":15},
+
+            {"matrix":[2, 0],  "flags":1, "x":4,   "y":26},
+            {"matrix":[2, 1],  "flags":4, "x":22,  "y":26},
+            {"matrix":[2, 2],  "flags":4, "x":37,  "y":26},
+            {"matrix":[2, 3],  "flags":4, "x":51,  "y":26},
+            {"matrix":[2, 4],  "flags":4, "x":66,  "y":26},
+            {"matrix":[2, 5],  "flags":4, "x":81,  "y":26},
+            {"matrix":[2, 6],  "flags":4, "x":95,  "y":26},
+            {"matrix":[2, 7],  "flags":4, "x":110, "y":26},
+            {"matrix":[2, 8],  "flags":4, "x":125, "y":26},
+            {"matrix":[2, 9],  "flags":4, "x":140, "y":26},
+            {"matrix":[2, 10], "flags":4, "x":154, "y":26},
+            {"matrix":[2, 11], "flags":4, "x":169, "y":26},
+            {"matrix":[2, 12], "flags":4, "x":184, "y":26},
+            {"matrix":[2, 13], "flags":4, "x":202, "y":26},
+            {"matrix":[2, 15], "flags":1, "x":224, "y":26},
+
+            {"matrix":[3, 0],  "flags":9, "x":6,   "y":38},
+            {"matrix":[3, 1],  "flags":4, "x":26,  "y":38},
+            {"matrix":[3, 2],  "flags":4, "x":40,  "y":38},
+            {"matrix":[3, 3],  "flags":4, "x":55,  "y":38},
+            {"matrix":[3, 4],  "flags":4, "x":70,  "y":38},
+            {"matrix":[3, 5],  "flags":4, "x":84,  "y":38},
+            {"matrix":[3, 6],  "flags":4, "x":99,  "y":38},
+            {"matrix":[3, 7],  "flags":4, "x":114, "y":38},
+            {"matrix":[3, 8],  "flags":4, "x":129, "y":38},
+            {"matrix":[3, 9],  "flags":4, "x":143, "y":38},
+            {"matrix":[3, 10], "flags":4, "x":158, "y":38},
+            {"matrix":[3, 11], "flags":4, "x":173, "y":38},
+            {"matrix":[3, 13], "flags":1, "x":196, "y":38},
+            {"matrix":[3, 15], "flags":1, "x":224, "y":38},
+
+            {"matrix":[4, 0],  "flags":1, "x":9,   "y":49},
+            {"matrix":[4, 2],  "flags":4, "x":33,  "y":49},
+            {"matrix":[4, 3],  "flags":4, "x":48,  "y":49},
+            {"matrix":[4, 4],  "flags":4, "x":62,  "y":49},
+            {"matrix":[4, 5],  "flags":4, "x":77,  "y":49},
+            {"matrix":[4, 6],  "flags":4, "x":92,  "y":49},
+            {"matrix":[4, 7],  "flags":4, "x":106, "y":49},
+            {"matrix":[4, 8],  "flags":4, "x":121, "y":49},
+            {"matrix":[4, 9],  "flags":4, "x":136, "y":49},
+            {"matrix":[4, 10], "flags":4, "x":151, "y":49},
+            {"matrix":[4, 11], "flags":4, "x":165, "y":49},
+            {"matrix":[4, 13], "flags":1, "x":185, "y":49},
+            {"matrix":[4, 14], "flags":1, "x":209, "y":52},
+
+            {"matrix":[5, 0],  "flags":1, "x":2,   "y":61},
+            {"matrix":[5, 1],  "flags":1, "x":20,  "y":61},
+            {"matrix":[5, 2],  "flags":1, "x":39,  "y":61},
+            {"matrix":[5, 6],  "flags":4, "x":94,  "y":61},
+            {"matrix":[5, 10], "flags":1, "x":147, "y":61},
+            {"matrix":[5, 11], "flags":1, "x":162, "y":61},
+            {"matrix":[5, 12], "flags":1, "x":176, "y":61},
+            {"matrix":[5, 13], "flags":1, "x":195, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":209, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/q1v2/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1v2/ansi_encoder/keymaps/default/keymap.c
new file mode 100644
index 000000000000..d4424125249e
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/keymaps/default/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#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_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_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_82(
+        _______,  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_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_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_LCTL,  KC_LCMD,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), 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,  _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q1v2/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q1v2/ansi_encoder/keymaps/default/rules.mk
new file mode 100644
index 000000000000..a40474b4d5c7
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keychron/q1v2/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q1v2/ansi_encoder/keymaps/keychron/keymap.c
new file mode 100644
index 000000000000..9de2b88de986
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,83 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+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_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_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_82(
+        _______,  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_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_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_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_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+    return true;
+}
diff --git a/keyboards/keychron/q1v2/ansi_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q1v2/ansi_encoder/keymaps/keychron/rules.mk
new file mode 100644
index 000000000000..9cf1a9b56cba
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/keymaps/keychron/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q1v2/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1v2/ansi_encoder/keymaps/via/keymap.c
new file mode 100644
index 000000000000..e299e1c96bee
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/keymaps/via/keymap.c
@@ -0,0 +1,74 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#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_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_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_82(
+        _______,  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_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_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_LCTL,  KC_LCMD,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), 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,  _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+// clang-format on
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q1v2/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q1v2/ansi_encoder/keymaps/via/rules.mk
new file mode 100644
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q1v2/ansi_encoder/rules.mk b/keyboards/keychron/q1v2/ansi_encoder/rules.mk
new file mode 100644
index 000000000000..36ee49ccb093
--- /dev/null
+++ b/keyboards/keychron/q1v2/ansi_encoder/rules.mk
@@ -0,0 +1 @@
+SRC += matrix.c
diff --git a/keyboards/keychron/q1v2/config.h b/keyboards/keychron/q1v2/config.h
new file mode 100644
index 000000000000..e2d331c1ac19
--- /dev/null
+++ b/keyboards/keychron/q1v2/config.h
@@ -0,0 +1,59 @@
+/* Copyright 2023 @ 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 Driver Configuration */
+#define DRIVER_COUNT 2
+#define DRIVER_ADDR_1 0b1110111
+#define DRIVER_ADDR_2 0b1110100
+
+/* Increase I2C speed to 1000 KHz */
+#define I2C1_TIMINGR_PRESC 0U
+#define I2C1_TIMINGR_SCLDEL 3U
+#define I2C1_TIMINGR_SDADEL 0U
+#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)
+
+/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */
+#define PHASE_CHANNEL MSKPHASE_9CHANNEL
+/* Set LED driver current */
+#define CKLED2001_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/halconf.h b/keyboards/keychron/q1v2/halconf.h
new file mode 100644
index 000000000000..41bddcb2799b
--- /dev/null
+++ b/keyboards/keychron/q1v2/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_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/keychron/q1v2/info.json b/keyboards/keychron/q1v2/info.json
new file mode 100644
index 000000000000..c4a75f0283ab
--- /dev/null
+++ b/keyboards/keychron/q1v2/info.json
@@ -0,0 +1,58 @@
+{
+    "manufacturer": "Keychron",
+    "keyboard_name": "Keychron Q1",
+    "url": "https://github.com/Keychron",
+    "maintainer": "keychron-contrib",
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+        "vid": "0x3434"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "dip_switch": true
+    },
+    "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"],
+        "custom": true,
+        "custom_lite": true
+    },
+    "matrix_size": {
+        "cols": 16,
+        "rows": 6
+    },
+    "diode_direction": "ROW2COL",
+    "rgb_matrix": {
+        "driver": "ckled2001",
+        "animations": {
+            "band_spiral_val": 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,
+            "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
+        }
+    }
+}
diff --git a/keyboards/keychron/q1v2/iso/config.h b/keyboards/keychron/q1v2/iso/config.h
new file mode 100644
index 000000000000..d9e596e2c571
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2023 @ 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 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/info.json b/keyboards/keychron/q1v2/iso/info.json
new file mode 100644
index 000000000000..ed16a3a8208f
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/info.json
@@ -0,0 +1,192 @@
+{
+    "usb": {
+        "pid": "0x0108",
+        "device_version": "2.0.0"
+    },
+    "layouts": {
+        "LAYOUT_iso_83": {
+            "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,15], "x":15.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,15], "x":15.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,15], "x":15.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},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3,15], "x":15.25, "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, 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":1.75},
+                {"matrix":[4,14], "x":14.25, "y":4.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, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25},
+                {"matrix":[5,11], "x":11, "y":5.25},
+                {"matrix":[5,12], "x":12, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.5},
+                {"matrix":[5,14], "x":14.25, "y":5.5},
+                {"matrix":[5,15], "x":15.25, "y":5.5}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":1, "x":18,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":33,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":48,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":62,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":81,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":95,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":110, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":125, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":143, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":158, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":173, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":187, "y":0},
+            {"matrix":[0, 13], "flags":1, "x":206, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":0,   "y":15},
+            {"matrix":[1, 1],  "flags":4, "x":15,  "y":15},
+            {"matrix":[1, 2],  "flags":4, "x":29,  "y":15},
+            {"matrix":[1, 3],  "flags":4, "x":44,  "y":15},
+            {"matrix":[1, 4],  "flags":4, "x":59,  "y":15},
+            {"matrix":[1, 5],  "flags":4, "x":73,  "y":15},
+            {"matrix":[1, 6],  "flags":4, "x":88,  "y":15},
+            {"matrix":[1, 7],  "flags":4, "x":103, "y":15},
+            {"matrix":[1, 8],  "flags":4, "x":118, "y":15},
+            {"matrix":[1, 9],  "flags":4, "x":132, "y":15},
+            {"matrix":[1, 10], "flags":4, "x":147, "y":15},
+            {"matrix":[1, 11], "flags":4, "x":162, "y":15},
+            {"matrix":[1, 12], "flags":4, "x":176, "y":15},
+            {"matrix":[1, 13], "flags":1, "x":198, "y":15},
+            {"matrix":[1, 15], "flags":1, "x":224, "y":15},
+
+            {"matrix":[2, 0],  "flags":1, "x":4,   "y":26},
+            {"matrix":[2, 1],  "flags":4, "x":22,  "y":26},
+            {"matrix":[2, 2],  "flags":4, "x":37,  "y":26},
+            {"matrix":[2, 3],  "flags":4, "x":51,  "y":26},
+            {"matrix":[2, 4],  "flags":4, "x":66,  "y":26},
+            {"matrix":[2, 5],  "flags":4, "x":81,  "y":26},
+            {"matrix":[2, 6],  "flags":4, "x":95,  "y":26},
+            {"matrix":[2, 7],  "flags":4, "x":110, "y":26},
+            {"matrix":[2, 8],  "flags":4, "x":125, "y":26},
+            {"matrix":[2, 9],  "flags":4, "x":140, "y":26},
+            {"matrix":[2, 10], "flags":4, "x":154, "y":26},
+            {"matrix":[2, 11], "flags":4, "x":169, "y":26},
+            {"matrix":[2, 12], "flags":4, "x":184, "y":26},
+            {"matrix":[2, 15], "flags":1, "x":224, "y":26},
+
+            {"matrix":[3, 0],  "flags":9, "x":6,   "y":38},
+            {"matrix":[3, 1],  "flags":4, "x":26,  "y":38},
+            {"matrix":[3, 2],  "flags":4, "x":40,  "y":38},
+            {"matrix":[3, 3],  "flags":4, "x":55,  "y":38},
+            {"matrix":[3, 4],  "flags":4, "x":70,  "y":38},
+            {"matrix":[3, 5],  "flags":4, "x":84,  "y":38},
+            {"matrix":[3, 6],  "flags":4, "x":99,  "y":38},
+            {"matrix":[3, 7],  "flags":4, "x":114, "y":38},
+            {"matrix":[3, 8],  "flags":4, "x":129, "y":38},
+            {"matrix":[3, 9],  "flags":4, "x":143, "y":38},
+            {"matrix":[3, 10], "flags":4, "x":158, "y":38},
+            {"matrix":[3, 11], "flags":4, "x":173, "y":38},
+            {"matrix":[3, 13], "flags":1, "x":187, "y":38},
+            {"matrix":[2, 13], "flags":4, "x":203, "y":32},
+            {"matrix":[3, 15], "flags":1, "x":224, "y":38},
+
+            {"matrix":[4, 0],  "flags":1, "x":2,   "y":49},
+            {"matrix":[4, 1],  "flags":4, "x":18,  "y":49},
+            {"matrix":[4, 2],  "flags":4, "x":33,  "y":49},
+            {"matrix":[4, 3],  "flags":4, "x":48,  "y":49},
+            {"matrix":[4, 4],  "flags":4, "x":62,  "y":49},
+            {"matrix":[4, 5],  "flags":4, "x":77,  "y":49},
+            {"matrix":[4, 6],  "flags":4, "x":92,  "y":49},
+            {"matrix":[4, 7],  "flags":4, "x":106, "y":49},
+            {"matrix":[4, 8],  "flags":4, "x":121, "y":49},
+            {"matrix":[4, 9],  "flags":4, "x":136, "y":49},
+            {"matrix":[4, 10], "flags":4, "x":151, "y":49},
+            {"matrix":[4, 11], "flags":4, "x":165, "y":49},
+            {"matrix":[4, 13], "flags":1, "x":185, "y":49},
+            {"matrix":[4, 14], "flags":1, "x":209, "y":52},
+
+            {"matrix":[5, 0],  "flags":1, "x":2,   "y":61},
+            {"matrix":[5, 1],  "flags":1, "x":20,  "y":61},
+            {"matrix":[5, 2],  "flags":1, "x":39,  "y":61},
+            {"matrix":[5, 6],  "flags":4, "x":94,  "y":61},
+            {"matrix":[5, 10], "flags":1, "x":147, "y":61},
+            {"matrix":[5, 11], "flags":1, "x":162, "y":61},
+            {"matrix":[5, 12], "flags":1, "x":176, "y":61},
+            {"matrix":[5, 13], "flags":1, "x":195, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":209, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/q1v2/iso/iso.c b/keyboards/keychron/q1v2/iso/iso.c
new file mode 100644
index 000000000000..eae39c8d61d0
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/iso.c
@@ -0,0 +1,118 @@
+/* Copyright 2023 @ 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 "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to CKLED2001 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, 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, 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},
+
+    {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, 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, 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},
+};
+
+#endif
diff --git a/keyboards/keychron/q1v2/iso/keymaps/default/keymap.c b/keyboards/keychron/q1v2/iso/keymaps/default/keymap.c
new file mode 100644
index 000000000000..f97a595ea62f
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/keymaps/default/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers {
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_83(
+        _______,  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,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_83(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______)
+};
diff --git a/keyboards/keychron/q1v2/iso/keymaps/keychron/keymap.c b/keyboards/keychron/q1v2/iso/keymaps/keychron/keymap.c
new file mode 100644
index 000000000000..30e1ef18bb48
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/keymaps/keychron/keymap.c
@@ -0,0 +1,74 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers {
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+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_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_83(
+        _______,  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,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_83(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______)
+};
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+    return true;
+}
diff --git a/keyboards/keychron/q1v2/iso/keymaps/keychron/rules.mk b/keyboards/keychron/q1v2/iso/keymaps/keychron/rules.mk
new file mode 100644
index 000000000000..495e8907b48c
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/keymaps/keychron/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q1v2/iso/keymaps/via/keymap.c b/keyboards/keychron/q1v2/iso/keymaps/via/keymap.c
new file mode 100644
index 000000000000..f97a595ea62f
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/keymaps/via/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers {
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_83(
+        _______,  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,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_83(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______)
+};
diff --git a/keyboards/keychron/q1v2/iso/keymaps/via/rules.mk b/keyboards/keychron/q1v2/iso/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/q1v2/iso/rules.mk b/keyboards/keychron/q1v2/iso/rules.mk
new file mode 100644
index 000000000000..36ee49ccb093
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso/rules.mk
@@ -0,0 +1 @@
+SRC += matrix.c
diff --git a/keyboards/keychron/q1v2/iso_encoder/config.h b/keyboards/keychron/q1v2/iso_encoder/config.h
new file mode 100644
index 000000000000..ab9be499d98a
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/config.h
@@ -0,0 +1,28 @@
+/* Copyright 2023 @ 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 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
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 44
diff --git a/keyboards/keychron/q1v2/iso_encoder/info.json b/keyboards/keychron/q1v2/iso_encoder/info.json
new file mode 100644
index 000000000000..38e34176b89d
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/info.json
@@ -0,0 +1,201 @@
+{
+    "usb": {
+        "pid": "0x0109",
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "encoder": true
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A8", "resolution": 4}
+        ]
+    },
+    "layouts": {
+        "LAYOUT_iso_83": {
+            "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,15], "x":15.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,15], "x":15.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,15], "x":15.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},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3,15], "x":15.25, "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, 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":1.75},
+                {"matrix":[4,14], "x":14.25, "y":4.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, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25},
+                {"matrix":[5,11], "x":11, "y":5.25},
+                {"matrix":[5,12], "x":12, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.5},
+                {"matrix":[5,14], "x":14.25, "y":5.5},
+                {"matrix":[5,15], "x":15.25, "y":5.5}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":1, "x":18,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":33,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":48,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":62,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":81,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":95,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":110, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":125, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":143, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":158, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":173, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":187, "y":0},
+            {"matrix":[0, 13], "flags":1, "x":206, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":0,   "y":15},
+            {"matrix":[1, 1],  "flags":4, "x":15,  "y":15},
+            {"matrix":[1, 2],  "flags":4, "x":29,  "y":15},
+            {"matrix":[1, 3],  "flags":4, "x":44,  "y":15},
+            {"matrix":[1, 4],  "flags":4, "x":59,  "y":15},
+            {"matrix":[1, 5],  "flags":4, "x":73,  "y":15},
+            {"matrix":[1, 6],  "flags":4, "x":88,  "y":15},
+            {"matrix":[1, 7],  "flags":4, "x":103, "y":15},
+            {"matrix":[1, 8],  "flags":4, "x":118, "y":15},
+            {"matrix":[1, 9],  "flags":4, "x":132, "y":15},
+            {"matrix":[1, 10], "flags":4, "x":147, "y":15},
+            {"matrix":[1, 11], "flags":4, "x":162, "y":15},
+            {"matrix":[1, 12], "flags":4, "x":176, "y":15},
+            {"matrix":[1, 13], "flags":1, "x":198, "y":15},
+            {"matrix":[1, 15], "flags":1, "x":224, "y":15},
+
+            {"matrix":[2, 0],  "flags":1, "x":4,   "y":26},
+            {"matrix":[2, 1],  "flags":4, "x":22,  "y":26},
+            {"matrix":[2, 2],  "flags":4, "x":37,  "y":26},
+            {"matrix":[2, 3],  "flags":4, "x":51,  "y":26},
+            {"matrix":[2, 4],  "flags":4, "x":66,  "y":26},
+            {"matrix":[2, 5],  "flags":4, "x":81,  "y":26},
+            {"matrix":[2, 6],  "flags":4, "x":95,  "y":26},
+            {"matrix":[2, 7],  "flags":4, "x":110, "y":26},
+            {"matrix":[2, 8],  "flags":4, "x":125, "y":26},
+            {"matrix":[2, 9],  "flags":4, "x":140, "y":26},
+            {"matrix":[2, 10], "flags":4, "x":154, "y":26},
+            {"matrix":[2, 11], "flags":4, "x":169, "y":26},
+            {"matrix":[2, 12], "flags":4, "x":184, "y":26},
+            {"matrix":[2, 15], "flags":1, "x":224, "y":26},
+
+            {"matrix":[3, 0],  "flags":9, "x":6,   "y":38},
+            {"matrix":[3, 1],  "flags":4, "x":26,  "y":38},
+            {"matrix":[3, 2],  "flags":4, "x":40,  "y":38},
+            {"matrix":[3, 3],  "flags":4, "x":55,  "y":38},
+            {"matrix":[3, 4],  "flags":4, "x":70,  "y":38},
+            {"matrix":[3, 5],  "flags":4, "x":84,  "y":38},
+            {"matrix":[3, 6],  "flags":4, "x":99,  "y":38},
+            {"matrix":[3, 7],  "flags":4, "x":114, "y":38},
+            {"matrix":[3, 8],  "flags":4, "x":129, "y":38},
+            {"matrix":[3, 9],  "flags":4, "x":143, "y":38},
+            {"matrix":[3, 10], "flags":4, "x":158, "y":38},
+            {"matrix":[3, 11], "flags":4, "x":173, "y":38},
+            {"matrix":[3, 13], "flags":1, "x":187, "y":38},
+            {"matrix":[2, 13], "flags":4, "x":203, "y":32},
+            {"matrix":[3, 15], "flags":1, "x":224, "y":38},
+
+            {"matrix":[4, 0],  "flags":1, "x":2,   "y":49},
+            {"matrix":[4, 1],  "flags":4, "x":18,  "y":49},
+            {"matrix":[4, 2],  "flags":4, "x":33,  "y":49},
+            {"matrix":[4, 3],  "flags":4, "x":48,  "y":49},
+            {"matrix":[4, 4],  "flags":4, "x":62,  "y":49},
+            {"matrix":[4, 5],  "flags":4, "x":77,  "y":49},
+            {"matrix":[4, 6],  "flags":4, "x":92,  "y":49},
+            {"matrix":[4, 7],  "flags":4, "x":106, "y":49},
+            {"matrix":[4, 8],  "flags":4, "x":121, "y":49},
+            {"matrix":[4, 9],  "flags":4, "x":136, "y":49},
+            {"matrix":[4, 10], "flags":4, "x":151, "y":49},
+            {"matrix":[4, 11], "flags":4, "x":165, "y":49},
+            {"matrix":[4, 13], "flags":1, "x":185, "y":49},
+            {"matrix":[4, 14], "flags":1, "x":209, "y":52},
+
+            {"matrix":[5, 0],  "flags":1, "x":2,   "y":61},
+            {"matrix":[5, 1],  "flags":1, "x":20,  "y":61},
+            {"matrix":[5, 2],  "flags":1, "x":39,  "y":61},
+            {"matrix":[5, 6],  "flags":4, "x":94,  "y":61},
+            {"matrix":[5, 10], "flags":1, "x":147, "y":61},
+            {"matrix":[5, 11], "flags":1, "x":162, "y":61},
+            {"matrix":[5, 12], "flags":1, "x":176, "y":61},
+            {"matrix":[5, 13], "flags":1, "x":195, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":209, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c b/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c
new file mode 100644
index 000000000000..eae39c8d61d0
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c
@@ -0,0 +1,118 @@
+/* Copyright 2023 @ 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 "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to CKLED2001 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, 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, 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},
+
+    {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, 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, 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},
+};
+
+#endif
diff --git a/keyboards/keychron/q1v2/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1v2/iso_encoder/keymaps/default/keymap.c
new file mode 100644
index 000000000000..74aa487f95ed
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/keymaps/default/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+#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_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_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_83(
+        _______,  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_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_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_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_83(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q1v2/iso_encoder/keymaps/default/rules.mk b/keyboards/keychron/q1v2/iso_encoder/keymaps/default/rules.mk
new file mode 100644
index 000000000000..a40474b4d5c7
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keychron/q1v2/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q1v2/iso_encoder/keymaps/keychron/keymap.c
new file mode 100644
index 000000000000..3b1e8b68ece1
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,85 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+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_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_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_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_83(
+        _______,  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_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_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_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_83(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______)
+};
+
+// clang-format on
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+    return true;
+}
diff --git a/keyboards/keychron/q1v2/iso_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q1v2/iso_encoder/keymaps/keychron/rules.mk
new file mode 100644
index 000000000000..9cf1a9b56cba
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/keymaps/keychron/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q1v2/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1v2/iso_encoder/keymaps/via/keymap.c
new file mode 100644
index 000000000000..74aa487f95ed
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/keymaps/via/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+#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_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_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_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_iso_83(
+        _______,  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_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_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_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_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_iso_83(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q1v2/iso_encoder/keymaps/via/rules.mk b/keyboards/keychron/q1v2/iso_encoder/keymaps/via/rules.mk
new file mode 100644
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q1v2/iso_encoder/rules.mk b/keyboards/keychron/q1v2/iso_encoder/rules.mk
new file mode 100644
index 000000000000..36ee49ccb093
--- /dev/null
+++ b/keyboards/keychron/q1v2/iso_encoder/rules.mk
@@ -0,0 +1 @@
+SRC += matrix.c
diff --git a/keyboards/keychron/q1v2/jis/config.h b/keyboards/keychron/q1v2/jis/config.h
new file mode 100644
index 000000000000..2e3db213b0c5
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2023 @ 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 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/info.json b/keyboards/keychron/q1v2/jis/info.json
new file mode 100644
index 000000000000..e704624a6619
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/info.json
@@ -0,0 +1,198 @@
+{
+    "usb": {
+        "pid": "0x010A",
+        "device_version": "2.0.0"
+    },
+    "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,15], "x":15.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.251},
+                {"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":[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,15], "x":15.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},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3,15], "x":15.25, "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},
+                {"matrix":[4,13], "x":13.25, "y":4.25},
+                {"matrix":[4,14], "x":14.25, "y":4.5},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25},
+                {"matrix":[5, 2], "x":2.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 3], "x":3.5, "y":5.25},
+                {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5},
+                {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25},
+                {"matrix":[5,10], "x":10.25, "y":5.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25},
+                {"matrix":[5,12], "x":12.25, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.25},
+                {"matrix":[5,14], "x":14.25, "y":5.25},
+                {"matrix":[5,15], "x":15.25, "y":5.25}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":1, "x":18,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":33,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":48,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":62,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":81,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":95,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":110, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":125, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":143, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":158, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":173, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":187, "y":0},
+            {"matrix":[0, 13], "flags":1, "x":205, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":0,   "y":15},
+            {"matrix":[1, 1],  "flags":4, "x":15,  "y":15},
+            {"matrix":[1, 2],  "flags":4, "x":29,  "y":15},
+            {"matrix":[1, 3],  "flags":4, "x":44,  "y":15},
+            {"matrix":[1, 4],  "flags":4, "x":59,  "y":15},
+            {"matrix":[1, 5],  "flags":4, "x":73,  "y":15},
+            {"matrix":[1, 6],  "flags":4, "x":88,  "y":15},
+            {"matrix":[1, 7],  "flags":4, "x":103, "y":15},
+            {"matrix":[1, 8],  "flags":4, "x":117, "y":15},
+            {"matrix":[1, 9],  "flags":4, "x":132, "y":15},
+            {"matrix":[1, 10], "flags":4, "x":147, "y":15},
+            {"matrix":[1, 11], "flags":4, "x":161, "y":15},
+            {"matrix":[1, 12], "flags":4, "x":176, "y":15},
+            {"matrix":[1, 13], "flags":4, "x":191, "y":15},
+            {"matrix":[1, 14], "flags":1, "x":205, "y":15},
+            {"matrix":[1, 15], "flags":1, "x":224, "y":15},
+
+            {"matrix":[2, 0],  "flags":1, "x":4,   "y":28},
+            {"matrix":[2, 1],  "flags":4, "x":22,  "y":28},
+            {"matrix":[2, 2],  "flags":4, "x":37,  "y":28},
+            {"matrix":[2, 3],  "flags":4, "x":51,  "y":28},
+            {"matrix":[2, 4],  "flags":4, "x":66,  "y":28},
+            {"matrix":[2, 5],  "flags":4, "x":81,  "y":28},
+            {"matrix":[2, 6],  "flags":4, "x":95,  "y":28},
+            {"matrix":[2, 7],  "flags":4, "x":110, "y":28},
+            {"matrix":[2, 8],  "flags":4, "x":125, "y":28},
+            {"matrix":[2, 9],  "flags":4, "x":139, "y":28},
+            {"matrix":[2, 10], "flags":4, "x":154, "y":28},
+            {"matrix":[2, 11], "flags":4, "x":169, "y":28},
+            {"matrix":[2, 12], "flags":4, "x":183, "y":28},
+            {"matrix":[2, 15], "flags":1, "x":224, "y":28},
+
+            {"matrix":[3, 0],  "flags":9, "x":6,   "y":40},
+            {"matrix":[3, 1],  "flags":4, "x":26,  "y":40},
+            {"matrix":[3, 2],  "flags":4, "x":40,  "y":40},
+            {"matrix":[3, 3],  "flags":4, "x":55,  "y":40},
+            {"matrix":[3, 4],  "flags":4, "x":70,  "y":40},
+            {"matrix":[3, 5],  "flags":4, "x":84,  "y":40},
+            {"matrix":[3, 6],  "flags":4, "x":99,  "y":40},
+            {"matrix":[3, 7],  "flags":4, "x":114, "y":40},
+            {"matrix":[3, 8],  "flags":4, "x":128, "y":40},
+            {"matrix":[3, 9],  "flags":4, "x":143, "y":40},
+            {"matrix":[3, 10], "flags":4, "x":158, "y":40},
+            {"matrix":[3, 11], "flags":4, "x":172, "y":40},
+            {"matrix":[3, 13], "flags":4, "x":187, "y":40},
+            {"matrix":[2, 13], "flags":1, "x":207, "y":36},
+            {"matrix":[3, 15], "flags":1, "x":224, "y":40},
+
+            {"matrix":[4, 0],  "flags":1, "x":9,   "y":52},
+            {"matrix":[4, 2],  "flags":4, "x":33,  "y":52},
+            {"matrix":[4, 3],  "flags":4, "x":48,  "y":52},
+            {"matrix":[4, 4],  "flags":4, "x":62,  "y":52},
+            {"matrix":[4, 5],  "flags":4, "x":77,  "y":52},
+            {"matrix":[4, 6],  "flags":4, "x":92,  "y":52},
+            {"matrix":[4, 7],  "flags":4, "x":106, "y":52},
+            {"matrix":[4, 8],  "flags":4, "x":121, "y":52},
+            {"matrix":[4, 9],  "flags":4, "x":136, "y":52},
+            {"matrix":[4, 10], "flags":4, "x":150, "y":52},
+            {"matrix":[4, 11], "flags":4, "x":165, "y":52},
+            {"matrix":[4, 12], "flags":4, "x":180, "y":52},
+            {"matrix":[4, 13], "flags":1, "x":194, "y":52},
+            {"matrix":[4, 14], "flags":1, "x":209, "y":52},
+
+            {"matrix":[5, 0],  "flags":1, "x":2,   "y":64},
+            {"matrix":[5, 1],  "flags":1, "x":18,  "y":64},
+            {"matrix":[5, 2],  "flags":1, "x":35,  "y":64},
+            {"matrix":[5, 3],  "flags":1, "x":51,  "y":64},
+            {"matrix":[5, 6],  "flags":4, "x":92,  "y":64},
+            {"matrix":[5, 9],  "flags":1, "x":134, "y":64},
+            {"matrix":[5, 10], "flags":1, "x":150, "y":64},
+            {"matrix":[5, 11], "flags":1, "x":165, "y":64},
+            {"matrix":[5, 12], "flags":1, "x":180, "y":64},
+            {"matrix":[5, 13], "flags":1, "x":194, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":209, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/q1v2/jis/jis.c b/keyboards/keychron/q1v2/jis/jis.c
new file mode 100644
index 000000000000..6bfcbad3e4d0
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/jis.c
@@ -0,0 +1,121 @@
+/* Copyright 2023 @ 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 "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to CKLED2001 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, 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, 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},
+
+    {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, 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, 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},
+};
+
+#endif
diff --git a/keyboards/keychron/q1v2/jis/keymaps/default/keymap.c b/keyboards/keychron/q1v2/jis/keymaps/default/keymap.c
new file mode 100644
index 000000000000..14af11a77cb5
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/keymaps/default/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT(
+        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_INT3,  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_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_LOPT,  KC_LCMD,  KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_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_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_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_INT3,  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_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_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/q1v2/jis/keymaps/keychron/keymap.c b/keyboards/keychron/q1v2/jis/keymaps/keychron/keymap.c
new file mode 100644
index 000000000000..b783b9307809
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/keymaps/keychron/keymap.c
@@ -0,0 +1,74 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT(
+        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_INT3,  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_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_LOPTN, KC_LCMMD, KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_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_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_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_INT3,  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_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_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+    return true;
+}
diff --git a/keyboards/keychron/q1v2/jis/keymaps/keychron/rules.mk b/keyboards/keychron/q1v2/jis/keymaps/keychron/rules.mk
new file mode 100644
index 000000000000..495e8907b48c
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/keymaps/keychron/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q1v2/jis/keymaps/via/keymap.c b/keyboards/keychron/q1v2/jis/keymaps/via/keymap.c
new file mode 100644
index 000000000000..14af11a77cb5
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/keymaps/via/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT(
+        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_INT3,  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_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_LOPT,  KC_LCMD,  KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_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_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_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_INT3,  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_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_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/q1v2/jis/keymaps/via/rules.mk b/keyboards/keychron/q1v2/jis/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/q1v2/jis/rules.mk b/keyboards/keychron/q1v2/jis/rules.mk
new file mode 100644
index 000000000000..36ee49ccb093
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis/rules.mk
@@ -0,0 +1 @@
+SRC += matrix.c
diff --git a/keyboards/keychron/q1v2/jis_encoder/config.h b/keyboards/keychron/q1v2/jis_encoder/config.h
new file mode 100644
index 000000000000..c80c4238f57d
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/config.h
@@ -0,0 +1,28 @@
+/* Copyright 2023 @ 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 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
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 45
diff --git a/keyboards/keychron/q1v2/jis_encoder/info.json b/keyboards/keychron/q1v2/jis_encoder/info.json
new file mode 100644
index 000000000000..544958f24fd6
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/info.json
@@ -0,0 +1,207 @@
+{
+    "usb": {
+        "pid": "0x010B",
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "encoder": true
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "A10", "pin_b": "A8", "resolution": 4}
+        ]
+    },
+    "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,15], "x":15.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.251},
+                {"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":[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,15], "x":15.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},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3,15], "x":15.25, "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},
+                {"matrix":[4,13], "x":13.25, "y":4.25},
+                {"matrix":[4,14], "x":14.25, "y":4.5},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25},
+                {"matrix":[5, 2], "x":2.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 3], "x":3.5, "y":5.25},
+                {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5},
+                {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25},
+                {"matrix":[5,10], "x":10.25, "y":5.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25},
+                {"matrix":[5,12], "x":12.25, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.25},
+                {"matrix":[5,14], "x":14.25, "y":5.25},
+                {"matrix":[5,15], "x":15.25, "y":5.25}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":1, "x":18,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":33,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":48,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":62,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":81,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":95,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":110, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":125, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":143, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":158, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":173, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":187, "y":0},
+            {"matrix":[0, 13], "flags":1, "x":205, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":0,   "y":15},
+            {"matrix":[1, 1],  "flags":4, "x":15,  "y":15},
+            {"matrix":[1, 2],  "flags":4, "x":29,  "y":15},
+            {"matrix":[1, 3],  "flags":4, "x":44,  "y":15},
+            {"matrix":[1, 4],  "flags":4, "x":59,  "y":15},
+            {"matrix":[1, 5],  "flags":4, "x":73,  "y":15},
+            {"matrix":[1, 6],  "flags":4, "x":88,  "y":15},
+            {"matrix":[1, 7],  "flags":4, "x":103, "y":15},
+            {"matrix":[1, 8],  "flags":4, "x":117, "y":15},
+            {"matrix":[1, 9],  "flags":4, "x":132, "y":15},
+            {"matrix":[1, 10], "flags":4, "x":147, "y":15},
+            {"matrix":[1, 11], "flags":4, "x":161, "y":15},
+            {"matrix":[1, 12], "flags":4, "x":176, "y":15},
+            {"matrix":[1, 13], "flags":4, "x":191, "y":15},
+            {"matrix":[1, 14], "flags":1, "x":205, "y":15},
+            {"matrix":[1, 15], "flags":1, "x":224, "y":15},
+
+            {"matrix":[2, 0],  "flags":1, "x":4,   "y":28},
+            {"matrix":[2, 1],  "flags":4, "x":22,  "y":28},
+            {"matrix":[2, 2],  "flags":4, "x":37,  "y":28},
+            {"matrix":[2, 3],  "flags":4, "x":51,  "y":28},
+            {"matrix":[2, 4],  "flags":4, "x":66,  "y":28},
+            {"matrix":[2, 5],  "flags":4, "x":81,  "y":28},
+            {"matrix":[2, 6],  "flags":4, "x":95,  "y":28},
+            {"matrix":[2, 7],  "flags":4, "x":110, "y":28},
+            {"matrix":[2, 8],  "flags":4, "x":125, "y":28},
+            {"matrix":[2, 9],  "flags":4, "x":139, "y":28},
+            {"matrix":[2, 10], "flags":4, "x":154, "y":28},
+            {"matrix":[2, 11], "flags":4, "x":169, "y":28},
+            {"matrix":[2, 12], "flags":4, "x":183, "y":28},
+            {"matrix":[2, 15], "flags":1, "x":224, "y":28},
+
+            {"matrix":[3, 0],  "flags":9, "x":6,   "y":40},
+            {"matrix":[3, 1],  "flags":4, "x":26,  "y":40},
+            {"matrix":[3, 2],  "flags":4, "x":40,  "y":40},
+            {"matrix":[3, 3],  "flags":4, "x":55,  "y":40},
+            {"matrix":[3, 4],  "flags":4, "x":70,  "y":40},
+            {"matrix":[3, 5],  "flags":4, "x":84,  "y":40},
+            {"matrix":[3, 6],  "flags":4, "x":99,  "y":40},
+            {"matrix":[3, 7],  "flags":4, "x":114, "y":40},
+            {"matrix":[3, 8],  "flags":4, "x":128, "y":40},
+            {"matrix":[3, 9],  "flags":4, "x":143, "y":40},
+            {"matrix":[3, 10], "flags":4, "x":158, "y":40},
+            {"matrix":[3, 11], "flags":4, "x":172, "y":40},
+            {"matrix":[3, 13], "flags":4, "x":187, "y":40},
+            {"matrix":[2, 13], "flags":1, "x":207, "y":36},
+            {"matrix":[3, 15], "flags":1, "x":224, "y":40},
+
+            {"matrix":[4, 0],  "flags":1, "x":9,   "y":52},
+            {"matrix":[4, 2],  "flags":4, "x":33,  "y":52},
+            {"matrix":[4, 3],  "flags":4, "x":48,  "y":52},
+            {"matrix":[4, 4],  "flags":4, "x":62,  "y":52},
+            {"matrix":[4, 5],  "flags":4, "x":77,  "y":52},
+            {"matrix":[4, 6],  "flags":4, "x":92,  "y":52},
+            {"matrix":[4, 7],  "flags":4, "x":106, "y":52},
+            {"matrix":[4, 8],  "flags":4, "x":121, "y":52},
+            {"matrix":[4, 9],  "flags":4, "x":136, "y":52},
+            {"matrix":[4, 10], "flags":4, "x":150, "y":52},
+            {"matrix":[4, 11], "flags":4, "x":165, "y":52},
+            {"matrix":[4, 12], "flags":4, "x":180, "y":52},
+            {"matrix":[4, 13], "flags":1, "x":194, "y":52},
+            {"matrix":[4, 14], "flags":1, "x":209, "y":52},
+
+            {"matrix":[5, 0],  "flags":1, "x":2,   "y":64},
+            {"matrix":[5, 1],  "flags":1, "x":18,  "y":64},
+            {"matrix":[5, 2],  "flags":1, "x":35,  "y":64},
+            {"matrix":[5, 3],  "flags":1, "x":51,  "y":64},
+            {"matrix":[5, 6],  "flags":4, "x":92,  "y":64},
+            {"matrix":[5, 9],  "flags":1, "x":134, "y":64},
+            {"matrix":[5, 10], "flags":1, "x":150, "y":64},
+            {"matrix":[5, 11], "flags":1, "x":165, "y":64},
+            {"matrix":[5, 12], "flags":1, "x":180, "y":64},
+            {"matrix":[5, 13], "flags":1, "x":194, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":209, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c b/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c
new file mode 100644
index 000000000000..6bfcbad3e4d0
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c
@@ -0,0 +1,121 @@
+/* Copyright 2023 @ 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 "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to CKLED2001 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, 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, 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},
+
+    {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, 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, 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},
+};
+
+#endif
diff --git a/keyboards/keychron/q1v2/jis_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1v2/jis_encoder/keymaps/default/keymap.c
new file mode 100644
index 000000000000..def0cba27f4e
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/keymaps/default/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT(
+        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_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_INT3,  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_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_LOPT,  KC_LCMD,  KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_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_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_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_INT3,  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_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_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q1v2/jis_encoder/keymaps/default/rules.mk b/keyboards/keychron/q1v2/jis_encoder/keymaps/default/rules.mk
new file mode 100644
index 000000000000..a40474b4d5c7
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keychron/q1v2/jis_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q1v2/jis_encoder/keymaps/keychron/keymap.c
new file mode 100644
index 000000000000..5aa1ab9471f6
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,83 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT(
+        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_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_INT3,  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_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_LOPTN, KC_LCMMD, KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_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_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_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_INT3,  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_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_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+    return true;
+}
diff --git a/keyboards/keychron/q1v2/jis_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q1v2/jis_encoder/keymaps/keychron/rules.mk
new file mode 100644
index 000000000000..9cf1a9b56cba
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/keymaps/keychron/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q1v2/jis_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1v2/jis_encoder/keymaps/via/keymap.c
new file mode 100644
index 000000000000..def0cba27f4e
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/keymaps/via/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT(
+        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_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_INT3,  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_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_LOPT,  KC_LCMD,  KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_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_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+    [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_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_INT3,  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_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_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,                      _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q1v2/jis_encoder/keymaps/via/rules.mk b/keyboards/keychron/q1v2/jis_encoder/keymaps/via/rules.mk
new file mode 100644
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q1v2/jis_encoder/rules.mk b/keyboards/keychron/q1v2/jis_encoder/rules.mk
new file mode 100644
index 000000000000..36ee49ccb093
--- /dev/null
+++ b/keyboards/keychron/q1v2/jis_encoder/rules.mk
@@ -0,0 +1 @@
+SRC += matrix.c
diff --git a/keyboards/keychron/q1v2/matrix.c b/keyboards/keychron/q1v2/matrix.c
new file mode 100644
index 000000000000..d008a7938414
--- /dev/null
+++ b/keyboards/keychron/q1v2/matrix.c
@@ -0,0 +1,205 @@
+/* Copyright 2023 @ 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 "quantum.h"
+
+// Pin connected to DS of 74HC595
+#define DATA_PIN A7
+// Pin connected to SH_CP of 74HC595
+#define CLOCK_PIN B1
+// Pin connected to ST_CP of 74HC595
+#define LATCH_PIN B0
+
+#ifdef MATRIX_ROW_PINS
+static pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+#endif // MATRIX_ROW_PINS
+#ifdef MATRIX_COL_PINS
+static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+#endif // MATRIX_COL_PINS
+
+#define ROWS_PER_HAND (MATRIX_ROWS)
+
+static inline void setPinOutput_writeLow(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinOutput(pin);
+        writePinLow(pin);
+    }
+}
+
+static inline void setPinOutput_writeHigh(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinOutput(pin);
+        writePinHigh(pin);
+    }
+}
+
+static inline void setPinInputHigh_atomic(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinInputHigh(pin);
+    }
+}
+
+static inline uint8_t readMatrixPin(pin_t pin) {
+    if (pin != NO_PIN) {
+        return readPin(pin);
+    } else {
+        return 1;
+    }
+}
+
+static void shiftOut(uint8_t dataOut) {
+    for (uint8_t i = 0; i < 8; i++) {
+        if (dataOut & 0x1) {
+            setPinOutput_writeHigh(DATA_PIN);
+        } else {
+            setPinOutput_writeLow(DATA_PIN);
+        }
+        dataOut = dataOut >> 1;
+        setPinOutput_writeHigh(CLOCK_PIN);
+        setPinOutput_writeLow(CLOCK_PIN);
+    }
+    setPinOutput_writeHigh(LATCH_PIN);
+    setPinOutput_writeLow(LATCH_PIN);
+}
+
+static void shiftout_single(uint8_t data) {
+    if (data & 0x1) {
+        setPinOutput_writeHigh(DATA_PIN);
+    } else {
+        setPinOutput_writeLow(DATA_PIN);
+    }
+
+    setPinOutput_writeHigh(CLOCK_PIN);
+    setPinOutput_writeLow(CLOCK_PIN);
+
+    setPinOutput_writeHigh(LATCH_PIN);
+    setPinOutput_writeLow(LATCH_PIN);
+}
+
+static bool select_col(uint8_t col) {
+    pin_t pin = col_pins[col];
+
+    if (pin != NO_PIN) {
+        setPinOutput_writeLow(pin);
+        return true;
+    } else {
+        if (col == 8) {
+            shiftout_single(0x00);
+        } else {
+            shiftout_single(0x01);
+        }
+        return true;
+    }
+    return false;
+}
+
+static void unselect_col(uint8_t col) {
+    pin_t pin = col_pins[col];
+
+    if (pin != NO_PIN) {
+#ifdef MATRIX_UNSELECT_DRIVE_HIGH
+        setPinOutput_writeHigh(pin);
+#else
+        setPinInputHigh_atomic(pin);
+#endif
+    } else {
+        if (col == (MATRIX_COLS - 1)) shiftout_single(0x01);
+    }
+}
+
+static void unselect_cols(void) {
+    // unselect column pins
+    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+        pin_t pin = col_pins[x];
+
+        if (pin != NO_PIN) {
+#ifdef MATRIX_UNSELECT_DRIVE_HIGH
+            setPinOutput_writeHigh(pin);
+#else
+            setPinInputHigh_atomic(pin);
+#endif
+        }
+        if (x == (MATRIX_COLS - 1))
+            // unselect Shift Register
+            shiftOut(0xFF);
+    }
+}
+
+static void matrix_init_pins(void) {
+    unselect_cols();
+    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        if (row_pins[x] != NO_PIN) {
+            setPinInputHigh_atomic(row_pins[x]);
+        }
+    }
+}
+
+static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter) {
+    bool key_pressed = false;
+
+    // Select col
+    if (!select_col(current_col)) { // select col
+        return;                     // skip NO_PIN col
+    }
+
+    if (current_col < 8) {
+        matrix_output_select_delay();
+    } else {
+        for (int8_t cycle = 4; cycle > 0; cycle--) {
+            matrix_output_select_delay(); // 0.25us
+            matrix_output_select_delay();
+            matrix_output_select_delay();
+            matrix_output_select_delay();
+        }
+    }
+
+    // For each row...
+    for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) {
+        // Check row pin state
+        if (readMatrixPin(row_pins[row_index]) == 0) {
+            // Pin LO, set col bit
+            current_matrix[row_index] |= row_shifter;
+            key_pressed = true;
+        } else {
+            // Pin HI, clear col bit
+            current_matrix[row_index] &= ~row_shifter;
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col);
+    matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH
+}
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    matrix_init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    matrix_row_t curr_matrix[MATRIX_ROWS] = {0};
+
+    // Set col, read rows
+    matrix_row_t row_shifter = MATRIX_ROW_SHIFTER;
+    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++, row_shifter <<= 1) {
+        matrix_read_rows_on_col(curr_matrix, current_col, row_shifter);
+    }
+
+    bool changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0;
+    if (changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix));
+
+    return changed;
+}
diff --git a/keyboards/keychron/q1v2/mcuconf.h b/keyboards/keychron/q1v2/mcuconf.h
new file mode 100644
index 000000000000..0ca8c64850f4
--- /dev/null
+++ b/keyboards/keychron/q1v2/mcuconf.h
@@ -0,0 +1,22 @@
+/* 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_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/keychron/q1v2/q1v2.c b/keyboards/keychron/q1v2/q1v2.c
new file mode 100644
index 000000000000..4f83a760d385
--- /dev/null
+++ b/keyboards/keychron/q1v2/q1v2.c
@@ -0,0 +1,86 @@
+/* Copyright 2023 @ 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 "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)) {
+        return false;
+    }
+    if (index == 0) {
+        default_layer_set(1UL << (active ? 2 : 0));
+    }
+    return true;
+}
+#endif
+
+#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX)
+
+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) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    } break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                    } break;
+                }
+            }
+            if (!rgb_matrix_is_enabled()) {
+                rgb_matrix_set_flags(LED_FLAG_ALL);
+                rgb_matrix_enable();
+            }
+            return false;
+#    endif
+    }
+    return true;
+}
+
+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;
+    }
+    // RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue);
+
+    if (host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 255, 255, 255);
+    } else {
+        if (!rgb_matrix_get_flags()) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 0, 0, 0);
+        }
+    }
+    return true;
+}
+
+#endif
diff --git a/keyboards/keychron/q1v2/readme.md b/keyboards/keychron/q1v2/readme.md
new file mode 100644
index 000000000000..8efb51e60ff5
--- /dev/null
+++ b/keyboards/keychron/q1v2/readme.md
@@ -0,0 +1,31 @@
+# Keychron Q1 Version 2
+
+![Keychron Q1V2](https://i.imgur.com/BbJNGLYh.jpg)
+
+A customizable 75% keyboard.
+
+* Keyboard Maintainer: [Keychron](https://github.com/keychron)
+* Hardware Supported: Keychron Q1 Version 2
+* Hardware Availability: [Keychron Q1 QMK Custom Mechanical Keyboard](https://www.keychron.com/products/keychron-q1)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keychron/q1v2/ansi:default
+    make keychron/q1v2/ansi_encoder:default
+    make keychron/q1v2/iso:default
+    make keychron/q1v2/iso_encoder:default
+    make keychron/q1v2/jis:default
+    make keychron/q1v2/jis_encoder:default
+
+Flashing example for this keyboard:
+
+    make keychron/q1v2/ansi:default:flash
+    make keychron/q1v2/ansi_encoder:default:flash
+    make keychron/q1v2/iso:default:flash
+    make keychron/q1v2/iso_encoder:default:flash
+    make keychron/q1v2/jis:default:flash
+    make keychron/q1v2/jis_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).
diff --git a/keyboards/keychron/q2/ansi/info.json b/keyboards/keychron/q2/ansi/info.json
index 8683144f8985..8ed601fe8f4a 100644
--- a/keyboards/keychron/q2/ansi/info.json
+++ b/keyboards/keychron/q2/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/q2/ansi/keymaps/badger/keymap.c b/keyboards/keychron/q2/ansi/keymaps/badger/keymap.c
new file mode 100644
index 000000000000..a9fe2057a8c2
--- /dev/null
+++ b/keyboards/keychron/q2/ansi/keymaps/badger/keymap.c
@@ -0,0 +1,65 @@
+/* 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 QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    WIN_BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+#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(
+        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_LOPT, KC_LGUI,                            KC_SPC,                             MO(_FN1),KC_RALT,  KC_LCTL,  KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_BASE] = LAYOUT_ansi_67(
+        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_LGUI, KC_LALT,                            KC_SPC,                             MO(_FN1),KC_RALT,  KC_LCTL,  KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [_FN1] = LAYOUT_ansi_67(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  _______,          _______,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______,  _______, _______,          _______,
+        _______, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______,           _______,          KC_INS,
+        _______,          _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______,           _______, KC_PGUP,
+        _______, _______, _______,                            _______,                            _______, _______,  MO(_FN2),_______, KC_PGDN, _______),
+
+    [_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, _______,          QK_BOOT,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______,  _______, _______,          _______,
+        _______, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______,           _______,          _______,
+        _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,           _______, _______,
+        _______, _______, _______,                            _______,                            _______, MO(_FN3), _______, _______, _______, _______),
+
+    [_FN2] = LAYOUT_ansi_67(
+        KC_GRV,  KC_BRID, KC_BRIU, _______, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU, _______,          _______,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______,  _______, _______,          _______,
+        _______, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______,           _______,          _______,
+        _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,           _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,  _______, _______, _______, _______)
+};
diff --git a/keyboards/keychron/q2/ansi/rules.mk b/keyboards/keychron/q2/ansi/rules.mk
index bc7a0e0ff314..ede7d6fab23a 100644
--- a/keyboards/keychron/q2/ansi/rules.mk
+++ b/keyboards/keychron/q2/ansi/rules.mk
@@ -16,5 +16,3 @@ RGB_MATRIX_ENABLE = yes
 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
diff --git a/keyboards/keychron/q2/ansi_encoder/info.json b/keyboards/keychron/q2/ansi_encoder/info.json
index b05c2e68d21f..c9587d20ea0a 100644
--- a/keyboards/keychron/q2/ansi_encoder/info.json
+++ b/keyboards/keychron/q2/ansi_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/q2/ansi_encoder/rules.mk b/keyboards/keychron/q2/ansi_encoder/rules.mk
index 3de172c6e3fe..b294cf950e01 100644
--- a/keyboards/keychron/q2/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q2/ansi_encoder/rules.mk
@@ -16,5 +16,3 @@ RGB_MATRIX_ENABLE = yes
 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
diff --git a/keyboards/keychron/q2/iso/info.json b/keyboards/keychron/q2/iso/info.json
index 17905eb8724b..e3cad79b14be 100644
--- a/keyboards/keychron/q2/iso/info.json
+++ b/keyboards/keychron/q2/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/q2/iso/rules.mk b/keyboards/keychron/q2/iso/rules.mk
index f4aca09af8ac..b3de9622913e 100644
--- a/keyboards/keychron/q2/iso/rules.mk
+++ b/keyboards/keychron/q2/iso/rules.mk
@@ -16,5 +16,3 @@ RGB_MATRIX_ENABLE = yes
 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
diff --git a/keyboards/keychron/q2/iso_encoder/info.json b/keyboards/keychron/q2/iso_encoder/info.json
index f5a2976bd3d0..5030e6be4262 100644
--- a/keyboards/keychron/q2/iso_encoder/info.json
+++ b/keyboards/keychron/q2/iso_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/q2/iso_encoder/rules.mk b/keyboards/keychron/q2/iso_encoder/rules.mk
index 33a50c67f751..aba76c09442f 100644
--- a/keyboards/keychron/q2/iso_encoder/rules.mk
+++ b/keyboards/keychron/q2/iso_encoder/rules.mk
@@ -16,5 +16,3 @@ RGB_MATRIX_ENABLE = yes
 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
diff --git a/keyboards/keychron/q2/jis/info.json b/keyboards/keychron/q2/jis/info.json
index 09092873eb88..d0af24b29daa 100644
--- a/keyboards/keychron/q2/jis/info.json
+++ b/keyboards/keychron/q2/jis/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/q2/jis/rules.mk b/keyboards/keychron/q2/jis/rules.mk
index 2b4a67b1eeed..c37beecb9ec1 100644
--- a/keyboards/keychron/q2/jis/rules.mk
+++ b/keyboards/keychron/q2/jis/rules.mk
@@ -15,6 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/q2/jis_encoder/info.json b/keyboards/keychron/q2/jis_encoder/info.json
index af22479aa04b..e409fb63a67e 100644
--- a/keyboards/keychron/q2/jis_encoder/info.json
+++ b/keyboards/keychron/q2/jis_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/q2/jis_encoder/rules.mk b/keyboards/keychron/q2/jis_encoder/rules.mk
index 6a772965ff6b..5091fe94148b 100644
--- a/keyboards/keychron/q2/jis_encoder/rules.mk
+++ b/keyboards/keychron/q2/jis_encoder/rules.mk
@@ -16,6 +16,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/q3/ansi/info.json b/keyboards/keychron/q3/ansi/info.json
index 3f18242e4568..124ac1bdcc9c 100644
--- a/keyboards/keychron/q3/ansi/info.json
+++ b/keyboards/keychron/q3/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/keychron/q3/ansi/rules.mk b/keyboards/keychron/q3/ansi/rules.mk
index 566c476585a4..58bbb89a7226 100644
--- a/keyboards/keychron/q3/ansi/rules.mk
+++ b/keyboards/keychron/q3/ansi/rules.mk
@@ -16,5 +16,3 @@ LTO_ENABLE = yes
 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
diff --git a/keyboards/keychron/q3/ansi_encoder/info.json b/keyboards/keychron/q3/ansi_encoder/info.json
index b536bb235e82..2dd2f18bf9f5 100644
--- a/keyboards/keychron/q3/ansi_encoder/info.json
+++ b/keyboards/keychron/q3/ansi_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/q3/ansi_encoder/rules.mk b/keyboards/keychron/q3/ansi_encoder/rules.mk
index 95a153f68918..77b90f246666 100644
--- a/keyboards/keychron/q3/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q3/ansi_encoder/rules.mk
@@ -17,9 +17,6 @@ LTO_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q3/iso/info.json b/keyboards/keychron/q3/iso/info.json
index e858ee224589..c9618c5b47fe 100644
--- a/keyboards/keychron/q3/iso/info.json
+++ b/keyboards/keychron/q3/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/keychron/q3/iso/rules.mk b/keyboards/keychron/q3/iso/rules.mk
index 566c476585a4..58bbb89a7226 100644
--- a/keyboards/keychron/q3/iso/rules.mk
+++ b/keyboards/keychron/q3/iso/rules.mk
@@ -16,5 +16,3 @@ LTO_ENABLE = yes
 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
diff --git a/keyboards/keychron/q3/iso_encoder/info.json b/keyboards/keychron/q3/iso_encoder/info.json
index 6790d8b06f31..85714450876c 100644
--- a/keyboards/keychron/q3/iso_encoder/info.json
+++ b/keyboards/keychron/q3/iso_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/q3/iso_encoder/rules.mk b/keyboards/keychron/q3/iso_encoder/rules.mk
index 95a153f68918..77b90f246666 100644
--- a/keyboards/keychron/q3/iso_encoder/rules.mk
+++ b/keyboards/keychron/q3/iso_encoder/rules.mk
@@ -17,9 +17,6 @@ LTO_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q3/jis/info.json b/keyboards/keychron/q3/jis/info.json
index 772b8f4c183a..6f17a7cf9d71 100644
--- a/keyboards/keychron/q3/jis/info.json
+++ b/keyboards/keychron/q3/jis/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/keychron/q3/jis/rules.mk b/keyboards/keychron/q3/jis/rules.mk
index 566c476585a4..58bbb89a7226 100644
--- a/keyboards/keychron/q3/jis/rules.mk
+++ b/keyboards/keychron/q3/jis/rules.mk
@@ -16,5 +16,3 @@ LTO_ENABLE = yes
 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
diff --git a/keyboards/keychron/q3/jis_encoder/info.json b/keyboards/keychron/q3/jis_encoder/info.json
index 2bb4242c1bc3..fd1f361f5724 100644
--- a/keyboards/keychron/q3/jis_encoder/info.json
+++ b/keyboards/keychron/q3/jis_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/q3/jis_encoder/rules.mk b/keyboards/keychron/q3/jis_encoder/rules.mk
index 95a153f68918..77b90f246666 100644
--- a/keyboards/keychron/q3/jis_encoder/rules.mk
+++ b/keyboards/keychron/q3/jis_encoder/rules.mk
@@ -17,9 +17,6 @@ LTO_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q4/ansi_v1/info.json b/keyboards/keychron/q4/ansi_v1/info.json
index 4de9da9c8d12..8ee286c48190 100644
--- a/keyboards/keychron/q4/ansi_v1/info.json
+++ b/keyboards/keychron/q4/ansi_v1/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
diff --git a/keyboards/keychron/q4/ansi_v1/rules.mk b/keyboards/keychron/q4/ansi_v1/rules.mk
index 9111c3b9bd4b..cad488b009c9 100644
--- a/keyboards/keychron/q4/ansi_v1/rules.mk
+++ b/keyboards/keychron/q4/ansi_v1/rules.mk
@@ -16,6 +16,3 @@ LTO_ENABLE = no
 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
-
diff --git a/keyboards/keychron/q4/ansi_v2/info.json b/keyboards/keychron/q4/ansi_v2/info.json
index 4de9da9c8d12..8ee286c48190 100644
--- a/keyboards/keychron/q4/ansi_v2/info.json
+++ b/keyboards/keychron/q4/ansi_v2/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
diff --git a/keyboards/keychron/q4/ansi_v2/rules.mk b/keyboards/keychron/q4/ansi_v2/rules.mk
index 9111c3b9bd4b..cad488b009c9 100644
--- a/keyboards/keychron/q4/ansi_v2/rules.mk
+++ b/keyboards/keychron/q4/ansi_v2/rules.mk
@@ -16,6 +16,3 @@ LTO_ENABLE = no
 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
-
diff --git a/keyboards/keychron/q4/iso/info.json b/keyboards/keychron/q4/iso/info.json
index 5d675ff3b585..f8945cda6198 100644
--- a/keyboards/keychron/q4/iso/info.json
+++ b/keyboards/keychron/q4/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
diff --git a/keyboards/keychron/q4/iso/rules.mk b/keyboards/keychron/q4/iso/rules.mk
index 9111c3b9bd4b..cad488b009c9 100644
--- a/keyboards/keychron/q4/iso/rules.mk
+++ b/keyboards/keychron/q4/iso/rules.mk
@@ -16,6 +16,3 @@ LTO_ENABLE = no
 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
-
diff --git a/keyboards/keychron/q5/ansi/info.json b/keyboards/keychron/q5/ansi/info.json
index 7be2a383670e..55d7ae0165c6 100644
--- a/keyboards/keychron/q5/ansi/info.json
+++ b/keyboards/keychron/q5/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/keychron/q5/ansi/rules.mk b/keyboards/keychron/q5/ansi/rules.mk
index f2dba218bfc6..e859eb9c34c6 100644
--- a/keyboards/keychron/q5/ansi/rules.mk
+++ b/keyboards/keychron/q5/ansi/rules.mk
@@ -15,9 +15,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q5/ansi_encoder/info.json b/keyboards/keychron/q5/ansi_encoder/info.json
index a1a12f17ed11..468261b1e9ad 100644
--- a/keyboards/keychron/q5/ansi_encoder/info.json
+++ b/keyboards/keychron/q5/ansi_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/q5/ansi_encoder/rules.mk b/keyboards/keychron/q5/ansi_encoder/rules.mk
index 5df3cbccaf16..7da353fbd162 100644
--- a/keyboards/keychron/q5/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q5/ansi_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q5/iso/info.json b/keyboards/keychron/q5/iso/info.json
index 786fa4a67e37..3b0b2ea1a069 100644
--- a/keyboards/keychron/q5/iso/info.json
+++ b/keyboards/keychron/q5/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/keychron/q5/iso/rules.mk b/keyboards/keychron/q5/iso/rules.mk
index f2dba218bfc6..e859eb9c34c6 100644
--- a/keyboards/keychron/q5/iso/rules.mk
+++ b/keyboards/keychron/q5/iso/rules.mk
@@ -15,9 +15,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q5/iso_encoder/info.json b/keyboards/keychron/q5/iso_encoder/info.json
index 650af582af1e..eefa6dc69306 100644
--- a/keyboards/keychron/q5/iso_encoder/info.json
+++ b/keyboards/keychron/q5/iso_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/q5/iso_encoder/rules.mk b/keyboards/keychron/q5/iso_encoder/rules.mk
index 5df3cbccaf16..7da353fbd162 100644
--- a/keyboards/keychron/q5/iso_encoder/rules.mk
+++ b/keyboards/keychron/q5/iso_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q6/ansi/info.json b/keyboards/keychron/q6/ansi/info.json
index f12809d8d01c..fdec220e80c3 100644
--- a/keyboards/keychron/q6/ansi/info.json
+++ b/keyboards/keychron/q6/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/keychron/q6/ansi/rules.mk b/keyboards/keychron/q6/ansi/rules.mk
index ce3d41a17d2c..ec47b77d0f64 100644
--- a/keyboards/keychron/q6/ansi/rules.mk
+++ b/keyboards/keychron/q6/ansi/rules.mk
@@ -16,9 +16,6 @@ LTO_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q6/ansi_encoder/info.json b/keyboards/keychron/q6/ansi_encoder/info.json
index ce1ffbb29403..df3902f44abf 100644
--- a/keyboards/keychron/q6/ansi_encoder/info.json
+++ b/keyboards/keychron/q6/ansi_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/q6/ansi_encoder/rules.mk b/keyboards/keychron/q6/ansi_encoder/rules.mk
index 95a153f68918..77b90f246666 100644
--- a/keyboards/keychron/q6/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q6/ansi_encoder/rules.mk
@@ -17,9 +17,6 @@ LTO_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q6/iso/info.json b/keyboards/keychron/q6/iso/info.json
index 77285ad1b91e..dfaa20aa9317 100644
--- a/keyboards/keychron/q6/iso/info.json
+++ b/keyboards/keychron/q6/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/keychron/q6/iso/rules.mk b/keyboards/keychron/q6/iso/rules.mk
index 3388811adde7..6548448302c0 100644
--- a/keyboards/keychron/q6/iso/rules.mk
+++ b/keyboards/keychron/q6/iso/rules.mk
@@ -17,9 +17,6 @@ LTO_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q6/iso_encoder/info.json b/keyboards/keychron/q6/iso_encoder/info.json
index db795c312a18..45906168312c 100644
--- a/keyboards/keychron/q6/iso_encoder/info.json
+++ b/keyboards/keychron/q6/iso_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/q6/iso_encoder/rules.mk b/keyboards/keychron/q6/iso_encoder/rules.mk
index d7fe88d9ca3b..548b0d696baa 100644
--- a/keyboards/keychron/q6/iso_encoder/rules.mk
+++ b/keyboards/keychron/q6/iso_encoder/rules.mk
@@ -18,9 +18,6 @@ LTO_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q60/ansi/info.json b/keyboards/keychron/q60/ansi/info.json
index 5c915ea1a9a0..95b1c4e4728f 100644
--- a/keyboards/keychron/q60/ansi/info.json
+++ b/keyboards/keychron/q60/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
diff --git a/keyboards/keychron/q60/ansi/rules.mk b/keyboards/keychron/q60/ansi/rules.mk
index 6dcd47b1fe3e..46f5aef144b4 100644
--- a/keyboards/keychron/q60/ansi/rules.mk
+++ b/keyboards/keychron/q60/ansi/rules.mk
@@ -15,6 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/q65/ansi_encoder/info.json b/keyboards/keychron/q65/ansi_encoder/info.json
index ce150f5a6187..0f7679945a26 100644
--- a/keyboards/keychron/q65/ansi_encoder/info.json
+++ b/keyboards/keychron/q65/ansi_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/q65/ansi_encoder/rules.mk b/keyboards/keychron/q65/ansi_encoder/rules.mk
index 5df3cbccaf16..7da353fbd162 100644
--- a/keyboards/keychron/q65/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q65/ansi_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/q7/ansi/info.json b/keyboards/keychron/q7/ansi/info.json
index 6912d48a9e32..2549e329f26b 100644
--- a/keyboards/keychron/q7/ansi/info.json
+++ b/keyboards/keychron/q7/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
diff --git a/keyboards/keychron/q7/ansi/rules.mk b/keyboards/keychron/q7/ansi/rules.mk
index 2b4a67b1eeed..c37beecb9ec1 100644
--- a/keyboards/keychron/q7/ansi/rules.mk
+++ b/keyboards/keychron/q7/ansi/rules.mk
@@ -15,6 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/q7/iso/info.json b/keyboards/keychron/q7/iso/info.json
index 6b5c9ec66846..27262eb4f368 100644
--- a/keyboards/keychron/q7/iso/info.json
+++ b/keyboards/keychron/q7/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
diff --git a/keyboards/keychron/q7/iso/rules.mk b/keyboards/keychron/q7/iso/rules.mk
index 7f91e808b113..c37beecb9ec1 100644
--- a/keyboards/keychron/q7/iso/rules.mk
+++ b/keyboards/keychron/q7/iso/rules.mk
@@ -15,5 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
diff --git a/keyboards/keychron/q8/ansi/info.json b/keyboards/keychron/q8/ansi/info.json
index 6ef7d5fee1fb..7ee5b6c21f3e 100644
--- a/keyboards/keychron/q8/ansi/info.json
+++ b/keyboards/keychron/q8/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/q8/ansi/rules.mk b/keyboards/keychron/q8/ansi/rules.mk
index 2b4a67b1eeed..c37beecb9ec1 100644
--- a/keyboards/keychron/q8/ansi/rules.mk
+++ b/keyboards/keychron/q8/ansi/rules.mk
@@ -15,6 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/q8/ansi_encoder/info.json b/keyboards/keychron/q8/ansi_encoder/info.json
index a8838ae8d13e..a4c3ac77e13a 100644
--- a/keyboards/keychron/q8/ansi_encoder/info.json
+++ b/keyboards/keychron/q8/ansi_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/q8/ansi_encoder/rules.mk b/keyboards/keychron/q8/ansi_encoder/rules.mk
index e94a89ab85fb..5091fe94148b 100644
--- a/keyboards/keychron/q8/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q8/ansi_encoder/rules.mk
@@ -16,5 +16,3 @@ RGB_MATRIX_ENABLE = yes
 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
diff --git a/keyboards/keychron/q8/iso/info.json b/keyboards/keychron/q8/iso/info.json
index bf7405cce22d..03a6cd1fddcb 100644
--- a/keyboards/keychron/q8/iso/info.json
+++ b/keyboards/keychron/q8/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/q8/iso/rules.mk b/keyboards/keychron/q8/iso/rules.mk
index 2b4a67b1eeed..c37beecb9ec1 100644
--- a/keyboards/keychron/q8/iso/rules.mk
+++ b/keyboards/keychron/q8/iso/rules.mk
@@ -15,6 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/q8/iso_encoder/info.json b/keyboards/keychron/q8/iso_encoder/info.json
index f55ccaf202a4..eb9dc22503b6 100644
--- a/keyboards/keychron/q8/iso_encoder/info.json
+++ b/keyboards/keychron/q8/iso_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/q8/iso_encoder/rules.mk b/keyboards/keychron/q8/iso_encoder/rules.mk
index 6a772965ff6b..5091fe94148b 100644
--- a/keyboards/keychron/q8/iso_encoder/rules.mk
+++ b/keyboards/keychron/q8/iso_encoder/rules.mk
@@ -16,6 +16,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/q9/ansi/info.json b/keyboards/keychron/q9/ansi/info.json
index 736467f42f91..952d3158c813 100644
--- a/keyboards/keychron/q9/ansi/info.json
+++ b/keyboards/keychron/q9/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
diff --git a/keyboards/keychron/q9/ansi/rules.mk b/keyboards/keychron/q9/ansi/rules.mk
index 2b4a67b1eeed..c37beecb9ec1 100644
--- a/keyboards/keychron/q9/ansi/rules.mk
+++ b/keyboards/keychron/q9/ansi/rules.mk
@@ -15,6 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/q9/ansi_encoder/info.json b/keyboards/keychron/q9/ansi_encoder/info.json
index 95e2a1a2fbf7..4fd5352638a0 100644
--- a/keyboards/keychron/q9/ansi_encoder/info.json
+++ b/keyboards/keychron/q9/ansi_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
diff --git a/keyboards/keychron/q9/ansi_encoder/rules.mk b/keyboards/keychron/q9/ansi_encoder/rules.mk
index 7caead18d7fb..911c497043a0 100644
--- a/keyboards/keychron/q9/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q9/ansi_encoder/rules.mk
@@ -17,6 +17,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/q9/iso/info.json b/keyboards/keychron/q9/iso/info.json
index a28b47dcf02e..3e9a7690c18a 100644
--- a/keyboards/keychron/q9/iso/info.json
+++ b/keyboards/keychron/q9/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
diff --git a/keyboards/keychron/q9/iso/rules.mk b/keyboards/keychron/q9/iso/rules.mk
index 2b4a67b1eeed..c37beecb9ec1 100644
--- a/keyboards/keychron/q9/iso/rules.mk
+++ b/keyboards/keychron/q9/iso/rules.mk
@@ -15,6 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/q9/iso_encoder/info.json b/keyboards/keychron/q9/iso_encoder/info.json
index f7f1ed8529af..ecf944744d82 100644
--- a/keyboards/keychron/q9/iso_encoder/info.json
+++ b/keyboards/keychron/q9/iso_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
diff --git a/keyboards/keychron/q9/iso_encoder/rules.mk b/keyboards/keychron/q9/iso_encoder/rules.mk
index 7caead18d7fb..911c497043a0 100644
--- a/keyboards/keychron/q9/iso_encoder/rules.mk
+++ b/keyboards/keychron/q9/iso_encoder/rules.mk
@@ -17,6 +17,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/q9_plus/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q9_plus/ansi_encoder/ansi_encoder.c
new file mode 100755
index 000000000000..c0b4b3a32ddb
--- /dev/null
+++ b/keyboards/keychron/q9_plus/ansi_encoder/ansi_encoder.c
@@ -0,0 +1,85 @@
+/* Copyright 2023 @ 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 "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to CKLED2001 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, 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, 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, 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},
+};
+#endif
diff --git a/keyboards/keychron/q9_plus/ansi_encoder/config.h b/keyboards/keychron/q9_plus/ansi_encoder/config.h
new file mode 100755
index 000000000000..1943a0fb2755
--- /dev/null
+++ b/keyboards/keychron/q9_plus/ansi_encoder/config.h
@@ -0,0 +1,26 @@
+/* Copyright 2023 @ 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 53
+
+/* Encoder Configuration */
+#define ENCODER_DEFAULT_POS 0x3
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 14
diff --git a/keyboards/keychron/q9_plus/ansi_encoder/info.json b/keyboards/keychron/q9_plus/ansi_encoder/info.json
new file mode 100755
index 000000000000..c465071ca14a
--- /dev/null
+++ b/keyboards/keychron/q9_plus/ansi_encoder/info.json
@@ -0,0 +1,66 @@
+{
+    "usb": {
+        "pid": "0x0194",
+        "device_version": "1.0.0"
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":2,   "y":0},
+            {"matrix":[0, 1],  "flags":4, "x":20,  "y":0},
+            {"matrix":[0, 2],  "flags":4, "x":35,  "y":0},
+            {"matrix":[0, 3],  "flags":4, "x":50,  "y":0},
+            {"matrix":[0, 4],  "flags":4, "x":65,  "y":0},
+            {"matrix":[0, 5],  "flags":4, "x":80,  "y":0},
+            {"matrix":[0, 6],  "flags":4, "x":94,  "y":0},
+            {"matrix":[0, 7],  "flags":4, "x":109, "y":0},
+            {"matrix":[0, 8],  "flags":4, "x":124, "y":0},
+            {"matrix":[0, 9],  "flags":4, "x":139, "y":0},
+            {"matrix":[0, 10], "flags":4, "x":154, "y":0},
+            {"matrix":[0, 11], "flags":4, "x":168, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":183, "y":0},
+            {"matrix":[0, 13], "flags":1, "x":202, "y":0},
+
+            {"matrix":[1, 0],  "flags":8, "x":4,   "y":21},
+            {"matrix":[1, 1],  "flags":4, "x":24,  "y":21},
+            {"matrix":[1, 2],  "flags":4, "x":39,  "y":21},
+            {"matrix":[1, 3],  "flags":4, "x":54,  "y":21},
+            {"matrix":[1, 4],  "flags":4, "x":68,  "y":21},
+            {"matrix":[1, 5],  "flags":4, "x":83,  "y":21},
+            {"matrix":[1, 6],  "flags":4, "x":98,  "y":21},
+            {"matrix":[1, 7],  "flags":4, "x":113, "y":21},
+            {"matrix":[1, 8],  "flags":4, "x":128, "y":21},
+            {"matrix":[1, 9],  "flags":4, "x":142, "y":21},
+            {"matrix":[1, 10], "flags":4, "x":157, "y":21},
+            {"matrix":[1, 11], "flags":4, "x":172, "y":21},
+            {"matrix":[1, 13], "flags":1, "x":196, "y":21},
+            {"matrix":[1, 14], "flags":1, "x":224, "y":21},
+
+            {"matrix":[2, 0],  "flags":1, "x":7,   "y":43},
+            {"matrix":[2, 2],  "flags":4, "x":31,  "y":43},
+            {"matrix":[2, 3],  "flags":4, "x":46,  "y":43},
+            {"matrix":[2, 4],  "flags":4, "x":61,  "y":43},
+            {"matrix":[2, 5],  "flags":4, "x":76,  "y":43},
+            {"matrix":[2, 6],  "flags":4, "x":91,  "y":43},
+            {"matrix":[2, 7],  "flags":4, "x":105, "y":43},
+            {"matrix":[2, 8],  "flags":4, "x":120, "y":43},
+            {"matrix":[2, 9],  "flags":4, "x":135, "y":43},
+            {"matrix":[2, 10], "flags":4, "x":150, "y":43},
+            {"matrix":[2, 11], "flags":4, "x":165, "y":43},
+            {"matrix":[2, 13], "flags":1, "x":185, "y":43},
+            {"matrix":[2, 14], "flags":1, "x":205, "y":43},
+
+            {"matrix":[3, 0],  "flags":1, "x":0,   "y":64},
+            {"matrix":[3, 1],  "flags":1, "x":18,  "y":64},
+            {"matrix":[3, 2],  "flags":1, "x":37,  "y":64},
+            {"matrix":[3, 3],  "flags":1, "x":55,  "y":64},
+            {"matrix":[3, 6],  "flags":4, "x":81,  "y":64},
+            {"matrix":[3, 9],  "flags":4, "x":118, "y":64},
+            {"matrix":[3, 10], "flags":1, "x":146, "y":64},
+            {"matrix":[3, 11], "flags":1, "x":161, "y":64},
+            {"matrix":[3, 12], "flags":1, "x":176, "y":64},
+            {"matrix":[3, 13], "flags":1, "x":190, "y":64},
+            {"matrix":[3, 14], "flags":1, "x":205, "y":64},
+            {"matrix":[1, 12], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/q9_plus/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q9_plus/ansi_encoder/keymaps/default/keymap.c
new file mode 100755
index 000000000000..06c43f6929d7
--- /dev/null
+++ b/keyboards/keychron/q9_plus/ansi_encoder/keymaps/default/keymap.c
@@ -0,0 +1,71 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    WIN_BASE,
+    MAC_FN1,
+    WIN_FN1,
+    FN2,
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_54_ansi(
+        KC_TAB,  KC_Q,     KC_W,     KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,     KC_RBRC,  KC_BSLS,          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_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,  MO(MAC_FN1),      KC_SPC,                    KC_SPC,           KC_RCMD,  MO(MAC_FN1), MO(FN2),  KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_BASE] = LAYOUT_54_ansi(
+        KC_TAB,  KC_Q,     KC_W,     KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,     KC_RBRC,  KC_BSLS,          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_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_LWIN,  KC_LALT,  MO(WIN_FN1),      KC_SPC,                    KC_SPC,           KC_RALT,  MO(WIN_FN1), MO(FN2),  KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [MAC_FN1] = LAYOUT_54_ansi(
+        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,  _______,          RGB_TOG,
+        RGB_TOG, RGB_MOD,  RGB_VAI,  RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______,  _______,               _______,          _______,
+        _______,           RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______,  _______,               _______, _______,
+        _______, _______,  _______,  _______,          _______,                   _______,          _______,  _______,     _______,  _______, _______, _______),
+
+    [WIN_FN1] = LAYOUT_54_ansi(
+        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,  _______,          RGB_TOG,
+        RGB_TOG, RGB_MOD,  RGB_VAI,  RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______,  _______,               _______,          _______,
+        _______,           RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______,  _______,               _______, _______,
+        _______, _______,  _______,  _______,          _______,                   _______,          _______,  _______,     _______,  _______, _______, _______),
+
+    [FN2] = LAYOUT_54_ansi(
+        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_BSPC,          _______,
+        KC_ESC,  KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     _______,               _______,          _______,
+        _______,           _______,  _______, _______, _______, _______, _______, _______, _______, _______,  _______,               _______, _______,
+        _______, _______,  _______,  _______,          _______,                   _______,          _______,  _______,     _______,  _______, _______, _______)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN1]  = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_FN1]  = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [FN2]      = {ENCODER_CCW_CW(_______, _______)}
+};
+#endif
diff --git a/keyboards/keychron/q9_plus/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q9_plus/ansi_encoder/keymaps/default/rules.mk
new file mode 100755
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/keychron/q9_plus/ansi_encoder/keymaps/default/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q9_plus/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q9_plus/ansi_encoder/keymaps/keychron/keymap.c
new file mode 100755
index 000000000000..bf995fca2b25
--- /dev/null
+++ b/keyboards/keychron/q9_plus/ansi_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,80 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+enum layers{
+    MAC_BASE,
+    WIN_BASE,
+    MAC_FN1,
+    WIN_FN1,
+    FN2,
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_54_ansi(
+        KC_TAB,  KC_Q,     KC_W,     KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,     KC_RBRC,  KC_BSLS,          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_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_LOPTN, KC_LCMMD, MO(MAC_FN1),      KC_SPC,                    KC_SPC,           KC_RCMMD, MO(MAC_FN1), MO(FN2),  KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_BASE] = LAYOUT_54_ansi(
+        KC_TAB,  KC_Q,     KC_W,     KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,     KC_RBRC,  KC_BSLS,          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_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_LWIN,  KC_LALT,  MO(WIN_FN1),      KC_SPC,                    KC_SPC,           KC_RALT,  MO(WIN_FN1), MO(FN2),  KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [MAC_FN1] = LAYOUT_54_ansi(
+        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,  _______,          RGB_TOG,
+        RGB_TOG, RGB_MOD,  RGB_VAI,  RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______,  _______,               _______,          _______,
+        _______,           RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______,  _______,               _______, _______,
+        _______, _______,  _______,  _______,          _______,                   _______,          _______,  _______,     _______,  _______, _______, _______),
+
+    [WIN_FN1] = LAYOUT_54_ansi(
+        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,  _______,          RGB_TOG,
+        RGB_TOG, RGB_MOD,  RGB_VAI,  RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______,  _______,               _______,          _______,
+        _______,           RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______,  _______,               _______, _______,
+        _______, _______,  _______,  _______,          _______,                   _______,          _______,  _______,     _______,  _______, _______, _______),
+
+    [FN2] = LAYOUT_54_ansi(
+        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_BSPC,          _______,
+        KC_ESC,  KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     _______,               _______,          _______,
+        _______,           _______,  _______, _______, _______, _______, _______, _______, _______, _______,  _______,               _______, _______,
+        _______, _______,  _______,  _______,          _______,                   _______,          _______,  _______,     _______,  _______, _______, _______)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN1]  = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_FN1]  = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [FN2]      = {ENCODER_CCW_CW(_______, _______)}
+};
+#endif
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
+    return true;
+}
diff --git a/keyboards/keychron/q9_plus/ansi_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q9_plus/ansi_encoder/keymaps/keychron/rules.mk
new file mode 100755
index 000000000000..9cf1a9b56cba
--- /dev/null
+++ b/keyboards/keychron/q9_plus/ansi_encoder/keymaps/keychron/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q9_plus/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q9_plus/ansi_encoder/keymaps/via/keymap.c
new file mode 100755
index 000000000000..06c43f6929d7
--- /dev/null
+++ b/keyboards/keychron/q9_plus/ansi_encoder/keymaps/via/keymap.c
@@ -0,0 +1,71 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    WIN_BASE,
+    MAC_FN1,
+    WIN_FN1,
+    FN2,
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_54_ansi(
+        KC_TAB,  KC_Q,     KC_W,     KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,     KC_RBRC,  KC_BSLS,          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_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,  MO(MAC_FN1),      KC_SPC,                    KC_SPC,           KC_RCMD,  MO(MAC_FN1), MO(FN2),  KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_BASE] = LAYOUT_54_ansi(
+        KC_TAB,  KC_Q,     KC_W,     KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,     KC_RBRC,  KC_BSLS,          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_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_LWIN,  KC_LALT,  MO(WIN_FN1),      KC_SPC,                    KC_SPC,           KC_RALT,  MO(WIN_FN1), MO(FN2),  KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [MAC_FN1] = LAYOUT_54_ansi(
+        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,  _______,          RGB_TOG,
+        RGB_TOG, RGB_MOD,  RGB_VAI,  RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______,  _______,               _______,          _______,
+        _______,           RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______,  _______,               _______, _______,
+        _______, _______,  _______,  _______,          _______,                   _______,          _______,  _______,     _______,  _______, _______, _______),
+
+    [WIN_FN1] = LAYOUT_54_ansi(
+        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,  _______,          RGB_TOG,
+        RGB_TOG, RGB_MOD,  RGB_VAI,  RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______,  _______,               _______,          _______,
+        _______,           RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______,  _______,               _______, _______,
+        _______, _______,  _______,  _______,          _______,                   _______,          _______,  _______,     _______,  _______, _______, _______),
+
+    [FN2] = LAYOUT_54_ansi(
+        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_BSPC,          _______,
+        KC_ESC,  KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     _______,               _______,          _______,
+        _______,           _______,  _______, _______, _______, _______, _______, _______, _______, _______,  _______,               _______, _______,
+        _______, _______,  _______,  _______,          _______,                   _______,          _______,  _______,     _______,  _______, _______, _______)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN1]  = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_FN1]  = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [FN2]      = {ENCODER_CCW_CW(_______, _______)}
+};
+#endif
diff --git a/keyboards/keychron/q9_plus/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q9_plus/ansi_encoder/keymaps/via/rules.mk
new file mode 100755
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/keychron/q9_plus/ansi_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q9_plus/ansi_encoder/rules.mk b/keyboards/keychron/q9_plus/ansi_encoder/rules.mk
new file mode 100755
index 000000000000..e69de29bb2d1
diff --git a/keyboards/keychron/q9_plus/config.h b/keyboards/keychron/q9_plus/config.h
new file mode 100755
index 000000000000..a8cba07e9028
--- /dev/null
+++ b/keyboards/keychron/q9_plus/config.h
@@ -0,0 +1,54 @@
+/* Copyright 2023 @ 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
+
+/* Disable DIP switch in matrix data */
+#define MATRIX_MASKED
+
+/* DIP switch */
+#define DIP_SWITCH_MATRIX_GRID {{ 3, 4 }}
+
+/* RGB Matrix Driver Configuration */
+#define DRIVER_COUNT 1
+#define DRIVER_ADDR_1 0b1110100
+
+/* Increase I2C speed to 1000 KHz */
+#define I2C1_TIMINGR_PRESC 0U
+#define I2C1_TIMINGR_SCLDEL 3U
+#define I2C1_TIMINGR_SDADEL 0U
+#define I2C1_TIMINGR_SCLH 15U
+#define I2C1_TIMINGR_SCLL 51U
+
+/* Set LED driver current */
+#define CKLED2001_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/halconf.h b/keyboards/keychron/q9_plus/halconf.h
new file mode 100755
index 000000000000..41bddcb2799b
--- /dev/null
+++ b/keyboards/keychron/q9_plus/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_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/keychron/q9_plus/info.json b/keyboards/keychron/q9_plus/info.json
new file mode 100755
index 000000000000..c56650cb1dca
--- /dev/null
+++ b/keyboards/keychron/q9_plus/info.json
@@ -0,0 +1,124 @@
+{
+    "keyboard_name": "Keychron Q9 Plus",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+        "vid": "0x3434"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "dip_switch": true,
+        "encoder": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "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": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "B5"}
+        ]
+    },
+    "dynamic_keymap": {
+        "layer_count": 5
+    },
+    "layouts": {
+        "LAYOUT_54_ansi": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0, "w":1.5},
+                {"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":[0,8], "x":8.5, "y":0},
+                {"matrix":[0,9], "x":9.5, "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, "w":1.5},
+                {"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},
+                {"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,13], "x":12.75, "y":1, "w":2.25},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+
+                {"matrix":[2,0], "x":0, "y":2, "w":2.25},
+                {"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":[2,6], "x":6.25, "y":2},
+                {"matrix":[2,7], "x":7.25, "y":2},
+                {"matrix":[2,8], "x":8.25, "y":2},
+                {"matrix":[2,9], "x":9.25, "y":2},
+                {"matrix":[2,10], "x":10.25, "y":2},
+                {"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},
+                {"matrix":[3,3], "x":3.75, "y":3, "w":1.25},
+                {"matrix":[3,6], "x":5, "y":3, "w":2.25},
+                {"matrix":[3,9], "x":7.25, "y":3, "w":2.75},
+                {"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":[3,14], "x":14, "y":3},
+                {"matrix":[1,12], "x":15, "y":3}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "driver": "ckled2001",
+        "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
+        }
+    }
+}
diff --git a/keyboards/keychron/q9_plus/mcuconf.h b/keyboards/keychron/q9_plus/mcuconf.h
new file mode 100755
index 000000000000..0ca8c64850f4
--- /dev/null
+++ b/keyboards/keychron/q9_plus/mcuconf.h
@@ -0,0 +1,22 @@
+/* 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_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/keychron/q9_plus/q9_plus.c b/keyboards/keychron/q9_plus/q9_plus.c
new file mode 100755
index 000000000000..848117d323be
--- /dev/null
+++ b/keyboards/keychron/q9_plus/q9_plus.c
@@ -0,0 +1,81 @@
+/* Copyright 2023 @ 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 "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)) {
+        return false;
+    }
+    if (index == 0) {
+        default_layer_set(1UL << (active ? 1 : 0));
+    }
+    return true;
+}
+#endif
+
+#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX)
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+    switch (keycode) {
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    } break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                    } break;
+                }
+            }
+            if (!rgb_matrix_is_enabled()) {
+                rgb_matrix_set_flags(LED_FLAG_ALL);
+                rgb_matrix_enable();
+            }
+            return false;
+    }
+    return true;
+}
+
+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) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 255, 255, 255);
+    } else {
+        if (!rgb_matrix_get_flags()) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 0, 0, 0);
+        }
+    }
+    return true;
+}
+
+#endif
diff --git a/keyboards/keychron/q9_plus/readme.md b/keyboards/keychron/q9_plus/readme.md
new file mode 100755
index 000000000000..d0ab58e13c3a
--- /dev/null
+++ b/keyboards/keychron/q9_plus/readme.md
@@ -0,0 +1,21 @@
+# Keychron Q9 Plus
+
+![Keychron Q9 Plus](https://i.imgur.com/Yp9K7Gsh.jpg)
+
+A customizable 40% keyboard.
+
+* Keyboard Maintainer: [Keychron](https://github.com/keychron)
+* Hardware Supported: Keychron Q9 Plus
+* 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_plus/ansi_encoder:default
+
+Flashing example for this keyboard:
+
+    make keychron/q9_plus/ansi:default:flash
+
+**Reset Key**: Hold down the key located at *K00*, programmed as *TAB* 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).
diff --git a/keyboards/keychron/s1/ansi/rgb/info.json b/keyboards/keychron/s1/ansi/rgb/info.json
index de3fdef57318..3bef5f343c30 100644
--- a/keyboards/keychron/s1/ansi/rgb/info.json
+++ b/keyboards/keychron/s1/ansi/rgb/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "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/rules.mk b/keyboards/keychron/s1/ansi/rgb/rules.mk
index 2b4a67b1eeed..c37beecb9ec1 100644
--- a/keyboards/keychron/s1/ansi/rgb/rules.mk
+++ b/keyboards/keychron/s1/ansi/rgb/rules.mk
@@ -15,6 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/s1/ansi/white/info.json b/keyboards/keychron/s1/ansi/white/info.json
index 6d4d90525c3d..ff0a6b69cbb6 100644
--- a/keyboards/keychron/s1/ansi/white/info.json
+++ b/keyboards/keychron/s1/ansi/white/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "led_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "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/rules.mk b/keyboards/keychron/s1/ansi/white/rules.mk
index 1fa4f83a77ce..cb70ced9173b 100644
--- a/keyboards/keychron/s1/ansi/white/rules.mk
+++ b/keyboards/keychron/s1/ansi/white/rules.mk
@@ -15,6 +15,3 @@ LED_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/v1/ansi/info.json b/keyboards/keychron/v1/ansi/info.json
index 696f43462271..f4c526bfdcbc 100644
--- a/keyboards/keychron/v1/ansi/info.json
+++ b/keyboards/keychron/v1/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/keychron/v1/ansi/rules.mk b/keyboards/keychron/v1/ansi/rules.mk
index f2dba218bfc6..e859eb9c34c6 100644
--- a/keyboards/keychron/v1/ansi/rules.mk
+++ b/keyboards/keychron/v1/ansi/rules.mk
@@ -15,9 +15,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v1/ansi_encoder/info.json b/keyboards/keychron/v1/ansi_encoder/info.json
index 6829cd7f768c..9beffb9f6a18 100644
--- a/keyboards/keychron/v1/ansi_encoder/info.json
+++ b/keyboards/keychron/v1/ansi_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/v1/ansi_encoder/rules.mk b/keyboards/keychron/v1/ansi_encoder/rules.mk
index 5df3cbccaf16..7da353fbd162 100644
--- a/keyboards/keychron/v1/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v1/ansi_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v1/iso/info.json b/keyboards/keychron/v1/iso/info.json
index 871358a86bda..5a4c74234c15 100644
--- a/keyboards/keychron/v1/iso/info.json
+++ b/keyboards/keychron/v1/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/keychron/v1/iso/rules.mk b/keyboards/keychron/v1/iso/rules.mk
index f2dba218bfc6..e859eb9c34c6 100644
--- a/keyboards/keychron/v1/iso/rules.mk
+++ b/keyboards/keychron/v1/iso/rules.mk
@@ -15,9 +15,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v1/iso_encoder/info.json b/keyboards/keychron/v1/iso_encoder/info.json
index bffa90acadcc..106b43b5e794 100644
--- a/keyboards/keychron/v1/iso_encoder/info.json
+++ b/keyboards/keychron/v1/iso_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/v1/iso_encoder/rules.mk b/keyboards/keychron/v1/iso_encoder/rules.mk
index 5df3cbccaf16..7da353fbd162 100644
--- a/keyboards/keychron/v1/iso_encoder/rules.mk
+++ b/keyboards/keychron/v1/iso_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v1/jis/info.json b/keyboards/keychron/v1/jis/info.json
index 173794430ccf..16365ccd9eec 100644
--- a/keyboards/keychron/v1/jis/info.json
+++ b/keyboards/keychron/v1/jis/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/keychron/v1/jis/rules.mk b/keyboards/keychron/v1/jis/rules.mk
index f2dba218bfc6..e859eb9c34c6 100644
--- a/keyboards/keychron/v1/jis/rules.mk
+++ b/keyboards/keychron/v1/jis/rules.mk
@@ -15,9 +15,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v1/jis_encoder/info.json b/keyboards/keychron/v1/jis_encoder/info.json
index 73313eb64d3e..702e57975800 100644
--- a/keyboards/keychron/v1/jis_encoder/info.json
+++ b/keyboards/keychron/v1/jis_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/v1/jis_encoder/rules.mk b/keyboards/keychron/v1/jis_encoder/rules.mk
index 5df3cbccaf16..7da353fbd162 100644
--- a/keyboards/keychron/v1/jis_encoder/rules.mk
+++ b/keyboards/keychron/v1/jis_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v10/ansi_encoder/info.json b/keyboards/keychron/v10/ansi_encoder/info.json
index 813a076bdca0..2a7dc307cb03 100644
--- a/keyboards/keychron/v10/ansi_encoder/info.json
+++ b/keyboards/keychron/v10/ansi_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/v10/ansi_encoder/rules.mk b/keyboards/keychron/v10/ansi_encoder/rules.mk
index 5df3cbccaf16..7da353fbd162 100644
--- a/keyboards/keychron/v10/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v10/ansi_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v10/iso_encoder/info.json b/keyboards/keychron/v10/iso_encoder/info.json
index 9cf0add090b9..455b375472b3 100644
--- a/keyboards/keychron/v10/iso_encoder/info.json
+++ b/keyboards/keychron/v10/iso_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/v10/iso_encoder/rules.mk b/keyboards/keychron/v10/iso_encoder/rules.mk
index 5df3cbccaf16..7da353fbd162 100644
--- a/keyboards/keychron/v10/iso_encoder/rules.mk
+++ b/keyboards/keychron/v10/iso_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v2/ansi/info.json b/keyboards/keychron/v2/ansi/info.json
index 7d844d0c1d83..d07fba97b864 100644
--- a/keyboards/keychron/v2/ansi/info.json
+++ b/keyboards/keychron/v2/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/v2/ansi/rules.mk b/keyboards/keychron/v2/ansi/rules.mk
index 2b4a67b1eeed..c37beecb9ec1 100644
--- a/keyboards/keychron/v2/ansi/rules.mk
+++ b/keyboards/keychron/v2/ansi/rules.mk
@@ -15,6 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/v2/ansi_encoder/info.json b/keyboards/keychron/v2/ansi_encoder/info.json
index 8de781ab9cd5..c733b389e685 100644
--- a/keyboards/keychron/v2/ansi_encoder/info.json
+++ b/keyboards/keychron/v2/ansi_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/v2/ansi_encoder/rules.mk b/keyboards/keychron/v2/ansi_encoder/rules.mk
index 6a772965ff6b..5091fe94148b 100644
--- a/keyboards/keychron/v2/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v2/ansi_encoder/rules.mk
@@ -16,6 +16,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/v2/iso/info.json b/keyboards/keychron/v2/iso/info.json
index 45ba9503e4bc..0d8376f7b76e 100644
--- a/keyboards/keychron/v2/iso/info.json
+++ b/keyboards/keychron/v2/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/v2/iso/rules.mk b/keyboards/keychron/v2/iso/rules.mk
index 2b4a67b1eeed..c37beecb9ec1 100644
--- a/keyboards/keychron/v2/iso/rules.mk
+++ b/keyboards/keychron/v2/iso/rules.mk
@@ -15,6 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/v2/iso_encoder/info.json b/keyboards/keychron/v2/iso_encoder/info.json
index d517e341df5c..0241cdb21e30 100644
--- a/keyboards/keychron/v2/iso_encoder/info.json
+++ b/keyboards/keychron/v2/iso_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/v2/iso_encoder/rules.mk b/keyboards/keychron/v2/iso_encoder/rules.mk
index 6a772965ff6b..5091fe94148b 100644
--- a/keyboards/keychron/v2/iso_encoder/rules.mk
+++ b/keyboards/keychron/v2/iso_encoder/rules.mk
@@ -16,6 +16,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/v2/jis/info.json b/keyboards/keychron/v2/jis/info.json
index 6a705e7f8c15..f65e2b51d2ac 100644
--- a/keyboards/keychron/v2/jis/info.json
+++ b/keyboards/keychron/v2/jis/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/v2/jis/rules.mk b/keyboards/keychron/v2/jis/rules.mk
index 2b4a67b1eeed..c37beecb9ec1 100644
--- a/keyboards/keychron/v2/jis/rules.mk
+++ b/keyboards/keychron/v2/jis/rules.mk
@@ -15,6 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/v2/jis_encoder/info.json b/keyboards/keychron/v2/jis_encoder/info.json
index 028432f7f70a..263e403167c6 100644
--- a/keyboards/keychron/v2/jis_encoder/info.json
+++ b/keyboards/keychron/v2/jis_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/v2/jis_encoder/rules.mk b/keyboards/keychron/v2/jis_encoder/rules.mk
index 6a772965ff6b..5091fe94148b 100644
--- a/keyboards/keychron/v2/jis_encoder/rules.mk
+++ b/keyboards/keychron/v2/jis_encoder/rules.mk
@@ -16,6 +16,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/v3/ansi/info.json b/keyboards/keychron/v3/ansi/info.json
index e0d7fdb63d3d..65720663291a 100644
--- a/keyboards/keychron/v3/ansi/info.json
+++ b/keyboards/keychron/v3/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/keychron/v3/ansi/rules.mk b/keyboards/keychron/v3/ansi/rules.mk
index 2b4a67b1eeed..c37beecb9ec1 100644
--- a/keyboards/keychron/v3/ansi/rules.mk
+++ b/keyboards/keychron/v3/ansi/rules.mk
@@ -15,6 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/v3/ansi_encoder/info.json b/keyboards/keychron/v3/ansi_encoder/info.json
index 3232da0fba1f..cffbc851581c 100644
--- a/keyboards/keychron/v3/ansi_encoder/info.json
+++ b/keyboards/keychron/v3/ansi_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/v3/ansi_encoder/rules.mk b/keyboards/keychron/v3/ansi_encoder/rules.mk
index 5df3cbccaf16..7da353fbd162 100644
--- a/keyboards/keychron/v3/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v3/ansi_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v3/iso/info.json b/keyboards/keychron/v3/iso/info.json
index 3ba7acb32290..18c73a8f5821 100644
--- a/keyboards/keychron/v3/iso/info.json
+++ b/keyboards/keychron/v3/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/keychron/v3/iso/rules.mk b/keyboards/keychron/v3/iso/rules.mk
index 201148f39d41..2eadfbded904 100644
--- a/keyboards/keychron/v3/iso/rules.mk
+++ b/keyboards/keychron/v3/iso/rules.mk
@@ -15,6 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/v3/iso_encoder/info.json b/keyboards/keychron/v3/iso_encoder/info.json
index 5cd2631c12e3..60c56a6b87bb 100644
--- a/keyboards/keychron/v3/iso_encoder/info.json
+++ b/keyboards/keychron/v3/iso_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/v3/iso_encoder/rules.mk b/keyboards/keychron/v3/iso_encoder/rules.mk
index 5df3cbccaf16..7da353fbd162 100644
--- a/keyboards/keychron/v3/iso_encoder/rules.mk
+++ b/keyboards/keychron/v3/iso_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v3/jis/info.json b/keyboards/keychron/v3/jis/info.json
index 4680d5e0b56d..9b97707b2f7d 100644
--- a/keyboards/keychron/v3/jis/info.json
+++ b/keyboards/keychron/v3/jis/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/keychron/v3/jis/rules.mk b/keyboards/keychron/v3/jis/rules.mk
index 7f91e808b113..c37beecb9ec1 100644
--- a/keyboards/keychron/v3/jis/rules.mk
+++ b/keyboards/keychron/v3/jis/rules.mk
@@ -15,5 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
diff --git a/keyboards/keychron/v3/jis_encoder/info.json b/keyboards/keychron/v3/jis_encoder/info.json
index 2cc520700621..585cf4519e01 100644
--- a/keyboards/keychron/v3/jis_encoder/info.json
+++ b/keyboards/keychron/v3/jis_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/v3/jis_encoder/rules.mk b/keyboards/keychron/v3/jis_encoder/rules.mk
index 5df3cbccaf16..7da353fbd162 100644
--- a/keyboards/keychron/v3/jis_encoder/rules.mk
+++ b/keyboards/keychron/v3/jis_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v4/ansi/info.json b/keyboards/keychron/v4/ansi/info.json
index b55717243e12..812aec53a71a 100644
--- a/keyboards/keychron/v4/ansi/info.json
+++ b/keyboards/keychron/v4/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
diff --git a/keyboards/keychron/v4/ansi/rules.mk b/keyboards/keychron/v4/ansi/rules.mk
index 6dcd47b1fe3e..46f5aef144b4 100644
--- a/keyboards/keychron/v4/ansi/rules.mk
+++ b/keyboards/keychron/v4/ansi/rules.mk
@@ -15,6 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/v4/iso/info.json b/keyboards/keychron/v4/iso/info.json
index 6c481ed18f76..7d4a8eae1d29 100644
--- a/keyboards/keychron/v4/iso/info.json
+++ b/keyboards/keychron/v4/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
diff --git a/keyboards/keychron/v4/iso/rules.mk b/keyboards/keychron/v4/iso/rules.mk
index 6dcd47b1fe3e..46f5aef144b4 100644
--- a/keyboards/keychron/v4/iso/rules.mk
+++ b/keyboards/keychron/v4/iso/rules.mk
@@ -15,6 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/v5/ansi/info.json b/keyboards/keychron/v5/ansi/info.json
index 7b087b7033e1..bc5eec2ca55e 100644
--- a/keyboards/keychron/v5/ansi/info.json
+++ b/keyboards/keychron/v5/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/keychron/v5/ansi/rules.mk b/keyboards/keychron/v5/ansi/rules.mk
index f2dba218bfc6..e859eb9c34c6 100644
--- a/keyboards/keychron/v5/ansi/rules.mk
+++ b/keyboards/keychron/v5/ansi/rules.mk
@@ -15,9 +15,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v5/ansi_encoder/info.json b/keyboards/keychron/v5/ansi_encoder/info.json
index 32824efe6b04..8a4aec4e3660 100644
--- a/keyboards/keychron/v5/ansi_encoder/info.json
+++ b/keyboards/keychron/v5/ansi_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/v5/ansi_encoder/rules.mk b/keyboards/keychron/v5/ansi_encoder/rules.mk
index 5df3cbccaf16..7da353fbd162 100644
--- a/keyboards/keychron/v5/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v5/ansi_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v5/iso/info.json b/keyboards/keychron/v5/iso/info.json
index 0fac99cd3801..02db87e9ac25 100644
--- a/keyboards/keychron/v5/iso/info.json
+++ b/keyboards/keychron/v5/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/keychron/v5/iso/rules.mk b/keyboards/keychron/v5/iso/rules.mk
index f2dba218bfc6..e859eb9c34c6 100644
--- a/keyboards/keychron/v5/iso/rules.mk
+++ b/keyboards/keychron/v5/iso/rules.mk
@@ -15,9 +15,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v5/iso_encoder/info.json b/keyboards/keychron/v5/iso_encoder/info.json
index 1c650cdf50fc..b0be43fc502f 100644
--- a/keyboards/keychron/v5/iso_encoder/info.json
+++ b/keyboards/keychron/v5/iso_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/v5/iso_encoder/rules.mk b/keyboards/keychron/v5/iso_encoder/rules.mk
index 5df3cbccaf16..7da353fbd162 100644
--- a/keyboards/keychron/v5/iso_encoder/rules.mk
+++ b/keyboards/keychron/v5/iso_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v6/ansi/info.json b/keyboards/keychron/v6/ansi/info.json
index 3c1a0eb8171f..3f12305f06a5 100644
--- a/keyboards/keychron/v6/ansi/info.json
+++ b/keyboards/keychron/v6/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/keychron/v6/ansi/rules.mk b/keyboards/keychron/v6/ansi/rules.mk
index de86b770f3a6..980311d3f2fe 100644
--- a/keyboards/keychron/v6/ansi/rules.mk
+++ b/keyboards/keychron/v6/ansi/rules.mk
@@ -15,9 +15,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v6/ansi_encoder/info.json b/keyboards/keychron/v6/ansi_encoder/info.json
index 4f14dea8ca3f..ad0ea78318a3 100644
--- a/keyboards/keychron/v6/ansi_encoder/info.json
+++ b/keyboards/keychron/v6/ansi_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/v6/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/v6/ansi_encoder/keymaps/via/rules.mk
index c09b2475769a..f1adcab005e8 100644
--- a/keyboards/keychron/v6/ansi_encoder/keymaps/via/rules.mk
+++ b/keyboards/keychron/v6/ansi_encoder/keymaps/via/rules.mk
@@ -1,2 +1,2 @@
 VIA_ENABLE = yes
-EMCODER_MAP_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/v6/ansi_encoder/rules.mk b/keyboards/keychron/v6/ansi_encoder/rules.mk
index 9958a466f6d6..80a3f300bd22 100644
--- a/keyboards/keychron/v6/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v6/ansi_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v6/iso/info.json b/keyboards/keychron/v6/iso/info.json
index adbebecda6a3..0840ee9cc8e9 100644
--- a/keyboards/keychron/v6/iso/info.json
+++ b/keyboards/keychron/v6/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/keychron/v6/iso/rules.mk b/keyboards/keychron/v6/iso/rules.mk
index de86b770f3a6..980311d3f2fe 100644
--- a/keyboards/keychron/v6/iso/rules.mk
+++ b/keyboards/keychron/v6/iso/rules.mk
@@ -15,9 +15,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v6/iso_encoder/info.json b/keyboards/keychron/v6/iso_encoder/info.json
index 177c48b9123a..a40d4d66b62e 100644
--- a/keyboards/keychron/v6/iso_encoder/info.json
+++ b/keyboards/keychron/v6/iso_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/keychron/v6/iso_encoder/rules.mk b/keyboards/keychron/v6/iso_encoder/rules.mk
index df920055a087..986772495755 100644
--- a/keyboards/keychron/v6/iso_encoder/rules.mk
+++ b/keyboards/keychron/v6/iso_encoder/rules.mk
@@ -16,9 +16,6 @@ RGB_MATRIX_ENABLE = yes
 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
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/keychron/v7/ansi/info.json b/keyboards/keychron/v7/ansi/info.json
index 6e831d2607bd..26f31786b5b8 100644
--- a/keyboards/keychron/v7/ansi/info.json
+++ b/keyboards/keychron/v7/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
diff --git a/keyboards/keychron/v7/ansi/rules.mk b/keyboards/keychron/v7/ansi/rules.mk
index 6dcd47b1fe3e..46f5aef144b4 100644
--- a/keyboards/keychron/v7/ansi/rules.mk
+++ b/keyboards/keychron/v7/ansi/rules.mk
@@ -15,6 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/v7/iso/info.json b/keyboards/keychron/v7/iso/info.json
index d3ae4f75e57a..f29d9d9a3261 100644
--- a/keyboards/keychron/v7/iso/info.json
+++ b/keyboards/keychron/v7/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"],
diff --git a/keyboards/keychron/v7/iso/rules.mk b/keyboards/keychron/v7/iso/rules.mk
index 6dcd47b1fe3e..46f5aef144b4 100644
--- a/keyboards/keychron/v7/iso/rules.mk
+++ b/keyboards/keychron/v7/iso/rules.mk
@@ -15,6 +15,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/v8/ansi/info.json b/keyboards/keychron/v8/ansi/info.json
index 38e8be2c0026..02780ffcde4e 100644
--- a/keyboards/keychron/v8/ansi/info.json
+++ b/keyboards/keychron/v8/ansi/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/v8/ansi/rules.mk b/keyboards/keychron/v8/ansi/rules.mk
index bdb97dbf1c70..e506e322d599 100644
--- a/keyboards/keychron/v8/ansi/rules.mk
+++ b/keyboards/keychron/v8/ansi/rules.mk
@@ -17,6 +17,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/v8/ansi_encoder/info.json b/keyboards/keychron/v8/ansi_encoder/info.json
index c2325070aa36..c3fc389780be 100644
--- a/keyboards/keychron/v8/ansi_encoder/info.json
+++ b/keyboards/keychron/v8/ansi_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/v8/ansi_encoder/rules.mk b/keyboards/keychron/v8/ansi_encoder/rules.mk
index d2bee999c868..e3b0d8f03f18 100644
--- a/keyboards/keychron/v8/ansi_encoder/rules.mk
+++ b/keyboards/keychron/v8/ansi_encoder/rules.mk
@@ -17,6 +17,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/v8/iso/info.json b/keyboards/keychron/v8/iso/info.json
index 585dcc979c38..5f30af5b1a8c 100644
--- a/keyboards/keychron/v8/iso/info.json
+++ b/keyboards/keychron/v8/iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/v8/iso/rules.mk b/keyboards/keychron/v8/iso/rules.mk
index fec3d8d15ce1..8edab2465bd3 100644
--- a/keyboards/keychron/v8/iso/rules.mk
+++ b/keyboards/keychron/v8/iso/rules.mk
@@ -16,6 +16,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keychron/v8/iso_encoder/info.json b/keyboards/keychron/v8/iso_encoder/info.json
index a0ddfcbeeaab..e13261a2d65c 100644
--- a/keyboards/keychron/v8/iso_encoder/info.json
+++ b/keyboards/keychron/v8/iso_encoder/info.json
@@ -9,7 +9,7 @@
         "device_version": "1.0.0"
     },
     "rgb_matrix": {
-        "driver": "CKLED2001"
+        "driver": "ckled2001"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
diff --git a/keyboards/keychron/v8/iso_encoder/rules.mk b/keyboards/keychron/v8/iso_encoder/rules.mk
index d2bee999c868..e3b0d8f03f18 100644
--- a/keyboards/keychron/v8/iso_encoder/rules.mk
+++ b/keyboards/keychron/v8/iso_encoder/rules.mk
@@ -17,6 +17,3 @@ RGB_MATRIX_ENABLE = yes
 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
-
diff --git a/keyboards/keygem/kg60ansi/config.h b/keyboards/keygem/kg60ansi/config.h
index d2cf17fe2b31..388a273f7c2a 100644
--- a/keyboards/keygem/kg60ansi/config.h
+++ b/keyboards/keygem/kg60ansi/config.h
@@ -22,22 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Define RGB Underglow */
-#define RGBLED_NUM 64
-#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_VAL_STEP 12
 #define RGBLIGHT_DEFAULT_SPD 144
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-/* #define RGBLIGHT_LAYER_BLINK*/
 
 /* Define less important options */
 
diff --git a/keyboards/keygem/kg60ansi/info.json b/keyboards/keygem/kg60ansi/info.json
index 2d4fa5365b1c..9d8cbd485e0d 100644
--- a/keyboards/keygem/kg60ansi/info.json
+++ b/keyboards/keygem/kg60ansi/info.json
@@ -12,7 +12,20 @@
         "pin": "F7"
     },
     "rgblight": {
-        "max_brightness": 108
+        "led_count": 64,
+        "max_brightness": 108,
+        "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": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"],
diff --git a/keyboards/keygem/kg65rgbv2/config.h b/keyboards/keygem/kg65rgbv2/config.h
index ab1fab73ffb0..388a273f7c2a 100644
--- a/keyboards/keygem/kg65rgbv2/config.h
+++ b/keyboards/keygem/kg65rgbv2/config.h
@@ -22,22 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Define RGB Underglow */
-#define RGBLED_NUM 68
-#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_VAL_STEP 12
 #define RGBLIGHT_DEFAULT_SPD 144
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-/* #define RGBLIGHT_LAYER_BLINK*/
 
 /* Define less important options */
 
diff --git a/keyboards/keygem/kg65rgbv2/info.json b/keyboards/keygem/kg65rgbv2/info.json
index 8dccdc233d04..674b62957753 100644
--- a/keyboards/keygem/kg65rgbv2/info.json
+++ b/keyboards/keygem/kg65rgbv2/info.json
@@ -12,7 +12,20 @@
         "pin": "F7"
     },
     "rgblight": {
-        "max_brightness": 96
+        "led_count": 68,
+        "max_brightness": 96,
+        "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": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"],
diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
index c916ffc430ac..37867c3cd14b 100644
--- a/keyboards/keyhive/absinthe/config.h
+++ b/keyboards/keyhive/absinthe/config.h
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 32
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/keyhive/absinthe/info.json b/keyboards/keyhive/absinthe/info.json
index 8001d6db0175..1496756d9a2a 100644
--- a/keyboards/keyhive/absinthe/info.json
+++ b/keyboards/keyhive/absinthe/info.json
@@ -8,6 +8,18 @@
         "pid": "0xFEED",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 32,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "B0"
     },
diff --git a/keyboards/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index e7de4ca7bdd7..39eec86786a7 100644
--- a/keyboards/keyhive/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-   #define RGBLED_NUM 32
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #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
-
 /* 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/keyhive/ergosaurus/info.json b/keyboards/keyhive/ergosaurus/info.json
index 28461eaf85a5..76d1988da08d 100644
--- a/keyboards/keyhive/ergosaurus/info.json
+++ b/keyboards/keyhive/ergosaurus/info.json
@@ -11,7 +11,17 @@
         "pin": "B6"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 32,
+        "max_brightness": 200,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true
+        }
     },
     "matrix_pins": {
         "cols": ["D7", "C6", "D0", "D1", "F7", "B1", "B3", "B2"],
diff --git a/keyboards/keyhive/smallice/config.h b/keyboards/keyhive/smallice/config.h
deleted file mode 100644
index 7113cd26e917..000000000000
--- a/keyboards/keyhive/smallice/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 quark
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#    define RGBLED_NUM 12
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
diff --git a/keyboards/keyhive/smallice/info.json b/keyboards/keyhive/smallice/info.json
index afe95e7aa794..fae716f8208c 100644
--- a/keyboards/keyhive/smallice/info.json
+++ b/keyboards/keyhive/smallice/info.json
@@ -8,6 +8,24 @@
         "pid": "0x5341",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "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"
     },
diff --git a/keyboards/keyhive/uno/rev1/config.h b/keyboards/keyhive/uno/rev1/config.h
deleted file mode 100644
index 414590f6437c..000000000000
--- a/keyboards/keyhive/uno/rev1/config.h
+++ /dev/null
@@ -1,23 +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/>.
- */
-
-#pragma once
-
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 1
-#endif
diff --git a/keyboards/keyhive/uno/rev1/info.json b/keyboards/keyhive/uno/rev1/info.json
index 69fe9afd7763..61121267d7b6 100644
--- a/keyboards/keyhive/uno/rev1/info.json
+++ b/keyboards/keyhive/uno/rev1/info.json
@@ -3,6 +3,12 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 1,
+        "animations": {
+            "rainbow_mood": true
+        }
+    },
     "ws2812": {
         "pin": "F6"
     },
diff --git a/keyboards/keyhive/uno/rev2/config.h b/keyboards/keyhive/uno/rev2/config.h
deleted file mode 100644
index 414590f6437c..000000000000
--- a/keyboards/keyhive/uno/rev2/config.h
+++ /dev/null
@@ -1,23 +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/>.
- */
-
-#pragma once
-
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 1
-#endif
diff --git a/keyboards/keyhive/uno/rev2/info.json b/keyboards/keyhive/uno/rev2/info.json
index 0af41bab773d..908c254babb5 100644
--- a/keyboards/keyhive/uno/rev2/info.json
+++ b/keyboards/keyhive/uno/rev2/info.json
@@ -3,6 +3,12 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "rgblight": {
+        "led_count": 1,
+        "animations": {
+            "rainbow_mood": true
+        }
+    },
     "ws2812": {
         "pin": "D1"
     },
diff --git a/keyboards/keyhive/ut472/config.h b/keyboards/keyhive/ut472/config.h
index 5ab934812664..8dd82d2464c4 100644
--- a/keyboards/keyhive/ut472/config.h
+++ b/keyboards/keyhive/ut472/config.h
@@ -20,18 +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 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/keyhive/ut472/info.json b/keyboards/keyhive/ut472/info.json
index 9755bd656916..6c3dd26eef65 100644
--- a/keyboards/keyhive/ut472/info.json
+++ b/keyboards/keyhive/ut472/info.json
@@ -8,6 +8,23 @@
     "pid": "0x0472",
     "device_version": "0.0.2"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 8,
+    "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": "C6"
   },
diff --git a/keyboards/keyquest/enclave/config.h b/keyboards/keyquest/enclave/config.h
deleted file mode 100644
index 012d53a36b24..000000000000
--- a/keyboards/keyquest/enclave/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 keyquest
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should 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 setup*/
-#define RGBLED_NUM 2
-#define RGBLIGHT_SLEEP
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-/* RGB light 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
diff --git a/keyboards/keyquest/enclave/info.json b/keyboards/keyquest/enclave/info.json
index 8135d7fec2e8..6a5ab097fe68 100644
--- a/keyboards/keyquest/enclave/info.json
+++ b/keyboards/keyquest/enclave/info.json
@@ -11,7 +11,22 @@
         "pin": "B5"
     },
     "rgblight": {
-        "max_brightness": 200
+        "hue_steps": 10,
+        "led_count": 2,
+        "max_brightness": 200,
+        "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": ["B4", "B7", "C7"],
diff --git a/keyboards/keysofkings/twokey/config.h b/keyboards/keysofkings/twokey/config.h
index 6fea0e2cb614..c2f47d2d8e79 100755
--- a/keyboards/keysofkings/twokey/config.h
+++ b/keyboards/keysofkings/twokey/config.h
@@ -22,24 +22,8 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#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 RGBLED_NUM 5
-#define RGBLIGHT_HUE_STEP 4
-#define RGBLIGHT_SAT_STEP 4
-#define RGBLIGHT_VAL_STEP 4
 #define AUDIO_PIN B6
 #define AUDIO_CLICKY
-#endif
 
 #ifdef AUDIO_ENABLE
 #define STARTUP_SONG SONG(MAJOR_SOUND)
diff --git a/keyboards/keysofkings/twokey/info.json b/keyboards/keysofkings/twokey/info.json
index 8040b94face8..e7564bf2a547 100644
--- a/keyboards/keysofkings/twokey/info.json
+++ b/keyboards/keysofkings/twokey/info.json
@@ -8,6 +8,24 @@
         "pid": "0xAE12",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 4,
+        "saturation_steps": 4,
+        "brightness_steps": 4,
+        "led_count": 5,
+        "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": "D3"
     },
diff --git a/keyboards/keystonecaps/gameroyadvance/config.h b/keyboards/keystonecaps/gameroyadvance/config.h
index adca3366f23d..f3286df1230c 100644
--- a/keyboards/keystonecaps/gameroyadvance/config.h
+++ b/keyboards/keystonecaps/gameroyadvance/config.h
@@ -22,18 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keystonecaps/gameroyadvance/info.json b/keyboards/keystonecaps/gameroyadvance/info.json
index 884bc706e492..b2d2a01f8b0c 100644
--- a/keyboards/keystonecaps/gameroyadvance/info.json
+++ b/keyboards/keystonecaps/gameroyadvance/info.json
@@ -18,6 +18,23 @@
             {"pin_a": "B5", "pin_b": "B4"}
         ]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 0,
+        "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": "C7"
     },
diff --git a/keyboards/kibou/suisei/info.json b/keyboards/kibou/suisei/info.json
index a33bb12abd0c..f212df1bc7c4 100644
--- a/keyboards/kibou/suisei/info.json
+++ b/keyboards/kibou/suisei/info.json
@@ -26,76 +26,156 @@
     "indicators": {
         "caps_lock": "B1"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs"
+    },
     "layouts": {
-        "LAYOUT": {
+        "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": [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, 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.0, "y": 3},
+                {"matrix": [3, 15], "x": 15.0, "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": [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,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.0, "y":3}, 
-                {"matrix": [3,15], "x":15.0, "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}
+                {"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, 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.0, "y": 3},
+                {"matrix": [3, 15], "x": 15.0, "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}
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/kibou/suisei/keymaps/default/keymap.c b/keyboards/kibou/suisei/keymaps/default/keymap.c
index 2c9d04c6c1ce..94070aededb6 100644
--- a/keyboards/kibou/suisei/keymaps/default/keymap.c
+++ b/keyboards/kibou/suisei/keymaps/default/keymap.c
@@ -4,14 +4,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [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_SPC, 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(
+	[1] = LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs(
     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_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
 	KC_NO, KC_NO, 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/kibou/suisei/keymaps/via/keymap.c b/keyboards/kibou/suisei/keymaps/via/keymap.c
index 2c9d04c6c1ce..94070aededb6 100644
--- a/keyboards/kibou/suisei/keymaps/via/keymap.c
+++ b/keyboards/kibou/suisei/keymaps/via/keymap.c
@@ -4,14 +4,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [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_SPC, 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(
+	[1] = LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs(
     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_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
 	KC_NO, KC_NO, 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/kibou/suisei/matrix_diagram.md b/keyboards/kibou/suisei/matrix_diagram.md
new file mode 100644
index 000000000000..a5ebdf3633c8
--- /dev/null
+++ b/keyboards/kibou/suisei/matrix_diagram.md
@@ -0,0 +1,18 @@
+# Matrix Diagram for kibou suisei
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│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   │1F │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │2F │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+│30      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B    │3E │3F │
+├─────┬──┼───┴─┬─┴───┴───┴───┴───┴───┴───┴─┬─┴───┼──┬───┼───┼───┤
+│40   │  │42   │45                         │4A   │  │4D │4E │4F │
+└─────┘  └─────┴───────────────────────────┴─────┘  └───┴───┴───┘
+```
diff --git a/keyboards/kikoslab/ellora65/config.h b/keyboards/kikoslab/ellora65/config.h
deleted file mode 100644
index c6fba5ebcf8d..000000000000
--- a/keyboards/kikoslab/ellora65/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/*RGB TINGS*/
-#define RGBLED_NUM 12
diff --git a/keyboards/kikoslab/ellora65/info.json b/keyboards/kikoslab/ellora65/info.json
index 5f3646476bbf..0ab7f7015afc 100644
--- a/keyboards/kikoslab/ellora65/info.json
+++ b/keyboards/kikoslab/ellora65/info.json
@@ -18,6 +18,9 @@
             {"pin_a": "B0", "pin_b": "B1"}
         ]
     },
+    "rgblight": {
+        "led_count": 12
+    },
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/kikoslab/kl90/config.h b/keyboards/kikoslab/kl90/config.h
index 9987ae161efa..7f9b0b12d498 100644
--- a/keyboards/kikoslab/kl90/config.h
+++ b/keyboards/kikoslab/kl90/config.h
@@ -17,7 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define EMCODER_DIRECTION_FLIP
-
 /*EEPROM for via*/
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
\ No newline at end of file
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/kikoslab/kl90/rules.mk b/keyboards/kikoslab/kl90/rules.mk
index 27c445ca2fc7..a62bc3d00cd6 100644
--- a/keyboards/kikoslab/kl90/rules.mk
+++ b/keyboards/kikoslab/kl90/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/kin80/blackpill103/rules.mk b/keyboards/kin80/blackpill103/rules.mk
index a92b0993283e..8b137891791f 100644
--- a/keyboards/kin80/blackpill103/rules.mk
+++ b/keyboards/kin80/blackpill103/rules.mk
@@ -1,2 +1 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
diff --git a/keyboards/kindakeyboards/conone65/keymaps/default/keymap.c b/keyboards/kindakeyboards/conone65/keymaps/default/keymap.c
index a3cf3191611b..4c0d09aa3a06 100644
--- a/keyboards/kindakeyboards/conone65/keymaps/default/keymap.c
+++ b/keyboards/kindakeyboards/conone65/keymaps/default/keymap.c
@@ -35,5 +35,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
-    ),
+    )
 };
diff --git a/keyboards/kindakeyboards/conone65/keymaps/default/readme.md b/keyboards/kindakeyboards/conone65/keymaps/default/readme.md
deleted file mode 100644
index 2f1619634775..000000000000
--- a/keyboards/kindakeyboards/conone65/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for Conone 65
diff --git a/keyboards/kindakeyboards/conone65/keymaps/via/keymap.c b/keyboards/kindakeyboards/conone65/keymaps/via/keymap.c
new file mode 100644
index 000000000000..a70f50418406
--- /dev/null
+++ b/keyboards/kindakeyboards/conone65/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2023 Matt 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
+
+// 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_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_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_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_END,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,          KC_SPC,            KC_SPC,  KC_RALT, KC_APP,  MO(1),   KC_LEFT,          KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_all(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,          _______,          _______,          _______, _______, _______, _______, _______,          _______, _______
+    )
+};
diff --git a/keyboards/kindakeyboards/conone65/keymaps/via/rules.mk b/keyboards/kindakeyboards/conone65/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/kindakeyboards/conone65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kindakeyboards/conone65/readme.md b/keyboards/kindakeyboards/conone65/readme.md
index f3429142dcab..d0694fcc03ba 100644
--- a/keyboards/kindakeyboards/conone65/readme.md
+++ b/keyboards/kindakeyboards/conone65/readme.md
@@ -1,10 +1,12 @@
 # Conone 65
 
+![Conone65 PCB](https://i.imgur.com/50dKAqh.jpeg)
+
 The Conone 65 is a custom keyboard designed and machined in Belgium.
 
-* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
-* Hardware Supported: Conone 65 PCB
-* Hardware Availability: [Group buy](https://forms.gle/nEFTxzBxy4KDm3nG8)
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13), [Matt Chan](https://github.com/mattchan)
+* Hardware Supported: Conone 65 PCB, ATMega32u4
+* Hardware Availability: https://www.kindakeyboards.be/conone65
 
 Make example for this keyboard (after setting up your build environment):
 
@@ -15,3 +17,11 @@ Flashing example for this keyboard:
     make kindakeyboards/conone65: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/kinesis/alvicstep/alvicstep.c b/keyboards/kinesis/alvicstep/alvicstep.c
index 274ac083c504..e803125681f1 100644
--- a/keyboards/kinesis/alvicstep/alvicstep.c
+++ b/keyboards/kinesis/alvicstep/alvicstep.c
@@ -1,3 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "alvicstep.h"
 
 // begin section origin  https://github.com/alvicstep/tmk_keyboard 
diff --git a/keyboards/kinesis/alvicstep/alvicstep.h b/keyboards/kinesis/alvicstep/alvicstep.h
index 7bd56c4678db..bd52bbeb9873 100644
--- a/keyboards/kinesis/alvicstep/alvicstep.h
+++ b/keyboards/kinesis/alvicstep/alvicstep.h
@@ -1,3 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
 #include "quantum.h"
diff --git a/keyboards/kinesis/alvicstep/config.h b/keyboards/kinesis/alvicstep/config.h
index bb3357ea57b8..82b8deca9313 100644
--- a/keyboards/kinesis/alvicstep/config.h
+++ b/keyboards/kinesis/alvicstep/config.h
@@ -1,3 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
 /* key matrix size */
diff --git a/keyboards/kinesis/alvicstep/info.json b/keyboards/kinesis/alvicstep/info.json
index ef3509caf335..293b0168a404 100644
--- a/keyboards/kinesis/alvicstep/info.json
+++ b/keyboards/kinesis/alvicstep/info.json
@@ -6,100 +6,20 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "console": false,
+        "command": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "audio": false,
+        "backlight": false
+    },
     "processor": "at90usb1286",
     "bootloader": "halfkay",
     "layouts": {
         "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [1, 2], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [2, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [1, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [8, 0], "x": 0, "y": 1.25, "w": 1.25},
-                {"matrix": [7, 0], "x": 1.25, "y": 1.25},
-                {"matrix": [6, 0], "x": 2.25, "y": 1},
-                {"matrix": [5, 0], "x": 3.25, "y": 1},
-                {"matrix": [4, 0], "x": 4.25, "y": 1},
-                {"matrix": [3, 0], "x": 5.25, "y": 1},
-                {"matrix": [8, 1], "x": 0, "y": 2.25, "w": 1.25},
-                {"matrix": [7, 1], "x": 1.25, "y": 2.25},
-                {"matrix": [6, 1], "x": 2.25, "y": 2},
-                {"matrix": [5, 1], "x": 3.25, "y": 2},
-                {"matrix": [4, 1], "x": 4.25, "y": 2},
-                {"matrix": [3, 1], "x": 5.25, "y": 2},
-                {"matrix": [8, 2], "x": 0, "y": 3.25, "w": 1.25},
-                {"matrix": [7, 2], "x": 1.25, "y": 3.25},
-                {"matrix": [6, 2], "x": 2.25, "y": 3},
-                {"matrix": [5, 2], "x": 3.25, "y": 3},
-                {"matrix": [4, 2], "x": 4.25, "y": 3},
-                {"matrix": [3, 2], "x": 5.25, "y": 3},
-                {"matrix": [8, 3], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [7, 3], "x": 1.25, "y": 4.25},
-                {"matrix": [6, 3], "x": 2.25, "y": 4},
-                {"matrix": [5, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 3], "x": 4.25, "y": 4},
-                {"matrix": [3, 3], "x": 5.25, "y": 4},
-                {"matrix": [7, 4], "x": 1.25, "y": 5.25},
-                {"matrix": [6, 4], "x": 2.25, "y": 5},
-                {"matrix": [5, 4], "x": 3.25, "y": 5},
-                {"matrix": [3, 4], "x": 4.25, "y": 5},
-                {"matrix": [3, 6], "x": 5.25, "y": 6},
-                {"matrix": [3, 5], "x": 6.25, "y": 6},
-                {"matrix": [5, 5], "x": 6.25, "y": 7},
-                {"matrix": [5, 6], "x": 4.25, "y": 7, "h": 2},
-                {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
-                {"matrix": [7, 5], "x": 6.25, "y": 8},
-                {"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [2, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [1, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [8, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [8, 4], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [9, 4], "x": 9.25, "y": 1},
-                {"matrix": [10, 4], "x": 10.25, "y": 1},
-                {"matrix": [11, 4], "x": 11.25, "y": 1},
-                {"matrix": [13, 4], "x": 12.25, "y": 1},
-                {"matrix": [14, 4], "x": 13.25, "y": 1.25},
-                {"matrix": [15, 4], "x": 14.25, "y": 1.25, "w": 1.25},
-                {"matrix": [9, 5], "x": 9.25, "y": 2},
-                {"matrix": [10, 5], "x": 10.25, "y": 2},
-                {"matrix": [11, 5], "x": 11.25, "y": 2},
-                {"matrix": [13, 5], "x": 12.25, "y": 2},
-                {"matrix": [14, 5], "x": 13.25, "y": 2.25},
-                {"matrix": [15, 5], "x": 14.25, "y": 2.25, "w": 1.25},
-                {"matrix": [9, 6], "x": 9.25, "y": 3},
-                {"matrix": [10, 6], "x": 10.25, "y": 3},
-                {"matrix": [11, 6], "x": 11.25, "y": 3},
-                {"matrix": [13, 6], "x": 12.25, "y": 3},
-                {"matrix": [14, 6], "x": 13.25, "y": 3.25},
-                {"matrix": [15, 6], "x": 14.25, "y": 3.25, "w": 1.25},
-                {"matrix": [9, 7], "x": 9.25, "y": 4},
-                {"matrix": [10, 7], "x": 10.25, "y": 4},
-                {"matrix": [11, 7], "x": 11.25, "y": 4},
-                {"matrix": [13, 7], "x": 12.25, "y": 4},
-                {"matrix": [14, 7], "x": 13.25, "y": 4.25},
-                {"matrix": [15, 7], "x": 14.25, "y": 4.25, "w": 1.25},
-                {"matrix": [9, 3], "x": 10.25, "y": 5},
-                {"matrix": [11, 3], "x": 11.25, "y": 5},
-                {"matrix": [13, 3], "x": 12.25, "y": 5},
-                {"matrix": [14, 3], "x": 13.25, "y": 5.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 6},
-                {"matrix": [6, 6], "x": 9.25, "y": 6},
-                {"matrix": [6, 7], "x": 8.25, "y": 7},
-                {"matrix": [8, 7], "x": 8.25, "y": 8},
-                {"matrix": [7, 6], "x": 9.25, "y": 7, "h": 2},
-                {"matrix": [8, 6], "x": 10.25, "y": 7, "h": 2}
-            ]
-        },
-        "LAYOUT_pretty": {
             "layout": [
                 {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
                 {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
diff --git a/keyboards/kinesis/keymaps/alvicstep/keymap.c b/keyboards/kinesis/keymaps/alvicstep/keymap.c
new file mode 100644
index 000000000000..e9373ea21453
--- /dev/null
+++ b/keyboards/kinesis/keymaps/alvicstep/keymap.c
@@ -0,0 +1,135 @@
+// Copyright 2023 Alex Stepanov (@alvicstep)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BASE,   // default layer
+    _KEYPAD, // arrow keys, shifted symbols, HOME, END, PGUP, PGDN, FKeys, CTRL(TAB)
+    _NUMPAD  // numpad keys
+};
+
+/* ,------------------------------------------------------------------------------------------------------------------------.
+* | Esc | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 |                           | F9 | F10 | F11 | F12 |PSCR|SLCK|PAUS|KPAD|BOOT|
+* |--------+------+------+------+-------+------+--------------------------------+------+------+------+------+------+--------|
+* |   -_   |  1!  |  2@  |  3#  |  4$   |  5%  |                                |  6^  |  7&  |  8*  |  9(  |  0)  |  =+    |
+* |--------+------+------+------+-------+------|                                +------+------+------+------+------+--------|
+* | 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  |  ,.  |  .>  |  /?  |Sht/Ent |
+* `--------+------+------+------+-------+-------                                `------+------+------+------+------+--------'
+*          | `~   | Gui  | Esc  |MO(Num)|                                              | [{   |  ]}  |      |      |
+*          `----------------------------'                                              `---------------------------'
+*                                        ,---------------.         ,---------------.
+*                                        |Alt+Tab|  Alt  |         |  Alt  |TO(Num)|
+*                                 ,------|------ |-------|         |-------+-------+------.
+*                                 |      |       | Shift |         | Shift |       |      |
+*                                 | BkSp | KPAD  |-------|         |------ | KPAD  | Space|
+*                                 |      |       | Ctrl  |         | Ctrl  |       |      |
+*                                 `----------------------'         `----------------------'
+*/
+
+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,TO(_KEYPAD),QK_BOOT,
+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_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,SC_SENT,
+KC_GRV,KC_LGUI,KC_ESC,MO(_NUMPAD),                                      KC_LBRC,KC_RBRC,KC_NO,KC_NO,
+                          LALT(KC_TAB),KC_LALT,                   KC_RALT,TO(_NUMPAD),
+                          KC_LSFT,                                KC_RSFT,
+                          KC_BSPC,MO(_KEYPAD),KC_LCTL,            KC_RCTL,MO(_KEYPAD),KC_SPC
+),
+/* ,------------------------------------------------------------------------------------------------------------------------.
+* |   |   |   |   |   |   |   |   |                                              |   |   |   |   |   |   |   | TO(BASE) |   |
+* |--------+------+------+------+------+------+---------------------------------+------+------+------+------+------+--------|
+* |   _    |   !  |  @   |  #   |  $   |  %   |                                 |  ^   |  &   |  *   |  (   |  )   |   +    |
+* |--------+------+------+------+------+------|                                 |------+------+------+------+------+--------|
+* |        |  F1  |  F2  |  F3  | F4   |  F5  |                                 |      | Home |  Up  | End  |      |   |    |
+* |--------+------+------+------+------+------|                                 |------+------+------+------+------+--------|
+* |        |  F6  |  F7  |  F8  | F9   |  F10 |                                 | Pgup | Lft  | Dwn  | Rgt  |  :   |   "    |
+* |--------+------+------+------+------+------|                                 |------+------+------+------+------+--------|
+* | CapsLk |      |      |      | F11  |  F12 |                                 | Pgdn |      |  <   |  >   |  ?   |        |
+* `--------+------+------+------+------+------'                                 `------+------+------+------+------+--------'
+*          |   ~  | INS  |      |      |                                               |  {   |  }   |      |      |
+*          `---------------------------'                                               `---------------------------'
+*                                        ,--------------.         ,--------------------.
+*                                        |Ctl+Tab|      |         |      |      |      |
+*                                 ,------|------ |------|         |------+------+------.
+*                                 |      |       |Shift |         |Shift |      |      |
+*                                 |      |       |------|         |------|      |      |
+*                                 |      |       | Ctrl |         | Ctrl |      |      |
+*                                 `-------------- ------'         `--------------------'
+*/
+[_KEYPAD] = 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,TO(_BASE),KC_NO,
+ KC_UNDS,KC_EXLM,KC_AT,KC_HASH,KC_DLR,KC_PERC,                          KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_PLUS,
+ KC_NO,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,                                   KC_NO,KC_HOME,KC_UP,KC_END,KC_NO,KC_PIPE,
+ KC_CAPS,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,                                KC_PGUP,KC_LEFT,KC_DOWN,KC_RGHT,KC_COLN,KC_DQUO,
+ KC_NO,KC_NO,KC_NO,KC_NO,KC_F11,KC_F12,                                 KC_PGDN,KC_NO,KC_LT,KC_GT,KC_QUES,KC_NO,
+ KC_TILD,KC_INS,KC_NO,KC_NO,                                            KC_LCBR,KC_RCBR,KC_NO,KC_NO,
+                                LCTL(KC_TAB),KC_NO,             KC_NO,KC_NO,
+                                KC_LSFT,                        KC_RSFT,
+                                KC_NO,KC_NO,KC_LCTL,            KC_RCTL,KC_NO,KC_NO
+),
+/*,--------+------+------+------+------+------+                           +------+------+------+------+------+--------.
+* |        |      |      |      |      |      |                           |      | Base |  =   |  /   |  *   |        |
+* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+* |        |      |      |      |      |      |                           |      |  7   |  8   |  9   |  -   |        |
+* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+* |  Del   |      |      |      |      |      |                           |      |  4   |  5   |  6   |  +   |        |
+* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+* |  BkSp  |      |      |      |      |      |                           |      |  1   |  2   |  3   |Enter | Enter  |
+* `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
+*          |      |      |      |      |                                         |  .   |Enter |      |      |
+*          `---------------------------'                                         `---------------------------'
+*                                        ,-------------.         ,-------------.
+*                                        |      |      |         |      | Base |
+*                                 ,------|------|------|         |------+------+------.
+*                                 |      |      |      |         |      |      |      |
+*                                 | BkSp |      |------|         |------|      |  0   |
+*                                 |      |      |      |         |      |      |      |
+*                                 `--------------------'         `--------------------'
+*/
+
+[_NUMPAD] = 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,TO(_BASE),KC_EQL,KC_SLSH,KC_ASTR,KC_NO,
+ KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,                                   KC_NO,KC_7,KC_8,KC_9,KC_MINS,KC_NO,
+ KC_DEL,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,                                  KC_NO,KC_4,KC_5,KC_6,KC_PLUS,KC_NO,
+ KC_BSPC,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,                                 KC_NO,KC_1,KC_2,KC_3,KC_ENT,KC_ENT,
+ KC_NO,KC_NO,KC_NO,KC_NO,                                               KC_DOT,KC_ENT,KC_NO,KC_NO,
+                                KC_NO,KC_NO,                  KC_NO,TO(_BASE),
+                                KC_NO,                        KC_NO,
+                                KC_BSPC,KC_NO,KC_NO,          KC_NO,KC_NO,KC_0
+)
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  //set LEDs which are triggered by a layer change
+  #ifdef LED_COMPOSE_PIN
+    writePin(LED_COMPOSE_PIN, !layer_state_cmp(state, _KEYPAD));
+  #endif
+
+  #ifdef LED_NUM_LOCK_PIN
+    writePin(LED_NUM_LOCK_PIN, !layer_state_cmp(state, _NUMPAD));
+  #endif
+
+  return state;
+};
+
+bool led_update_user(led_t led_state) {
+  #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
+  
+  //disable default processing of LEDs
+  return false;
+}
\ No newline at end of file
diff --git a/keyboards/kinesis/keymaps/alvicstep/readme.md b/keyboards/kinesis/keymaps/alvicstep/readme.md
new file mode 100644
index 000000000000..c21618a1dc93
--- /dev/null
+++ b/keyboards/kinesis/keymaps/alvicstep/readme.md
@@ -0,0 +1,105 @@
+## Custom Layout
+Kinesis Contoured family of keyboards belong to a relatively small group of keyboards that utilize thumb clusters. The keycap profiles of thumb cluster keys make it easy to press multiple keys simultaneously by a thumb finger. Co-locating CTRL, SHIFT and KEYPAD modifiers in the thumb cluster gives truly unique capabilities to these keyboards.
+
+### "alvicstep" Layout
+The **alvicstep** layout is optimized for software development on a Windows machine. It is a result of many years of daily usage. It is a great starting point for your own design.
+
+#### Layout Features
+- 3 layers: default layer, keypad layer, numpad layer
+- keypad layer allows for 2 finger operation using **arrow** keys together with
+    - **CTRL** and/or **SHIFT** modifiers OR
+    - **HOME/END** keys OR
+    - **PAGEUP/PAGEDOWN** keys.  
+- two finger operations can be achieved by holding up to 3 modifier keys (KEYPAD/SHIFT/CTRL) with a thumb finger and using index/middle/ring finger by pressing keywell keys. For example, you can fully control caret position and text selection of:  
+    - each letter
+    - each word
+    - from a current caret position to the beginning of the line
+    - from a current caret position to the end of the line
+    - multiple lines
+    - multiple pages
+- with little practice you will be able to string together different key combinations. For example, executing `KEYPAD + O` and then `KEYPAD + SHIFT + U` selects the whole line of text with barely any finger movement. The best part is that it works in any text editor!
+- keypad layer allows accessing **F1-F12** and **ESC** keys by moving only a single finger away from the home row, making it very fast and convenient
+- **KEYPAD** key can be used to access US ANSI Shifted Symbols instead of pressing a SHIFT key. This gives you two advantages: it makes KEYPAD key a "go to" key which is used in almost all operations unrelated to typing of letters. To understand the second advantage, compare pressing `SHIFT + 0` and `KEYPAD + 0` using the right hand
+- **NUMPAD** "momentary" modifier key can be used to quickly switch to a numeric pad while typing alphanumeric strings. In a stock Kinesis firmware you would have to switch to KEYPAD layer and then press NUMLOCK key which makes it unusable for this task
+- **NUMPAD** key in the right thumb cluster can be used to switch to a numeric pad for long numeric sequences
+
+#### Layout Layers
+
+![](https://i.imgur.com/86LCI3zh.jpg)
+![](https://i.imgur.com/Gv4WBw7h.jpg) 
+![](https://i.imgur.com/gKXMUI2h.jpg) 
+
+#### Notes
+- MO(1) - switch to **KEYPAD** layer while key is being pressed
+- MO(2) - switch to **NUMPAD** layer while key is being pressed
+- TO(0) - switch to **BASE** layer 
+- TO(2) - switch to **NUMPAD** layer 
+- Rsft(Enter) - acts as an ENTER key when pressed and released. Acts as a SHIFT modifier in combination with other keys
+- Bt - enter bootloader mode
+- Alt(Tab) - toggle between last two active applications
+- Ctrl(Tab) - toggle between last two active tabs
+
+
+### Differences From Stock
+- **{}[]** keys are moved to the left side of the keywell to be easily accessible
+- **-** and **+** keys are switched
+- **CAPS LOCK** key is moved to **KEYPAD** layer and is mapped to **DELETE** on **BASE** layer
+
+### Shortcuts
+
+
+|Shortcut             | Control Caret                         |
+|---------------------|---------------------------------------|
+|`KEYPAD + J`         | move caret one character left         | 
+|`KEYPAD + L`         | move caret one character right        | 
+|`KEYPAD + I`         | move caret one line up                | 
+|`KEYPAD + K`         | move caret one line down              | 
+|`KEYPAD + CTRL + J`  | move caret one word to the left       | 
+|`KEYPAD + CTRL + L`  | move caret one word to the right      | 
+|`KEYPAD + U`         | move caret to the start of the line   | 
+|`KEYPAD + O`         | move caret to the end of the line     | 
+|`KEYPAD + H`         | move caret one page up                | 
+|`KEYPAD + N`         | move caret one page down              | 
+
+
+|Shortcut             | Scroll Lock                           |
+|---------------------|---------------------------------------|
+|`KEYPAD + CTRL + I`  | scroll page up                        | 
+|`KEYPAD + CTRL + K`  | scroll page down                      | 
+
+
+|Shortcut                     | Select Text                   |
+|-----------------------------|-------------------------------|
+|`KEYPAD + CTRL + SHIFT + J`  | select one word to the left   | 
+|`KEYPAD + CTRL + SHIFT + L`  | select one word to the right  | 
+|`KEYPAD + CTRL + SHIFT + I`  | select one line up            | 
+|`KEYPAD + CTRL + SHIFT + K`  | select one line down          | 
+|`KEYPAD + SHIFT + H`         | select one page up            | 
+|`KEYPAD + SHIFT + N`         | select one page down          | 
+|`KEYPAD + CTRL + SHIFT + U`  | select from beginning of the file up to the caret position   | 
+|`KEYPAD + CTRL + SHIFT + O`  | select from caret position to the end of the file  | 
+
+
+|Shortcut             | US ANSI Shifted Symbols               |
+|---------------------|---------------------------------------|
+|`KEYPAD + -`         | _                                     | 
+|`KEYPAD + 1`         | !                                     | 
+|`KEYPAD + 2`         | @                                     | 
+|`KEYPAD + 3`         | #                                     | 
+|`KEYPAD + 4`         | $                                     | 
+|`KEYPAD + 5`         | %                                     | 
+|`KEYPAD + 6`         | ^                                     | 
+|`KEYPAD + 7`         | &                                     | 
+|`KEYPAD + 8`         | *                                     | 
+|`KEYPAD + 9`         | (                                     | 
+|`KEYPAD + 0`         | )                                     | 
+|`KEYPAD + =`         | +                                     | 
+|`KEYPAD + \`         | \|                                    | 
+|`KEYPAD + '`         | "                                     | 
+|`KEYPAD + ;`         | :                                     | 
+|`KEYPAD + /`         | ?                                     | 
+|`KEYPAD + [`         | {                                     | 
+|`KEYPAD + ]`         | }                                     | 
+|`KEYPAD + ,`         | <                                     | 
+|`KEYPAD + .`         | >                                     | 
+|`KEYPAD + BACKTICK`  | ~                                     | 
\ No newline at end of file
diff --git a/keyboards/kinesis/keymaps/default/keymap.c b/keyboards/kinesis/keymaps/default/keymap.c
index e0f114902cd9..c9449c540823 100644
--- a/keyboards/kinesis/keymaps/default/keymap.c
+++ b/keyboards/kinesis/keymaps/default/keymap.c
@@ -1,3 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+ 
 #include QMK_KEYBOARD_H
 
 #define QWERTY 0 // Base qwerty
@@ -30,24 +33,17 @@
 */
 
 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_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_INS ,KC_LEFT,KC_RGHT,
-			   KC_LCTL,KC_LALT,
-                                    KC_HOME,
-                           KC_BSPC,KC_DEL ,KC_END ,
-    KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SCRL  ,KC_PAUS, KC_NO, QK_BOOT,
-	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,
-           KC_RGUI,KC_RCTL,
-           KC_PGUP,
-           KC_PGDN,KC_ENTER ,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,  KC_NO,    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,  KC_ENTER, KC_SPC
+  )
+
 };
diff --git a/keyboards/kinesis/keymaps/default_pretty/keymap.c b/keyboards/kinesis/keymaps/default_pretty/keymap.c
deleted file mode 100644
index c790e0894566..000000000000
--- a/keyboards/kinesis/keymaps/default_pretty/keymap.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define QWERTY 0 // Base qwerty
-
-
-/****************************************************************************************************
-*
-* Keymap: Default Layer in Qwerty
-*
-* ,-------------------------------------------------------------------------------------------------------------------.
-* | Esc    |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F8  |  F9  |  F10 |  F12 | PSCR | SLCK | PAUS |  FN0 |  BOOT  |
-* |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
-* | =+     |  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  |  ;:  | '"     |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* | Shift  |   Z  |   X  |   C  |   V  |   B  |                           |   N  |   M  |  ,.  |  .>  |  /?  | Shift  |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          | `~   | INS  | Left | Right|                                         | Up   | Down |  [{  |  ]}  |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        | Ctrl | Alt  |         | Gui  | Ctrl |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | Home |         | PgUp |      |      |
-*                                 | BkSp | Del  |------|         |------|Return| Space|
-*                                 |      |      | End  |         | PgDn |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [QWERTY] = LAYOUT_pretty(
-    KC_ESC,   KC_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_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,  KC_ENTER, KC_SPC
-  )
-
-};
diff --git a/keyboards/kinesis/keymaps/default_pretty/readme.md b/keyboards/kinesis/keymaps/default_pretty/readme.md
deleted file mode 100644
index a8783b978a99..000000000000
--- a/keyboards/kinesis/keymaps/default_pretty/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# The default keymap for kinesis-advantage
-
-This keymap is the same as the one in the `default` directory, but is
-formatted to use the `LAYOUT_pretty` matrix, which places the two halves of
-the keyboard side-by-side, rather than the left-hand side being on top.
diff --git a/keyboards/kinesis/keymaps/default_pretty/rules.mk b/keyboards/kinesis/keymaps/default_pretty/rules.mk
deleted file mode 100644
index adb07adf7d29..000000000000
--- a/keyboards/kinesis/keymaps/default_pretty/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-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
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
diff --git a/keyboards/kinesis/keymaps/dvorak/keymap.c b/keyboards/kinesis/keymaps/dvorak/keymap.c
index 9ebb088cf73d..f8a5b4ed4f96 100644
--- a/keyboards/kinesis/keymaps/dvorak/keymap.c
+++ b/keyboards/kinesis/keymaps/dvorak/keymap.c
@@ -1,3 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 #define _DVORAK 0 // Base Dvorak layer
@@ -6,51 +9,29 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_DVORAK] = 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_QUOT, KC_COMM, KC_DOT,  KC_P,   KC_Y,
-        KC_CAPS,  KC_A,    KC_O,    KC_E,    KC_U,   KC_I,
-        KC_LSFT,  KC_SCLN, KC_Q,    KC_J,    KC_K,   KC_X,
-                  KC_GRV,  KC_INS, KC_LEFT, KC_RIGHT,
-        // 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, KC_NO, QK_BOOT,
-        KC_6,   KC_7,     KC_8,     KC_9,     KC_0,    KC_MINS,
-        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,    KC_RSFT,
-                          KC_UP,  KC_DOWN, KC_LBRC, KC_RBRC,
-        // right thumb
-        KC_RGUI,    KC_RCTL,
-        KC_PGUP,
-        KC_PGDN, KC_ENT, KC_SPC
+        KC_ESC,   KC_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_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_CAPS,  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_LCTL, KC_LALT,        KC_RGUI,    KC_RCTL,
+                                     KC_HOME,        KC_PGUP,
+                   KC_BSPC, KC_DEL,  KC_END,        KC_PGDN, KC_ENT, KC_SPC
     ),
 
 [_MEDIA] = LAYOUT(
        // left hand
-       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO,
-       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-       KC_NO,   KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1, KC_NO,
-       KC_NO,   KC_NO,   KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,
-                KC_NO,   KC_NO,   KC_MS_D, KC_MS_U,
-        // left thumb
-                                           KC_NO,   KC_NO,
-                                                    KC_NO,
-                                  KC_NO,   KC_NO,   KC_TRNS,
-       // right hand
-       KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PWR,
-       KC_NO,   KC_VOLU, KC_MS_U, KC_VOLD, KC_NO,   KC_NO,
-       KC_NO,   KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,   KC_NO,
-       KC_NO,   KC_MPRV, KC_MPLY, KC_MNXT, KC_NO,   KC_NO,
-                KC_MS_L, KC_MS_R, KC_NO,   KC_NO,
-       // right thumb
-       KC_NO, KC_NO,
-       KC_NO,
-       KC_TRNS, KC_ENT, KC_NO
+       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO, KC_NO, KC_NO,       KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PWR,
+       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,       KC_NO,   KC_VOLU, KC_MS_U, KC_VOLD, KC_NO,   KC_NO,
+       KC_NO,   KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1, KC_NO,       KC_NO,   KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,   KC_NO,
+       KC_NO,   KC_NO,   KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,       KC_NO,   KC_MPRV, KC_MPLY, KC_MNXT, KC_NO,   KC_NO,
+                KC_NO,   KC_NO,   KC_MS_D, KC_MS_U,                KC_MS_L, KC_MS_R, 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_ENT, KC_NO
 )
 };
diff --git a/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c b/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
index b6a4fa2d10fd..7dbb4b9159e1 100644
--- a/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
+++ b/keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
@@ -1,3 +1,6 @@
+// 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
@@ -5,26 +8,15 @@
 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_EQL,   KC_1,    KC_2,    KC_3,    KC_4,   KC_5,
-        KC_TAB,   KC_QUOT, KC_COMM, KC_DOT,  KC_P,   KC_Y,
-        KC_ESC,   KC_A,    KC_O,    KC_E,    KC_U,   KC_I,
-        KC_LSFT,  KC_SCLN, KC_Q,    KC_J,    KC_K,   KC_X,
-                  KC_GRV,  KC_INS,  KC_LEFT, KC_RIGHT,
-        // left thumb
-                            KC_LGUI, 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, KC_NUM, KC_PWR,
-        KC_6,   KC_7,     KC_8,     KC_9,     KC_0,    KC_MINS,
-        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,    KC_RSFT,
-                          KC_UP,  KC_DOWN, KC_LBRC,    KC_RBRC,
-        // right thumb
-        KC_RCTL,    KC_RGUI,
-        KC_PGUP,
-        KC_PGDN, KC_ENT, KC_SPC
+        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
index 554f6f8f5815..cae763d8ec7c 100644
--- a/keyboards/kinesis/keymaps/farmergreg/keymap.c
+++ b/keyboards/kinesis/keymaps/farmergreg/keymap.c
@@ -70,164 +70,88 @@ const key_override_t **key_overrides = (const key_override_t *[]){
  */
 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_EQL     , KC_1  ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,
-	KC_TAB     , KC_Q  ,KC_W   ,KC_F   ,KC_P   ,KC_G   ,
-	TD(TD_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_BSLS,KC_LEFT,KC_RGHT,
-
-			KC_LCTL,KC_LALT,
-				KC_HOME,
-			KC_BSPC,KC_DEL ,KC_END,
-
-	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_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
-	KC_J   ,KC_L   ,KC_U   ,KC_Y   ,KC_SCLN,KC_BSLS,
-	KC_H   ,KC_N   ,KC_E   ,KC_I   ,KC_O   ,KC_QUOT,
-	KC_K   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,
-		KC_DOWN,KC_UP  ,KC_LBRC,KC_RBRC,
-
-			KC_RGUI,KC_RCTL,
-				KC_PGUP,
-			KC_PGDN,KC_ENT ,KC_SPC
+	KC_ESC     , KC_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_A   ,KC_O   ,KC_E   ,KC_U   ,KC_I   ,
-	_______,KC_SCLN,KC_Q   ,KC_J   ,KC_K   ,KC_X   ,
-		_______,_______,_______,_______,
-
-			_______,_______,
-				_______,
-			_______,_______,_______,
-
-	_______,_______,_______,_______,_______,_______,_______,_______, _______,
-	_______,_______,_______,_______,_______,_______,
-	KC_F   ,KC_G   ,KC_C   ,KC_R   ,KC_L   ,KC_SLSH,
-	KC_D   ,KC_H   ,KC_T   ,KC_N   ,KC_S   ,KC_QUOT,
-	KC_B   ,KC_M   ,KC_W   ,KC_V   ,KC_Z   ,_______,
-		_______,_______,_______,_______,
-
-			_______,_______,
-				_______,
-			_______,_______,_______
+	_______,_______,_______,_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,_______,_______, _______,
+	_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,
+	_______,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_A  ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,
-	_______,KC_Z  ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,
-		    _______,_______,_______,_______,
-			_______,_______,
-				_______,
-			_______,_______,_______,
-
-	_______,_______,_______,_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,
-	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_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 ,_______,_______, // BACKSPACE becomes SPACE
-
-	_______,_______,_______,_______,_______,_______,_______, _______,_______,
-	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,
-		_______,_______,_______,_______,
-
-			_______,_______,
-				_______,
-			_______,_______,KC_BSPC // SPACE becomes BACKSPACE
+	_______,_______,_______,_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,_______, _______,_______,
+	_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,
+	_______,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_INS ,_______,_______,
-
-			_______,_______,
-				_______,
-			_______,_______,_______,
-
-	_______,_______,_______ ,_______,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_PDOT,KC_PENT,
-
-			_______,_______,
-				_______,
-			_______,_______,KC_P0
+	_______,_______,_______,_______,_______,_______,_______,_______,_______,	_______,_______,_______ ,_______,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),_______         ,_______,_______,_______,
-	_______,_______,_______,_______     ,_______    ,_______         ,
-	_______,_______,_______,_______     ,_______    ,DF(_QWERTY_GAME),	// The G in Colemak
-	_______,_______,_______,_______     ,_______    ,DF(_QWERTY_GAME),	// The G in QWERTY
-	_______,_______,_______,DF(_COLEMAK),_______    ,_______,
-		_______,_______,_______     ,_______,
-
-			_______,_______,
-				_______,
-			_______,_______,_______,
-
-	QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,
-		_______,_______,_______,_______,
-
-			_______,_______,
-				_______,
-			_______,_______,_______
+	_______,_______,_______,DF(_QWERTY),DF(_DVORAK),_______         ,_______,_______,_______,	QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______     ,_______    ,_______         ,	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______     ,_______    ,DF(_QWERTY_GAME),	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______     ,_______    ,DF(_QWERTY_GAME),	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,DF(_COLEMAK),_______    ,_______,	_______,_______,_______,_______,_______,_______,
+		_______,_______,_______     ,_______,		_______,_______,_______,_______,
+
+			_______,_______,			_______,_______,
+				_______,				_______,
+			_______,_______,_______,			_______,_______,_______
 	)
 /*
 	,[_TEMPLATE] = LAYOUT(
-	_______,_______,_______,_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,
-		_______,_______,_______,_______,
-
-			_______,_______,
-				_______,
-			_______,_______,_______,
-
-	_______,_______,_______,_______,_______,_______,_______,_______, _______,
-	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,
-	_______,_______,_______,_______,_______,_______,
-		_______,_______,_______,_______,
-
-			_______,_______,
-				_______,
-			_______,_______,_______
+	_______,_______,_______,_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,_______,_______, _______,
+	_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,
+	_______,_______,_______,_______,_______,_______,	_______,_______,_______,_______,_______,_______,
+		_______,_______,_______,_______,		_______,_______,_______,_______,
+
+			_______,_______,			_______,_______,
+				_______,				_______,
+			_______,_______,_______,			_______,_______,_______
 	)
 */
 };
diff --git a/keyboards/kinesis/keymaps/heatxsink/keymap.c b/keyboards/kinesis/keymaps/heatxsink/keymap.c
index 53b4b57cf56f..e430df225a7a 100644
--- a/keyboards/kinesis/keymaps/heatxsink/keymap.c
+++ b/keyboards/kinesis/keymaps/heatxsink/keymap.c
@@ -36,155 +36,75 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_DEFAULT] = LAYOUT(
-        // LHAND
-        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 ,_______,_______,_______,_______,_______,
-        HCTLESC,_______,_______,_______,_______,_______,
-        SC_LSPO,_______,_______,_______,_______,_______,
-                KC_GRV ,LAYERS ,KC_LEFT,KC_RGHT,
-        // LTHUMB
-                KC_LALT,KC_LCTL,
-                        KC_HOME,
-        KC_BSPC,KC_DEL ,KC_END ,
-        // RHAND
-        KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SCRL,KC_PAUS,KEYPAD ,QK_BOOT,
-        KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
-        _______,_______,_______,_______,_______,KC_BSLS,
-        _______,_______,_______,_______,_______,KC_QUOT,
-        _______,_______,_______,_______,_______,SC_RSPC,
-                KC_UP  ,KC_DOWN,KC_LBRC,KC_RBRC,
-        // RTHUMB
-        KC_RCTL,KC_LGUI,
-        KC_PGUP,
-        KC_PGDN,KC_ENT ,KC_SPC
+        KC_ESC ,KC_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(
-        // LHAND
-        _______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,
-        _______,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   ,
-                _______,_______,_______,_______,
-        // LTHUMB
-                _______,_______,
-                        _______,
-        _______,_______,_______,
-        // RHAND
-        _______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,
-        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,_______,
-                _______,_______,_______,_______,
-        // RTHUMB
-        _______,_______,
-        _______,
-        _______,_______,_______
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,
+        _______,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(
-        // LHAND
-        _______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,
-        _______,KC_Q   ,KC_W   ,KC_F   ,KC_P   ,KC_B,
-        _______,KC_A   ,KC_R   ,KC_S   ,KC_T   ,KC_G,
-        _______,KC_Z   ,KC_X   ,KC_C   ,KC_D   ,KC_V,
-                _______,_______,_______,_______,
-        // LTHUMB
-                _______,_______,
-                        _______,
-        _______,_______,_______,
-        // RHAND
-        _______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,
-        KC_J   ,KC_L   ,KC_U   ,KC_Y   ,KC_SCLN,_______,
-        KC_M   ,KC_N   ,KC_E   ,KC_I   ,KC_O   ,_______,
-        KC_K   ,KC_H   ,KC_COMM,KC_DOT ,KC_SLSH,_______,
-                _______,_______,_______,_______,
-        // RTHUMB
-        _______,_______,
-        _______,
-        _______,_______,_______
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,
+        _______,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(
-        // LHAND
-        _______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,
-        _______,KC_Q   ,KC_D   ,KC_R   ,KC_W   ,KC_B,
-        _______,KC_A   ,KC_S   ,KC_H   ,KC_T   ,KC_G,
-        _______,KC_Z   ,KC_X   ,KC_M   ,KC_C   ,KC_V,
-                _______,_______,_______,_______,
-        // LTHUMB
-                _______,_______,
-                        _______,
-        _______,_______,_______,
-        // RHAND
-        _______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,
-        KC_J   ,KC_F   ,KC_U   ,KC_P   ,KC_SCLN,_______,
-        KC_Y   ,KC_N   ,KC_E   ,KC_O   ,KC_I   ,_______,
-        KC_K   ,KC_L   ,KC_COMM,KC_DOT ,KC_SLSH,_______,
-                _______,_______,_______,_______,
-        // RTHUMB
-        _______,_______,
-        _______,
-        _______,_______,_______
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,
+        _______,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 (
-        // LHAND
-        _______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,
-        _______,_______,KC_MUTE,KC_VOLD,KC_VOLU,_______,
-        _______,KC_MSTP,KC_MPRV,KC_MPLY,KC_MNXT,KC_MSEL,
-        _______,_______,_______,_______,_______,_______,
-                _______,_______,_______,_______,
-        // LTHUMB
-                _______,_______,
-                        _______,
-        _______,_______,_______,
-
-        // RHAND
-        _______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,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_LPRN,KC_RPRN,KC_PDOT,KC_PENT,
-        // RTHUMB
-        _______,_______,
-        _______,
-        _______,KC_PENT,KC_P0
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,        _______,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 (
-        // LHAND
-        _______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,QWERTY ,CMMDH  ,WM     ,KEYPAD ,_______,
-        _______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,
-                _______,_______,_______,_______,
-        // LTHUMB
-                _______,_______,
-                        _______,
-        _______,_______,_______,
-
-        // RHAND
-        _______,_______,_______,_______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,
-        _______,_______,_______,_______,_______,_______,
-                _______,_______,_______,_______,
-        // RTHUMB
-        _______,_______,
-        _______,
-        _______,_______,_______
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,
+        _______,QWERTY ,CMMDH  ,WM     ,KEYPAD ,_______,        _______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,_______,_______,        _______,_______,_______,_______,_______,_______,
+                _______,_______,_______,_______,                _______,_______,_______,_______,
+                _______,_______,        _______,_______,
+                        _______,        _______,
+        _______,_______,_______,        _______,_______,_______
     ),
 };
 
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
index 04fa8d39bc98..6275ed0a8d05 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c
@@ -1,3 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
@@ -99,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                  |  Fn   | Number|  Bspc |                   | Enter |Number2|  Fn2  |
 	                  `-----------------------'                   `-----------------------'
 */
-[_COLEMAK] = LAYOUT_pretty(
+[_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,
@@ -135,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                  |  Fn   | Number|  Bspc |                   | Enter |Number2|  Fn2  |
 	                  `-----------------------'                   `-----------------------'
 */
-[_QWERTY] = LAYOUT_pretty(
+[_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,
@@ -171,7 +174,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                  |       |       |       |                   |       |       |       |
 	                  `-----------------------'                   `-----------------------'
 */
-[_NUMBERS] = LAYOUT_pretty(
+[_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, _______,
@@ -183,7 +186,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                  _______,  _______, _______,                   _______, _______, _______
 ),
 
-[_NUMBERS2] = LAYOUT_pretty(
+[_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, _______,
@@ -218,7 +221,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                  |       |       |       |                   |       |       |       |
 	                  `-----------------------'                   `-----------------------'
 */
-[_FUNCTION] = LAYOUT_pretty(
+[_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), _______, _______,
@@ -230,7 +233,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                            _______,     _______, _______,                   _______, _______, _______
 ),
 
-[_FUNCTION2] = LAYOUT_pretty(
+[_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), _______, _______,
@@ -266,7 +269,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                  |       |       |       |                   |       |       |       |
 	                  `-----------------------'                   `-----------------------'
 */
-[_NUMPAD] = LAYOUT_pretty(
+[_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, _______,
@@ -302,7 +305,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                  |       |       |  Bspc |                   | Ent/NS|Number2|  Fn2  |
 	                  `-----------------------'                   `-----------------------'
 */
-[_COLEMAKGM] = LAYOUT_pretty(
+[_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,
@@ -338,7 +341,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                  |       |       |  Bspc |                   | Ent/NS|Number2|  Fn2  |
 	                  `-----------------------'                   `-----------------------'
 */
-[_QWERTYGM] = LAYOUT_pretty(
+[_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,
@@ -374,7 +377,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	                  |       |       |       |                   |       |       |       |
 	                  `-----------------------'                   `-----------------------'
 */
-[_ADJUST] = LAYOUT_pretty(
+[_ADJUST] = LAYOUT(
   _______, _______, _______, _______, _______,   _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM,                                                        NUMPAD,  _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______,   _______,                                                         _______, _______, _______, _______, _______, _______,
@@ -386,7 +389,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                  _______,  _______, _______,                    _______, _______, _______
 ),
 
-[_ADJUST2] = LAYOUT_pretty(
+[_ADJUST2] = LAYOUT(
   _______, _______, _______, _______, _______,   _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, COLEMAK, QWERTY,  _______, COLEMAKGM, QWERTYGM,                                                        NUMPAD,  _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______,   _______,                                                         _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kinesis/keymaps/jwon/keymap.c b/keyboards/kinesis/keymaps/jwon/keymap.c
index fe335e68aca8..c23663da922c 100644
--- a/keyboards/kinesis/keymaps/jwon/keymap.c
+++ b/keyboards/kinesis/keymaps/jwon/keymap.c
@@ -40,107 +40,55 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_BASE_DVORAK] = LAYOUT (
-           // Left Hand
-           MACLOCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
-           KC_PIPE, KC_PLUS, KC_LBRC, KC_LCBR, KC_LPRN, KC_AMPR,
-           KC_TAB,  KC_SCLN, KC_COMM, KC_DOT,  KC_P,    KC_Y,
-           SFT_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,
-           KC_LCTL, KC_QUOT, KC_Q,    KC_J,    KC_K,    KC_X,
-                    KC_DLR,  KC_BSLS, KC_LEFT, KC_RGHT,
-           // Left Thumb
-                    KC_LGUI, KC_LALT,
-                             MACPAST,
-           KC_BSPC, KC_SPC,  MACCOPY,
-
-           // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, QWERTY,  QK_BOOT,
-           KC_EQL,  KC_RPRN, KC_RCBR, KC_RBRC, KC_ASTR, KC_EXLM,
-           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_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-                    KC_DOWN, KC_UP,   KC_SLSH, KC_AT,
-           // Right Thumb
-           KEYPAD,  LSA_,
-           MACUNDO,
-           MACREDO, RAISE, KC_ENT
+           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 (
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
-           _______, KC_COLN, KC_LABK, KC_RABK, S(KC_P), S(KC_Y),
-           _______, S(KC_A), S(KC_O), S(KC_E), S(KC_U), S(KC_I),
-           _______, KC_DQUO, S(KC_Q), S(KC_J), S(KC_K), S(KC_X),
-                    KC_TILD, KC_PIPE, _______, _______,
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_PERC,
-           S(KC_F), S(KC_G), S(KC_C), S(KC_R), S(KC_L), KC_HASH,
-           S(KC_D), S(KC_H), S(KC_T), S(KC_N), S(KC_S), KC_UNDS,
-           S(KC_B), S(KC_M), S(KC_W), S(KC_V), S(KC_Z), _______,
-                    _______, _______, KC_QUES, KC_CIRC,
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, _______
+           _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,
+           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 (
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, 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
+           _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______, _______, _______,           _______, 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(
-           // Left Hand
-           KC_ESC,  _______, _______, _______, _______, _______, _______, _______, _______,
-           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_INS,  KC_LEFT, KC_RGHT,
-           // Left Thumb
-                    KC_LGUI, KC_LALT,
-                             KC_HOME,
-           KC_BSPC, KC_DEL,  KC_END ,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	       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_RGUI, KC_RCTL,
-           KC_PGUP,
-           KC_PGDN, KC_ENT,  KC_SPC
+           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
     )
 };
 
diff --git a/keyboards/kinesis/keymaps/peott-fr/keymap.c b/keyboards/kinesis/keymaps/peott-fr/keymap.c
index 9bdcb6df3145..22453517a94d 100644
--- a/keyboards/kinesis/keymaps/peott-fr/keymap.c
+++ b/keyboards/kinesis/keymaps/peott-fr/keymap.c
@@ -21,8 +21,52 @@
  */
 
 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_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, LGUI_T(KC_MPLY), LALT_T(KC_MNXT), KC_GRV, KC_BSLS, KC_LBRC, KC_RBRC, KC_HOME, LT(1,KC_SPC), KC_DEL, KC_END, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, TG(3), KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_RALT, KC_APP, KC_PGUP, 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_PGUP, KC_LBRC, KC_UP, KC_RBRC, KC_LPRN, KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_RPRN, 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_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, 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_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, 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),
-	[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_TRNS, KC_NO, KC_NO, KC_NUM, KC_PEQL, KC_PSLS, KC_PAST, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_NO, KC_NO, KC_P0, KC_PDOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
+	[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/stapelberg/keymap.c b/keyboards/kinesis/keymaps/stapelberg/keymap.c
index 77578463904a..f8e7b572f153 100644
--- a/keyboards/kinesis/keymaps/stapelberg/keymap.c
+++ b/keyboards/kinesis/keymaps/stapelberg/keymap.c
@@ -48,24 +48,15 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [QWERTY] = LAYOUT(
-           KC_DEL, 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_INS ,KC_LEFT,KC_RGHT,
-			   KC_LCTL,KC_LALT,
-                                    KC_LGUI,
-                           KC_BSPC,KC_ESC ,KC_END ,
-    KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SCRL  ,KC_PAUS, MO(1), QK_BOOT,
-	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,
-           KC_RALT,KC_RCTL,
-           KC_PGUP,
-           KC_PGDN,KC_ENTER ,KC_SPC
+           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_PSCR ,KC_SCRL  ,KC_PAUS, MO(1), 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_RALT,KC_RCTL,
+                                    KC_LGUI,           KC_PGUP,
+                           KC_BSPC,KC_ESC ,KC_END ,           KC_PGDN,KC_ENTER ,KC_SPC
     ),
 
 // LAYER1 is activated by the keypad key. It has WAKE on Escape (left-most key),
@@ -73,23 +64,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // as printed on the Kinesis Advantage 2.
 [LAYER1] = LAYOUT(
 
-           KC_WAKE,  KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO,
-           KC_NO  ,  KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,
-           KC_NO  ,  KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,
-           KC_NO  ,  KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,
-           KC_NO  ,  KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,
-                   KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,
-			   KC_NO  ,KC_NO  ,
-                                    KC_NO  ,
-                           KC_NO  ,KC_NO  ,KC_NO  ,
-    KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_MUTE ,KC_VOLD  ,KC_VOLU, 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_WAKE,  KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO,    KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_MUTE ,KC_VOLD  ,KC_VOLU, 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  ,           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/keymap.c b/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
index 6a7a6cc68e01..ffcb1c3a8d18 100644
--- a/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
+++ b/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c
@@ -1,3 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
@@ -119,7 +122,7 @@ Colemak
 	                                          |   Fn   | Number |  Bspc  |                 |  Enter | Number2|   Fn2  |
 	                                          `--------------------------'                 `--------------------------'
 */
-[_COLEMAK] = LAYOUT_pretty(
+[_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,
@@ -156,7 +159,7 @@ QWERTY
 	                                          |   Fn   | Number |  Bspc  |                 |  Enter | Number2|   Fn2  |
 	                                          `--------------------------'                 `--------------------------'
 */
-[_QWERTY] = LAYOUT_pretty(
+[_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,
@@ -193,7 +196,7 @@ Numbers/Symbols layer
 	                                          |        |        |        |                 |        |        |        |
 	                                          `--------------------------'                 `--------------------------'
 */
-[_NUMBERS] = LAYOUT_pretty(
+[_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, _______,
@@ -205,7 +208,7 @@ Numbers/Symbols layer
                                                _______, _______, _______,                   _______, _______, _______
 ),
 
-[_NUMBERS2] = LAYOUT_pretty(
+[_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, _______,
@@ -241,7 +244,7 @@ Function layer
 	                                          |        |        |        |                 |        |        |        |
 	                                          `--------------------------'                 `--------------------------'
 */
-[_FUNCTION] = LAYOUT_pretty(
+[_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,   _______, _______,
@@ -253,7 +256,7 @@ Function layer
                                                _______, _______, _______,                   _______, _______, _______
 ),
 
-[_FUNCTION2] = LAYOUT_pretty(
+[_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,   _______, _______,
@@ -290,7 +293,7 @@ Numpad layer
 	                                          |        |        |        |                 |        |        |        |
 	                                          `--------------------------'                 `--------------------------'
 */
-[_NUMPAD] = LAYOUT_pretty(
+[_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, _______,
@@ -327,7 +330,7 @@ Gaming
 	                                          |        |        |  Bspc  |                 |Enter/NS| Number2|   Fn2  |
 	                                          `--------------------------'                 `--------------------------'
 */
-[_GAMING] = LAYOUT_pretty(
+[_GAMING] = LAYOUT(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______,
@@ -364,7 +367,7 @@ Adjust layer
 	                                          |        |        |        |                 |        |        |        |
 	                                          `--------------------------'                 `--------------------------'
 */
-[_ADJUST] = LAYOUT_pretty(
+[_ADJUST] = LAYOUT(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, COLEMAK, QWERTY,  _______, GAMING,  _______,                                                       NUMPAD,  _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______,
@@ -376,7 +379,7 @@ Adjust layer
                                                _______, _______, _______,                   _______, _______, _______
 ),
 
-[_ADJUST2] = LAYOUT_pretty(
+[_ADJUST2] = LAYOUT(
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   _______, COLEMAK, QWERTY,  _______, GAMING,  _______,                                                       NUMPAD,  _______, _______, _______, _______, QK_BOOT,
   _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kinesis/keymaps/tw1t611/keymap.c b/keyboards/kinesis/keymaps/tw1t611/keymap.c
index 0a812aef35b5..e5fb5519dc1c 100644
--- a/keyboards/kinesis/keymaps/tw1t611/keymap.c
+++ b/keyboards/kinesis/keymaps/tw1t611/keymap.c
@@ -1,3 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 #include "keymap_german.h"
 
@@ -6,59 +9,25 @@
 
 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_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,
-           KC_ESC ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,
-           KC_TAB ,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,
-           DE_PIPE,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,
-           _______,_______,_______,_______,
-                   KC_RCTL,KC_LALT,
-                   KC_HOME,
-                   KC_SPC ,KC_LSFT,KC_BSPC ,
-           KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SCRL,KC_PAUS,KC_NO ,QK_BOOT,
-           KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,DE_SS  ,
-           KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,DE_ADIA,
-           KC_H   ,KC_J   ,KC_K   ,KC_L   ,DE_SLSH,DE_ODIA,
-           KC_N   ,KC_M   ,DE_COMM,DE_DOT ,DE_MINS,DE_UDIA,
-           _______,_______,_______,_______,
-                   KC_LGUI,KC_LCTL,
-                   KC_END ,
-                   KC_DEL,MO(MOD),KC_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 ,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 ,
-           DE_TILD,DE_EXLM,DE_DLR ,DE_LPRN,DE_RPRN,DE_AMPR,
-           DE_BSLS,DE_HASH,DE_LABK,DE_LBRC,DE_RBRC,DE_RABK,
-           _______,_______,_______,_______,
-                   _______,_______,
-                   _______,
-                   _______,_______,_______,
-           _______,_______,_______,_______,_______,_______,_______,_______,_______,
-           _______,_______,_______,_______,_______,_______,
-           KC_HOME,KC_PGDN,KC_PGUP,KC_END ,DE_EQL ,DE_PERC,
-           KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,DE_QUES,DE_ASTR,
-           DE_AT  ,DE_EURO,DE_SCLN,DE_COLN,DE_UNDS,DE_PLUS,
-           _______,_______,_______,_______,
-                   _______,_______,
-                   _______,
-                   _______,_______ ,_______
+           _______,_______,_______,_______,_______,_______,_______,_______,_______,           _______,_______,_______,_______,_______,_______,_______,_______,_______,
+           _______,_______,_______,_______,_______,_______,           _______,_______,_______,_______,_______,_______,
+           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,
+           _______,_______,_______,_______,           _______,_______,_______,_______,
+                   _______,_______,                   _______,_______,
+                   _______,                   _______,
+                   _______,_______,_______,                   _______,_______ ,_______
     )
 };
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c
index 5e4f7c1e8868..1dff9053a8b8 100644
--- a/keyboards/kinesis/keymaps/xyverz/keymap.c
+++ b/keyboards/kinesis/keymaps/xyverz/keymap.c
@@ -1,3 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 enum layer_names {
@@ -110,107 +113,55 @@ enum custom_keycodes { DVORAK = SAFE_RANGE, QWERTY, COLEMAK, KEYPAD };
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_DVORAK] = 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_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,
-           KC_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,
-           KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,
-                    KC_GRV,  KC_INS,  KC_LEFT, KC_RGHT,
-           // Left Thumb
-                    KC_LCTL, KC_LALT,
-                             KC_HOME,
-           KC_BSPC, KC_DEL,  GUI_END,
-
-           // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD),  QK_BOOT,
-           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-           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_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-                    KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC,
-           // Right Thumb
-           KC_RGUI, KC_RCTL,
-           KC_PGUP,
-           KC_PGDN, KPD_ENT, KC_SPC
+           KC_ESC,  KC_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 (
-           // 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_INS,  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),  QK_BOOT,
-           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_RGUI, KC_RCTL,
-           KC_PGUP,
-           KC_PGDN, KPD_ENT, KC_SPC
+           KC_ESC,  KC_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 (
-           // 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_F,    KC_P,    KC_G,
-           KC_BSPC, 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_INS,  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),  QK_BOOT,
-           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-           KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-           KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-           KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-                    KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC,
-           // Right Thumb
-           KC_RGUI, KC_RCTL,
-           KC_PGUP,
-           KC_PGDN, KPD_ENT, KC_SPC
+           KC_ESC,  KC_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 (
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           KC_PWR,  _______, _______, _______, _______, _______,
-           KC_SLEP, _______, _______, _______, _______, _______,
-           KC_WAKE, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,
-           _______, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL,
-                    _______, QWERTY,  COLEMAK, DVORAK,
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, MACLOCK,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, 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
-           _______, MACLOCK,
-           _______,
-           _______, _______, KC_P0
+           _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,
+           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
     )
 };
 
@@ -232,6 +183,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     }
     return true;
 };
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void){};
diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/info.json
index 74d96d59e045..ecf86658a849 100644
--- a/keyboards/kinesis/kint2pp/info.json
+++ b/keyboards/kinesis/kint2pp/info.json
@@ -7,6 +7,19 @@
         "device_version": "0.0.2",
         "max_power": 100
     },
+    "features": {
+        "bootmagic": true,
+        "console": false,
+        "command": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "audio": false,
+        "backlight": false
+    },
+    "build": {
+        "debounce_type": "sym_eager_pk"
+    },
     "matrix_pins": {
         "cols": ["E7", "F0", "F7", "B1", "B3", "B0", "D5"],
         "rows": ["D7", "E0", "E1", "C0", "C6", "F6", "D4", "D2", "D3", "D0", "B7", "D1", "E6", "B4", "B2"]
@@ -24,96 +37,6 @@
     "debounce": 20,
     "layouts": {
         "LAYOUT": {
-            "layout": [
-                {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
-                {"matrix": [1, 0], "x": 1.25, "y": 1.25},
-                {"matrix": [2, 0], "x": 2.25, "y": 1},
-                {"matrix": [3, 0], "x": 3.25, "y": 1},
-                {"matrix": [4, 0], "x": 4.25, "y": 1},
-                {"matrix": [5, 0], "x": 5.25, "y": 1},
-                {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 2.25},
-                {"matrix": [2, 1], "x": 2.25, "y": 2},
-                {"matrix": [3, 1], "x": 3.25, "y": 2},
-                {"matrix": [4, 1], "x": 4.25, "y": 2},
-                {"matrix": [5, 1], "x": 5.25, "y": 2},
-                {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
-                {"matrix": [1, 2], "x": 1.25, "y": 3.25},
-                {"matrix": [2, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [4, 2], "x": 4.25, "y": 3},
-                {"matrix": [5, 2], "x": 5.25, "y": 3},
-                {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [1, 3], "x": 1.25, "y": 4.25},
-                {"matrix": [2, 3], "x": 2.25, "y": 4},
-                {"matrix": [3, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 3], "x": 4.25, "y": 4},
-                {"matrix": [5, 3], "x": 5.25, "y": 4},
-                {"matrix": [1, 4], "x": 1.25, "y": 5.25},
-                {"matrix": [2, 4], "x": 2.25, "y": 5},
-                {"matrix": [3, 4], "x": 3.25, "y": 5},
-                {"matrix": [5, 4], "x": 4.25, "y": 5},
-                {"matrix": [5, 6], "x": 5.25, "y": 6},
-                {"matrix": [5, 5], "x": 6.25, "y": 6},
-                {"matrix": [3, 5], "x": 6.25, "y": 7},
-                {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
-                {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 8},
-                {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [6, 0], "x": 9.25, "y": 1},
-                {"matrix": [7, 0], "x": 10.25, "y": 1},
-                {"matrix": [8, 0], "x": 11.25, "y": 1},
-                {"matrix": [9, 0], "x": 12.25, "y": 1},
-                {"matrix": [10, 0], "x": 13.25, "y": 1.25},
-                {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
-                {"matrix": [6, 1], "x": 9.25, "y": 2},
-                {"matrix": [7, 1], "x": 10.25, "y": 2},
-                {"matrix": [8, 1], "x": 11.25, "y": 2},
-                {"matrix": [9, 1], "x": 12.25, "y": 2},
-                {"matrix": [10, 1], "x": 13.25, "y": 2.25},
-                {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
-                {"matrix": [6, 2], "x": 9.25, "y": 3},
-                {"matrix": [7, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 2], "x": 11.25, "y": 3},
-                {"matrix": [9, 2], "x": 12.25, "y": 3},
-                {"matrix": [10, 2], "x": 13.25, "y": 3.25},
-                {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
-                {"matrix": [6, 3], "x": 9.25, "y": 4},
-                {"matrix": [7, 3], "x": 10.25, "y": 4},
-                {"matrix": [8, 3], "x": 11.25, "y": 4},
-                {"matrix": [9, 3], "x": 12.25, "y": 4},
-                {"matrix": [10, 3], "x": 13.25, "y": 4.25},
-                {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
-                {"matrix": [6, 4], "x": 10.25, "y": 5},
-                {"matrix": [8, 4], "x": 11.25, "y": 5},
-                {"matrix": [9, 4], "x": 12.25, "y": 5},
-                {"matrix": [10, 4], "x": 13.25, "y": 5.25},
-                {"matrix": [9, 6], "x": 8.25, "y": 6},
-                {"matrix": [8, 5], "x": 9.25, "y": 6},
-                {"matrix": [8, 6], "x": 8.25, "y": 7},
-                {"matrix": [6, 6], "x": 8.25, "y": 8},
-                {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
-                {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
-            ]
-        },
-        "LAYOUT_pretty": {
             "layout": [
                 {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
                 {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
diff --git a/keyboards/kinesis/kint2pp/rules.mk b/keyboards/kinesis/kint2pp/rules.mk
index 7c48a98bfcbb..e69de29bb2d1 100644
--- a/keyboards/kinesis/kint2pp/rules.mk
+++ b/keyboards/kinesis/kint2pp/rules.mk
@@ -1,3 +0,0 @@
-# Debounce eagerly (report change immediately), keep per-key timers. We can use
-# this because the kinT does not have to deal with noise.
-DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/info.json
index 815b6cb87199..969f819f80e1 100644
--- a/keyboards/kinesis/kint36/info.json
+++ b/keyboards/kinesis/kint36/info.json
@@ -7,6 +7,19 @@
         "device_version": "0.0.1",
         "max_power": 100
     },
+    "features": {
+        "bootmagic": true,
+        "console": false,
+        "command": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "audio": false,
+        "backlight": false
+    },
+    "build": {
+        "debounce_type": "sym_eager_pk"
+    },
     "matrix_pins": {
         "cols": ["B3", "D1", "C0", "D5", "C1", "B2", "D4"],
         "rows": ["D3", "C3", "C4", "C6", "D2", "B0", "D7", "A12", "A13", "B17", "B16", "D0", "B1", "C2", "D6"]
@@ -24,96 +37,6 @@
     "debounce": 20,
     "layouts": {
         "LAYOUT": {
-            "layout": [
-                {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
-                {"matrix": [1, 0], "x": 1.25, "y": 1.25},
-                {"matrix": [2, 0], "x": 2.25, "y": 1},
-                {"matrix": [3, 0], "x": 3.25, "y": 1},
-                {"matrix": [4, 0], "x": 4.25, "y": 1},
-                {"matrix": [5, 0], "x": 5.25, "y": 1},
-                {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 2.25},
-                {"matrix": [2, 1], "x": 2.25, "y": 2},
-                {"matrix": [3, 1], "x": 3.25, "y": 2},
-                {"matrix": [4, 1], "x": 4.25, "y": 2},
-                {"matrix": [5, 1], "x": 5.25, "y": 2},
-                {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
-                {"matrix": [1, 2], "x": 1.25, "y": 3.25},
-                {"matrix": [2, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [4, 2], "x": 4.25, "y": 3},
-                {"matrix": [5, 2], "x": 5.25, "y": 3},
-                {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [1, 3], "x": 1.25, "y": 4.25},
-                {"matrix": [2, 3], "x": 2.25, "y": 4},
-                {"matrix": [3, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 3], "x": 4.25, "y": 4},
-                {"matrix": [5, 3], "x": 5.25, "y": 4},
-                {"matrix": [1, 4], "x": 1.25, "y": 5.25},
-                {"matrix": [2, 4], "x": 2.25, "y": 5},
-                {"matrix": [3, 4], "x": 3.25, "y": 5},
-                {"matrix": [5, 4], "x": 4.25, "y": 5},
-                {"matrix": [5, 6], "x": 5.25, "y": 6},
-                {"matrix": [5, 5], "x": 6.25, "y": 6},
-                {"matrix": [3, 5], "x": 6.25, "y": 7},
-                {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
-                {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 8},
-                {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [6, 0], "x": 9.25, "y": 1},
-                {"matrix": [7, 0], "x": 10.25, "y": 1},
-                {"matrix": [8, 0], "x": 11.25, "y": 1},
-                {"matrix": [9, 0], "x": 12.25, "y": 1},
-                {"matrix": [10, 0], "x": 13.25, "y": 1.25},
-                {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
-                {"matrix": [6, 1], "x": 9.25, "y": 2},
-                {"matrix": [7, 1], "x": 10.25, "y": 2},
-                {"matrix": [8, 1], "x": 11.25, "y": 2},
-                {"matrix": [9, 1], "x": 12.25, "y": 2},
-                {"matrix": [10, 1], "x": 13.25, "y": 2.25},
-                {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
-                {"matrix": [6, 2], "x": 9.25, "y": 3},
-                {"matrix": [7, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 2], "x": 11.25, "y": 3},
-                {"matrix": [9, 2], "x": 12.25, "y": 3},
-                {"matrix": [10, 2], "x": 13.25, "y": 3.25},
-                {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
-                {"matrix": [6, 3], "x": 9.25, "y": 4},
-                {"matrix": [7, 3], "x": 10.25, "y": 4},
-                {"matrix": [8, 3], "x": 11.25, "y": 4},
-                {"matrix": [9, 3], "x": 12.25, "y": 4},
-                {"matrix": [10, 3], "x": 13.25, "y": 4.25},
-                {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
-                {"matrix": [6, 4], "x": 10.25, "y": 5},
-                {"matrix": [8, 4], "x": 11.25, "y": 5},
-                {"matrix": [9, 4], "x": 12.25, "y": 5},
-                {"matrix": [10, 4], "x": 13.25, "y": 5.25},
-                {"matrix": [9, 6], "x": 8.25, "y": 6},
-                {"matrix": [8, 5], "x": 9.25, "y": 6},
-                {"matrix": [8, 6], "x": 8.25, "y": 7},
-                {"matrix": [6, 6], "x": 8.25, "y": 8},
-                {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
-                {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
-            ]
-        },
-        "LAYOUT_pretty": {
             "layout": [
                 {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
                 {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
diff --git a/keyboards/kinesis/kint36/rules.mk b/keyboards/kinesis/kint36/rules.mk
index 7c48a98bfcbb..e69de29bb2d1 100644
--- a/keyboards/kinesis/kint36/rules.mk
+++ b/keyboards/kinesis/kint36/rules.mk
@@ -1,3 +0,0 @@
-# Debounce eagerly (report change immediately), keep per-key timers. We can use
-# this because the kinT does not have to deal with noise.
-DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/info.json
index 1901ed1d3bbb..eec726cf51eb 100644
--- a/keyboards/kinesis/kint41/info.json
+++ b/keyboards/kinesis/kint41/info.json
@@ -7,6 +7,19 @@
         "device_version": "0.0.1",
         "max_power": 100
     },
+    "features": {
+        "bootmagic": true,
+        "console": false,
+        "command": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "audio": false,
+        "backlight": false
+    },
+    "build": {
+        "debounce_type": "sym_eager_pk"
+    },
     "matrix_pins": {
         "cols": ["LINE_PIN18", "LINE_PIN14", "LINE_PIN15", "LINE_PIN20", "LINE_PIN22", "LINE_PIN19", "LINE_PIN6"],
         "rows": ["LINE_PIN8", "LINE_PIN9", "LINE_PIN10", "LINE_PIN11", "LINE_PIN7", "LINE_PIN16", "LINE_PIN5", "LINE_PIN3", "LINE_PIN4", "LINE_PIN1", "LINE_PIN0", "LINE_PIN2", "LINE_PIN17", "LINE_PIN23", "LINE_PIN21"]
@@ -22,96 +35,6 @@
     "debounce": 20,
     "layouts": {
         "LAYOUT": {
-            "layout": [
-                {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
-                {"matrix": [1, 0], "x": 1.25, "y": 1.25},
-                {"matrix": [2, 0], "x": 2.25, "y": 1},
-                {"matrix": [3, 0], "x": 3.25, "y": 1},
-                {"matrix": [4, 0], "x": 4.25, "y": 1},
-                {"matrix": [5, 0], "x": 5.25, "y": 1},
-                {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 2.25},
-                {"matrix": [2, 1], "x": 2.25, "y": 2},
-                {"matrix": [3, 1], "x": 3.25, "y": 2},
-                {"matrix": [4, 1], "x": 4.25, "y": 2},
-                {"matrix": [5, 1], "x": 5.25, "y": 2},
-                {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
-                {"matrix": [1, 2], "x": 1.25, "y": 3.25},
-                {"matrix": [2, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [4, 2], "x": 4.25, "y": 3},
-                {"matrix": [5, 2], "x": 5.25, "y": 3},
-                {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [1, 3], "x": 1.25, "y": 4.25},
-                {"matrix": [2, 3], "x": 2.25, "y": 4},
-                {"matrix": [3, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 3], "x": 4.25, "y": 4},
-                {"matrix": [5, 3], "x": 5.25, "y": 4},
-                {"matrix": [1, 4], "x": 1.25, "y": 5.25},
-                {"matrix": [2, 4], "x": 2.25, "y": 5},
-                {"matrix": [3, 4], "x": 3.25, "y": 5},
-                {"matrix": [5, 4], "x": 4.25, "y": 5},
-                {"matrix": [5, 6], "x": 5.25, "y": 6},
-                {"matrix": [5, 5], "x": 6.25, "y": 6},
-                {"matrix": [3, 5], "x": 6.25, "y": 7},
-                {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
-                {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 8},
-                {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [6, 0], "x": 9.25, "y": 1},
-                {"matrix": [7, 0], "x": 10.25, "y": 1},
-                {"matrix": [8, 0], "x": 11.25, "y": 1},
-                {"matrix": [9, 0], "x": 12.25, "y": 1},
-                {"matrix": [10, 0], "x": 13.25, "y": 1.25},
-                {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
-                {"matrix": [6, 1], "x": 9.25, "y": 2},
-                {"matrix": [7, 1], "x": 10.25, "y": 2},
-                {"matrix": [8, 1], "x": 11.25, "y": 2},
-                {"matrix": [9, 1], "x": 12.25, "y": 2},
-                {"matrix": [10, 1], "x": 13.25, "y": 2.25},
-                {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
-                {"matrix": [6, 2], "x": 9.25, "y": 3},
-                {"matrix": [7, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 2], "x": 11.25, "y": 3},
-                {"matrix": [9, 2], "x": 12.25, "y": 3},
-                {"matrix": [10, 2], "x": 13.25, "y": 3.25},
-                {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
-                {"matrix": [6, 3], "x": 9.25, "y": 4},
-                {"matrix": [7, 3], "x": 10.25, "y": 4},
-                {"matrix": [8, 3], "x": 11.25, "y": 4},
-                {"matrix": [9, 3], "x": 12.25, "y": 4},
-                {"matrix": [10, 3], "x": 13.25, "y": 4.25},
-                {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
-                {"matrix": [6, 4], "x": 10.25, "y": 5},
-                {"matrix": [8, 4], "x": 11.25, "y": 5},
-                {"matrix": [9, 4], "x": 12.25, "y": 5},
-                {"matrix": [10, 4], "x": 13.25, "y": 5.25},
-                {"matrix": [9, 6], "x": 8.25, "y": 6},
-                {"matrix": [8, 5], "x": 9.25, "y": 6},
-                {"matrix": [8, 6], "x": 8.25, "y": 7},
-                {"matrix": [6, 6], "x": 8.25, "y": 8},
-                {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
-                {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
-            ]
-        },
-        "LAYOUT_pretty": {
             "layout": [
                 {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
                 {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
diff --git a/keyboards/kinesis/kint41/rules.mk b/keyboards/kinesis/kint41/rules.mk
index e273e8f282e9..825c63939f88 100644
--- a/keyboards/kinesis/kint41/rules.mk
+++ b/keyboards/kinesis/kint41/rules.mk
@@ -9,9 +9,4 @@ ARMV = 7
 # Bootloader selection
 BOOTLOADER = halfkay
 
-# Debounce eagerly (report change immediately), keep per-key timers. We can use
-# this because the Cherry MX keyswitches on the Kinesis only produce noise while
-# pressed.
-DEBOUNCE_TYPE = sym_eager_pk
-
 FIRMWARE_FORMAT = hex
diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/info.json
index da8e8f7e45e4..13c2f9a55c50 100644
--- a/keyboards/kinesis/kintlc/info.json
+++ b/keyboards/kinesis/kintlc/info.json
@@ -7,6 +7,19 @@
         "device_version": "0.0.1",
         "max_power": 50
     },
+    "features": {
+        "bootmagic": true,
+        "console": false,
+        "command": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "audio": false,
+        "backlight": false
+    },
+    "build": {
+        "debounce_type": "sym_eager_pk"
+    },
     "matrix_pins": {
         "cols": ["LINE_PIN18", "LINE_PIN14", "LINE_PIN15", "LINE_PIN20", "LINE_PIN22", "LINE_PIN19", "LINE_PIN6"],
         "rows": ["LINE_PIN8", "LINE_PIN9", "LINE_PIN10", "LINE_PIN11", "LINE_PIN7", "LINE_PIN16", "LINE_PIN5", "LINE_PIN3", "LINE_PIN4", "LINE_PIN1", "LINE_PIN0", "LINE_PIN2", "LINE_PIN17", "LINE_PIN23", "LINE_PIN21"]
@@ -23,96 +36,6 @@
     "debounce": 20,
     "layouts": {
         "LAYOUT": {
-            "layout": [
-                {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
-                {"matrix": [1, 0], "x": 1.25, "y": 1.25},
-                {"matrix": [2, 0], "x": 2.25, "y": 1},
-                {"matrix": [3, 0], "x": 3.25, "y": 1},
-                {"matrix": [4, 0], "x": 4.25, "y": 1},
-                {"matrix": [5, 0], "x": 5.25, "y": 1},
-                {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 2.25},
-                {"matrix": [2, 1], "x": 2.25, "y": 2},
-                {"matrix": [3, 1], "x": 3.25, "y": 2},
-                {"matrix": [4, 1], "x": 4.25, "y": 2},
-                {"matrix": [5, 1], "x": 5.25, "y": 2},
-                {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
-                {"matrix": [1, 2], "x": 1.25, "y": 3.25},
-                {"matrix": [2, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [4, 2], "x": 4.25, "y": 3},
-                {"matrix": [5, 2], "x": 5.25, "y": 3},
-                {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [1, 3], "x": 1.25, "y": 4.25},
-                {"matrix": [2, 3], "x": 2.25, "y": 4},
-                {"matrix": [3, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 3], "x": 4.25, "y": 4},
-                {"matrix": [5, 3], "x": 5.25, "y": 4},
-                {"matrix": [1, 4], "x": 1.25, "y": 5.25},
-                {"matrix": [2, 4], "x": 2.25, "y": 5},
-                {"matrix": [3, 4], "x": 3.25, "y": 5},
-                {"matrix": [5, 4], "x": 4.25, "y": 5},
-                {"matrix": [5, 6], "x": 5.25, "y": 6},
-                {"matrix": [5, 5], "x": 6.25, "y": 6},
-                {"matrix": [3, 5], "x": 6.25, "y": 7},
-                {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
-                {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 8},
-                {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [6, 0], "x": 9.25, "y": 1},
-                {"matrix": [7, 0], "x": 10.25, "y": 1},
-                {"matrix": [8, 0], "x": 11.25, "y": 1},
-                {"matrix": [9, 0], "x": 12.25, "y": 1},
-                {"matrix": [10, 0], "x": 13.25, "y": 1.25},
-                {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
-                {"matrix": [6, 1], "x": 9.25, "y": 2},
-                {"matrix": [7, 1], "x": 10.25, "y": 2},
-                {"matrix": [8, 1], "x": 11.25, "y": 2},
-                {"matrix": [9, 1], "x": 12.25, "y": 2},
-                {"matrix": [10, 1], "x": 13.25, "y": 2.25},
-                {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
-                {"matrix": [6, 2], "x": 9.25, "y": 3},
-                {"matrix": [7, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 2], "x": 11.25, "y": 3},
-                {"matrix": [9, 2], "x": 12.25, "y": 3},
-                {"matrix": [10, 2], "x": 13.25, "y": 3.25},
-                {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
-                {"matrix": [6, 3], "x": 9.25, "y": 4},
-                {"matrix": [7, 3], "x": 10.25, "y": 4},
-                {"matrix": [8, 3], "x": 11.25, "y": 4},
-                {"matrix": [9, 3], "x": 12.25, "y": 4},
-                {"matrix": [10, 3], "x": 13.25, "y": 4.25},
-                {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
-                {"matrix": [6, 4], "x": 10.25, "y": 5},
-                {"matrix": [8, 4], "x": 11.25, "y": 5},
-                {"matrix": [9, 4], "x": 12.25, "y": 5},
-                {"matrix": [10, 4], "x": 13.25, "y": 5.25},
-                {"matrix": [9, 6], "x": 8.25, "y": 6},
-                {"matrix": [8, 5], "x": 9.25, "y": 6},
-                {"matrix": [8, 6], "x": 8.25, "y": 7},
-                {"matrix": [6, 6], "x": 8.25, "y": 8},
-                {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
-                {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
-            ]
-        },
-        "LAYOUT_pretty": {
             "layout": [
                 {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
                 {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
diff --git a/keyboards/kinesis/kintlc/rules.mk b/keyboards/kinesis/kintlc/rules.mk
index a6a1eafbfcc9..c2a404fd1e7d 100644
--- a/keyboards/kinesis/kintlc/rules.mk
+++ b/keyboards/kinesis/kintlc/rules.mk
@@ -1,7 +1,2 @@
 # This MCU is not in the main CHIBIOS repo but in the CHIBIOS_CONTRIB repo.
 USE_CHIBIOS_CONTRIB = yes
-
-# Debounce eagerly (report change immediately), keep per-key timers. We can use
-# this because the Cherry MX keyswitches on the Kinesis only produce noise while
-# pressed.
-DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/kinesis/kintwin/info.json b/keyboards/kinesis/kintwin/info.json
new file mode 100644
index 000000000000..ed67c36af392
--- /dev/null
+++ b/keyboards/kinesis/kintwin/info.json
@@ -0,0 +1,146 @@
+{
+    "development_board": "blackpill_f401",
+    "keyboard_name": "Kinesis",
+    "url": "https://github.com/alvicstep/kintwin",
+    "manufacturer": "https://github.com/alvicstep/kintwin",
+    "maintainer": "Alex Stepanov",
+    "usb": {
+        "device_version": "0.0.1",
+        "vid": "0x4B53",
+        "pid": "0x0001",
+        "shared_endpoint": {
+            "keyboard": true   
+        } 
+    },
+    "features": {
+        "bootmagic": true,
+        "console": false,
+        "command": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "audio": false,
+        "backlight": false
+    },
+    "matrix_pins": {
+        "rows": ["A0", "A1", "A2", "A3", "A4", "A5", "A6"],
+        "cols": ["A7", "B0", "B1", "B10", "B9", "B8", "B7", "B14", "B13", "B12", "C14", "C15", "B15", "B6", "B5"]
+    },
+    "diode_direction": "ROW2COL",
+    "indicators": {
+        "caps_lock": "A15",
+        "scroll_lock": "B3",
+        "num_lock": "B4",
+        "compose": "C13",
+        "on_state": 0
+    },    
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 12], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 13], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 14], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 12], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 13], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 14], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 12], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 13], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 14], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+
+                {"matrix": [3, 12], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [3, 13], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [3, 14], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [4, 12], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [4, 13], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [4, 14], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [5, 12], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [5, 14], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [5, 13], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1},
+                {"matrix": [0, 3], "x": 3.25, "y": 1},
+                {"matrix": [0, 4], "x": 4.25, "y": 1},
+                {"matrix": [0, 5], "x": 5.25, "y": 1},
+
+                {"matrix": [0, 6], "x": 9.25, "y": 1},
+                {"matrix": [0, 7], "x": 10.25, "y": 1},
+                {"matrix": [0, 8], "x": 11.25, "y": 1},
+                {"matrix": [0, 9], "x": 12.25, "y": 1},
+                {"matrix": [0, 10], "x": 13.25, "y": 1.25},
+                {"matrix": [0, 11], "x": 14.25, "y": 1.25, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2},
+                {"matrix": [1, 3], "x": 3.25, "y": 2},
+                {"matrix": [1, 4], "x": 4.25, "y": 2},
+                {"matrix": [1, 5], "x": 5.25, "y": 2},
+
+                {"matrix": [1, 6], "x": 11.25, "y": 2.25},
+                {"matrix": [1, 7], "x": 12.25, "y": 2.25},
+                {"matrix": [1, 8], "x": 13.25, "y": 2.25},
+                {"matrix": [1, 9], "x": 14.25, "y": 2.25},
+                {"matrix": [1, 10], "x": 15.25, "y": 2.25},
+                {"matrix": [1, 11], "x": 16.25, "y": 2.25, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3},
+                {"matrix": [2, 3], "x": 3.25, "y": 3},
+                {"matrix": [2, 4], "x": 4.25, "y": 3},
+                {"matrix": [2, 5], "x": 5.25, "y": 3},
+
+                {"matrix": [2, 6], "x": 9.25, "y": 3},
+                {"matrix": [2, 7], "x": 10.25, "y": 3},
+                {"matrix": [2, 8], "x": 11.25, "y": 3},
+                {"matrix": [2, 9], "x": 12.25, "y": 3},
+                {"matrix": [2, 10], "x": 13.25, "y": 3.25},
+                {"matrix": [2, 11], "x": 14.25, "y": 3.25, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4},
+                {"matrix": [3, 3], "x": 3.25, "y": 4},
+                {"matrix": [3, 4], "x": 4.25, "y": 4},
+                {"matrix": [3, 5], "x": 5.25, "y": 4},
+
+                {"matrix": [3, 6], "x": 9.25, "y": 4},
+                {"matrix": [3, 7], "x": 10.25, "y": 4},
+                {"matrix": [3, 8], "x": 11.25, "y": 4},
+                {"matrix": [3, 9], "x": 12.25, "y": 4},
+                {"matrix": [3, 10], "x": 13.25, "y": 4.25},
+                {"matrix": [3, 11], "x": 14.25, "y": 4.25, "w": 1.25},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5},
+                {"matrix": [4, 3], "x": 3.25, "y": 5},
+                {"matrix": [4, 5], "x": 4.25, "y": 5},
+
+                {"matrix": [4, 6], "x": 10.25, "y": 5},
+                {"matrix": [4, 8], "x": 11.25, "y": 5},
+                {"matrix": [4, 9], "x": 12.25, "y": 5},
+                {"matrix": [4, 10], "x": 13.25, "y": 5.25},
+
+                {"matrix": [6, 5], "x": 5.25, "y": 6},
+                {"matrix": [5, 5], "x": 6.25, "y": 6},
+
+                {"matrix": [6, 9], "x": 8.25, "y": 6},
+                {"matrix": [5, 8], "x": 9.25, "y": 6},
+
+                {"matrix": [5, 3], "x": 6.25, "y": 7},
+
+                {"matrix": [6, 8], "x": 8.25, "y": 7},
+
+                {"matrix": [6, 3], "x": 4.25, "y": 7, "h": 2},
+                {"matrix": [6, 4], "x": 5.25, "y": 7, "h": 2},
+                {"matrix": [5, 2], "x": 6.25, "y": 8},
+
+                {"matrix": [6, 6], "x": 8.25, "y": 8},
+                {"matrix": [5, 7], "x": 9.25, "y": 7, "h": 2},
+                {"matrix": [5, 6], "x": 10.25, "y": 7, "h": 2}
+            ]
+        }    
+    }    
+}
diff --git a/keyboards/kinesis/kintwin/kintwin.c b/keyboards/kinesis/kintwin/kintwin.c
new file mode 100644
index 000000000000..0e2e7a579283
--- /dev/null
+++ b/keyboards/kinesis/kintwin/kintwin.c
@@ -0,0 +1,29 @@
+// Copyright 2023 Alex Stepanov (@alvicstep)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+void matrix_init_kb(void) {
+
+  uint8_t led_delay_ms = 80;
+
+  /* LED pins setup */
+  setPinOutput(LED_CAPS_LOCK_PIN);
+  writePinLow(LED_CAPS_LOCK_PIN);
+
+  wait_ms(led_delay_ms);
+  setPinOutput(LED_NUM_LOCK_PIN);   
+  writePinLow(LED_NUM_LOCK_PIN);
+  wait_ms(led_delay_ms);
+
+  setPinOutput(LED_SCROLL_LOCK_PIN);   
+  writePinLow(LED_SCROLL_LOCK_PIN);
+  wait_ms(led_delay_ms);
+
+  setPinOutput(LED_COMPOSE_PIN);   
+  writePinLow(LED_COMPOSE_PIN);
+  wait_ms(led_delay_ms);
+  writePinHigh(LED_COMPOSE_PIN);
+
+	matrix_init_user();
+}
\ No newline at end of file
diff --git a/keyboards/kinesis/kintwin/readme.md b/keyboards/kinesis/kintwin/readme.md
new file mode 100644
index 000000000000..7f944e02bc22
--- /dev/null
+++ b/keyboards/kinesis/kintwin/readme.md
@@ -0,0 +1,32 @@
+# KinTwin
+[KinTwin](https://github.com/alvicstep/kintwin) is a drop-in replacement of a controller and thumb cluster PCB boards for [Kinesis Contoured keyboards](https://deskthority.net/wiki/Kinesis_Contoured). The controller board is a fork of [KinBP](https://github.com/DmNosachev/KinBP). 
+
+### Keyboard
+![Kinesis keyboard](https://i.imgur.com/gmuYlUyh.jpg)
+
+### Controller
+![KinTwin controller](https://i.imgur.com/vu6pexwh.jpg)
+
+The main difference between KinTwin and KinT controllers is that the former utilizes **Blackpill STM32F401** development board and the latter utilizes **Teensy** development boards.
+
+* Keyboard Maintainer: Alex Stepanov
+* Hardware Supported: KinTwin PCB, WeAct Black Pill STM32F401 micro controller
+* Hardware Availability: [Open Source (CC-BY-SA)](https://github.com/alvicstep/kintwin)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kinesis/kintwin:default
+
+Flashing example for this keyboard:
+
+    make kinesis/kintwin: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**. Hold 'boot0' button on MCU board, press 'reset', then release 'boot0'.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kinesis/kintwin/rules.mk b/keyboards/kinesis/kintwin/rules.mk
new file mode 100644
index 000000000000..3922c569c4ec
--- /dev/null
+++ b/keyboards/kinesis/kintwin/rules.mk
@@ -0,0 +1 @@
+# File intentionally blank
\ No newline at end of file
diff --git a/keyboards/kinesis/nguyenvietyen/config.h b/keyboards/kinesis/nguyenvietyen/config.h
index f4d3af8dbd1c..5e21732a5c68 100644
--- a/keyboards/kinesis/nguyenvietyen/config.h
+++ b/keyboards/kinesis/nguyenvietyen/config.h
@@ -1,3 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
 /* key matrix size */
diff --git a/keyboards/kinesis/nguyenvietyen/info.json b/keyboards/kinesis/nguyenvietyen/info.json
index 803f64025f01..123b42e9bfc2 100644
--- a/keyboards/kinesis/nguyenvietyen/info.json
+++ b/keyboards/kinesis/nguyenvietyen/info.json
@@ -6,6 +6,16 @@
         "pid": "0x6060",
         "device_version": "0.0.3"
     },
+    "features": {
+        "bootmagic": true,
+        "console": false,
+        "command": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "audio": false,
+        "backlight": false
+    },
     "indicators": {
         "caps_lock": "E6",
         "num_lock": "D4",
@@ -13,100 +23,11 @@
         "compose": "D7",
         "on_state": 0
     },
+    "debounce": 1,
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [1, 2], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [2, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [1, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [8, 0], "x": 0, "y": 1.25, "w": 1.25},
-                {"matrix": [7, 0], "x": 1.25, "y": 1.25},
-                {"matrix": [6, 0], "x": 2.25, "y": 1},
-                {"matrix": [5, 0], "x": 3.25, "y": 1},
-                {"matrix": [4, 0], "x": 4.25, "y": 1},
-                {"matrix": [3, 0], "x": 5.25, "y": 1},
-                {"matrix": [8, 1], "x": 0, "y": 2.25, "w": 1.25},
-                {"matrix": [7, 1], "x": 1.25, "y": 2.25},
-                {"matrix": [6, 1], "x": 2.25, "y": 2},
-                {"matrix": [5, 1], "x": 3.25, "y": 2},
-                {"matrix": [4, 1], "x": 4.25, "y": 2},
-                {"matrix": [3, 1], "x": 5.25, "y": 2},
-                {"matrix": [8, 2], "x": 0, "y": 3.25, "w": 1.25},
-                {"matrix": [7, 2], "x": 1.25, "y": 3.25},
-                {"matrix": [6, 2], "x": 2.25, "y": 3},
-                {"matrix": [5, 2], "x": 3.25, "y": 3},
-                {"matrix": [4, 2], "x": 4.25, "y": 3},
-                {"matrix": [3, 2], "x": 5.25, "y": 3},
-                {"matrix": [8, 3], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [7, 3], "x": 1.25, "y": 4.25},
-                {"matrix": [6, 3], "x": 2.25, "y": 4},
-                {"matrix": [5, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 3], "x": 4.25, "y": 4},
-                {"matrix": [3, 3], "x": 5.25, "y": 4},
-                {"matrix": [7, 4], "x": 1.25, "y": 5.25},
-                {"matrix": [6, 4], "x": 2.25, "y": 5},
-                {"matrix": [5, 4], "x": 3.25, "y": 5},
-                {"matrix": [3, 4], "x": 4.25, "y": 5},
-                {"matrix": [3, 6], "x": 5.25, "y": 6},
-                {"matrix": [3, 5], "x": 6.25, "y": 6},
-                {"matrix": [5, 5], "x": 6.25, "y": 7},
-                {"matrix": [5, 6], "x": 4.25, "y": 7, "h": 2},
-                {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
-                {"matrix": [7, 5], "x": 6.25, "y": 8},
-                {"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [2, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [1, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 0], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 1], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [9, 4], "x": 9.25, "y": 1},
-                {"matrix": [10, 4], "x": 10.25, "y": 1},
-                {"matrix": [11, 4], "x": 11.25, "y": 1},
-                {"matrix": [13, 4], "x": 12.25, "y": 1},
-                {"matrix": [14, 4], "x": 13.25, "y": 1.25},
-                {"matrix": [15, 4], "x": 14.25, "y": 1.25, "w": 1.25},
-                {"matrix": [9, 5], "x": 9.25, "y": 2},
-                {"matrix": [10, 5], "x": 10.25, "y": 2},
-                {"matrix": [11, 5], "x": 11.25, "y": 2},
-                {"matrix": [13, 5], "x": 12.25, "y": 2},
-                {"matrix": [14, 5], "x": 13.25, "y": 2.25},
-                {"matrix": [15, 5], "x": 14.25, "y": 2.25, "w": 1.25},
-                {"matrix": [9, 6], "x": 9.25, "y": 3},
-                {"matrix": [10, 6], "x": 10.25, "y": 3},
-                {"matrix": [11, 6], "x": 11.25, "y": 3},
-                {"matrix": [13, 6], "x": 12.25, "y": 3},
-                {"matrix": [14, 6], "x": 13.25, "y": 3.25},
-                {"matrix": [15, 6], "x": 14.25, "y": 3.25, "w": 1.25},
-                {"matrix": [9, 7], "x": 9.25, "y": 4},
-                {"matrix": [10, 7], "x": 10.25, "y": 4},
-                {"matrix": [11, 7], "x": 11.25, "y": 4},
-                {"matrix": [13, 7], "x": 12.25, "y": 4},
-                {"matrix": [14, 7], "x": 13.25, "y": 4.25},
-                {"matrix": [15, 7], "x": 14.25, "y": 4.25, "w": 1.25},
-                {"matrix": [9, 3], "x": 10.25, "y": 5},
-                {"matrix": [11, 3], "x": 11.25, "y": 5},
-                {"matrix": [13, 3], "x": 12.25, "y": 5},
-                {"matrix": [14, 3], "x": 13.25, "y": 5.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 6},
-                {"matrix": [6, 6], "x": 9.25, "y": 6},
-                {"matrix": [6, 7], "x": 8.25, "y": 7},
-                {"matrix": [8, 7], "x": 8.25, "y": 8},
-                {"matrix": [7, 6], "x": 9.25, "y": 7, "h": 2},
-                {"matrix": [8, 6], "x": 10.25, "y": 7, "h": 2}
-            ]
-        },
-        "LAYOUT_pretty": {
             "layout": [
                 {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
                 {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
diff --git a/keyboards/kinesis/nguyenvietyen/matrix.c b/keyboards/kinesis/nguyenvietyen/matrix.c
index 3e078946e09f..d6ea67da681b 100644
--- a/keyboards/kinesis/nguyenvietyen/matrix.c
+++ b/keyboards/kinesis/nguyenvietyen/matrix.c
@@ -1,3 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "matrix.h"
 
 #include "quantum.h"
diff --git a/keyboards/kinesis/nguyenvietyen/rules.mk b/keyboards/kinesis/nguyenvietyen/rules.mk
index 3e0a265135a6..59129f4320d4 100644
--- a/keyboards/kinesis/nguyenvietyen/rules.mk
+++ b/keyboards/kinesis/nguyenvietyen/rules.mk
@@ -1,14 +1,7 @@
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-COMMAND_ENABLE = yes
-NKRO_ENABLE = yes           # Enable N-Key Rollover
+
 SLEEP_LED_ENABLE = yes
 CUSTOM_MATRIX = lite
 SRC += matrix.c
-
-# experimentally determined to be sufficient :)
-DEBOUNCE=1
diff --git a/keyboards/kinesis/readme.md b/keyboards/kinesis/readme.md
index 3802f50c9a3a..4767d6a4363a 100644
--- a/keyboards/kinesis/readme.md
+++ b/keyboards/kinesis/readme.md
@@ -1,12 +1,15 @@
 # Firmware for the Kinesis Advantage/Contoured keyboard
 
-There are at least two different ways to replace the controller in this keyboard.
+There are at least three different ways to replace the controller in this keyboard.
 
-The Stapelberg folder contains the docs and configuration for using the custom controller created by Michael Stapelberg.
+1. The **stapelberg** directory contains the docs and configuration for using Teensy based controller created by Michael Stapelberg.
 
-The alvicstep folder contains docs and configuration for directly wiring a Teensy2++ to the existing controller board. This follows the pinouts described in https://github.com/alvicstep/tmk_keyboard, which is where the name comes from. 
+2. The **alvicstep** directory contains docs and configuration for directly wiring a Teensy2++ to the existing controller board. This follows the pinouts described in https://github.com/alvicstep/tmk_keyboard, which is where the name comes from. 
 
-## Keymaps
-Both hardware solutions should work with the same keymaps
+3. The **kintwin** directory contains the docs and configuration for using BlackPill based controller.
 
+## Keymaps
+All three hardware solutions should work with the same keymaps
 
+## Switch Modifications
+In addition to the drop-in replacements of the stock controller above, the directory **"keyboards\kin80"** contains the files to support 80 switch modification of the keyboard, compared to original 86 switches. Kin80 keymaps are not compatible with keymaps that are located inside of **kinesis** directory.
\ No newline at end of file
diff --git a/keyboards/kinesis/rules.mk b/keyboards/kinesis/rules.mk
deleted file mode 100644
index 2090c50d4707..000000000000
--- a/keyboards/kinesis/rules.mk
+++ /dev/null
@@ -1,13 +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
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-
-DEFAULT_FOLDER = kinesis/alvicstep
diff --git a/keyboards/kinesis/stapelberg/config.h b/keyboards/kinesis/stapelberg/config.h
index a3ae6615ac5b..c0c78135ba17 100644
--- a/keyboards/kinesis/stapelberg/config.h
+++ b/keyboards/kinesis/stapelberg/config.h
@@ -1,3 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
 /* don't know if this should be defined at the board or top level. Assuming board 
diff --git a/keyboards/kinesis/stapelberg/info.json b/keyboards/kinesis/stapelberg/info.json
index 4435edf4cc51..44e2a331575c 100644
--- a/keyboards/kinesis/stapelberg/info.json
+++ b/keyboards/kinesis/stapelberg/info.json
@@ -6,6 +6,16 @@
         "pid": "0x6060",
         "device_version": "0.0.2"
     },
+    "features": {
+        "bootmagic": true,
+        "console": false,
+        "command": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "audio": false,
+        "backlight": false
+    },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"],
         "rows": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6"]
@@ -22,96 +32,6 @@
     "bootloader": "halfkay",
     "layouts": {
         "LAYOUT": {
-            "layout": [
-                {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 0], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 2], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 2], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 2], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [0, 0], "x": 0, "y": 1.25, "w": 1.25},
-                {"matrix": [1, 0], "x": 1.25, "y": 1.25},
-                {"matrix": [2, 0], "x": 2.25, "y": 1},
-                {"matrix": [3, 0], "x": 3.25, "y": 1},
-                {"matrix": [4, 0], "x": 4.25, "y": 1},
-                {"matrix": [5, 0], "x": 5.25, "y": 1},
-                {"matrix": [0, 1], "x": 0, "y": 2.25, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 2.25},
-                {"matrix": [2, 1], "x": 2.25, "y": 2},
-                {"matrix": [3, 1], "x": 3.25, "y": 2},
-                {"matrix": [4, 1], "x": 4.25, "y": 2},
-                {"matrix": [5, 1], "x": 5.25, "y": 2},
-                {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.25},
-                {"matrix": [1, 2], "x": 1.25, "y": 3.25},
-                {"matrix": [2, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [4, 2], "x": 4.25, "y": 3},
-                {"matrix": [5, 2], "x": 5.25, "y": 3},
-                {"matrix": [0, 3], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [1, 3], "x": 1.25, "y": 4.25},
-                {"matrix": [2, 3], "x": 2.25, "y": 4},
-                {"matrix": [3, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 3], "x": 4.25, "y": 4},
-                {"matrix": [5, 3], "x": 5.25, "y": 4},
-                {"matrix": [1, 4], "x": 1.25, "y": 5.25},
-                {"matrix": [2, 4], "x": 2.25, "y": 5},
-                {"matrix": [3, 4], "x": 3.25, "y": 5},
-                {"matrix": [5, 4], "x": 4.25, "y": 5},
-                {"matrix": [5, 6], "x": 5.25, "y": 6},
-                {"matrix": [5, 5], "x": 6.25, "y": 6},
-                {"matrix": [3, 5], "x": 6.25, "y": 7},
-                {"matrix": [3, 6], "x": 4.25, "y": 7, "h": 2},
-                {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 8},
-                {"matrix": [12, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [12, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [14, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [13, 5], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
-                {"matrix": [6, 0], "x": 9.25, "y": 1},
-                {"matrix": [7, 0], "x": 10.25, "y": 1},
-                {"matrix": [8, 0], "x": 11.25, "y": 1},
-                {"matrix": [9, 0], "x": 12.25, "y": 1},
-                {"matrix": [10, 0], "x": 13.25, "y": 1.25},
-                {"matrix": [11, 0], "x": 14.25, "y": 1.25, "w": 1.25},
-                {"matrix": [6, 1], "x": 9.25, "y": 2},
-                {"matrix": [7, 1], "x": 10.25, "y": 2},
-                {"matrix": [8, 1], "x": 11.25, "y": 2},
-                {"matrix": [9, 1], "x": 12.25, "y": 2},
-                {"matrix": [10, 1], "x": 13.25, "y": 2.25},
-                {"matrix": [11, 1], "x": 14.25, "y": 2.25, "w": 1.25},
-                {"matrix": [6, 2], "x": 9.25, "y": 3},
-                {"matrix": [7, 2], "x": 10.25, "y": 3},
-                {"matrix": [8, 2], "x": 11.25, "y": 3},
-                {"matrix": [9, 2], "x": 12.25, "y": 3},
-                {"matrix": [10, 2], "x": 13.25, "y": 3.25},
-                {"matrix": [11, 2], "x": 14.25, "y": 3.25, "w": 1.25},
-                {"matrix": [6, 3], "x": 9.25, "y": 4},
-                {"matrix": [7, 3], "x": 10.25, "y": 4},
-                {"matrix": [8, 3], "x": 11.25, "y": 4},
-                {"matrix": [9, 3], "x": 12.25, "y": 4},
-                {"matrix": [10, 3], "x": 13.25, "y": 4.25},
-                {"matrix": [11, 3], "x": 14.25, "y": 4.25, "w": 1.25},
-                {"matrix": [6, 4], "x": 10.25, "y": 5},
-                {"matrix": [8, 4], "x": 11.25, "y": 5},
-                {"matrix": [9, 4], "x": 12.25, "y": 5},
-                {"matrix": [10, 4], "x": 13.25, "y": 5.25},
-                {"matrix": [9, 6], "x": 8.25, "y": 6},
-                {"matrix": [8, 5], "x": 9.25, "y": 6},
-                {"matrix": [8, 6], "x": 8.25, "y": 7},
-                {"matrix": [6, 6], "x": 8.25, "y": 8},
-                {"matrix": [7, 5], "x": 9.25, "y": 7, "h": 2},
-                {"matrix": [6, 5], "x": 10.25, "y": 7, "h": 2}
-            ]
-        },
-        "LAYOUT_pretty": {
             "layout": [
                 {"matrix": [12, 0], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
                 {"matrix": [13, 0], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
diff --git a/keyboards/kingly_keys/ave/config.h b/keyboards/kingly_keys/ave/config.h
index af9ffae03dbd..e43087b6978e 100644
--- a/keyboards/kingly_keys/ave/config.h
+++ b/keyboards/kingly_keys/ave/config.h
@@ -17,11 +17,6 @@
 
 #pragma once
 
-#if defined(RGBLIGHT_ENABLE)
-#    define RGBLED_NUM 2
-#    define RGBLIGHT_EFFECT_BREATHING
-#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/kingly_keys/ave/ortho/info.json b/keyboards/kingly_keys/ave/ortho/info.json
index 0de5b82bddf4..c17f41dcb40c 100644
--- a/keyboards/kingly_keys/ave/ortho/info.json
+++ b/keyboards/kingly_keys/ave/ortho/info.json
@@ -18,6 +18,12 @@
       {"pin_a": "B2", "pin_b": "B1"}
     ]
   },
+  "rgblight": {
+    "led_count": 2,
+    "animations": {
+      "breathing": true
+    }
+  },
   "ws2812": {
     "pin": "B7"
   },
diff --git a/keyboards/kingly_keys/ave/staggered/info.json b/keyboards/kingly_keys/ave/staggered/info.json
index b3795f81012c..66e6bb3a4c11 100644
--- a/keyboards/kingly_keys/ave/staggered/info.json
+++ b/keyboards/kingly_keys/ave/staggered/info.json
@@ -18,6 +18,12 @@
         {"pin_a": "B2", "pin_b": "B1"}
      ]
   },
+  "rgblight": {
+    "led_count": 2,
+    "animations": {
+      "breathing": true
+    }
+  },
   "ws2812": {
      "pin": "B7"
   },
diff --git a/keyboards/kingly_keys/little_foot/config.h b/keyboards/kingly_keys/little_foot/config.h
index fe391e91a19b..a2c4815a2070 100644
--- a/keyboards/kingly_keys/little_foot/config.h
+++ b/keyboards/kingly_keys/little_foot/config.h
@@ -21,20 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 10    // 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 6
-#define RGBLIGHT_SAT_STEP 4
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kingly_keys/little_foot/info.json b/keyboards/kingly_keys/little_foot/info.json
index c3dfe6691044..314693d561ef 100644
--- a/keyboards/kingly_keys/little_foot/info.json
+++ b/keyboards/kingly_keys/little_foot/info.json
@@ -9,6 +9,24 @@
     "device_version": "0.0.1",
     "force_nkro": true
   },
+  "rgblight": {
+    "hue_steps": 6,
+    "saturation_steps": 4,
+    "brightness_steps": 8,
+    "led_count": 10,
+    "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": "F4"
   },
diff --git a/keyboards/kingly_keys/romac/config.h b/keyboards/kingly_keys/romac/config.h
index 0f5a7a6d7fb6..5f360813239b 100644
--- a/keyboards/kingly_keys/romac/config.h
+++ b/keyboards/kingly_keys/romac/config.h
@@ -5,8 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk b/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk
index eee9c0d533e1..68d31978961b 100755
--- a/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk
+++ b/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk
@@ -1,4 +1,3 @@
 VIA_ENABLE = yes
 BOOTLOADER = qmk-dfu
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
diff --git a/keyboards/kingly_keys/romac_plus/config.h b/keyboards/kingly_keys/romac_plus/config.h
index 2d715dbe51f0..5f360813239b 100644
--- a/keyboards/kingly_keys/romac_plus/config.h
+++ b/keyboards/kingly_keys/romac_plus/config.h
@@ -5,20 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 4    // 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 6
-#define RGBLIGHT_SAT_STEP 4
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kingly_keys/romac_plus/info.json b/keyboards/kingly_keys/romac_plus/info.json
index a5bb27e39728..5808d7fe5815 100644
--- a/keyboards/kingly_keys/romac_plus/info.json
+++ b/keyboards/kingly_keys/romac_plus/info.json
@@ -18,6 +18,24 @@
       {"pin_a": "B3", "pin_b": "B2"}
     ]
   },
+  "rgblight": {
+    "hue_steps": 6,
+    "saturation_steps": 4,
+    "brightness_steps": 8,
+    "led_count": 4,
+    "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": "F7"
   },
diff --git a/keyboards/kingly_keys/romac_plus/keymaps/default/keymap.c b/keyboards/kingly_keys/romac_plus/keymaps/default/keymap.c
index 62c2349150a0..ce84abb24dd1 100644
--- a/keyboards/kingly_keys/romac_plus/keymaps/default/keymap.c
+++ b/keyboards/kingly_keys/romac_plus/keymaps/default/keymap.c
@@ -57,10 +57,10 @@ bool oled_task_user(void) {
   }
 
   // Host Keyboard LED Status
-  uint8_t led_usb_state = host_keyboard_leds();
-  oled_write_P(IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK) ? PSTR("NLCK ") : PSTR("     "), false);
-  oled_write_P(IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK) ? PSTR("CAPS ") : PSTR("       "), false);
-  oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLK") : PSTR("       "), false);
+  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;
 }
diff --git a/keyboards/kingly_keys/romac_plus/rules.mk b/keyboards/kingly_keys/romac_plus/rules.mk
index a2287ae9158b..3eef56841c47 100644
--- a/keyboards/kingly_keys/romac_plus/rules.mk
+++ b/keyboards/kingly_keys/romac_plus/rules.mk
@@ -10,4 +10,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable support for EC11 Rotary Encoder
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
diff --git a/keyboards/kingly_keys/ropro/config.h b/keyboards/kingly_keys/ropro/config.h
index 3dba50223869..a11ec4dfb288 100644
--- a/keyboards/kingly_keys/ropro/config.h
+++ b/keyboards/kingly_keys/ropro/config.h
@@ -21,16 +21,3 @@
 
  /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define RGBLED_NUM 18
-
-#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/kingly_keys/ropro/info.json b/keyboards/kingly_keys/ropro/info.json
index ad77ae560858..8026d5c76438 100644
--- a/keyboards/kingly_keys/ropro/info.json
+++ b/keyboards/kingly_keys/ropro/info.json
@@ -18,6 +18,21 @@
       {"pin_a": "B7", "pin_b": "D5"}
     ]
   },
+  "rgblight": {
+    "led_count": 18,
+    "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": "D3"
   },
diff --git a/keyboards/kingly_keys/smd_milk/config.h b/keyboards/kingly_keys/smd_milk/config.h
index cb3fcd2e0da0..7bbb5b4e941b 100644
--- a/keyboards/kingly_keys/smd_milk/config.h
+++ b/keyboards/kingly_keys/smd_milk/config.h
@@ -20,21 +20,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 4  // 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 6
-#define RGBLIGHT_SAT_STEP 4
-#define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/kingly_keys/smd_milk/info.json b/keyboards/kingly_keys/smd_milk/info.json
index d2f408e51fe7..84174ac248a2 100644
--- a/keyboards/kingly_keys/smd_milk/info.json
+++ b/keyboards/kingly_keys/smd_milk/info.json
@@ -9,6 +9,24 @@
     "device_version": "0.0.1",
     "force_nkro": true
   },
+  "rgblight": {
+    "hue_steps": 6,
+    "saturation_steps": 4,
+    "brightness_steps": 10,
+    "led_count": 4,
+    "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": "B3"
   },
diff --git a/keyboards/kingly_keys/soap/config.h b/keyboards/kingly_keys/soap/config.h
index 682f1a753150..847cfcd5be77 100644
--- a/keyboards/kingly_keys/soap/config.h
+++ b/keyboards/kingly_keys/soap/config.h
@@ -19,15 +19,3 @@
 
  /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 3
diff --git a/keyboards/kingly_keys/soap/info.json b/keyboards/kingly_keys/soap/info.json
index b10260aa0b42..e6d2cee42121 100644
--- a/keyboards/kingly_keys/soap/info.json
+++ b/keyboards/kingly_keys/soap/info.json
@@ -8,6 +8,21 @@
     "pid": "0x0003",
     "device_version": "0.0.4"
   },
+  "rgblight": {
+    "led_count": 3,
+    "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": "B6"
   },
diff --git a/keyboards/kira75/config.h b/keyboards/kira75/config.h
index b51a90cb7e5b..d876570c808e 100644
--- a/keyboards/kira75/config.h
+++ b/keyboards/kira75/config.h
@@ -17,21 +17,6 @@ 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 RGBLED_NUM 18
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* 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/kira75/info.json b/keyboards/kira75/info.json
index 48e4bdf85eb5..0a923fa44e41 100644
--- a/keyboards/kira75/info.json
+++ b/keyboards/kira75/info.json
@@ -17,6 +17,23 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "E2"
     },
diff --git a/keyboards/kisakeyluxury/qtz/config.h b/keyboards/kisakeyluxury/qtz/config.h
new file mode 100644
index 000000000000..7660e3d7e98e
--- /dev/null
+++ b/keyboards/kisakeyluxury/qtz/config.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2023 kisakeyluxury
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should 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/kisakeyluxury/qtz/info.json b/keyboards/kisakeyluxury/qtz/info.json
new file mode 100644
index 000000000000..ba79fc31a22b
--- /dev/null
+++ b/keyboards/kisakeyluxury/qtz/info.json
@@ -0,0 +1,69 @@
+{
+  "keyboard_name": "fraserqaz",
+  "manufacturer": "iceage",
+  "maintainer": "kisakey-luxury",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
+  "features": {
+      "bootmagic": true,
+      "mousekey": true,
+      "extrakey": true,
+      "nkro": true
+  },
+  "matrix_pins": {
+    "cols": ["D0", "D1", "D2", "D3", "F7", "F6", "F5", "F4", "F1", "F0"],
+    "rows": ["D5", "D4", "D6", "C6"]
+  },
+  "diode_direction": "COL2ROW",
+    "development_board": "promicro",
+  "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, "w": 1.25},
+
+        {"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": [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.5},
+
+        {"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},
+        {"matrix": [3, 5], "x": 4, "y": 3, "w": 2.25},
+        {"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},
+      ]
+    }
+  }
+}
diff --git a/keyboards/kisakeyluxury/qtz/keymaps/default/config.h b/keyboards/kisakeyluxury/qtz/keymaps/default/config.h
new file mode 100644
index 000000000000..7d03c4ddb8e5
--- /dev/null
+++ b/keyboards/kisakeyluxury/qtz/keymaps/default/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2023 kisakeyluxury
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have 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 200
diff --git a/keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c b/keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c
new file mode 100644
index 000000000000..d5b0a8d2affb
--- /dev/null
+++ b/keyboards/kisakeyluxury/qtz/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/*
+Copyright 2023 kisakeyluxury
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received 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
+};
+
+enum combo_events {
+	COMBO_ESC
+};
+
+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_ENT,
+    KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M, KC_COMM, KC_DOT,
+    KC_1, KC_2, KC_3, KC_4, KC_SPACE, KC_4, KC_3, KC_2, QK_BOOT
+  )
+};
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END};
+
+combo_t key_combos[] = {
+	[COMBO_ESC] = COMBO(combo_esc,KC_ESC),
+};
+#endif
diff --git a/keyboards/kisakeyluxury/qtz/keymaps/default/rules.mk b/keyboards/kisakeyluxury/qtz/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ab1e438182a3
--- /dev/null
+++ b/keyboards/kisakeyluxury/qtz/keymaps/default/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/kisakeyluxury/qtz/readme.md b/keyboards/kisakeyluxury/qtz/readme.md
new file mode 100644
index 000000000000..813bf10a32d1
--- /dev/null
+++ b/keyboards/kisakeyluxury/qtz/readme.md
@@ -0,0 +1,24 @@
+# qtz
+
+35% keyboard designed by Iceage
+
+![pcb image](https://i.imgur.com/D2OmIkUh.png)
+
+* Keyboard Maintainer: [kisakey-luxury](https://github.com/kisakey-luxury)
+* Hardware Supported: *not released yet*
+* Hardware Availability: *not released yet*
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kisakeyluxury/qtz:default
+
+Flashing example for this keyboard:
+
+    make kisakeyluxury/qtz:default:flash
+    
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the back of the PCB under the "Z" key
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available (default is bottom-right most key)
\ No newline at end of file
diff --git a/keyboards/kisakeyluxury/qtz/rules.mk b/keyboards/kisakeyluxury/qtz/rules.mk
new file mode 100644
index 000000000000..0d24fc285796
--- /dev/null
+++ b/keyboards/kisakeyluxury/qtz/rules.mk
@@ -0,0 +1 @@
+# intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/madeline/config.h b/keyboards/kiserdesigns/madeline/config.h
new file mode 100644
index 000000000000..8522d7cd431c
--- /dev/null
+++ b/keyboards/kiserdesigns/madeline/config.h
@@ -0,0 +1,25 @@
+/* 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 LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+
+#define RP2040_FLASH_GENERIC_03H
diff --git a/keyboards/kiserdesigns/madeline/info.json b/keyboards/kiserdesigns/madeline/info.json
new file mode 100644
index 000000000000..73d3f5ccff4a
--- /dev/null
+++ b/keyboards/kiserdesigns/madeline/info.json
@@ -0,0 +1,77 @@
+{
+    "manufacturer": "rubybuilds",
+    "keyboard_name": "Madeline",
+    "maintainer": "NCKiser",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "GP13", "pin_b": "GP15"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP25", "GP26", "GP27", "GP28", "GP29", "GP9", "GP0", "GP1", "GP2", "GP3"],
+        "rows": ["GP5", "GP4", "GP12", "GP7"]
+    },
+    "processor": "RP2040",
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "url": "https://qmk.fm/keyboards",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6D64",
+        "vid": "0x5242"
+    },
+    "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": 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": 10.5, "y": 0, "w": 1.25},
+                {"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": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+                {"matrix": [1, 7], "x": 8.75, "y": 1},
+                {"matrix": [1, 8], "x": 9.75, "y": 1},
+                {"matrix": [1, 9], "x": 10.75, "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": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2, "w": 1.5},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c b/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c
new file mode 100644
index 000000000000..09c9d3a2ff7c
--- /dev/null
+++ b/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/* 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/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _BASE,
+    _NUM_SYM
+};
+
+#define KC_NUM_SPC LT(_NUM_SYM, 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)
+
+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_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_BSPC, KC_NUM_SPC, KC_RGUI, KC_RCTL
+    ),
+
+    [_NUM_SYM] = LAYOUT(
+        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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_BSPC,
+        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
+    )
+};
+
+#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_MS_WH_UP, KC_MS_WH_DOWN) }
+    };
+#endif
diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/rules.mk b/keyboards/kiserdesigns/madeline/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/kiserdesigns/madeline/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/kiserdesigns/madeline/readme.md b/keyboards/kiserdesigns/madeline/readme.md
new file mode 100644
index 000000000000..138368282a9a
--- /dev/null
+++ b/keyboards/kiserdesigns/madeline/readme.md
@@ -0,0 +1,23 @@
+# Madeline
+
+![Madeline](https://i.imgur.com/MBT5kg2h.jpg)
+
+*A cool QAZ-Alice hybrid designed based on the Adalyn by [Marv](https://github.com/MarvFPV/Adalyn) with a PCB by [Rossman360](https://github.com/Rossman360)*
+* Keyboard Maintainer: [NCKiser](https://github.com/NCKiser)
+* Hardware Supported: Madeline PCB, rp2040
+* Hardware Availability: kb.rubybuilds.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kiserdesigns/madeline:default
+
+Flashing example for this keyboard:
+
+    make kiserdesigns/madeline: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-tap 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/kiserdesigns/madeline/rules.mk b/keyboards/kiserdesigns/madeline/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/kiserdesigns/madeline/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/kiwikey/borderland/config.h b/keyboards/kiwikey/borderland/config.h
index 541c8b45e2c5..bff2f881e877 100644
--- a/keyboards/kiwikey/borderland/config.h
+++ b/keyboards/kiwikey/borderland/config.h
@@ -3,24 +3,6 @@
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
-#define RGBLED_NUM 18
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-//#    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
-
 /* 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/kiwikey/borderland/info.json b/keyboards/kiwikey/borderland/info.json
index 7ecd81e07b11..2e6efabb4226 100644
--- a/keyboards/kiwikey/borderland/info.json
+++ b/keyboards/kiwikey/borderland/info.json
@@ -18,6 +18,26 @@
             {"pin_a": "F5", "pin_b": "F6"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "B2"
     },
diff --git a/keyboards/kiwikey/kawii9/config.h b/keyboards/kiwikey/kawii9/config.h
index ceaf40636e87..bc1b5f6c88d1 100644
--- a/keyboards/kiwikey/kawii9/config.h
+++ b/keyboards/kiwikey/kawii9/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 4
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-//#    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
-
 /* 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/kiwikey/kawii9/info.json b/keyboards/kiwikey/kawii9/info.json
index 7537e7fe8a3b..ca0e60495171 100644
--- a/keyboards/kiwikey/kawii9/info.json
+++ b/keyboards/kiwikey/kawii9/info.json
@@ -8,6 +8,23 @@
         "pid": "0x0303",
         "device_version": "0.0.2"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 4,
+        "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": "D3"
     },
diff --git a/keyboards/kiwikey/wanderland/config.h b/keyboards/kiwikey/wanderland/config.h
index 223620c5fe59..1a4dea1b385f 100644
--- a/keyboards/kiwikey/wanderland/config.h
+++ b/keyboards/kiwikey/wanderland/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 18
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
-
 /* 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/kiwikey/wanderland/info.json b/keyboards/kiwikey/wanderland/info.json
index eb41a349d089..f0e9317fe17b 100644
--- a/keyboards/kiwikey/wanderland/info.json
+++ b/keyboards/kiwikey/wanderland/info.json
@@ -17,6 +17,24 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "F7"
     },
diff --git a/keyboards/kiwikey/wanderland/keymaps/stanrc85/rules.mk b/keyboards/kiwikey/wanderland/keymaps/stanrc85/rules.mk
index d34d066ded93..dd68e9d3b090 100644
--- a/keyboards/kiwikey/wanderland/keymaps/stanrc85/rules.mk
+++ b/keyboards/kiwikey/wanderland/keymaps/stanrc85/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/kmac/config.h b/keyboards/kmac/config.h
index bc647193cad4..dd12560fb6cc 100644
--- a/keyboards/kmac/config.h
+++ b/keyboards/kmac/config.h
@@ -32,9 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS \
     { B6, C6, C7, F1, F0, B5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 
-/* COL2ROW, ROW2COL*/
-//#define DIODE_DIRECTION
-
 /* 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/kmac_pad/config.h b/keyboards/kmac_pad/config.h
index aaffc6c987f6..ee27565dcef6 100644
--- a/keyboards/kmac_pad/config.h
+++ b/keyboards/kmac_pad/config.h
@@ -30,9 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { E2, D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { C7, C6, B6, B5 }
 
-/* COL2ROW, ROW2COL*/
-// #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 */
diff --git a/keyboards/kmini/config.h b/keyboards/kmini/config.h
index 3c92c89423e0..c06925781f60 100755
--- a/keyboards/kmini/config.h
+++ b/keyboards/kmini/config.h
@@ -28,6 +28,3 @@
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { }
-
-/* COL2ROW, ROW2COL*/
-//#define DIODE_DIRECTION
diff --git a/keyboards/kmini/keymaps/default/keymap.c b/keyboards/kmini/keymaps/default/keymap.c
index c3a7b12a40cd..1f041daffc9b 100755
--- a/keyboards/kmini/keymaps/default/keymap.c
+++ b/keyboards/kmini/keymaps/default/keymap.c
@@ -39,10 +39,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 };
 
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         writePinLow(B1);
     } else {
         writePinHigh(B1);
     }
+    return false;
 }
diff --git a/keyboards/knobgoblin/rules.mk b/keyboards/knobgoblin/rules.mk
index e19365e2abd6..41cfa4949a43 100644
--- a/keyboards/knobgoblin/rules.mk
+++ b/keyboards/knobgoblin/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/knops/mini/keymaps/default-gsm-newbs/keymap.c b/keyboards/knops/mini/keymaps/default-gsm-newbs/keymap.c
index 49215645294f..5a629f57ffa9 100644
--- a/keyboards/knops/mini/keymaps/default-gsm-newbs/keymap.c
+++ b/keyboards/knops/mini/keymaps/default-gsm-newbs/keymap.c
@@ -273,44 +273,6 @@ void matrix_init_user(void) {
 	set_layer_led(0);
 }
 
-void matrix_scan_user(void) {
-}
-
-void led_set_user(uint8_t usb_led) {
-
-	if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-
-	} else {
-
-	}
-
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-
-	} else {
-
-	}
-
-	if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-
-	} else {
-
-	}
-
-	if (usb_led & (1 << USB_LED_COMPOSE)) {
-
-	} else {
-
-	}
-
-	if (usb_led & (1 << USB_LED_KANA)) {
-
-	} else {
-
-	}
-
-}
-
-
 /*
 *   NOTE:
 *
diff --git a/keyboards/kona_classic/config.h b/keyboards/kona_classic/config.h
index dd6631f5456a..b9449c4714bf 100644
--- a/keyboards/kona_classic/config.h
+++ b/keyboards/kona_classic/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Underlight configuration
- */
-#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 5
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
-
 /* 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/kona_classic/info.json b/keyboards/kona_classic/info.json
index bc79963cb165..7202c3586964 100644
--- a/keyboards/kona_classic/info.json
+++ b/keyboards/kona_classic/info.json
@@ -8,6 +8,24 @@
     "pid": "0x6060",
     "device_version": "0.0.3"
   },
+  "rgblight": {
+    "hue_steps": 5,
+    "saturation_steps": 10,
+    "brightness_steps": 10,
+    "led_count": 30,
+    "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": "B2"
   },
diff --git a/keyboards/kopibeng/mnk65_stm32/rules.mk b/keyboards/kopibeng/mnk65_stm32/rules.mk
index fddc8cdf7379..f2400ced17af 100644
--- a/keyboards/kopibeng/mnk65_stm32/rules.mk
+++ b/keyboards/kopibeng/mnk65_stm32/rules.mk
@@ -15,5 +15,3 @@ RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no			# Enable Encoder
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/kopibeng/mnk88/config.h b/keyboards/kopibeng/mnk88/config.h
index 449d46060760..62a2978f67cf 100644
--- a/keyboards/kopibeng/mnk88/config.h
+++ b/keyboards/kopibeng/mnk88/config.h
@@ -16,21 +16,6 @@
 
 #pragma once
 
-    #define RGBLED_NUM 20
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-
 /* 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/kopibeng/mnk88/info.json b/keyboards/kopibeng/mnk88/info.json
index 08baf2310b77..67ef66c6479c 100644
--- a/keyboards/kopibeng/mnk88/info.json
+++ b/keyboards/kopibeng/mnk88/info.json
@@ -12,7 +12,18 @@
         "pin": "A10"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "max_brightness": 200,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true,
+            "rgb_test": true
+        }
     },
     "matrix_pins": {
         "cols": ["A2", "A1", "A0", "B11", "B10", "B2", "F1", "B1", "B0", "A7", "A6", "A5", "F0", "A4", "C15", "C14", "C13"],
diff --git a/keyboards/kopibeng/mnk88/rules.mk b/keyboards/kopibeng/mnk88/rules.mk
index cc3bf2abed31..65bc2097f51c 100644
--- a/keyboards/kopibeng/mnk88/rules.mk
+++ b/keyboards/kopibeng/mnk88/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no			# Enable Encoder
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/kopibeng/xt60/config.h b/keyboards/kopibeng/xt60/config.h
index 7a903e4eff23..62a2978f67cf 100644
--- a/keyboards/kopibeng/xt60/config.h
+++ b/keyboards/kopibeng/xt60/config.h
@@ -16,21 +16,6 @@
 
 #pragma once
 
-    #define RGBLED_NUM 14
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-
 /* 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/kopibeng/xt60/info.json b/keyboards/kopibeng/xt60/info.json
index ca278dff70aa..2eefea131082 100644
--- a/keyboards/kopibeng/xt60/info.json
+++ b/keyboards/kopibeng/xt60/info.json
@@ -8,6 +8,19 @@
         "pid": "0x0600",
         "device_version": "0.0.2"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true,
+            "rgb_test": true
+        }
+    },
     "ws2812": {
         "pin": "F6"
     },
diff --git a/keyboards/kopibeng/xt60_singa/config.h b/keyboards/kopibeng/xt60_singa/config.h
index 7a903e4eff23..62a2978f67cf 100644
--- a/keyboards/kopibeng/xt60_singa/config.h
+++ b/keyboards/kopibeng/xt60_singa/config.h
@@ -16,21 +16,6 @@
 
 #pragma once
 
-    #define RGBLED_NUM 14
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-
 /* 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/kopibeng/xt60_singa/info.json b/keyboards/kopibeng/xt60_singa/info.json
index a4ed2178285a..7ccfee941d07 100644
--- a/keyboards/kopibeng/xt60_singa/info.json
+++ b/keyboards/kopibeng/xt60_singa/info.json
@@ -8,6 +8,19 @@
         "pid": "0x0601",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true,
+            "rgb_test": true
+        }
+    },
     "ws2812": {
         "pin": "F6"
     },
diff --git a/keyboards/kopibeng/xt65/config.h b/keyboards/kopibeng/xt65/config.h
index b64511a63f7d..2ef1d22576d5 100644
--- a/keyboards/kopibeng/xt65/config.h
+++ b/keyboards/kopibeng/xt65/config.h
@@ -16,22 +16,6 @@
 
 #pragma once
 
-    #define RGBLED_NUM 12
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-
 /* 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/kopibeng/xt65/info.json b/keyboards/kopibeng/xt65/info.json
index 0a909a1cd3c3..d761667b9dd4 100644
--- a/keyboards/kopibeng/xt65/info.json
+++ b/keyboards/kopibeng/xt65/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "B1",
         "levels": 5
     },
@@ -21,7 +22,23 @@
         "pin": "D5"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "max_brightness": 200,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/kopibeng/xt87/info.json b/keyboards/kopibeng/xt87/info.json
index 8447d40815c5..05198e0a5816 100644
--- a/keyboards/kopibeng/xt87/info.json
+++ b/keyboards/kopibeng/xt87/info.json
@@ -54,832 +54,1359 @@
     "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": [2, 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": [3, 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": [4, 16], "x": 17.25, "y": 5.25 }
+                {"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": [2, 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], "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": [3, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "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": 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, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "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": [4, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "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], "w": 2, "x": 13, "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": [3, 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": 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": 2.75, "x": 12.25, "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": [4, 16], "x": 17.25, "y": 5.25 }
+                {"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": [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": [3, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "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.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.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "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": [4, 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.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": [2, 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": [3, 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": 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, 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": [4, 16], "x": 17.25, "y": 5.25 }
+                {"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": [2, 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], "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": [3, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "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": 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, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "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": [4, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi_tsangan": {
             "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], "w": 2, "x": 13, "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": [3, 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": 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": 2.75, "x": 12.25, "y": 4.25 },
-                { "matrix": [4, 15], "x": 16.25, "y": 4.25 },
-                { "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
-                { "matrix": [5, 1], "w": 1, "x": 1.5, "y": 5.25 },
-                { "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25 },
-                { "matrix": [5, 11], "w": 1.5, "x": 11, "y": 5.25 },
-                { "matrix": [5, 12], "w": 1, "x": 12.5, "y": 5.25 },
-                { "matrix": [5, 13], "w": 1.5, "x": 13.5, "y": 5.25 },
-                { "matrix": [5, 14], "x": 15.25, "y": 5.25 },
-                { "matrix": [5, 15], "x": 16.25, "y": 5.25 },
-                { "matrix": [4, 16], "x": 17.25, "y": 5.25 }
+                {"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": [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": [3, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "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": [4, 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.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": [2, 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": [3, 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": 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, 15], "x": 16.25, "y": 4.25 },
-                { "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
-                { "matrix": [5, 1], "w": 1, "x": 1.5, "y": 5.25 },
-                { "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25 },
-                { "matrix": [5, 11], "w": 1.5, "x": 11, "y": 5.25 },
-                { "matrix": [5, 12], "w": 1, "x": 12.5, "y": 5.25 },
-                { "matrix": [5, 13], "w": 1.5, "x": 13.5, "y": 5.25 },
-                { "matrix": [5, 14], "x": 15.25, "y": 5.25 },
-                { "matrix": [5, 15], "x": 16.25, "y": 5.25 },
-                { "matrix": [4, 16], "x": 17.25, "y": 5.25 }
+                {"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": [2, 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], "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": [3, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "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": 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, 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": [4, 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": [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": [3, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "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": [4, 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": [2, 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], "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": [3, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "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": 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, 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": [4, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso": {
             "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], "w": 2, "x": 13, "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": [3, 12], "x": 12.5, "y": 2.25 },
-                { "h": 2, "matrix": [2, 13], "w": 1.25, "x": 13.75, "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], "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": 2.75, "x": 12.25, "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": [4, 16], "x": 17.25, "y": 5.25 }
+                {"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": [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": [3, 12], "x": 12.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], "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},
+                {"matrix": [2, 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, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "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": [4, 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.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": [2, 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": [3, 12], "x": 12.5, "y": 2.25 },
-                { "h": 2, "matrix": [2, 13], "w": 1.25, "x": 13.75, "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], "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": [4, 16], "x": 17.25, "y": 5.25 }
+                {"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": [2, 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], "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": [3, 12], "x": 12.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], "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},
+                {"matrix": [2, 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, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "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": [4, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso_tsangan": {
             "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], "w": 2, "x": 13, "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": [3, 12], "x": 12.5, "y": 2.25 },
-                { "h": 2, "matrix": [2, 13], "w": 1.25, "x": 13.75, "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], "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": 2.75, "x": 12.25, "y": 4.25 },
-                { "matrix": [4, 15], "x": 16.25, "y": 4.25 },
-                { "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
-                { "matrix": [5, 1], "w": 1, "x": 1.5, "y": 5.25 },
-                { "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25 },
-                { "matrix": [5, 11], "w": 1.5, "x": 11, "y": 5.25 },
-                { "matrix": [5, 12], "w": 1, "x": 12.5, "y": 5.25 },
-                { "matrix": [5, 13], "w": 1.5, "x": 13.5, "y": 5.25 },
-                { "matrix": [5, 14], "x": 15.25, "y": 5.25 },
-                { "matrix": [5, 15], "x": 16.25, "y": 5.25 },
-                { "matrix": [4, 16], "x": 17.25, "y": 5.25 }
+                {"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": [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": [3, 12], "x": 12.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], "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},
+                {"matrix": [2, 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, 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": [4, 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.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": [2, 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": [3, 12], "x": 12.5, "y": 2.25 },
-                { "h": 2, "matrix": [2, 13], "w": 1.25, "x": 13.75, "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], "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.5, "x": 0, "y": 5.25 },
-                { "matrix": [5, 1], "w": 1, "x": 1.5, "y": 5.25 },
-                { "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25 },
-                { "matrix": [5, 11], "w": 1.5, "x": 11, "y": 5.25 },
-                { "matrix": [5, 12], "w": 1, "x": 12.5, "y": 5.25 },
-                { "matrix": [5, 13], "w": 1.5, "x": 13.5, "y": 5.25 },
-                { "matrix": [5, 14], "x": 15.25, "y": 5.25 },
-                { "matrix": [5, 15], "x": 16.25, "y": 5.25 },
-                { "matrix": [4, 16], "x": 17.25, "y": 5.25 }
+                {"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": [2, 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], "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": [3, 12], "x": 12.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], "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},
+                {"matrix": [2, 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, 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": [4, 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": [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": [3, 12], "x": 12.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], "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},
+                {"matrix": [2, 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, 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": [4, 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": [2, 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], "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": [3, 12], "x": 12.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], "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},
+                {"matrix": [2, 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, 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": [4, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/kopibeng/xt8x/config.h b/keyboards/kopibeng/xt8x/config.h
index f385599d8008..5f12451e15dd 100644
--- a/keyboards/kopibeng/xt8x/config.h
+++ b/keyboards/kopibeng/xt8x/config.h
@@ -18,21 +18,6 @@
 
 #define INDICATOR_PIN_0 B13
 
-    #define RGBLED_NUM 19
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-
 /* 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/kopibeng/xt8x/info.json b/keyboards/kopibeng/xt8x/info.json
index 1596ed883ef0..882dc0521aa8 100644
--- a/keyboards/kopibeng/xt8x/info.json
+++ b/keyboards/kopibeng/xt8x/info.json
@@ -21,7 +21,18 @@
         "pin": "A10"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 19,
+        "max_brightness": 200,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true,
+            "rgb_test": true
+        }
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/kopibeng/xt8x/rules.mk b/keyboards/kopibeng/xt8x/rules.mk
index cc3bf2abed31..65bc2097f51c 100644
--- a/keyboards/kopibeng/xt8x/rules.mk
+++ b/keyboards/kopibeng/xt8x/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no			# Enable Encoder
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/kprepublic/bm16a/v2/info.json b/keyboards/kprepublic/bm16a/v2/info.json
index 8d65ee51f464..e922d0b9ee70 100644
--- a/keyboards/kprepublic/bm16a/v2/info.json
+++ b/keyboards/kprepublic/bm16a/v2/info.json
@@ -55,7 +55,7 @@
     },
     "community_layouts": ["ortho_4x4"],
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "animations": {
             "alphas_mods": true,
             "gradient_up_down": true,
diff --git a/keyboards/kprepublic/bm16s/config.h b/keyboards/kprepublic/bm16s/config.h
index fb73fedb0451..5f360813239b 100755
--- a/keyboards/kprepublic/bm16s/config.h
+++ b/keyboards/kprepublic/bm16s/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 16
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/kprepublic/bm16s/info.json b/keyboards/kprepublic/bm16s/info.json
index 262ce39fba2b..de0d51cc4b27 100644
--- a/keyboards/kprepublic/bm16s/info.json
+++ b/keyboards/kprepublic/bm16s/info.json
@@ -8,6 +8,23 @@
       "pid": "0x016B",
       "device_version": "0.0.1"
     },
+    "rgblight": {
+      "saturation_steps": 8,
+      "brightness_steps": 8,
+      "led_count": 16,
+      "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": "E2"
     },
diff --git a/keyboards/kprepublic/bm40hsrgb/info.json b/keyboards/kprepublic/bm40hsrgb/info.json
index 4007cc7360ac..c0ba89dbabd2 100644
--- a/keyboards/kprepublic/bm40hsrgb/info.json
+++ b/keyboards/kprepublic/bm40hsrgb/info.json
@@ -12,7 +12,7 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "rgblight": {
         "max_brightness": 180
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
index 5a1d366f56ca..eb20a1a25b95 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/signynt/keymap.c
@@ -165,7 +165,7 @@ if(IS_LAYER_ON(NSSL)) {
 
 //capslock leds
 
-if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
+if (host_keyboard_led_state().caps_lock) {
     rgb_matrix_set_color_all(50, 15.6, 0);
   }
 
diff --git a/keyboards/kprepublic/bm43a/config.h b/keyboards/kprepublic/bm43a/config.h
index c3303237f735..aff98236a565 100644
--- a/keyboards/kprepublic/bm43a/config.h
+++ b/keyboards/kprepublic/bm43a/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-    #define RGBLED_NUM 10
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
 #endif
diff --git a/keyboards/kprepublic/bm43a/info.json b/keyboards/kprepublic/bm43a/info.json
index 8cd348756729..041da2164d15 100644
--- a/keyboards/kprepublic/bm43a/info.json
+++ b/keyboards/kprepublic/bm43a/info.json
@@ -21,7 +21,11 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 180
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "max_brightness": 180,
+        "sleep": true
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/kprepublic/bm43a/keymaps/badger/keymap.c b/keyboards/kprepublic/bm43a/keymaps/badger/keymap.c
new file mode 100644
index 000000000000..816132b7f6df
--- /dev/null
+++ b/keyboards/kprepublic/bm43a/keymaps/badger/keymap.c
@@ -0,0 +1,76 @@
+/*
+Copyright 2023 Dan White <opensource@bluetufa.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "badger.h"
+
+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,
+        MOVE_MAC, 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,  LT_SLSH,
+        KC_LCTL,  KC_RALT, KC_LGUI, LT_SPACE,         FN_SPACE,          LT_FUNC, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+    [_MOVE]       = LAYOUT(
+        KC_GRV,   VS_STEP, VS_INTO, VS_OUT,  VS_RUN,  VS_STOP,  VS_MVUP, WD_BACK, KC_HOME, KC_END,  WD_FRWD, WD_DELE,
+        _______,  MM_LH,   MM_MAX,  MM_RH,   IJ_FIND, VS_LINE,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_DQUO,
+        _______,  MM_UH,   MM_BH,   MAC_CPY, MAC_PST, _______,  VS_MVDN, IJ_REN,  IJ_BACK, KC_UP,   _______,
+        _______,  _______, _______, KC_SPC,           KC_SPC,            _______, _______, _______, _______
+    ),
+    [_FUNCTION]   = 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_4,    KC_5,    KC_6,    _______, KC_SCLN,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_QUOT,
+        _______,  KC_7,    KC_8,    KC_9,    KC_0,    _______, _______,  _______, KC_SCLN, KC_QUOT, KC_RSFT,
+        _______,  _______, _______, _______,          _______,           _______, _______, _______, _______
+    ),
+    [_MACRO]      = LAYOUT(
+        KC_TILD,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,  KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE,
+        _______,  MAC_ALL, MAC_SAV, MAC_DUP, KC_MINS, KC_COLN,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_DQUO,
+        _______,  MAC_UND, MAC_CUT, MAC_CPY, MAC_PST, KC_PLUS, _______,  _______, _______, KC_COLN, KC_DQUO,
+        _______,  _______, _______, _______,          _______,           _______, _______, _______, CONFIG
+    ),
+    [_CONFIG]     = LAYOUT(
+        QK_BOOT,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
+        _______,  BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______,  _______, _______, KC_F11,  KC_F12,  _______,
+        _______,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI,  RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,
+        _______,  _______, _______, _______,           _______,          _______, _______, _______, _______
+    )
+    /*
+  [_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, \
+     MOVE_MAC,  KC_A,     KC_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,   FUNCTION, KC_RGUI,  KC_RALT,  J_MACRO),
+
+  [_FUNCTION]   = 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, \
+     _______,   _______,  _______,  _______,  _______,   VS_TERM,  KC_MPLY,  KC_PGUP,  _______,  _______,  KC_PGDN,  KC_VOLD,   KC_VOLU,  KC_INS, \
+     _______,   VS_EXP,   VS_DBG,   VS_CMD,   VS_FILE,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  \
+     _______,   DF_1,     DF_2,     KC_CAPS,  _______,   KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,   \
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  CONFIG),
+
+  [_MACRO]     = 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, \
+     _______,   _______,  _______,  _______,  SED,       KC_MSTP,  KC_MPLY,  KC_PGUP,  BASH_IF,  _______,  KC_PGDN,  KC_VOLD,   KC_VOLU,  KC_INS, \
+     _______,   _______,  SELECT,   _______,  FN,        _______,  _______,  _______,  _______,  FOR_LOOP, _______,  _______,   _______,  \
+     _______,   DF_1,     DF_2,     CONST,    _______,   SHEBANG,  TS_IMPT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,  \
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______),
+
+  [_CONFIG]     = LAYOUT_60_ansi(\
+     _______,   DF_1,     DF_2,     DF_3,     DF_4,      KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL, \
+     _______,   _______,  _______,  EEP_RST,  RESET,     _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
+     _______,   _______,  _______,  DEBUG,    RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,  \
+     _______,   _______,  _______,  _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,   \
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______) */
+};
diff --git a/keyboards/kprepublic/bm43hsrgb/config.h b/keyboards/kprepublic/bm43hsrgb/config.h
deleted file mode 100755
index fb800abc06de..000000000000
--- a/keyboards/kprepublic/bm43hsrgb/config.h
+++ /dev/null
@@ -1,34 +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 RGBLED_NUM 53
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/kprepublic/bm43hsrgb/info.json b/keyboards/kprepublic/bm43hsrgb/info.json
index 1cdaa64602ec..93821f3b53eb 100755
--- a/keyboards/kprepublic/bm43hsrgb/info.json
+++ b/keyboards/kprepublic/bm43hsrgb/info.json
@@ -12,7 +12,22 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 180
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 53,
+        "max_brightness": 180,
+        "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
+        }
     },
     "matrix_pins": {
         "cols": ["C6", "D2", "D1", "D0", "D7", "D6", "D4", "D5", "D3", "B7", "B3", "B2"],
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/config.h b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
index eebd3381d57e..6a3bee5a52d6 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGB_MATRIX_LED_COUNT 69
-#    define RGBLED_NUM 69
 #    define RGB_MATRIX_KEYPRESSES
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/info.json b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
index f73af590d3ce..589f4310f711 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/info.json
@@ -12,7 +12,7 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "rgblight": {
         "max_brightness": 180
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
index c2aafb9adc9a..82a3a14e9ec1 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
@@ -15,22 +15,7 @@
  */
 #pragma once
 
-//rgb light setting
-#define RGBLED_NUM          6
-#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_MOOD
-#define RGBLIGHT_HUE_STEP   8
-#define RGBLIGHT_SAT_STEP   8
-#define RGBLIGHT_VAL_STEP   8
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
 #define DRIVER_ADDR_1 0b1010000
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
index bb6533b823f1..47c0b8081a1f 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
@@ -15,7 +15,22 @@
         "driver": "custom"
     },
     "rgblight": {
-        "max_brightness": 150
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "max_brightness": 150,
+        "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": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
index 869db0368a86..bbc3e8db52bd 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
@@ -153,16 +153,16 @@ LED_TYPE rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
 
 static void rgb_matrix_driver_init(void) {
     i2c_init();
-    IS31FL3733_init(DRIVER_ADDR_1, 0);
+    is31fl3733_init(DRIVER_ADDR_1, 0);
     for (uint8_t index = 0; index < ISSI_LED_TOTAL; index++) {
         bool enabled = true;
-        IS31FL3733_set_led_control_register(index, enabled, enabled, enabled);
+        is31fl3733_set_led_control_register(index, enabled, enabled, enabled);
     }
-    IS31FL3733_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3733_update_led_control_registers(DRIVER_ADDR_1, 0);
 }
 
 static void rgb_matrix_driver_flush(void) {
-    IS31FL3733_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3733_update_pwm_buffers(DRIVER_ADDR_1, 0);
 #    if WS2812_LED_TOTAL > 0
     ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_TOTAL);
 #    endif
@@ -170,7 +170,7 @@ static void rgb_matrix_driver_flush(void) {
 
 static void rgb_matrix_driver_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     if (index < ISSI_LED_TOTAL) {
-        IS31FL3733_set_color(index, red, green, blue);
+        is31fl3733_set_color(index, red, green, blue);
     } else {
 #    if WS2812_LED_TOTAL > 0
         rgb_matrix_ws2812_array[index - ISSI_LED_TOTAL].r = red;
@@ -181,7 +181,7 @@ static void rgb_matrix_driver_set_color(int index, uint8_t red, uint8_t green, u
 }
 
 static void rgb_matrix_driver_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
-    IS31FL3733_set_color_all(red, green, blue);
+    is31fl3733_set_color_all(red, green, blue);
 #    if WS2812_LED_TOTAL > 0
     for (uint8_t i = 0; i < WS2812_LED_TOTAL; i++) {
         rgb_matrix_ws2812_array[i].r = red;
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
index a11d57923977..2f02594e156c 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
@@ -17,7 +17,6 @@
 #pragma once
 
 #define RGB_MATRIX_LED_COUNT 69
-    #define RGBLED_NUM 69
     #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 140
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
index 3849e5a338f1..a18aa9d4f5fa 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
@@ -12,7 +12,7 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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 1cc17d6c8663..b7e95393e5eb 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
@@ -15,22 +15,7 @@
  */
 #pragma once
 
-//rgb light setting
-#define RGBLED_NUM          6
-#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_MOOD
-#define RGBLIGHT_HUE_STEP   8
-#define RGBLIGHT_SAT_STEP   8
-#define RGBLIGHT_VAL_STEP   8
 
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
 #    define DRIVER_ADDR_1 0b1010000
@@ -66,8 +51,8 @@
 // #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
+// #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
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
index d91f6a853171..d78ae63740d1 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
@@ -12,10 +12,25 @@
         "pin": "F0"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "rgblight": {
-        "max_brightness": 150
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "max_brightness": 150,
+        "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": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
index d4ba498987a2..563ac242c867 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h
@@ -18,12 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGB_MATRIX_LED_COUNT 70
-#    define RGBLED_NUM 70
 #    define RGB_MATRIX_KEYPRESSES
-    // #define RGBLIGHT_HUE_STEP 8
-    // #define RGBLIGHT_SAT_STEP 8
-    // #define RGBLIGHT_VAL_STEP 8
-    // #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
index 6e9256523f2e..ad67cc28c3e7 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
@@ -12,10 +12,7 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
-    },
-    "rgblight": {
-        "max_brightness": 180
+        "driver": "ws2812"
     },
     "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 7af983c5e770..8ad699ed9a09 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
@@ -17,22 +17,7 @@
  */
 #pragma once
 
-//rgb light setting
-#define RGBLED_NUM          6
-#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_MOOD
-#define RGBLIGHT_HUE_STEP   8
-#define RGBLIGHT_SAT_STEP   8
-#define RGBLIGHT_VAL_STEP   8
 
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
@@ -106,7 +91,7 @@
 #ifdef RGBLIGHT_ENABLE
 #    define WS2812_LED_TOTAL 0
 #else
-#    define WS2812_LED_TOTAL RGBLED_NUM
+#    define WS2812_LED_TOTAL 6
 #endif
 
 #define RGB_MATRIX_LED_COUNT (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
index 6326d871df2d..6c577a283eac 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
@@ -15,7 +15,22 @@
         "driver": "custom"
     },
     "rgblight": {
-        "max_brightness": 150
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "max_brightness": 150,
+        "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": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
index fb38180b4d06..c4ac03e4478a 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
@@ -153,16 +153,16 @@ LED_TYPE rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
 
 static void rgb_matrix_driver_init(void) {
     i2c_init();
-    IS31FL3733_init(DRIVER_ADDR_1, 0);
+    is31fl3733_init(DRIVER_ADDR_1, 0);
     for (uint8_t index = 0; index < ISSI_LED_TOTAL; index++) {
         bool enabled = true;
-        IS31FL3733_set_led_control_register(index, enabled, enabled, enabled);
+        is31fl3733_set_led_control_register(index, enabled, enabled, enabled);
     }
-    IS31FL3733_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3733_update_led_control_registers(DRIVER_ADDR_1, 0);
 }
 
 static void rgb_matrix_driver_flush(void) {
-    IS31FL3733_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3733_update_pwm_buffers(DRIVER_ADDR_1, 0);
 #    if WS2812_LED_TOTAL > 0
     ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_TOTAL);
 #    endif
@@ -170,7 +170,7 @@ static void rgb_matrix_driver_flush(void) {
 
 static void rgb_matrix_driver_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     if (index < ISSI_LED_TOTAL) {
-        IS31FL3733_set_color(index, red, green, blue);
+        is31fl3733_set_color(index, red, green, blue);
     } else {
 #    if WS2812_LED_TOTAL > 0
         rgb_matrix_ws2812_array[index - ISSI_LED_TOTAL].r = red;
@@ -181,7 +181,7 @@ static void rgb_matrix_driver_set_color(int index, uint8_t red, uint8_t green, u
 }
 
 static void rgb_matrix_driver_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
-    IS31FL3733_set_color_all(red, green, blue);
+    is31fl3733_set_color_all(red, green, blue);
 #    if WS2812_LED_TOTAL > 0
     for (uint8_t i = 0; i < WS2812_LED_TOTAL; i++) {
         rgb_matrix_ws2812_array[i].r = red;
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
index aac03cec4dfa..6e721bb7c068 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h
@@ -18,22 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGB_MATRIX_LED_COUNT 67
-    #define RGBLED_NUM 67
     #define RGB_MATRIX_KEYPRESSES
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
+
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
index 5746594468a2..d6368610ff59 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
@@ -12,10 +12,26 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "rgblight": {
-        "max_brightness": 180
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 67,
+        "max_brightness": 180,
+        "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": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
index 2feead3386f0..2c0710bfe482 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
@@ -15,21 +15,7 @@
  */
 #pragma once
 
-//rgb light setting
-#define RGBLED_NUM          6
-#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_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-#define RGBLIGHT_HUE_STEP   8
-#define RGBLIGHT_SAT_STEP   8
-#define RGBLIGHT_VAL_STEP   8
 
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
 #    define RGB_MATRIX_KEYPRESSES
@@ -102,7 +88,7 @@
 #ifdef RGBLIGHT_ENABLE
 #    define WS2812_LED_TOTAL 0
 #else
-#    define WS2812_LED_TOTAL RGBLED_NUM
+#    define WS2812_LED_TOTAL 6
 #endif
 
 #define RGB_MATRIX_LED_COUNT (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
index 01d09b594603..82d1974f06ee 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
@@ -15,7 +15,21 @@
         "driver": "custom"
     },
     "rgblight": {
-        "max_brightness": 150
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "max_brightness": 150,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        }
     },
     "matrix_pins": {
         "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
index ee95726e160b..bd976f315ab3 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
@@ -149,16 +149,16 @@ LED_TYPE rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
 
 static void rgb_matrix_driver_init(void) {
     i2c_init();
-    IS31FL3733_init(DRIVER_ADDR_1, 0);
+    is31fl3733_init(DRIVER_ADDR_1, 0);
     for (uint8_t index = 0; index < ISSI_LED_TOTAL; index++) {
         bool enabled = true;
-        IS31FL3733_set_led_control_register(index, enabled, enabled, enabled);
+        is31fl3733_set_led_control_register(index, enabled, enabled, enabled);
     }
-    IS31FL3733_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3733_update_led_control_registers(DRIVER_ADDR_1, 0);
 }
 
 static void rgb_matrix_driver_flush(void) {
-    IS31FL3733_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3733_update_pwm_buffers(DRIVER_ADDR_1, 0);
 #    if WS2812_LED_TOTAL > 0
     ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_TOTAL);
 #    endif
@@ -166,7 +166,7 @@ static void rgb_matrix_driver_flush(void) {
 
 static void rgb_matrix_driver_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     if (index < ISSI_LED_TOTAL) {
-        IS31FL3733_set_color(index, red, green, blue);
+        is31fl3733_set_color(index, red, green, blue);
     } else {
 #    if WS2812_LED_TOTAL > 0
         rgb_matrix_ws2812_array[index - ISSI_LED_TOTAL].r = red;
@@ -177,7 +177,7 @@ static void rgb_matrix_driver_set_color(int index, uint8_t red, uint8_t green, u
 }
 
 static void rgb_matrix_driver_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
-    IS31FL3733_set_color_all(red, green, blue);
+    is31fl3733_set_color_all(red, green, blue);
 #    if WS2812_LED_TOTAL > 0
     for (uint8_t i = 0; i < WS2812_LED_TOTAL; i++) {
         rgb_matrix_ws2812_array[i].r = red;
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/config.h b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
index e2522723fc85..ef410e944124 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 73
-    #define RGBLED_NUM 73
     #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/info.json b/keyboards/kprepublic/bm65hsrgb/rev1/info.json
index d88f3b81773f..563d90ce32a6 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/info.json
@@ -12,7 +12,7 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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/config.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
index 2814a6609a3f..c916ffb2a985 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
@@ -18,11 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGB_MATRIX_LED_COUNT 74
-    #define RGBLED_NUM 74
     #define RGB_MATRIX_KEYPRESSES
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 140
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
@@ -74,15 +70,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_BAND_SAT
-/* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#    define RGBLIGHT_SLEEP 
-/*== all animations 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
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
index 8c3536db6b45..6b8a5a8a3a1e 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
@@ -9,11 +9,28 @@
         "device_version": "0.0.1",
         "force_nkro": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 74,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
index cef5a0939b21..a3ef1df3b355 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 74
-#    define RGBLED_NUM 74
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/info.json b/keyboards/kprepublic/bm68hsrgb/rev1/info.json
index b3747af5b16c..ac3dcdf50884 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/info.json
@@ -12,10 +12,7 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
-    },
-    "rgblight": {
-        "max_brightness": 180
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/config.h b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
index 53aabdaf9483..3e74f353f9b5 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
@@ -16,25 +16,7 @@
   */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
-
-#define RGBLED_NUM          6
-#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_MOOD
-#define RGBLIGHT_HUE_STEP   8
-#define RGBLIGHT_SAT_STEP   8
-#define RGBLIGHT_VAL_STEP   8
-
-
 
 #define DRIVER_ADDR_1 0b0110000
 
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/info.json b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
index b7c827e0eac9..7a0cefeace9d 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
@@ -12,10 +12,25 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "rgblight": {
-        "max_brightness": 150
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "max_brightness": 150,
+        "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": ["F0", "F1", "B0", "B1", "B2", "B3", "E6", "B7", "D2", "D7", "B4", "B5", "B6", "C6", "C7"],
diff --git a/keyboards/kprepublic/bm80hsrgb/config.h b/keyboards/kprepublic/bm80hsrgb/config.h
index a9ba033fb0ef..c55999846e20 100644
--- a/keyboards/kprepublic/bm80hsrgb/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/config.h
@@ -20,11 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT 87
 
-#define RGBLED_NUM 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_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
 //#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
diff --git a/keyboards/kprepublic/bm80hsrgb/info.json b/keyboards/kprepublic/bm80hsrgb/info.json
index d3989e36157a..0feaa9a99a4e 100644
--- a/keyboards/kprepublic/bm80hsrgb/info.json
+++ b/keyboards/kprepublic/bm80hsrgb/info.json
@@ -12,7 +12,7 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "D7", "D6", "D4", "D5", "D3", "D2", "F5", "F6", "F7", "D1", "D0", "B4", "B5", "B6"],
diff --git a/keyboards/kprepublic/bm80v2/info.json b/keyboards/kprepublic/bm80v2/info.json
index cbad2ee816eb..a30886a988c5 100644
--- a/keyboards/kprepublic/bm80v2/info.json
+++ b/keyboards/kprepublic/bm80v2/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.2"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "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_iso/info.json b/keyboards/kprepublic/bm80v2_iso/info.json
index 064af0212817..6f8bdc5fd9bc 100644
--- a/keyboards/kprepublic/bm80v2_iso/info.json
+++ b/keyboards/kprepublic/bm80v2_iso/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.2"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "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 7ecc626803aa..73c222c113f3 100644
--- a/keyboards/kprepublic/bm980hsrgb/config.h
+++ b/keyboards/kprepublic/bm980hsrgb/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // The number of LEDs connected
 #define RGB_MATRIX_LED_COUNT  98
-#    define RGBLED_NUM 98
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 //#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/kprepublic/bm980hsrgb/info.json b/keyboards/kprepublic/bm980hsrgb/info.json
index badd7d6458fc..29944ba47430 100644
--- a/keyboards/kprepublic/bm980hsrgb/info.json
+++ b/keyboards/kprepublic/bm980hsrgb/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "E6", "F0", "F1", "F4", "F5", "D6"],
diff --git a/keyboards/kprepublic/cospad/config.h b/keyboards/kprepublic/cospad/config.h
index d9727b63c718..5e90ea1c05b3 100644
--- a/keyboards/kprepublic/cospad/config.h
+++ b/keyboards/kprepublic/cospad/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-    #define RGBLED_NUM 4
-//   #define RGBLIGHT_HUE_STEP 8
-//   #define RGBLIGHT_SAT_STEP 8
-//   #define RGBLIGHT_VAL_STEP 8
-#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
-
 /* 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/cospad/info.json b/keyboards/kprepublic/cospad/info.json
index 1814b50464c8..02551a2f46f1 100644
--- a/keyboards/kprepublic/cospad/info.json
+++ b/keyboards/kprepublic/cospad/info.json
@@ -14,9 +14,26 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "F7",
         "on_state": 0
     },
+    "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": "F6"
     },
diff --git a/keyboards/kprepublic/cstc40/config.h b/keyboards/kprepublic/cstc40/config.h
new file mode 100644
index 000000000000..c43098689529
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/config.h
@@ -0,0 +1,59 @@
+// Copyright 2022 Var (@itsvar8)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define I2C1_SDA_PIN B9
+#define I2C1_SCL_PIN B8
+#define DRIVER_ADDR_1 0b1010000
+#define DRIVER_COUNT 1
+#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
diff --git a/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c b/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c
new file mode 100644
index 000000000000..39d3d7ff5284
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c
@@ -0,0 +1,71 @@
+/* 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/>.
+ */
+#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 },
+
+    { 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, 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, 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 }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/daughterboard/info.json b/keyboards/kprepublic/cstc40/daughterboard/info.json
new file mode 100644
index 000000000000..cdba7942df84
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/daughterboard/info.json
@@ -0,0 +1,6 @@
+{
+    "matrix_pins": {
+        "cols": ["B15", "B14", "B13", "B10", "B12", "A5", "C4", "A7", "A15", "C10", "C11", "C0"],
+        "rows": ["B1", "B0", "C5", "A6"]
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/daughterboard/rules.mk b/keyboards/kprepublic/cstc40/daughterboard/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/daughterboard/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/halconf.h b/keyboards/kprepublic/cstc40/halconf.h
new file mode 100644
index 000000000000..0f279040aae1
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/halconf.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/info.json b/keyboards/kprepublic/cstc40/info.json
new file mode 100644
index 000000000000..4ccd8389e882
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/info.json
@@ -0,0 +1,130 @@
+{
+    "manufacturer": "kprepublic",
+    "keyboard_name": "cstc40",
+    "maintainer": "itsvar8",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+        "debounce": 2,
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "processor": "STM32F401",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0040",
+        "vid": "0x586A"
+    },
+    "layouts": {
+        "LAYOUT_planck_mit": {
+            "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 },
+                { "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], "w": 2, "x": 5, "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 }
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "driver": "is31fl3733",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 40, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 61, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 81, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 101, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 122, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 142, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 162, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 183, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 203, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 21, "flags": 1},
+            {"matrix": [1, 1], "x": 20, "y": 21, "flags": 4},
+            {"matrix": [1, 2], "x": 40, "y": 21, "flags": 4},
+            {"matrix": [1, 3], "x": 61, "y": 21, "flags": 4},
+            {"matrix": [1, 4], "x": 81, "y": 21, "flags": 4},
+            {"matrix": [1, 5], "x": 101, "y": 21, "flags": 4},
+            {"matrix": [1, 6], "x": 122, "y": 21, "flags": 4},
+            {"matrix": [1, 7], "x": 142, "y": 21, "flags": 4},
+            {"matrix": [1, 8], "x": 162, "y": 21, "flags": 4},
+            {"matrix": [1, 9], "x": 183, "y": 21, "flags": 4},
+            {"matrix": [1, 10], "x": 203, "y": 21, "flags": 4},
+            {"matrix": [1, 11], "x": 224, "y": 21, "flags": 1},
+            {"matrix": [2, 0], "x": 0, "y": 42, "flags": 1},
+            {"matrix": [2, 1], "x": 20, "y": 42, "flags": 4},
+            {"matrix": [2, 2], "x": 40, "y": 42, "flags": 4},
+            {"matrix": [2, 3], "x": 61, "y": 42, "flags": 4},
+            {"matrix": [2, 4], "x": 81, "y": 42, "flags": 4},
+            {"matrix": [2, 5], "x": 101, "y": 42, "flags": 4},
+            {"matrix": [2, 6], "x": 122, "y": 42, "flags": 4},
+            {"matrix": [2, 7], "x": 142, "y": 42, "flags": 4},
+            {"matrix": [2, 8], "x": 162, "y": 42, "flags": 4},
+            {"matrix": [2, 9], "x": 183, "y": 42, "flags": 4},
+            {"matrix": [2, 10], "x": 203, "y": 42, "flags": 4},
+            {"matrix": [2, 11], "x": 224, "y": 42, "flags": 1},
+            {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
+            {"matrix": [3, 1], "x": 20, "y": 64, "flags": 1},
+            {"matrix": [3, 2], "x": 40, "y": 64, "flags": 1},
+            {"matrix": [3, 3], "x": 61, "y": 64, "flags": 1},
+            {"matrix": [3, 4], "x": 81, "y": 64, "flags": 1},
+            {"matrix": [3, 5], "x": 111, "y": 64, "flags": 1},
+            {"matrix": [3, 7], "x": 142, "y": 64, "flags": 1},
+            {"matrix": [3, 8], "x": 162, "y": 64, "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, "flags": 1}
+        ],
+        "max_brightness": 200
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/keymaps/default/keymap.c b/keyboards/kprepublic/cstc40/keymaps/default/keymap.c
new file mode 100644
index 000000000000..e47ff226a935
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/keymaps/default/keymap.c
@@ -0,0 +1,94 @@
+/* Copyright 2023
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along 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
+ * ,-----------------------------------------------------------------------------------.
+ * | 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 |
+ * `-----------------------------------------------------------------------------------'
+ */
+[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 ,
+    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 |
+ * `-----------------------------------------------------------------------------------'
+ */
+[1] = 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 |
+ * `-----------------------------------------------------------------------------------'
+ */
+[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_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 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[3] = 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,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______   
+)
+
+};
diff --git a/keyboards/kprepublic/cstc40/keymaps/default/rules.mk b/keyboards/kprepublic/cstc40/keymaps/default/rules.mk
new file mode 100644
index 000000000000..7c9bf212a6f5
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/keymaps/default/rules.mk
@@ -0,0 +1 @@
+TRI_LAYER_ENABLE = yes
diff --git a/keyboards/kprepublic/cstc40/keymaps/via/keymap.c b/keyboards/kprepublic/cstc40/keymaps/via/keymap.c
new file mode 100644
index 000000000000..e47ff226a935
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/keymaps/via/keymap.c
@@ -0,0 +1,94 @@
+/* Copyright 2023
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along 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
+ * ,-----------------------------------------------------------------------------------.
+ * | 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 |
+ * `-----------------------------------------------------------------------------------'
+ */
+[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 ,
+    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 |
+ * `-----------------------------------------------------------------------------------'
+ */
+[1] = 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 |
+ * `-----------------------------------------------------------------------------------'
+ */
+[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_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 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[3] = 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,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______   
+)
+
+};
diff --git a/keyboards/kprepublic/cstc40/keymaps/via/rules.mk b/keyboards/kprepublic/cstc40/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kprepublic/cstc40/mcuconf.h b/keyboards/kprepublic/cstc40/mcuconf.h
new file mode 100644
index 000000000000..a56e52fb8dae
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/mcuconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/readme.md b/keyboards/kprepublic/cstc40/readme.md
new file mode 100644
index 000000000000..211c078cc2ec
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/readme.md
@@ -0,0 +1,26 @@
+# cstc40
+
+A 40% hotswap ortholinear RGB keyboard from KP Republic.
+
+* Keyboard Maintainer: [Var](https://github.com/itsvar8)
+* Hardware Supported: CSTC40
+* Hardware Availability: kprepublic.com
+
+The differences between the two versions are just the rows and columns pins and the additional small pcb for the daughterboard version.
+
+Make example for this keyboard (after setting up your build environment):
+
+    for daughterboard version: make kprepublic/cstc40/daughterboard:default
+    for single pcb version: make kprepublic/cstc40/single_pcb: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**: 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
+
+The single_pcb uses pin A10, which apparently is a design flaw that prevent the bootloader to start every time - https://docs.qmk.fm/#/platformdev_blackpill_f4x1?id=pins-to-be-avoided. There is a simple workaround that works most of the time - press the pin key (generally the letter R) during the boot.
diff --git a/keyboards/kprepublic/cstc40/single_pcb/info.json b/keyboards/kprepublic/cstc40/single_pcb/info.json
new file mode 100644
index 000000000000..330ada7bac5b
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/single_pcb/info.json
@@ -0,0 +1,6 @@
+{
+    "matrix_pins": {
+        "cols": ["C7", "C8", "C9", "A8", "A10", "B10", "A15", "C13", "B6", "B5", "B4", "B3"],
+        "rows": ["C12", "C10", "C11", "B0"]
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/single_pcb/rules.mk b/keyboards/kprepublic/cstc40/single_pcb/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/single_pcb/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ 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
new file mode 100644
index 000000000000..39d3d7ff5284
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c
@@ -0,0 +1,71 @@
+/* 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/>.
+ */
+#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 },
+
+    { 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, 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, 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 }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/kprepublic/jj40/config.h b/keyboards/kprepublic/jj40/config.h
deleted file mode 100644
index d77984fc6992..000000000000
--- a/keyboards/kprepublic/jj40/config.h
+++ /dev/null
@@ -1,29 +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
-
-/* RGB underglow */
-// NOTE: for PS2AVRGB boards, underglow commands are sent via I2C to 0xB0.
-#define RGBLED_NUM 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_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/kprepublic/jj40/info.json b/keyboards/kprepublic/jj40/info.json
index 2627ffbff950..79c9d4a75919 100644
--- a/keyboards/kprepublic/jj40/info.json
+++ b/keyboards/kprepublic/jj40/info.json
@@ -19,6 +19,21 @@
     "levels": 12,
     "breathing": true
   },
+  "rgblight": {
+    "led_count": 5,
+    "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": {
     "driver": "i2c"
   },
diff --git a/keyboards/kprepublic/jj40/keymaps/fun40/rules.mk b/keyboards/kprepublic/jj40/keymaps/fun40/rules.mk
index cc9508d7d6f2..9018bddfe35b 100644
--- a/keyboards/kprepublic/jj40/keymaps/fun40/rules.mk
+++ b/keyboards/kprepublic/jj40/keymaps/fun40/rules.mk
@@ -13,9 +13,5 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 
 RGBLIGHT_ENABLE = yes
-RGBLIGHT_CUSTOM_DRIVER = yes
-DISABLE_WS2812 = yes
-
 
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c b/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
index 51691e8f1f95..6c8220a702ab 100644
--- a/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/stevexyz/keymap.c
@@ -262,14 +262,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 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_leds() & (1<<USB_LED_NUM_LOCK))) {
+  if (!host_keyboard_led_state().num_lock) {
       SEND_STRING(SS_TAP(X_NUM_LOCK)); //register_code(KC_NUM_LOCK); unregister_code(KC_NUM_LOCK);
   }
 }
 
-void matrix_scan_user(void) {
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case CK_TRIPLEZERO:
diff --git a/keyboards/kprepublic/jj40/keymaps/waples/rules.mk b/keyboards/kprepublic/jj40/keymaps/waples/rules.mk
index b9b67d1c7398..8f678e6b594e 100644
--- a/keyboards/kprepublic/jj40/keymaps/waples/rules.mk
+++ b/keyboards/kprepublic/jj40/keymaps/waples/rules.mk
@@ -6,5 +6,4 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-RGBLIGHT_CUSTOM_DRIVER = yes
 KEY_LOCK_ENABLE = yes
diff --git a/keyboards/kprepublic/jj4x4/config.h b/keyboards/kprepublic/jj4x4/config.h
deleted file mode 100644
index 5646d4c6536b..000000000000
--- a/keyboards/kprepublic/jj4x4/config.h
+++ /dev/null
@@ -1,32 +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
-
-/* RGB underglow */
-// NOTE: for PS2AVRGB boards, underglow commands are sent via I2C to 0xB0.
-#define RGBLED_NUM 4
-#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/kprepublic/jj4x4/info.json b/keyboards/kprepublic/jj4x4/info.json
index fce30c67b04d..5fc9c4934301 100644
--- a/keyboards/kprepublic/jj4x4/info.json
+++ b/keyboards/kprepublic/jj4x4/info.json
@@ -19,6 +19,21 @@
         "levels": 12,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 4,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/kprepublic/jj50/config.h b/keyboards/kprepublic/jj50/config.h
deleted file mode 100644
index 3220fd6477d0..000000000000
--- a/keyboards/kprepublic/jj50/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 Wayne Jones (WarmCatUK) <waynekjones@gmail.com>
-Modified 2020 Guillaume Gérard
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#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 12
-#define RGBLIGHT_SAT_STEP 15
-#define RGBLIGHT_VAL_STEP 18
diff --git a/keyboards/kprepublic/jj50/info.json b/keyboards/kprepublic/jj50/info.json
index a83d42ab6ab7..492d106f21e7 100644
--- a/keyboards/kprepublic/jj50/info.json
+++ b/keyboards/kprepublic/jj50/info.json
@@ -18,6 +18,24 @@
         "levels": 12,
         "breathing": true
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 15,
+        "brightness_steps": 18,
+        "led_count": 12,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c b/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c
index 21f8fcbb0f1d..f02f27005be9 100644
--- a/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c
+++ b/keyboards/kprepublic/jj50/keymaps/abstractkb/keymap.c
@@ -64,12 +64,13 @@ layer_state_t layer_state_set_user(layer_state_t state) {
   return state;
 }
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+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) {
diff --git a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c b/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
index 5292d99b5a91..888e43e7dd66 100644
--- a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
+++ b/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
@@ -64,12 +64,13 @@ layer_state_t layer_state_set_user(layer_state_t state) {
   return state;
 }
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+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) {
diff --git a/keyboards/kradoindustries/promenade/info.json b/keyboards/kradoindustries/promenade/info.json
index a4d47b34f356..86330dbc2ee1 100644
--- a/keyboards/kradoindustries/promenade/info.json
+++ b/keyboards/kradoindustries/promenade/info.json
@@ -46,8 +46,11 @@
     },
 
 
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 {"matrix": [0, 0], "x":0, "y":0, "w":1.5},
                 {"matrix": [0, 1], "x":1.5, "y":0},
@@ -63,6 +66,7 @@
                 {"matrix": [0, 11], "x":11.5, "y":0},
                 {"matrix": [0, 12], "x":12.5, "y":0},
                 {"matrix": [0, 13], "x":13.5, "y":0, "w":1.5},
+
                 {"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},
@@ -77,6 +81,7 @@
                 {"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.5},
                 {"matrix": [2, 1], "x":1.5, "y":2},
                 {"matrix": [2, 2], "x":2.5, "y":2},
@@ -89,20 +94,22 @@
                 {"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, 6], "x":6.5, "y":2.5, "h":1.5},
-                {"matrix": [3, 7], "x":7.5, "y":2.5, "h":1.5},
+
                 {"matrix": [3, 0], "x":0, "y":3, "w":1.5},
                 {"matrix": [3, 1], "x":1.5, "y":3},
                 {"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":2.5, "h":1.5},
+                {"matrix": [3, 7], "x":7.5, "y":2.5, "h":1.5},
                 {"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.5},
+
                 {"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},
@@ -116,7 +123,292 @@
                 {"matrix": [4, 11], "x":11.5, "y":4},
                 {"matrix": [4, 12], "x":12.5, "y":4},
                 {"matrix": [4, 13], "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_2x2u": {
+            "layout": [
+                {"matrix": [0, 0], "x":0, "y":0, "w":1.5},
+                {"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": [0, 8], "x":8.5, "y":0},
+                {"matrix": [0, 9], "x":9.5, "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, "w":1.5},
+
+                {"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, "h":1.5},
+                {"matrix": [1, 7], "x":7.5, "y":1, "h":1.5},
+                {"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.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, 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.5},
+                {"matrix": [3, 1], "x":1.5, "y":3},
+                {"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":2.5, "h":1.5},
+                {"matrix": [3, 7], "x":7.5, "y":2.5, "h":1.5},
+                {"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.5},
+
+                {"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},
+                {"matrix": [4, 3], "x":3.5, "y":4},
+                {"matrix": [4, 4], "x":4.5, "y":4},
+                {"matrix": [4, 5], "x":5.5, "y":4, "w":2},
+                {"matrix": [4, 8], "x":7.5, "y":4, "w":2},
+                {"matrix": [4, 9], "x":9.5, "y":4},
+                {"matrix": [4, 10], "x":10.5, "y":4},
+                {"matrix": [4, 11], "x":11.5, "y":4},
+                {"matrix": [4, 12], "x":12.5, "y":4},
+                {"matrix": [4, 13], "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_2x3u": {
+            "layout": [
+                {"matrix": [0, 0], "x":0, "y":0, "w":1.5},
+                {"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": [0, 8], "x":8.5, "y":0},
+                {"matrix": [0, 9], "x":9.5, "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, "w":1.5},
+
+                {"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, "h":1.5},
+                {"matrix": [1, 7], "x":7.5, "y":1, "h":1.5},
+                {"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.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, 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.5},
+                {"matrix": [3, 1], "x":1.5, "y":3},
+                {"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":2.5, "h":1.5},
+                {"matrix": [3, 7], "x":7.5, "y":2.5, "h":1.5},
+                {"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.5},
+
+                {"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},
+                {"matrix": [4, 3], "x":3.5, "y":4},
+                {"matrix": [4, 5], "x":4.5, "y":4, "w":3},
+                {"matrix": [4, 8], "x":7.5, "y":4, "w":3},
+                {"matrix": [4, 10], "x":10.5, "y":4},
+                {"matrix": [4, 11], "x":11.5, "y":4},
+                {"matrix": [4, 12], "x":12.5, "y":4},
+                {"matrix": [4, 13], "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_6u_space": {
+            "layout": [
+                {"matrix": [0, 0], "x":0, "y":0, "w":1.5},
+                {"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": [0, 8], "x":8.5, "y":0},
+                {"matrix": [0, 9], "x":9.5, "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, "w":1.5},
+
+                {"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, "h":1.5},
+                {"matrix": [1, 7], "x":7.5, "y":1, "h":1.5},
+                {"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.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, 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.5},
+                {"matrix": [3, 1], "x":1.5, "y":3},
+                {"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":2.5, "h":1.5},
+                {"matrix": [3, 7], "x":7.5, "y":2.5, "h":1.5},
+                {"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.5},
+
+                {"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},
+                {"matrix": [4, 3], "x":3.5, "y":4},
+                {"matrix": [4, 6], "x":4.5, "y":4, "w":6},
+                {"matrix": [4, 10], "x":10.5, "y":4},
+                {"matrix": [4, 11], "x":11.5, "y":4},
+                {"matrix": [4, 12], "x":12.5, "y":4},
+                {"matrix": [4, 13], "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_7u_space": {
+            "layout": [
+                {"matrix": [0, 0], "x":0, "y":0, "w":1.5},
+                {"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": [0, 8], "x":8.5, "y":0},
+                {"matrix": [0, 9], "x":9.5, "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, "w":1.5},
+
+                {"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, "h":1.5},
+                {"matrix": [1, 7], "x":7.5, "y":1, "h":1.5},
+                {"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.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, 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.5},
+                {"matrix": [3, 1], "x":1.5, "y":3},
+                {"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":2.5, "h":1.5},
+                {"matrix": [3, 7], "x":7.5, "y":2.5, "h":1.5},
+                {"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.5},
+
+                {"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}
             ]
         }
     }
diff --git a/keyboards/kradoindustries/promenade/keymaps/default/keymap.c b/keyboards/kradoindustries/promenade/keymaps/default/keymap.c
index 42e606c149ec..aef0f2816136 100644
--- a/keyboards/kradoindustries/promenade/keymaps/default/keymap.c
+++ b/keyboards/kradoindustries/promenade/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * | LCTRL  | LGUI   | FN     | LALT   | SPACE  | SPACE  | SPACE  | SPACE  | SPACE  | LEFT   | DOWN   | UP     | RIGHT  | RCTRL  |
      * '-----------------------------------------------------------------------------------------------------------------------------'
      */
-    [_BASE] = LAYOUT(
+    [_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,
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |        |        |        |        |        |        |        |        |        |        |        |        |        | Reset  |
      * '-----------------------------------------------------------------------------------------------------------------------------'
      */
-    [_FN] = LAYOUT(
+    [_FN] = LAYOUT_all(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______,
         _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,                   _______, _______, _______, _______, _______, QK_BOOT,
diff --git a/keyboards/kradoindustries/promenade/keymaps/via/keymap.c b/keyboards/kradoindustries/promenade/keymaps/via/keymap.c
index 8797471b4caa..aef0f2816136 100644
--- a/keyboards/kradoindustries/promenade/keymaps/via/keymap.c
+++ b/keyboards/kradoindustries/promenade/keymaps/via/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * | LCTRL  | LGUI   | FN     | LALT   | SPACE  | SPACE  | SPACE  | SPACE  | SPACE  | LEFT   | DOWN   | UP     | RIGHT  | RCTRL  |
      * '-----------------------------------------------------------------------------------------------------------------------------'
      */
-    [_BASE] = LAYOUT(
+    [_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,
@@ -56,10 +56,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |        |        |        |        |        |        |        |        |        |        |        |        |        | Reset  |
      * '-----------------------------------------------------------------------------------------------------------------------------'
      */
-    [_FN] = LAYOUT(
+    [_FN] = LAYOUT_all(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
         _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______,                   _______, _______, _______, _______, QK_BOOT,
+        _______, 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/matrix_diagram.md b/keyboards/kradoindustries/promenade/matrix_diagram.md
new file mode 100644
index 000000000000..086471b8b9ab
--- /dev/null
+++ b/keyboards/kradoindustries/promenade/matrix_diagram.md
@@ -0,0 +1,27 @@
+# Matrix Diagram for krado industries Promenade
+
+```
+┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+│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 ├───┼───┤28 │29 │2A │2B │2C │2D   │
+├─────┼───┼───┼───┼───┼───┤36 │37 ├───┼───┼───┼───┼───┼─────┤
+│30   │31 │32 │33 │34 │35 │   │   │38 │39 │3A │3B │3C │3D   │
+├─────┼───┼───┼───┼───┼───┼───┴───┼───┼───┼───┼───┼───┼─────┤
+│40   │41 │42 │43 │44 │45 │46     │48 │49 │4A │4B │4C │4D   │
+└─────┴───┴───┴───┴───┴───┴───────┴───┴───┴───┴───┴───┴─────┘
+┌─────┬───┬───┬───┬───┬───────┬───────┬───┬───┬───┬───┬─────┐
+│40   │41 │42 │43 │44 │45     │48     │49 │4A │4B │4C │4D   │ 2x2u
+└─────┴───┴───┴───┴───┴───────┴───────┴───┴───┴───┴───┴─────┘
+┌─────┬───┬───┬───┬───────────┬───────────┬───┬───┬───┬─────┐
+│40   │41 │42 │43 │45         │48         │4A │4B │4C │4D   │ 2x3u
+└─────┴───┴───┴───┴───────────┴───────────┴───┴───┴───┴─────┘
+┌─────┬───┬───┬───┬───────────────────────┬───┬───┬───┬─────┐
+│40   │41 │42 │43 │46                     │4A │4B │4C │4D   │ 6u Space
+└─────┴───┴───┴───┴───────────────────────┴───┴───┴───┴─────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40   │41 │42   │46                         │4B   │4C │4D   │ 7u Space
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```
diff --git a/keyboards/kraken_jones/pteron56/info.json b/keyboards/kraken_jones/pteron56/info.json
new file mode 100644
index 000000000000..0af1f6b73565
--- /dev/null
+++ b/keyboards/kraken_jones/pteron56/info.json
@@ -0,0 +1,96 @@
+{
+    "keyboard_name": "pteron56",
+    "manufacturer": "Kraken-jokes",
+    "url": "https://github.com/kraken-jokes/pteron-pcb",
+    "maintainer": "Kraken-jokes",
+    "usb": {
+        "vid": "0x6D4B",
+        "pid": "0x7056",
+        "device_version": "0.2.0"
+    },
+    "development_board": "promicro",
+    "matrix_pins": {
+        "rows": ["D3", "D2", "F4", "D4", "B5"],
+        "cols": ["E6", "B4", "D7", "C6", "D0", "D1", "F6", "F7", "B1", "B3", "B6", "B2"]
+    },
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT":{
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.75}, 
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.25}, 
+                {"matrix": [0, 3], "x": 3, "y": 0.0}, 
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.5},
+
+                {"matrix": [0, 6], "x": 9.8, "y": 0.5}, 
+                {"matrix": [0, 7], "x": 10.8, "y": 0.25}, 
+                {"matrix": [0, 8], "x": 11.8, "y": 0}, 
+                {"matrix": [0, 9], "x": 12.8, "y": 0.25}, 
+                {"matrix": [0, 10], "x": 13.8, "y": 0.75},
+                {"matrix": [0, 11], "x": 14.8, "y": 0.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.75},
+                {"matrix": [1, 1], "x": 1, "y": 1.75},
+                {"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.5},
+
+                {"matrix": [1, 6], "x": 9.8, "y": 1.5},
+                {"matrix": [1, 7], "x": 10.8, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.8, "y": 1},
+                {"matrix": [1, 9], "x": 12.8, "y": 1.25}, 
+                {"matrix": [1, 10], "x": 13.8, "y": 1.75},
+                {"matrix": [1, 11], "x": 14.8, "y": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.75},
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"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.5},
+
+                {"matrix": [2, 6], "x": 9.8, "y": 2.5},
+                {"matrix": [2, 7], "x": 10.8, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.8, "y": 2},
+                {"matrix": [2, 9], "x": 12.8, "y": 2.25},
+                {"matrix": [2, 10], "x": 13.8, "y": 2.75},
+                {"matrix": [2, 11], "x": 14.8, "y": 2.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.75},
+                {"matrix": [3, 1], "x": 1, "y": 3.75},
+                {"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.5},
+
+                {"matrix": [3, 6], "x": 9.8, "y": 3.5},
+                {"matrix": [3, 7], "x": 10.8, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.8, "y": 3},
+                {"matrix": [3, 9], "x": 12.8, "y": 3.25},
+                {"matrix": [3, 10], "x": 13.8, "y": 3.75},
+                {"matrix": [3, 11], "x": 14.8, "y": 3.75},
+                
+                {"matrix": [4, 0], "x": 3.9, "y": 4.5},
+                {"matrix": [4, 1], "x": 4.9, "y": 4.6},
+                {"matrix": [4, 2], "x": 5.9, "y": 4.85},
+                {"matrix": [4, 3], "x": 6.9, "y": 5.35},
+                
+                {"matrix": [4, 8], "x": 7.9, "y": 5.35},
+                {"matrix": [4, 9], "x": 8.9, "y": 4.85},
+                {"matrix": [4, 10], "x": 9.9, "y": 4.6},
+                {"matrix": [4, 11], "x": 10.9, "y": 4.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kraken_jones/pteron56/keymaps/default/keymap.c b/keyboards/kraken_jones/pteron56/keymaps/default/keymap.c
new file mode 100644
index 000000000000..e9e7e0dd9094
--- /dev/null
+++ b/keyboards/kraken_jones/pteron56/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+// Copyright (C) 2023 @kraken-jokes
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define L1_GUI LT(1,KC_LGUI)
+#define L1_DEL LT(1,KC_DEL)
+#define L2_APP LT(2,KC_APP)
+#define L2_ALT LT(2,KC_LALT)
+#define PRTSC LGUI(LSFT(KC_S))
+
+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_EQL, 
+        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_RBRC, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,            KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT, 
+                          L1_GUI,  KC_LCTL, KC_LSFT, L2_ALT,          L1_DEL,  KC_SPC,  L2_APP,  KC_TAB
+    ),
+
+    [1] = LAYOUT(
+        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_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_HOME, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U,         KC_PGUP, KC_UP,   KC_PGDN, KC_MENU, KC_RBRC, KC_TRNS, 
+        KC_VOLD, KC_END,  KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,         KC_LEFT, KC_DOWN, KC_RGHT, KC_LBRC, KC_BSLS, KC_TRNS, 
+                          KC_TRNS, KC_LCTL, KC_LSFT, KC_LALT,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [2] = LAYOUT(
+        QK_BOOT, KC_SLEP, KC_WAKE, KC_TRNS, KC_PWR,  KC_TRNS,         KC_TRNS, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_BSPC, 
+        KC_GRV,  KC_WBAK, KC_WFWD, KC_WSCH, KC_FIND, KC_TRNS,         KC_P7,   KC_P8,   KC_P9,   KC_PPLS, KC_PSLS, KC_PAST, 
+        KC_DEL,  KC_CALC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_P4,   KC_P5,   KC_P6,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_LBRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_P1,   KC_P2,   KC_P3,   KC_PDOT, KC_TRNS, KC_TRNS,
+                          KC_TRNS, KC_TRNS, PRTSC,   KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_P0
+    ),
+};
diff --git a/keyboards/kraken_jones/pteron56/keymaps/via/keymap.c b/keyboards/kraken_jones/pteron56/keymaps/via/keymap.c
new file mode 100644
index 000000000000..3a1da6324e88
--- /dev/null
+++ b/keyboards/kraken_jones/pteron56/keymaps/via/keymap.c
@@ -0,0 +1,36 @@
+// Copyright (C) 2023 @kraken-jokes
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define L1_GUI LT(1,KC_LGUI)
+#define L1_DEL LT(1,KC_DEL)
+#define L2_APP LT(2,KC_APP)
+#define L2_ALT LT(2,KC_LALT)
+
+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_EQL, 
+        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_SPC,  KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,            KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT, 
+                          L1_GUI,  KC_LCTL, KC_LSFT,  L2_ALT,          L1_DEL,  KC_SPC,  L2_APP,  KC_TAB
+    ),
+
+    [1] = LAYOUT(
+        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_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_HOME, KC_BTN1, KC_MS_U, KC_BTN2,  KC_WH_U,         KC_PGUP, KC_UP,   KC_PGDN, KC_MENU, KC_RBRC, KC_TRNS, 
+        KC_VOLD, KC_END,  KC_MS_L, KC_MS_D, KC_MS_R,  KC_WH_D,         KC_LEFT, KC_DOWN, KC_RGHT, KC_LBRC, KC_BSLS, KC_TRNS, 
+                          KC_TRNS, KC_LCTL, KC_LSFT,  KC_LALT,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [2] = LAYOUT(
+        QK_BOOT, KC_SLEP, KC_WAKE, KC_TRNS, KC_PWR,   KC_TRNS,         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, 
+        KC_DEL,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  KC_TRNS,         KC_TRNS, KC_TRNS, KC_MSEL, KC_MYCM, KC_PSLS, KC_PAST, 
+        RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, RGB_M_P,         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_LSFT,  KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_PDOT
+    ),
+
+};
diff --git a/keyboards/kraken_jones/pteron56/keymaps/via/rules.mk b/keyboards/kraken_jones/pteron56/keymaps/via/rules.mk
new file mode 100644
index 000000000000..43061db1dd46
--- /dev/null
+++ b/keyboards/kraken_jones/pteron56/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kraken_jones/pteron56/readme.md b/keyboards/kraken_jones/pteron56/readme.md
new file mode 100644
index 000000000000..aa5c97539b55
--- /dev/null
+++ b/keyboards/kraken_jones/pteron56/readme.md
@@ -0,0 +1,31 @@
+# Pteron56
+
+![Pteron56](https://i.imgur.com/kt1RSi9h.jpg)
+
+The Pteron56 is a 56-key vertically staggered ortholinear keyboard with a 15 degree inward tilt per hand. 
+
+Initially developed by [FSund](https://github.com/fsund), this keyboard was designed to potentially reduce wrist and typing strain by offsetting the keys in a manner that mimics the natural stagger of the human hand with 4 thumb keys per side arranged around an ~85mm arc to mimic the swimg of one's mighty thumbs.
+
+Users have reported reduced finger movement, reduced wrist movement, and better typing comfort and swiftness with the Pteron layouts compared to a standard keyboard. 
+
+* Keyboard Maintainer: [Alex Moore](https://github.com/kraken-jokes)
+* Hardware Supported:
+    * PCB: Pteron56v0.2, Pteron56v0.2hsu, Pteron56v0.3, Pteron56v0.4e
+    * MCU: Pro-Micro, Elite-C
+* Hardware Availability: moorekeys.etsy.com. Open source though so it varies.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pteron56:default
+
+Flashing example for this keyboard:
+
+    make pteron56: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 thusly:
+* **Keycode in layout**: Press and hold the right most thumb key on the left side (LT(2(KC_ALT)) and while that is held, hit the top left key on the left side of the keyboard (KC_ESC) which will reset the board and enter bootloader mode. 
+Thumb and pinky is my method, but do what you will.
diff --git a/keyboards/kraken_jones/pteron56/rules.mk b/keyboards/kraken_jones/pteron56/rules.mk
new file mode 100644
index 000000000000..876618b9d13a
--- /dev/null
+++ b/keyboards/kraken_jones/pteron56/rules.mk
@@ -0,0 +1 @@
+# File is intentionally blank
diff --git a/keyboards/ktec/daisy/config.h b/keyboards/ktec/daisy/config.h
index 7928ebcd352b..5e90ea1c05b3 100644
--- a/keyboards/ktec/daisy/config.h
+++ b/keyboards/ktec/daisy/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 8
-#    define RGBLIGHT_HUE_STEP 12
-#    define RGBLIGHT_SAT_STEP 25
-#    define RGBLIGHT_VAL_STEP 12
-//   #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
-
 /* 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/ktec/daisy/info.json b/keyboards/ktec/daisy/info.json
index ddd45dae05c8..32a289dace25 100644
--- a/keyboards/ktec/daisy/info.json
+++ b/keyboards/ktec/daisy/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "D0",
         "levels": 6
     },
@@ -21,6 +22,24 @@
         "caps_lock": "C6",
         "on_state": 0
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 25,
+        "brightness_steps": 12,
+        "led_count": 8,
+        "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": "C7"
     },
diff --git a/keyboards/ktec/ergodone/keymaps/vega/keymap.c b/keyboards/ktec/ergodone/keymaps/vega/keymap.c
index 8e460d7b4c39..d668f9b41eaa 100644
--- a/keyboards/ktec/ergodone/keymaps/vega/keymap.c
+++ b/keyboards/ktec/ergodone/keymaps/vega/keymap.c
@@ -686,112 +686,112 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [MATH] = LAYOUT_ergodox(
 	KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV,
-	KC_TAB,	X(Mc),	X(Munion),	X(arwl),	X(or),	X(exists),	KC_BSLS,
-	X(arwr), X(root), X(and), X(imply), X(nexists), X(forall),
-	SC_LSPO,	KC_SCLN,	X(intgrl),	X(Mn),	X(Mz),	X(member),	X(arwl),
+	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, X(plsminus),	X(infin),	X(neleof),	X(equiv),	X(Mq),	KC_EQL,
-	X(sum),	X(emtyset),	X(porp),	X(suprsetof),	X(not),	X(neq),
-	KC_PGDN,	X(subsetof),	X(intersection),	X(angl),	X(nmember),	X(eleof),	SC_RSPC,
+	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(
-	X(Os), X(Oa), X(Ob), X(Oc), X(Od), X(Oe), X(mdot),
-	X(boxemp), X(bbstr), X(bbrtr), X(bbrtl), X(bbstl), X(degree), X(brkdn),
-	X(boxchk), X(bbmbl), X(bbml), X(bbmr), X(bbmbr), X(neteen),
-	X(boxX), X(bbsbr), X(bbrbr), X(bbrbl), X(bbsbl), X(uxclm), X(brkup),
-	X(floppy), TO(BASE), TO(BASE), X(arwu), X(arwd),
-	X(fire), X(lshade), X(mshade), KC_SPC, X(OS), X(dshade),
-
-	X(Ox), X(Of), X(Og), X(Oh), X(Oi), X(OA), X(OB),
-	X(numero), X(trade), X(copy), X(cleft), X(cent), X(OED), X(OC),
-	X(Agrave), X(gnd), X(sqr), X(sine), X(opt), X(OD),
-	X(sect), X(Aacute), X(Acircm), X(Adiaer), X(Abreve), X(Atilde), X(OE),
-	X(arwl), X(arwr), X(geq), X(leq), X(OF),
-	X(rang), X(water), X(perup), X(perdn), X(baster), KC_ENT
+	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, X(Rone), X(Rtwo), X(Rthree), X(Rfour), X(Rfive), KC_GRV,
-	KC_TAB, KC_QUOT, KC_COMM, KC_DOT, X(gp), X(gy), KC_SLSH,
-	KC_SLSH, X(ga), X(go), X(ge), X(gu), X(gi),
-	MO(GREU), KC_SCLN, X(gq), X(gj), X(gk), X(gx), KC_AMPR,
+	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), X(Rsix), X(Rseven), X(Reight), X(Rnine), X(Rten), KC_BSPC,
-	KC_PGUP, X(gf), X(gg), X(gc), X(gr), X(gl), KC_EQL,
-	X(gd), X(gh), X(gt), X(gn), X(gs), KC_MINS,
-	KC_PGDN, X(gb), X(gm), X(gw), X(gv), X(gz), MO(GREU),
+	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, X(Rone), X(Rtwo), X(Rthree), X(Rfour), X(Rfive), KC_GRV,
-	KC_TAB, KC_QUOT, KC_COMM, KC_DOT, X(Gp), X(Gy), KC_SLSH,
-	KC_SLSH, X(Ga), X(Go), X(Ge), X(Gu), X(Gi),
-	KC_TRNS, KC_SCLN, X(Gq), X(Gj), X(Gk), X(Gx), KC_AMPR,
+	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), X(Rsix), X(Rseven), X(Reight), X(Rnine), X(Rten), KC_BSPC,
-	KC_PGUP, X(Gf), X(Gg), X(Gc), X(Gr), X(Gl), KC_EQL,
-	X(Gd), X(Gh), X(Gt), X(Gn), X(Gs), KC_MINS,
-	KC_PGDN, X(Gb), X(Gm), X(Gw), X(Gv), X(Gz), KC_TRNS,
+	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, X(tone), X(ttwo), X(tthree), X(tfour), X(tfive), KC_GRV,
-	KC_TAB, KC_QUOT, KC_COMM, KC_DOT, X(tp), X(ty), KC_SLSH,
-	KC_SLSH, X(ta), X(to), X(te), X(tu), X(ti),
-	KC_TRNS, KC_SCLN, X(tq), X(tj), X(tk), X(tx), KC_AMPR,
+	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), X(tsix), X(tseven), X(teight), X(tnine), X(tzero), KC_BSPC,
-	KC_PGUP, X(tf), X(tg), X(tc), X(tr), X(tl), KC_EQL,
-	X(td), X(th), X(tt), X(tn), X(ts), KC_MINS,
-	KC_PGDN, X(tb), X(tm), X(tw), X(tv), X(tz), KC_TRNS,
+	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, X(fwone), X(fwtwo), X(fwthree), X(fwfour), X(fwfive), KC_GRV,
-	KC_TAB, KC_QUOT, KC_COMM, KC_DOT, X(fwp), X(fwy), KC_SLSH,
-	KC_SLSH, X(fwa), X(fwo), X(fwe), X(fwu), X(fwi),
-	MO(FULU), KC_SCLN, X(fwq), X(fwj), X(fwk), X(fwx), KC_AMPR,
+	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), X(fwsix), X(fwseven), X(fweight), X(fwnine), X(fwzero), KC_BSPC,
-	KC_PGUP, X(fwf), X(fwg), X(fwc), X(fwr), X(fwl), KC_EQL,
-	X(fwd), X(fwh), X(fwt), X(fwn), X(fws), KC_MINS,
-	KC_PGDN, X(fwb), X(fwm), X(fww), X(fwv), X(fwz), MO(FULU),
+	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, X(Fwone), X(Fwtwo), X(Fwthree), X(Fwfour), X(Fwfive), KC_GRV,
-	KC_TAB, KC_QUOT, KC_COMM, KC_DOT, X(Fwp), X(Fwy), KC_SLSH,
-	KC_SLSH, X(Fwa), X(Fwo), X(Fwe), X(Fwu), X(Fwi),
-	KC_TRNS, KC_SCLN, X(Fwq), X(Fwj), X(Fwk), X(Fwx), KC_AMPR,
+	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), X(Fwsix), X(Fwseven), X(Fweight), X(Fwnine), X(Fwzero), KC_BSPC,
-	KC_PGUP, X(Fwf), X(Fwg), X(Fwc), X(Fwr), X(Fwl), KC_EQL,
-	X(Fwd), X(Fwh), X(Fwt), X(Fwn), X(Fws), KC_MINS,
-	KC_PGDN, X(Fwb), X(Fwm), X(Fww), X(Fwv), X(Fwz), KC_TRNS,
+	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
 ),
diff --git a/keyboards/ktec/staryu/config.h b/keyboards/ktec/staryu/config.h
deleted file mode 100755
index 31f2930ac177..000000000000
--- a/keyboards/ktec/staryu/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-Copyright 2018 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/>.
-*/
-#pragma once
-
-#define RGBLED_NUM 1     // 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
diff --git a/keyboards/ktec/staryu/info.json b/keyboards/ktec/staryu/info.json
index 3600de0c3582..ec29a53168f8 100644
--- a/keyboards/ktec/staryu/info.json
+++ b/keyboards/ktec/staryu/info.json
@@ -9,6 +9,7 @@
         "device_version": "2.0.5"
     },
     "backlight": {
+        "driver": "timer",
         "pins": ["C2", "C7", "D5", "D6", "B0"],
         "levels": 10
     },
@@ -19,7 +20,20 @@
         "pin": "C6"
     },
     "rgblight": {
-        "max_brightness": 200
+        "led_count": 1,
+        "max_brightness": 200,
+        "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": "atmega32u2",
     "bootloader": "lufa-dfu",
diff --git a/keyboards/kudox/columner/config.h b/keyboards/kudox/columner/config.h
index 7506090b1edc..04bc8cb2d211 100644
--- a/keyboards/kudox/columner/config.h
+++ b/keyboards/kudox/columner/config.h
@@ -21,22 +21,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#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_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kudox/columner/info.json b/keyboards/kudox/columner/info.json
index 7c106b14484b..5f7d4444114d 100644
--- a/keyboards/kudox/columner/info.json
+++ b/keyboards/kudox/columner/info.json
@@ -16,6 +16,23 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "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": "D3"
     },
diff --git a/keyboards/kudox/rev1/config.h b/keyboards/kudox/rev1/config.h
index 80ac84c64fa8..666cb49b2e4b 100644
--- a/keyboards/kudox/rev1/config.h
+++ b/keyboards/kudox/rev1/config.h
@@ -21,22 +21,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#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_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kudox/rev1/info.json b/keyboards/kudox/rev1/info.json
index efb55bb98959..52579e1c4318 100644
--- a/keyboards/kudox/rev1/info.json
+++ b/keyboards/kudox/rev1/info.json
@@ -16,6 +16,23 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "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": "D3"
     },
diff --git a/keyboards/kudox/rev2/config.h b/keyboards/kudox/rev2/config.h
index 80ac84c64fa8..666cb49b2e4b 100644
--- a/keyboards/kudox/rev2/config.h
+++ b/keyboards/kudox/rev2/config.h
@@ -21,22 +21,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#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_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kudox/rev2/info.json b/keyboards/kudox/rev2/info.json
index 9dab738c3889..98cb6bb43190 100644
--- a/keyboards/kudox/rev2/info.json
+++ b/keyboards/kudox/rev2/info.json
@@ -16,6 +16,23 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "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": "D3"
     },
diff --git a/keyboards/kudox/rev3/config.h b/keyboards/kudox/rev3/config.h
index 7506090b1edc..04bc8cb2d211 100644
--- a/keyboards/kudox/rev3/config.h
+++ b/keyboards/kudox/rev3/config.h
@@ -21,22 +21,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#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_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kudox/rev3/info.json b/keyboards/kudox/rev3/info.json
index a7e73c84ae75..35144cc25a1c 100644
--- a/keyboards/kudox/rev3/info.json
+++ b/keyboards/kudox/rev3/info.json
@@ -16,6 +16,23 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "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": "D3"
     },
diff --git a/keyboards/kudox_full/rev1/config.h b/keyboards/kudox_full/rev1/config.h
index 84d08bce5432..f1dcbbcf3dfc 100644
--- a/keyboards/kudox_full/rev1/config.h
+++ b/keyboards/kudox_full/rev1/config.h
@@ -8,19 +8,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#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_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kudox_full/rev1/info.json b/keyboards/kudox_full/rev1/info.json
index 45958b56c999..673fda9acfcd 100644
--- a/keyboards/kudox_full/rev1/info.json
+++ b/keyboards/kudox_full/rev1/info.json
@@ -16,6 +16,20 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/kudox_game/rev1/config.h b/keyboards/kudox_game/rev1/config.h
index 5fddd8102a2b..b0b9607f4bb0 100644
--- a/keyboards/kudox_game/rev1/config.h
+++ b/keyboards/kudox_game/rev1/config.h
@@ -22,22 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#undef RGBLED_NUM
-#define RGBLED_NUM 7    // 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 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kudox_game/rev1/info.json b/keyboards/kudox_game/rev1/info.json
index 7868308eadb9..e5c39fce316e 100644
--- a/keyboards/kudox_game/rev1/info.json
+++ b/keyboards/kudox_game/rev1/info.json
@@ -2,6 +2,23 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "D3"
     },
diff --git a/keyboards/kudox_game/rev2/config.h b/keyboards/kudox_game/rev2/config.h
index 7b6ef67bd973..37fde9159992 100644
--- a/keyboards/kudox_game/rev2/config.h
+++ b/keyboards/kudox_game/rev2/config.h
@@ -22,22 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#undef RGBLED_NUM
-#define RGBLED_NUM 7    // 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 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/kudox_game/rev2/info.json b/keyboards/kudox_game/rev2/info.json
index 4a441b73855e..e811c70d5ba6 100644
--- a/keyboards/kudox_game/rev2/info.json
+++ b/keyboards/kudox_game/rev2/info.json
@@ -2,6 +2,23 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "D3"
     },
diff --git a/keyboards/kuro/kuro65/info.json b/keyboards/kuro/kuro65/info.json
index eacb0a3ce675..c91a34f55c8a 100644
--- a/keyboards/kuro/kuro65/info.json
+++ b/keyboards/kuro/kuro65/info.json
@@ -115,7 +115,7 @@
         }
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [4, 6], "x": 96, "y": 64},
             {"flags": 1, "matrix": [4, 10], "x": 150, "y": 64},
diff --git a/keyboards/kwstudio/pisces/info.json b/keyboards/kwstudio/pisces/info.json
new file mode 100644
index 000000000000..48f4e6a4f66f
--- /dev/null
+++ b/keyboards/kwstudio/pisces/info.json
@@ -0,0 +1,127 @@
+{
+    "keyboard_name": "Pisces",
+    "manufacturer": "kws",
+    "maintainer": "kws",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B0"
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B2", "B3", "B1"],
+        "rows": ["B7", "D5", "D3", "D2", "D1", "D0"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x4B53"
+    },
+    "community_layouts": ["tkl_f13_ansi_tsangan"],
+    "layouts": {
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "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,6], "x":5.5, "y":0}, 
+                {"matrix":[0,7], "x":6.5, "y":0}, 
+                {"matrix":[0,8], "x":7.5, "y":0}, 
+                {"matrix":[0,9], "x":8.5, "y":0}, 
+                {"matrix":[0,10], "x":9.75, "y":0}, 
+                {"matrix":[0,11], "x":10.75, "y":0}, 
+                {"matrix":[0,12], "x":11.75, "y":0}, 
+                {"matrix":[0,13], "x":12.75, "y":0}, 
+                {"matrix":[0,14], "x":14, "y":0}, 
+                {"matrix":[0,15], "x":15.25, "y":0}, 
+                {"matrix":[0,16], "x":16.25, "y":0}, 
+                {"matrix":[0,17], "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":[1,17], "x":17.25, "y":1.25},
+ 
+                {"matrix":[2,0], "x":0, "y":2.25, "w":1.5}, 
+                {"matrix":[2,2], "x":1.5, "y":2.25}, 
+                {"matrix":[2,3], "x":2.5, "y":2.25}, 
+                {"matrix":[2,4], "x":3.5, "y":2.25}, 
+                {"matrix":[2,5], "x":4.5, "y":2.25}, 
+                {"matrix":[2,6], "x":5.5, "y":2.25}, 
+                {"matrix":[2,7], "x":6.5, "y":2.25}, 
+                {"matrix":[2,8], "x":7.5, "y":2.25}, 
+                {"matrix":[2,9], "x":8.5, "y":2.25}, 
+                {"matrix":[2,10], "x":9.5, "y":2.25}, 
+                {"matrix":[2,11], "x":10.5, "y":2.25}, 
+                {"matrix":[2,12], "x":11.5, "y":2.25}, 
+                {"matrix":[2,13], "x":12.5, "y":2.25}, 
+                {"matrix":[2,14], "x":13.5, "y":2.25, "w":1.5}, 
+                {"matrix":[2,15], "x":15.25, "y":2.25}, 
+                {"matrix":[2,16], "x":16.25, "y":2.25}, 
+                {"matrix":[2,17], "x":17.25, "y":2.25}, 
+
+                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75}, 
+                {"matrix":[3,2], "x":1.75, "y":3.25}, 
+                {"matrix":[3,3], "x":2.75, "y":3.25}, 
+                {"matrix":[3,4], "x":3.75, "y":3.25}, 
+                {"matrix":[3,5], "x":4.75, "y":3.25}, 
+                {"matrix":[3,6], "x":5.75, "y":3.25}, 
+                {"matrix":[3,7], "x":6.75, "y":3.25}, 
+                {"matrix":[3,8], "x":7.75, "y":3.25}, 
+                {"matrix":[3,9], "x":8.75, "y":3.25}, 
+                {"matrix":[3,10], "x":9.75, "y":3.25}, 
+                {"matrix":[3,11], "x":10.75, "y":3.25}, 
+                {"matrix":[3,12], "x":11.75, "y":3.25}, 
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix":[4,1], "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":2.75}, 
+                {"matrix":[4,16], "x":16.25, "y":4.25},
+
+                {"matrix":[5,0], "x":0, "y":5.25, "w":1.5}, 
+                {"matrix":[5,2], "x":1.5, "y":5.25}, 
+                {"matrix":[5,3], "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,13], "x":12.5, "y":5.25}, 
+                {"matrix":[5,14], "x":13.5, "y":5.25, "w":1.5}, 
+                {"matrix":[5,15], "x":15.25, "y":5.25}, 
+                {"matrix":[5,16], "x":16.25, "y":5.25}, 
+                {"matrix":[5,17], "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kwstudio/pisces/keymaps/default/keymap.c b/keyboards/kwstudio/pisces/keymaps/default/keymap.c
new file mode 100644
index 000000000000..6b20a3aa9001
--- /dev/null
+++ b/keyboards/kwstudio/pisces/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* 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_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_NO,      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
+    ),
+    [1] = LAYOUT_tkl_f13_ansi_tsangan(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,          _______,              _______,         
+        _______, _______, _______,                            _______,                                     _______, _______, _______,     _______, _______, _______
+    )
+};
diff --git a/keyboards/kwstudio/pisces/keymaps/via/keymap.c b/keyboards/kwstudio/pisces/keymaps/via/keymap.c
new file mode 100644
index 000000000000..6b20a3aa9001
--- /dev/null
+++ b/keyboards/kwstudio/pisces/keymaps/via/keymap.c
@@ -0,0 +1,36 @@
+/* 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_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_NO,      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
+    ),
+    [1] = LAYOUT_tkl_f13_ansi_tsangan(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,          _______,              _______,         
+        _______, _______, _______,                            _______,                                     _______, _______, _______,     _______, _______, _______
+    )
+};
diff --git a/keyboards/kwstudio/pisces/keymaps/via/rules.mk b/keyboards/kwstudio/pisces/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/kwstudio/pisces/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kwstudio/pisces/readme.md b/keyboards/kwstudio/pisces/readme.md
new file mode 100644
index 000000000000..29cf8ebf5c48
--- /dev/null
+++ b/keyboards/kwstudio/pisces/readme.md
@@ -0,0 +1,25 @@
+# Pisces
+
+![Pisces](https://i.imgur.com/fqEBVD8h.jpeg)
+
+* Keyboard Maintainer: [khchen](https://github.com/khchen2004)
+* Hardware Supported: Pisces PCB
+* Hardware Availability: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kwstudio/pisces:default
+
+Flashing example for this keyboard:
+
+    make kwstudio/pisces: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/pisces/rules.mk b/keyboards/kwstudio/pisces/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/kwstudio/pisces/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/rules.mk b/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/rules.mk
index cfdb94059ba3..0a6437f0ef14 100644
--- a/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/rules.mk
+++ b/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/rules.mk
@@ -1,2 +1,2 @@
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
\ No newline at end of file
+RGB_MATRIX_DRIVER = ws2812
\ No newline at end of file
diff --git a/keyboards/labyrinth75/config.h b/keyboards/labyrinth75/config.h
index 8ff700ade821..92a3858433b7 100644
--- a/keyboards/labyrinth75/config.h
+++ b/keyboards/labyrinth75/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 6
-//#    define RGBLIGHT_HUE_STEP 8
-//#    define RGBLIGHT_SAT_STEP 8
-//#    define RGBLIGHT_VAL_STEP 8
-//#    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
-
 /* 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/labyrinth75/info.json b/keyboards/labyrinth75/info.json
index 797627865e34..49b84b280a36 100644
--- a/keyboards/labyrinth75/info.json
+++ b/keyboards/labyrinth75/info.json
@@ -16,6 +16,21 @@
     "bootmagic": {
         "matrix": [0, 2]
     },
+    "rgblight": {
+        "led_count": 6,
+        "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": "B0"
     },
diff --git a/keyboards/laser_ninja/pumpkin_pad/info.json b/keyboards/laser_ninja/pumpkin_pad/info.json
index 9b11f873a1c5..cb76145388ee 100644
--- a/keyboards/laser_ninja/pumpkin_pad/info.json
+++ b/keyboards/laser_ninja/pumpkin_pad/info.json
@@ -46,7 +46,7 @@
         }
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 2, "x": 36, "y": 3},
             {"flags": 2, "x": 86, "y": 2},
diff --git a/keyboards/late9/rev1/config.h b/keyboards/late9/rev1/config.h
index e6fcd30ebeac..8c9a5702f26b 100644
--- a/keyboards/late9/rev1/config.h
+++ b/keyboards/late9/rev1/config.h
@@ -16,8 +16,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-/* Tap interval for tap dance */
-#define TAPPING_TERM 400
-
 /* Oneshot interval */
 #define ONESHOT_TIMEOUT 5000
diff --git a/keyboards/late9/rev1/info.json b/keyboards/late9/rev1/info.json
index 7d3a710bc544..05d0934b9647 100644
--- a/keyboards/late9/rev1/info.json
+++ b/keyboards/late9/rev1/info.json
@@ -8,6 +8,12 @@
         "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"]
diff --git a/keyboards/late9/rev1/rules.mk b/keyboards/late9/rev1/rules.mk
index 82d5e4237f80..874033acc902 100644
--- a/keyboards/late9/rev1/rules.mk
+++ b/keyboards/late9/rev1/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 OLED_ENABLE = yes
-DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/latincompass/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h
index 8b6470463879..7908e4cecab6 100644
--- a/keyboards/latincompass/latin17rgb/config.h
+++ b/keyboards/latincompass/latin17rgb/config.h
@@ -85,18 +85,3 @@
 #    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 #endif
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8
-#define RGBLIGHT_HUE_STEP 5
-#define RGBLIGHT_SAT_STEP 5
-#define RGBLIGHT_VAL_STEP 5
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/latincompass/latin17rgb/info.json b/keyboards/latincompass/latin17rgb/info.json
index 7a5a6fbb6d2d..9b466c216a2e 100644
--- a/keyboards/latincompass/latin17rgb/info.json
+++ b/keyboards/latincompass/latin17rgb/info.json
@@ -8,11 +8,30 @@
     "pid": "0x7C97",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "hue_steps": 5,
+    "saturation_steps": 5,
+    "brightness_steps": 5,
+    "led_count": 8,
+    "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"
   },
   "rgb_matrix": {
-    "driver": "IS31FL3731"
+    "driver": "is31fl3731"
   },
   "matrix_pins": {
     "cols": ["F7", "F6", "F5", "F4"],
diff --git a/keyboards/latincompass/latin47ble/config.h b/keyboards/latincompass/latin47ble/config.h
index 6068bc87d910..4551532bfa7b 100644
--- a/keyboards/latincompass/latin47ble/config.h
+++ b/keyboards/latincompass/latin47ble/config.h
@@ -16,24 +16,6 @@
 
 #pragma once
 
-     #define RGBLED_NUM 3
-     #define RGBLIGHT_HUE_STEP 8
-     #define RGBLIGHT_SAT_STEP 8
-     #define RGBLIGHT_VAL_STEP 8
-//   #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
-
-#define TAPPING_TERM 250
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -54,5 +36,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#define VIA_HAS_BROKEN_KEYCODES
diff --git a/keyboards/latincompass/latin47ble/info.json b/keyboards/latincompass/latin47ble/info.json
index b9a9b7eb9527..64ab0bd85c95 100644
--- a/keyboards/latincompass/latin47ble/info.json
+++ b/keyboards/latincompass/latin47ble/info.json
@@ -13,6 +13,29 @@
         "rows": ["D0", "D1", "D2", "D3"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 3,
+        "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
+        }
+    },
+    "tapping": {
+        "term": 250
+    },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
     "ws2812": {
         "pin": "B7"
     },
diff --git a/keyboards/latincompass/latin47ble/rules.mk b/keyboards/latincompass/latin47ble/rules.mk
index 77af9dc3dac3..1c65d3584ea7 100644
--- a/keyboards/latincompass/latin47ble/rules.mk
+++ b/keyboards/latincompass/latin47ble/rules.mk
@@ -14,4 +14,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
diff --git a/keyboards/latincompass/latin60rgb/info.json b/keyboards/latincompass/latin60rgb/info.json
index 3c32ccf76bf1..f11f6ac3d5de 100644
--- a/keyboards/latincompass/latin60rgb/info.json
+++ b/keyboards/latincompass/latin60rgb/info.json
@@ -9,7 +9,7 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "IS31FL3733"
+    "driver": "is31fl3733"
   },
   "matrix_pins": {
     "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "D6", "D4", "D3"],
diff --git a/keyboards/latincompass/latin64ble/config.h b/keyboards/latincompass/latin64ble/config.h
index 326f4795c009..1f8c7a49a0f8 100644
--- a/keyboards/latincompass/latin64ble/config.h
+++ b/keyboards/latincompass/latin64ble/config.h
@@ -15,21 +15,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 #pragma once
 
-#define RGBLED_NUM 2
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
-
-#define RGBLIGHT_VAL_STEP 25
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20
-#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 VIA_HAS_BROKEN_KEYCODES
diff --git a/keyboards/latincompass/latin64ble/info.json b/keyboards/latincompass/latin64ble/info.json
index d59a5fb02c59..cce49aea0546 100644
--- a/keyboards/latincompass/latin64ble/info.json
+++ b/keyboards/latincompass/latin64ble/info.json
@@ -8,6 +8,25 @@
         "pid": "0x6C71",
         "device_version": "0.0.1"
     },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "rgblight": {
+        "brightness_steps": 25,
+        "led_count": 2,
+        "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"
     },
diff --git a/keyboards/latincompass/latin64ble/rules.mk b/keyboards/latincompass/latin64ble/rules.mk
index 5fdb1567a427..6ad854a5a2b5 100644
--- a/keyboards/latincompass/latin64ble/rules.mk
+++ b/keyboards/latincompass/latin64ble/rules.mk
@@ -14,4 +14,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
diff --git a/keyboards/latincompass/latin6rgb/info.json b/keyboards/latincompass/latin6rgb/info.json
index dd7cfc232d26..0c43da36e47e 100644
--- a/keyboards/latincompass/latin6rgb/info.json
+++ b/keyboards/latincompass/latin6rgb/info.json
@@ -9,7 +9,7 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "IS31FL3731"
+    "driver": "is31fl3731"
   },
   "matrix_pins": {
     "cols": ["F7", "F6", "F5"],
diff --git a/keyboards/latincompass/latinpad/config.h b/keyboards/latincompass/latinpad/config.h
index d166baebc7db..35e52a8fc4ed 100644
--- a/keyboards/latincompass/latinpad/config.h
+++ b/keyboards/latincompass/latinpad/config.h
@@ -16,10 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 #pragma once
 
-#define SSD1306OLED
-
-#define RGBLED_NUM 18
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#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
@@ -53,20 +50,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #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
+// #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 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 3705550a6011..6c54145723fd 100644
--- a/keyboards/latincompass/latinpad/info.json
+++ b/keyboards/latincompass/latinpad/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6"],
diff --git a/keyboards/latincompass/latinpad/rules.mk b/keyboards/latincompass/latinpad/rules.mk
index 4d41664e3cee..c6959a65903e 100644
--- a/keyboards/latincompass/latinpad/rules.mk
+++ b/keyboards/latincompass/latinpad/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/latincompass/latinpadble/info.json b/keyboards/latincompass/latinpadble/info.json
index 70575f7381e9..fe35f74e794e 100644
--- a/keyboards/latincompass/latinpadble/info.json
+++ b/keyboards/latincompass/latinpadble/info.json
@@ -50,7 +50,7 @@
         }
     },
     "bluetooth": {
-        "driver": "BluefruitLE"
+        "driver": "bluefruit_le"
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/lazydesigners/bolt/config.h b/keyboards/lazydesigners/bolt/config.h
deleted file mode 100644
index 218631d1d51b..000000000000
--- a/keyboards/lazydesigners/bolt/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 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
-
-/* RBG underglow */
-#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 13
-	/* #define RGBLIGHT_HUE_STEP 8 */
-	/* #define RGBLIGHT_SAT_STEP 8 */
-	/* #define RGBLIGHT_VAL_STEP 8 */
diff --git a/keyboards/lazydesigners/bolt/info.json b/keyboards/lazydesigners/bolt/info.json
index a12226cf51b4..8319972abdaf 100644
--- a/keyboards/lazydesigners/bolt/info.json
+++ b/keyboards/lazydesigners/bolt/info.json
@@ -8,6 +8,22 @@
         "pid": "0x0041",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 13,
+        "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": "E6"
     },
diff --git a/keyboards/lazydesigners/cassette8/config.h b/keyboards/lazydesigners/cassette8/config.h
deleted file mode 100755
index 23284233ef4d..000000000000
--- a/keyboards/lazydesigners/cassette8/config.h
+++ /dev/null
@@ -1,34 +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
-
-/* RBG underglow */
-#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 15
-	/* #define RGBLIGHT_HUE_STEP 8 */
-	/* #define RGBLIGHT_SAT_STEP 8 */
-	/* #define RGBLIGHT_VAL_STEP 8 */
diff --git a/keyboards/lazydesigners/cassette8/info.json b/keyboards/lazydesigners/cassette8/info.json
index d01080fabfcb..c801c1352ea7 100755
--- a/keyboards/lazydesigners/cassette8/info.json
+++ b/keyboards/lazydesigners/cassette8/info.json
@@ -8,6 +8,22 @@
         "pid": "0x0008",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 15,
+        "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": "C2"
     },
diff --git a/keyboards/lazydesigners/dimple/config.h b/keyboards/lazydesigners/dimple/config.h
index 0dc7502eacd6..5a7ea57b4328 100644
--- a/keyboards/lazydesigners/dimple/config.h
+++ b/keyboards/lazydesigners/dimple/config.h
@@ -22,20 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* RBG underglow */
-#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 50
-	/* #define RGBLIGHT_HUE_STEP 8 */
-	/* #define RGBLIGHT_SAT_STEP 8 */
-	/* #define RGBLIGHT_VAL_STEP 8 */
diff --git a/keyboards/lazydesigners/dimple/ortho/info.json b/keyboards/lazydesigners/dimple/ortho/info.json
index fc23ad45c594..7328cfca79ee 100644
--- a/keyboards/lazydesigners/dimple/ortho/info.json
+++ b/keyboards/lazydesigners/dimple/ortho/info.json
@@ -13,6 +13,22 @@
         "rows": ["D0", "D1", "D2", "D3"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 50,
+        "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"
     },
diff --git a/keyboards/lazydesigners/dimple/staggered/info.json b/keyboards/lazydesigners/dimple/staggered/info.json
index 1ffe78fc5c94..66dea6414a51 100644
--- a/keyboards/lazydesigners/dimple/staggered/info.json
+++ b/keyboards/lazydesigners/dimple/staggered/info.json
@@ -8,6 +8,22 @@
         "pid": "0x0040",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 50,
+        "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"
     },
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/tominabox1/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/tominabox1/keymap.c
index cdaade987f17..d1917e4aa700 100644
--- a/keyboards/lazydesigners/dimple/staggered/keymaps/tominabox1/keymap.c
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/tominabox1/keymap.c
@@ -100,10 +100,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 };
 
-void led_set_user(uint8_t usb_led) {
-if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+if (led_state.caps_lock) {
 	writePinLow(E6);
 	} else {
 	writePinHigh(E6);
 	}
+  return false;
 }
diff --git a/keyboards/lazydesigners/dimpleplus/config.h b/keyboards/lazydesigners/dimpleplus/config.h
deleted file mode 100644
index 828667122d73..000000000000
--- a/keyboards/lazydesigners/dimpleplus/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 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
-
-/* RBG underglow */
-#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 8
-	/* #define RGBLIGHT_HUE_STEP 8 */
-	/* #define RGBLIGHT_SAT_STEP 8 */
-	/* #define RGBLIGHT_VAL_STEP 8 */
diff --git a/keyboards/lazydesigners/dimpleplus/info.json b/keyboards/lazydesigners/dimpleplus/info.json
index 0d47a51f95a6..35a40b60ff2a 100644
--- a/keyboards/lazydesigners/dimpleplus/info.json
+++ b/keyboards/lazydesigners/dimpleplus/info.json
@@ -16,6 +16,22 @@
     "backlight": {
         "pin": "B7"
     },
+    "rgblight": {
+        "led_count": 8,
+        "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": "D2"
     },
diff --git a/keyboards/lazydesigners/the40/config.h b/keyboards/lazydesigners/the40/config.h
deleted file mode 100644
index 8a326c3ba0cf..000000000000
--- a/keyboards/lazydesigners/the40/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- Copyright 2020 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 RGBLED_NUM 8
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/lazydesigners/the40/info.json b/keyboards/lazydesigners/the40/info.json
index e7aab1bea369..b87fc9a29dd2 100644
--- a/keyboards/lazydesigners/the40/info.json
+++ b/keyboards/lazydesigners/the40/info.json
@@ -17,6 +17,24 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "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": "C7"
     },
diff --git a/keyboards/lazydesigners/the50/config.h b/keyboards/lazydesigners/the50/config.h
index 366d9d33258d..5f360813239b 100644
--- a/keyboards/lazydesigners/the50/config.h
+++ b/keyboards/lazydesigners/the50/config.h
@@ -5,6 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define RGBLED_NUM 1
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/lazydesigners/the50/info.json b/keyboards/lazydesigners/the50/info.json
index f29e8dfe0d80..0c76516e803c 100644
--- a/keyboards/lazydesigners/the50/info.json
+++ b/keyboards/lazydesigners/the50/info.json
@@ -17,6 +17,10 @@
         "pin": "B6",
         "levels": 6
     },
+    "rgblight": {
+        "led_count": 1,
+        "sleep": true
+    },
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/lazydesigners/the50/keymaps/default/keymap.c b/keyboards/lazydesigners/the50/keymaps/default/keymap.c
index 5d8ea732f6be..61e6ee878c61 100644
--- a/keyboards/lazydesigners/the50/keymaps/default/keymap.c
+++ b/keyboards/lazydesigners/the50/keymaps/default/keymap.c
@@ -49,11 +49,12 @@ EE_CLR,  _______, _______,          _______,            _______,
 )
 };
 
-void led_set_user(uint8_t usb_led) {
+bool led_update_user(led_t led_state) {
   // Turn LED On/Off for Caps Lock
-  if (host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK)) {
+  if (led_state.caps_lock) {
     the50_led_on();
   } else {
     the50_led_off();
   }
+  return false;
 }
diff --git a/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c b/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
index 8986fd6c3d7f..c384c3c5202d 100644
--- a/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
+++ b/keyboards/lazydesigners/the50/keymaps/mikethetiger/keymap.c
@@ -69,11 +69,12 @@ EE_CLR,  _______, _______,          _______,            _______,
 )
 };
 
-void led_set_user(uint8_t usb_led) {
+bool led_update_user(led_t led_state) {
   // Turn LED On/Off for Caps Lock
-  if (host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK)) {
+  if (led_state.caps_lock) {
     the50_led_on();
   } else {
     the50_led_off();
   }
+  return false;
 }
diff --git a/keyboards/lazydesigners/the60/rev2/config.h b/keyboards/lazydesigners/the60/rev2/config.h
deleted file mode 100755
index 19bd7fbb1f53..000000000000
--- a/keyboards/lazydesigners/the60/rev2/config.h
+++ /dev/null
@@ -1,34 +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 RGBLED_NUM 10
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/lazydesigners/the60/rev2/info.json b/keyboards/lazydesigners/the60/rev2/info.json
index 7a5dce5906e1..6070b3a59a21 100755
--- a/keyboards/lazydesigners/the60/rev2/info.json
+++ b/keyboards/lazydesigners/the60/rev2/info.json
@@ -18,6 +18,24 @@
         "levels": 5,
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "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": "D1"
     },
diff --git a/keyboards/leafcutterlabs/bigknob/config.h b/keyboards/leafcutterlabs/bigknob/config.h
deleted file mode 100644
index d8b9a4fa0bed..000000000000
--- a/keyboards/leafcutterlabs/bigknob/config.h
+++ /dev/null
@@ -1,31 +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
-
-/* ws2812 RGB LED */
-#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 5    // Number of LEDs
diff --git a/keyboards/leafcutterlabs/bigknob/info.json b/keyboards/leafcutterlabs/bigknob/info.json
index 1361138549a8..4e955777a754 100644
--- a/keyboards/leafcutterlabs/bigknob/info.json
+++ b/keyboards/leafcutterlabs/bigknob/info.json
@@ -13,6 +13,21 @@
       {"pin_a": "D0", "pin_b": "D2"}
     ]
   },
+  "rgblight": {
+    "led_count": 5,
+    "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": "C7"
   },
diff --git a/keyboards/leeku/finger65/config.h b/keyboards/leeku/finger65/config.h
deleted file mode 100644
index 0626eb5d0e66..000000000000
--- a/keyboards/leeku/finger65/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2018 Rasmus Schults <rasmusx@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 RGBLED_NUM 12
diff --git a/keyboards/lefty/rules.mk b/keyboards/lefty/rules.mk
index e0d5a4375e5e..bbf738e03bb7 100644
--- a/keyboards/lefty/rules.mk
+++ b/keyboards/lefty/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
 
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 DEFAULT_FOLDER = lefty/rev2
diff --git a/keyboards/lendunistus/rpneko65/rev1/config.h b/keyboards/lendunistus/rpneko65/rev1/config.h
new file mode 100644
index 000000000000..6786155fbf62
--- /dev/null
+++ b/keyboards/lendunistus/rpneko65/rev1/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 lendunistus
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define CAPS_LOCK_ENABLE true
diff --git a/keyboards/lendunistus/rpneko65/rev1/info.json b/keyboards/lendunistus/rpneko65/rev1/info.json
new file mode 100644
index 000000000000..29682cf2a779
--- /dev/null
+++ b/keyboards/lendunistus/rpneko65/rev1/info.json
@@ -0,0 +1,766 @@
+{
+    "manufacturer": "lendunistus",
+    "keyboard_name": "RPNeko65",
+    "maintainer": "lendunistus",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["GP29", "GP15", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP6", "GP5", "GP4", "GP3", "GP2", "GP0", "GP1"],
+        "rows": ["GP28", "GP27", "GP26", "GP25", "GP24"]
+    },
+    "processor": "RP2040",
+    "rgblight": {
+        "led_count": 1
+    },
+    "url": "https://github.com/lendunistus/rpneko65",
+    "usb": {
+        "device_version": "1.0.0",
+        "force_nkro": true,
+        "pid": "0x0001",
+        "vid": "0x6C75"
+    },
+    "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",
+        "65_iso_blocker",
+        "65_iso_blocker_split_bs",
+        "65_iso_blocker_tsangan",
+        "65_iso_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, 14], "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, 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, 13], "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, 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, 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, 9], "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, 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, 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, 13], "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, 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, 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, 9], "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, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_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, 14], "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, 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, 13], "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, 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, 15], "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": 2.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4, "w": 2},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 2.75},
+                {"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, 15], "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, 14], "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, 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, 13], "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, 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, 15], "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, 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, 15], "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": [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, 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, 13], "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, 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, 15], "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, 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, 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, 14], "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, 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": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "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, 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, 9], "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, 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, 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": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "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, 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, 9], "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, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_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, 14], "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, 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": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "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, 15], "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, 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, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_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": [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, 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": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "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, 15], "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, 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, 15], "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": [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, 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, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "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, 15], "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": 2.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4, "w": 2},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 9], "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, 15], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lendunistus/rpneko65/rev1/keymaps/default/keymap.c b/keyboards/lendunistus/rpneko65/rev1/keymaps/default/keymap.c
new file mode 100644
index 000000000000..5b52fa20387d
--- /dev/null
+++ b/keyboards/lendunistus/rpneko65/rev1/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 lendunistus
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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_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_NUHS,          KC_PGUP,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,            KC_END,
+      KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT,          MO(1),            KC_LEFT, KC_DOWN,          KC_RGHT
+  ),
+  // Function 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_DEL,  _______,
+      _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, _______,          _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS,          _______,          _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,          _______,
+      _______, _______, _______,                   _______, _______, _______, _______,          _______,          _______, _______,          _______
+  )
+};
diff --git a/keyboards/lendunistus/rpneko65/rev1/keymaps/via/keymap.c b/keyboards/lendunistus/rpneko65/rev1/keymaps/via/keymap.c
new file mode 100644
index 000000000000..5b52fa20387d
--- /dev/null
+++ b/keyboards/lendunistus/rpneko65/rev1/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 lendunistus
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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_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_NUHS,          KC_PGUP,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,            KC_END,
+      KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT,          MO(1),            KC_LEFT, KC_DOWN,          KC_RGHT
+  ),
+  // Function 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_DEL,  _______,
+      _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, _______,          _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS,          _______,          _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,          _______,
+      _______, _______, _______,                   _______, _______, _______, _______,          _______,          _______, _______,          _______
+  )
+};
diff --git a/keyboards/lendunistus/rpneko65/rev1/keymaps/via/rules.mk b/keyboards/lendunistus/rpneko65/rev1/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/lendunistus/rpneko65/rev1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/lendunistus/rpneko65/rev1/readme.md b/keyboards/lendunistus/rpneko65/rev1/readme.md
new file mode 100644
index 000000000000..d41fe19c8a4d
--- /dev/null
+++ b/keyboards/lendunistus/rpneko65/rev1/readme.md
@@ -0,0 +1,24 @@
+# rpneko65
+
+![rpneko65](https://i.imgur.com/QUIUSqJh.png)\
+*PCB rear side*
+
+A multi-layout PCB designed to fit the Bakeneko65 case by kkatano.
+
+* Keyboard Maintainer: [lendunistus](https://github.com/lendunistus)
+* Hardware Supported: RPNeko65 PCB; [Bakeneko65 V3 Case](https://github.com/kkatano/bakeneko-65)
+* Hardware Availability: [Open source on GitHub](https://github.com/lendunistus/rpneko65)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make lendunistus/rpneko65/rev1:default
+
+Flashing example for this keyboard:
+
+    make lendunistus/rpneko65/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
+
+Plug in the keyboard while holding down either the ESC key or the button on the back of the PCB labelled "USB Boot".
diff --git a/keyboards/lendunistus/rpneko65/rev1/rev1.c b/keyboards/lendunistus/rpneko65/rev1/rev1.c
new file mode 100644
index 000000000000..2cb9cf07f871
--- /dev/null
+++ b/keyboards/lendunistus/rpneko65/rev1/rev1.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "quantum.h"
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (CAPS_LOCK_ENABLE && res) {
+        if(led_state.caps_lock) {
+            #ifdef CAPS_LOCK_COLOR
+                rgblight_sethsv_at(CAPS_LOCK_COLOR, 0);
+            #else
+                rgblight_sethsv_at(rgblight_get_hue(),rgblight_get_sat(),rgblight_get_val(), 0);
+            #endif
+        }
+        else{
+            rgblight_sethsv_at(HSV_BLACK, 0);
+        }
+    }
+    return res;
+}
diff --git a/keyboards/lendunistus/rpneko65/rev1/rules.mk b/keyboards/lendunistus/rpneko65/rev1/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/lendunistus/rpneko65/rev1/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h
index a7b7c4843e0c..0b8941e77606 100644
--- a/keyboards/lets_split/rev1/config.h
+++ b/keyboards/lets_split/rev1/config.h
@@ -23,8 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 16    // Number of LEDs
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/lets_split/rev1/info.json b/keyboards/lets_split/rev1/info.json
index 3c9cea5e5ee0..6f00161cd5d5 100644
--- a/keyboards/lets_split/rev1/info.json
+++ b/keyboards/lets_split/rev1/info.json
@@ -14,6 +14,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "led_count": 16
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h
index a30fed60780c..0b8941e77606 100644
--- a/keyboards/lets_split/rev2/config.h
+++ b/keyboards/lets_split/rev2/config.h
@@ -23,8 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 12    // Number of LEDs
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/lets_split/rev2/info.json b/keyboards/lets_split/rev2/info.json
index d25e6de61127..8c6d622732f1 100644
--- a/keyboards/lets_split/rev2/info.json
+++ b/keyboards/lets_split/rev2/info.json
@@ -14,6 +14,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "led_count": 12
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/lets_split/sockets/config.h b/keyboards/lets_split/sockets/config.h
index 3655ec19c50a..dee5c458b226 100644
--- a/keyboards/lets_split/sockets/config.h
+++ b/keyboards/lets_split/sockets/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 12    // Number of LEDs
-
 /* Audio settings */
 #ifdef AUDIO_ENABLE
     #define AUDIO_PIN C6 // Define this to enable the buzzer
diff --git a/keyboards/lets_split/sockets/info.json b/keyboards/lets_split/sockets/info.json
index cf716c050703..76972243dc43 100644
--- a/keyboards/lets_split/sockets/info.json
+++ b/keyboards/lets_split/sockets/info.json
@@ -14,6 +14,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "led_count": 12
+    },
     "ws2812": {
         "pin": "D4"
     },
diff --git a/keyboards/lfkeyboards/lfk65_hs/config.h b/keyboards/lfkeyboards/lfk65_hs/config.h
index ae682e447f4d..221eee1bd464 100644
--- a/keyboards/lfkeyboards/lfk65_hs/config.h
+++ b/keyboards/lfkeyboards/lfk65_hs/config.h
@@ -1,24 +1,7 @@
 #pragma once
 
-#define RGBLED_NUM 20     // Number of LEDs
-
 #define BACKLIGHT_PWM_MAP {8, 16, 40, 55, 70, 128, 200, 255}
 
-#define RGBLED_NUM 20     // 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
-
 /* 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/lfkeyboards/lfk65_hs/info.json b/keyboards/lfkeyboards/lfk65_hs/info.json
index 894a00958317..ca2e2c695bfa 100644
--- a/keyboards/lfkeyboards/lfk65_hs/info.json
+++ b/keyboards/lfkeyboards/lfk65_hs/info.json
@@ -16,6 +16,22 @@
   "backlight": {
     "levels": 8
   },
+  "rgblight": {
+    "hue_steps": 10,
+    "led_count": 20,
+    "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": "C7"
   },
diff --git a/keyboards/lfkeyboards/lfk78/config.h b/keyboards/lfkeyboards/lfk78/config.h
index 5748d29987cb..89d9c4b2437c 100644
--- a/keyboards/lfkeyboards/lfk78/config.h
+++ b/keyboards/lfkeyboards/lfk78/config.h
@@ -19,25 +19,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PWM_MAP { 8, 16, 40, 55, 70, 128, 200, 255 }
 
-#define TAPPING_TERM 200
-
 #define AUDIO_PIN C6
 #define AUDIO_VOICES
 
-#    define RGBLIGHT_HUE_STEP 10
-#    define RGBLIGHT_SAT_STEP 17
-#    define RGBLIGHT_VAL_STEP 17
-#    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
-
 /* 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/lfkeyboards/lfk78/keymaps/ca178858/rules.mk b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/rules.mk
index f1836baa2777..481ff1407bdf 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/rules.mk
+++ b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/rules.mk
@@ -10,7 +10,6 @@ AUDIO_ENABLE = no              # Audio output on port C6
 UNICODE_ENABLE = no             # Unicode
 BLUETOOTH_ENABLE = no           # Disable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no           # Enable RGB underlight
-RGBLIGHT_CUSTOM_DRIVER = no    # RGB code is implemented in lefkeyboards, not WS2812
 SLEEP_LED_ENABLE = yes
 TAP_DANCE_ENABLE = yes
 
diff --git a/keyboards/lfkeyboards/lfk78/post_rules.mk b/keyboards/lfkeyboards/lfk78/post_rules.mk
index 03f975b9df27..817a085f5e2c 100644
--- a/keyboards/lfkeyboards/lfk78/post_rules.mk
+++ b/keyboards/lfkeyboards/lfk78/post_rules.mk
@@ -2,13 +2,13 @@
 SRC += TWIlib.c issi.c lighting.c
 
 ifeq ($(strip $(ISSI_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DISSI_ENABLE
+    OPT_DEFS += -DISSI_ENABLE
 endif
 
 ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
+    OPT_DEFS += -DWATCHDOG_ENABLE
 endif
 
 ifeq ($(strip $(CAPSLOCK_LED)), yes)
-    TMK_COMMON_DEFS += -DCAPSLOCK_LED
+    OPT_DEFS += -DCAPSLOCK_LED
 endif
diff --git a/keyboards/lfkeyboards/lfk78/revb/config.h b/keyboards/lfkeyboards/lfk78/revb/config.h
deleted file mode 100644
index 377ea2112328..000000000000
--- a/keyboards/lfkeyboards/lfk78/revb/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 31
diff --git a/keyboards/lfkeyboards/lfk78/revb/info.json b/keyboards/lfkeyboards/lfk78/revb/info.json
index 92662bacc786..1431ce1cc68e 100644
--- a/keyboards/lfkeyboards/lfk78/revb/info.json
+++ b/keyboards/lfkeyboards/lfk78/revb/info.json
@@ -17,6 +17,23 @@
         "driver": "custom",
         "levels": 8
     },
+    "rgblight": {
+        "driver": "custom",
+        "hue_steps": 10,
+        "led_count": 31,
+        "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": "C7"
     },
diff --git a/keyboards/lfkeyboards/lfk78/revc/config.h b/keyboards/lfkeyboards/lfk78/revc/config.h
deleted file mode 100644
index 78343dc888c5..000000000000
--- a/keyboards/lfkeyboards/lfk78/revc/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 27
diff --git a/keyboards/lfkeyboards/lfk78/revc/info.json b/keyboards/lfkeyboards/lfk78/revc/info.json
index 830205c584ca..980ffafc6341 100644
--- a/keyboards/lfkeyboards/lfk78/revc/info.json
+++ b/keyboards/lfkeyboards/lfk78/revc/info.json
@@ -17,6 +17,23 @@
         "driver": "custom",
         "levels": 8
     },
+    "rgblight": {
+        "driver": "custom",
+        "hue_steps": 10,
+        "led_count": 27,
+        "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": "C7"
     },
diff --git a/keyboards/lfkeyboards/lfk78/revj/config.h b/keyboards/lfkeyboards/lfk78/revj/config.h
deleted file mode 100644
index 78343dc888c5..000000000000
--- a/keyboards/lfkeyboards/lfk78/revj/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 27
diff --git a/keyboards/lfkeyboards/lfk78/revj/info.json b/keyboards/lfkeyboards/lfk78/revj/info.json
index 8f9198b089d0..5ff7bcbbfd69 100644
--- a/keyboards/lfkeyboards/lfk78/revj/info.json
+++ b/keyboards/lfkeyboards/lfk78/revj/info.json
@@ -17,6 +17,23 @@
         "driver": "custom",
         "levels": 8
     },
+    "rgblight": {
+        "driver": "custom",
+        "hue_steps": 10,
+        "led_count": 27,
+        "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": "C7"
     },
diff --git a/keyboards/lfkeyboards/lfk78/rules.mk b/keyboards/lfkeyboards/lfk78/rules.mk
index 6c0b7f6d8dde..4e3f7b9256f2 100644
--- a/keyboards/lfkeyboards/lfk78/rules.mk
+++ b/keyboards/lfkeyboards/lfk78/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes          # Enable keyboard backlight functionality
 AUDIO_ENABLE = no               # Audio output
 RGBLIGHT_ENABLE = yes           # Enable WS2812 RGB underlight.
-RGBLIGHT_CUSTOM_DRIVER = yes    # RGB code is implemented in lfkeyboards, not qmk base
 SLEEP_LED_ENABLE = yes
 
 ISSI_ENABLE = yes               # If the I2C pullup resistors aren't install this must be disabled
diff --git a/keyboards/lfkeyboards/lfk87/config.h b/keyboards/lfkeyboards/lfk87/config.h
index 3a8f16e0fd51..20aba2ad6ba3 100644
--- a/keyboards/lfkeyboards/lfk87/config.h
+++ b/keyboards/lfkeyboards/lfk87/config.h
@@ -22,22 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255}
 
-#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
-
-#define TAPPING_TERM 200
-
 /* 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/lfkeyboards/lfk87/info.json b/keyboards/lfkeyboards/lfk87/info.json
index d76ee0c6937d..6a2d5eb796e4 100644
--- a/keyboards/lfkeyboards/lfk87/info.json
+++ b/keyboards/lfkeyboards/lfk87/info.json
@@ -12,6 +12,9 @@
     "driver": "custom",
     "levels": 10
   },
+  "rgblight": {
+    "driver": "custom"
+  },
   "ws2812": {
     "pin": "F4"
   },
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/rules.mk b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/rules.mk
index ab5bc0930dba..8d2c18f6dd2f 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/rules.mk
+++ b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/rules.mk
@@ -10,7 +10,6 @@ AUDIO_ENABLE = yes              # Audio output on port C6
 UNICODE_ENABLE = no             # Unicode
 BLUETOOTH_ENABLE = no           # Disable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes           # Enable RGB underlight
-RGBLIGHT_CUSTOM_DRIVER = yes    # RGB code is implemented in lefkeyboards, not WS2812
 SLEEP_LED_ENABLE = yes
 TAP_DANCE_ENABLE = yes
 
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/default/rules.mk b/keyboards/lfkeyboards/lfk87/keymaps/default/rules.mk
index 9babefffc885..ec4ce1afba30 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/default/rules.mk
+++ b/keyboards/lfkeyboards/lfk87/keymaps/default/rules.mk
@@ -7,7 +7,6 @@ NKRO_ENABLE = yes
 BACKLIGHT_ENABLE = yes           # Enable keyboard backlight functionality
 AUDIO_ENABLE = yes              # Audio output
 RGBLIGHT_ENABLE = yes           # Enable RGB underlight
-RGBLIGHT_CUSTOM_DRIVER = yes    # RGB code is implemented in lefkeyboards, not WS2812
 SLEEP_LED_ENABLE = yes
 
 ISSI_ENABLE = yes			# If the I2C pullup resistors aren't install this must be disabled
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/rules.mk b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/rules.mk
index 9a6b4ff65af5..01b8506d3a21 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/rules.mk
+++ b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/rules.mk
@@ -10,7 +10,6 @@ AUDIO_ENABLE = yes              # Audio output on port C6
 UNICODE_ENABLE = no             # Unicode
 BLUETOOTH_ENABLE = no           # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes           # Enable RGB underlight
-RGBLIGHT_CUSTOM_DRIVER = yes    # RGB code is implemented in lefkeyboards, not WS2812
 SLEEP_LED_ENABLE = yes
 
 ISSI_ENABLE = yes			# If the I2C pullup resistors aren't install this must be disabled
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/iso/rules.mk b/keyboards/lfkeyboards/lfk87/keymaps/iso/rules.mk
index 0e7008aa209a..7baa40317ad5 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/iso/rules.mk
+++ b/keyboards/lfkeyboards/lfk87/keymaps/iso/rules.mk
@@ -7,7 +7,6 @@ NKRO_ENABLE = yes
 BACKLIGHT_ENABLE = yes          # Enable keyboard backlight functionality
 AUDIO_ENABLE = yes              # Audio output
 RGBLIGHT_ENABLE = yes           # Enable RGB underlight
-RGBLIGHT_CUSTOM_DRIVER = yes    # RGB code is implemented in lefkeyboards, not WS2812
 SLEEP_LED_ENABLE = yes
 
 ISSI_ENABLE = yes               # If the I2C pullup resistors aren't install this must be disabled
diff --git a/keyboards/lfkeyboards/lfk87/reva/info.json b/keyboards/lfkeyboards/lfk87/reva/info.json
index 457f3602ab85..ad3ad7f8773c 100644
--- a/keyboards/lfkeyboards/lfk87/reva/info.json
+++ b/keyboards/lfkeyboards/lfk87/reva/info.json
@@ -7,7 +7,20 @@
     },
     "diode_direction": "COL2ROW",
     "rgblight": {
-        "led_count": 25
+        "hue_steps": 10,
+        "led_count": 25,
+        "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_tkl_ansi": {
diff --git a/keyboards/lfkeyboards/lfk87/revc/info.json b/keyboards/lfkeyboards/lfk87/revc/info.json
index 7d18e71197d7..cf627facdfcf 100644
--- a/keyboards/lfkeyboards/lfk87/revc/info.json
+++ b/keyboards/lfkeyboards/lfk87/revc/info.json
@@ -7,7 +7,20 @@
     },
     "diode_direction": "COL2ROW",
     "rgblight": {
-        "led_count": 24
+        "hue_steps": 10,
+        "led_count": 24,
+        "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_tkl_ansi": {
diff --git a/keyboards/lfkeyboards/lfk87/rules.mk b/keyboards/lfkeyboards/lfk87/rules.mk
index 2dc08f71f635..154e03fe7795 100644
--- a/keyboards/lfkeyboards/lfk87/rules.mk
+++ b/keyboards/lfkeyboards/lfk87/rules.mk
@@ -11,7 +11,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes          # Enable keyboard backlight functionality
 AUDIO_ENABLE = yes              # Audio output
 RGBLIGHT_ENABLE = yes           # Enable RGB underlight
-RGBLIGHT_CUSTOM_DRIVER = yes    # RGB code is implemented in lefkeyboards, not WS2812
 SLEEP_LED_ENABLE = yes
 
 ISSI_ENABLE = yes			# If the I2C pullup resistors aren't install this must be disabled
diff --git a/keyboards/lfkeyboards/lfkpad/config.h b/keyboards/lfkeyboards/lfkpad/config.h
index 5393e47b391e..b9449c4714bf 100644
--- a/keyboards/lfkeyboards/lfkpad/config.h
+++ b/keyboards/lfkeyboards/lfkpad/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 28
-#    define RGBLIGHT_HUE_STEP 10
-#    define RGBLIGHT_SAT_STEP 17
-#    define RGBLIGHT_VAL_STEP 17
-#    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 TAPPING_TERM 200
-
 /* 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/lfkeyboards/lfkpad/info.json b/keyboards/lfkeyboards/lfkpad/info.json
index d4abb0abdd1e..a3910b0df5ac 100644
--- a/keyboards/lfkeyboards/lfkpad/info.json
+++ b/keyboards/lfkeyboards/lfkpad/info.json
@@ -8,6 +8,23 @@
         "pid": "0x3231",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "driver": "custom",
+        "hue_steps": 10,
+        "led_count": 28,
+        "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": "C7"
     },
diff --git a/keyboards/lfkeyboards/lfkpad/post_rules.mk b/keyboards/lfkeyboards/lfkpad/post_rules.mk
index ad997587b2de..044d9754f150 100644
--- a/keyboards/lfkeyboards/lfkpad/post_rules.mk
+++ b/keyboards/lfkeyboards/lfkpad/post_rules.mk
@@ -1,7 +1,7 @@
 ifeq ($(strip $(ISSI_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DISSI_ENABLE
+    OPT_DEFS += -DISSI_ENABLE
 endif
 
 ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
+    OPT_DEFS += -DWATCHDOG_ENABLE
 endif
diff --git a/keyboards/lfkeyboards/lfkpad/rules.mk b/keyboards/lfkeyboards/lfkpad/rules.mk
index b60f4b532ffa..ec8efa88bf6e 100644
--- a/keyboards/lfkeyboards/lfkpad/rules.mk
+++ b/keyboards/lfkeyboards/lfkpad/rules.mk
@@ -9,7 +9,6 @@ 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
-RGBLIGHT_CUSTOM_DRIVER = yes # RGB code is implemented in lfkeyboards, not qmk base
 AUDIO_ENABLE = no            # Audio output
 SLEEP_LED_ENABLE = yes
 
diff --git a/keyboards/lfkeyboards/mini1800/config.h b/keyboards/lfkeyboards/mini1800/config.h
index c367ad95c3cb..20aba2ad6ba3 100644
--- a/keyboards/lfkeyboards/mini1800/config.h
+++ b/keyboards/lfkeyboards/mini1800/config.h
@@ -17,29 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-    #define RGBLED_NUM 26     // Number of LEDs
-
 #define AUDIO_VOICES
 #define AUDIO_PIN C6
 
 #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255}
 
-#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
-
-#define TAPPING_TERM 200
-
 /* 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/lfkeyboards/mini1800/info.json b/keyboards/lfkeyboards/mini1800/info.json
index cf1cc7764bb7..6737c1bacafd 100644
--- a/keyboards/lfkeyboards/mini1800/info.json
+++ b/keyboards/lfkeyboards/mini1800/info.json
@@ -17,6 +17,23 @@
         "driver": "custom",
         "levels": 10
     },
+    "rgblight": {
+        "driver": "custom",
+        "hue_steps": 10,
+        "led_count": 26,
+        "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": "F4"
     },
diff --git a/keyboards/lfkeyboards/mini1800/reva/post_rules.mk b/keyboards/lfkeyboards/mini1800/reva/post_rules.mk
index ad997587b2de..044d9754f150 100644
--- a/keyboards/lfkeyboards/mini1800/reva/post_rules.mk
+++ b/keyboards/lfkeyboards/mini1800/reva/post_rules.mk
@@ -1,7 +1,7 @@
 ifeq ($(strip $(ISSI_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DISSI_ENABLE
+    OPT_DEFS += -DISSI_ENABLE
 endif
 
 ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
+    OPT_DEFS += -DWATCHDOG_ENABLE
 endif
diff --git a/keyboards/lfkeyboards/mini1800/reva/rules.mk b/keyboards/lfkeyboards/mini1800/reva/rules.mk
index edd26e498d10..473bcb10ae93 100644
--- a/keyboards/lfkeyboards/mini1800/reva/rules.mk
+++ b/keyboards/lfkeyboards/mini1800/reva/rules.mk
@@ -10,9 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
-
-# RGB code is implemented in lfkeyboards, not WS2812
-RGBLIGHT_CUSTOM_DRIVER = yes
 SLEEP_LED_ENABLE = yes
 
 ISSI_ENABLE = yes           # If the I2C pullup resistors aren't install this must be disabled
diff --git a/keyboards/lfkeyboards/mini1800/revc/post_rules.mk b/keyboards/lfkeyboards/mini1800/revc/post_rules.mk
index ad997587b2de..044d9754f150 100644
--- a/keyboards/lfkeyboards/mini1800/revc/post_rules.mk
+++ b/keyboards/lfkeyboards/mini1800/revc/post_rules.mk
@@ -1,7 +1,7 @@
 ifeq ($(strip $(ISSI_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DISSI_ENABLE
+    OPT_DEFS += -DISSI_ENABLE
 endif
 
 ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
+    OPT_DEFS += -DWATCHDOG_ENABLE
 endif
diff --git a/keyboards/lfkeyboards/mini1800/revc/rules.mk b/keyboards/lfkeyboards/mini1800/revc/rules.mk
index edd26e498d10..473bcb10ae93 100644
--- a/keyboards/lfkeyboards/mini1800/revc/rules.mk
+++ b/keyboards/lfkeyboards/mini1800/revc/rules.mk
@@ -10,9 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
-
-# RGB code is implemented in lfkeyboards, not WS2812
-RGBLIGHT_CUSTOM_DRIVER = yes
 SLEEP_LED_ENABLE = yes
 
 ISSI_ENABLE = yes           # If the I2C pullup resistors aren't install this must be disabled
diff --git a/keyboards/lfkeyboards/smk65/keymaps/default/rules.mk b/keyboards/lfkeyboards/smk65/keymaps/default/rules.mk
index 0cc9a7b76ba9..1f0147bd38fa 100644
--- a/keyboards/lfkeyboards/smk65/keymaps/default/rules.mk
+++ b/keyboards/lfkeyboards/smk65/keymaps/default/rules.mk
@@ -6,12 +6,3 @@ RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 
 ISSI_ENABLE = no               # If the I2C pullup resistors aren't install this must be disabled
 WATCHDOG_ENABLE = no           # Resets keyboard if matrix_scan isn't run every 250ms
-
-
-ifeq ($(strip $(ISSI_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DISSI_ENABLE
-endif
-
-ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
-endif
diff --git a/keyboards/lfkeyboards/smk65/keymaps/iso/rules.mk b/keyboards/lfkeyboards/smk65/keymaps/iso/rules.mk
index 0cc9a7b76ba9..1f0147bd38fa 100644
--- a/keyboards/lfkeyboards/smk65/keymaps/iso/rules.mk
+++ b/keyboards/lfkeyboards/smk65/keymaps/iso/rules.mk
@@ -6,12 +6,3 @@ RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 
 ISSI_ENABLE = no               # If the I2C pullup resistors aren't install this must be disabled
 WATCHDOG_ENABLE = no           # Resets keyboard if matrix_scan isn't run every 250ms
-
-
-ifeq ($(strip $(ISSI_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DISSI_ENABLE
-endif
-
-ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
-endif
diff --git a/keyboards/lfkeyboards/smk65/post_rules.mk b/keyboards/lfkeyboards/smk65/post_rules.mk
new file mode 100644
index 000000000000..044d9754f150
--- /dev/null
+++ b/keyboards/lfkeyboards/smk65/post_rules.mk
@@ -0,0 +1,7 @@
+ifeq ($(strip $(ISSI_ENABLE)), yes)
+    OPT_DEFS += -DISSI_ENABLE
+endif
+
+ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
+    OPT_DEFS += -DWATCHDOG_ENABLE
+endif
diff --git a/keyboards/lfkeyboards/smk65/revb/config.h b/keyboards/lfkeyboards/smk65/revb/config.h
index af7f6b17b829..c758caa92c2c 100644
--- a/keyboards/lfkeyboards/smk65/revb/config.h
+++ b/keyboards/lfkeyboards/smk65/revb/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define MATRIX_ROW_PINS {D6, D7, E0, C3, C4}
 #define MATRIX_COL_PINS {F2, C5, E5, E4, B7, B6, B5, B4, B3, B2, B1, B0, E1, C0, C1, C2}
-#define RGBLED_NUM 20     // Number of LEDs
 
 //RevB only:
 
@@ -33,21 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PWM_MAP {8, 16, 40, 55, 70, 128, 200, 255}
 
-#define RGBLED_NUM 20     // 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
-
 /* 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/lfkeyboards/smk65/revb/info.json b/keyboards/lfkeyboards/smk65/revb/info.json
index f635133e9ada..39df87cc2362 100644
--- a/keyboards/lfkeyboards/smk65/revb/info.json
+++ b/keyboards/lfkeyboards/smk65/revb/info.json
@@ -5,6 +5,23 @@
     "backlight": {
         "levels": 8
     },
+    "rgblight": {
+        "driver": "custom",
+        "hue_steps": 10,
+        "led_count": 20,
+        "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": "C7"
     },
diff --git a/keyboards/lfkeyboards/smk65/revb/rules.mk b/keyboards/lfkeyboards/smk65/revb/rules.mk
index 57bf01d4cf5c..1bd6ebc6a6c7 100644
--- a/keyboards/lfkeyboards/smk65/revb/rules.mk
+++ b/keyboards/lfkeyboards/smk65/revb/rules.mk
@@ -3,7 +3,6 @@
 #
 BACKLIGHT_ENABLE = no           # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no            # Enable keyboard RGB underglow
-RGBLIGHT_CUSTOM_DRIVER = yes    # RGB code is implemented in lefkeyboards, not WS2812
 AUDIO_ENABLE = no               # Audio output
 
 # Extra source files for IS3731 lighting
diff --git a/keyboards/lfkeyboards/smk65/revf/config.h b/keyboards/lfkeyboards/smk65/revf/config.h
index 50ce3410539f..9e32ac9d3fe6 100644
--- a/keyboards/lfkeyboards/smk65/revf/config.h
+++ b/keyboards/lfkeyboards/smk65/revf/config.h
@@ -31,8 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-#define RGBLED_NUM 28
-
 /* 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/lfkeyboards/smk65/revf/info.json b/keyboards/lfkeyboards/smk65/revf/info.json
index 63e9d0abc752..50c039b76cb2 100644
--- a/keyboards/lfkeyboards/smk65/revf/info.json
+++ b/keyboards/lfkeyboards/smk65/revf/info.json
@@ -4,6 +4,10 @@
     },
     "processor": "atmega32u4",
     "bootloader": "halfkay",
+    "rgblight": {
+        "driver": "custom",
+        "led_count": 28
+    },
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
diff --git a/keyboards/lfkeyboards/smk65/revf/rules.mk b/keyboards/lfkeyboards/smk65/revf/rules.mk
index 254574795948..e372473a5076 100644
--- a/keyboards/lfkeyboards/smk65/revf/rules.mk
+++ b/keyboards/lfkeyboards/smk65/revf/rules.mk
@@ -2,4 +2,3 @@
 #   change yes to no to disable
 #
 RGBLIGHT_ENABLE = no        	# TODO: Enable keyboard RGB underglow
-RGBLIGHT_CUSTOM_DRIVER = yes    # RGB code is implemented in lefkeyboards, not WS2812
diff --git a/keyboards/lgbtkl/info.json b/keyboards/lgbtkl/info.json
new file mode 100644
index 000000000000..a3f126e86200
--- /dev/null
+++ b/keyboards/lgbtkl/info.json
@@ -0,0 +1,111 @@
+{
+    "manufacturer": "queertykeys",
+    "keyboard_name": "lgbtkl",
+    "maintainer": "ojthetiny",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "usb": {
+        "vid": "0x6F6A",
+        "pid": "0x4C54",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "rows": ["C10", "A15", "A5", "C1", "C2"],
+        "cols": ["C8", "C7", "C6", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "C5", "C4", "A7", "A6", "C3", "C14", "C13"]
+    },
+    "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": [0, 16], "x": 16.5, "y": 0 },
+                { "matrix": [0, 17], "x": 17.5, "y": 0 },
+                { "matrix": [0, 18], "x": 18.5, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "w": 1.5, "x": 1.25, "y": 1 },
+                { "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, 15], "w": 1.5, "x": 14.75, "y": 1 },
+                { "matrix": [1, 16], "x": 16.5, "y": 1 },
+                { "matrix": [1, 17], "x": 17.5, "y": 1 },
+                { "matrix": [1, 18], "x": 18.5, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2 },
+                { "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, 14], "w": 2.25, "x": 14, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "w": 2.25, "x": 1.25, "y": 3 },
+                { "matrix": [3, 2], "x": 3.5, "y": 3 },
+                { "matrix": [3, 3], "x": 4.5, "y": 3 },
+                { "matrix": [3, 4], "x": 5.5, "y": 3 },
+                { "matrix": [3, 5], "x": 6.5, "y": 3 },
+                { "matrix": [3, 6], "x": 7.5, "y": 3 },
+                { "matrix": [3, 7], "x": 8.5, "y": 3 },
+                { "matrix": [3, 8], "x": 9.5, "y": 3 },
+                { "matrix": [3, 9], "x": 10.5, "y": 3 },
+                { "matrix": [3, 10], "x": 11.5, "y": 3 },
+                { "matrix": [3, 11], "x": 12.5, "y": 3 },
+                { "matrix": [3, 13], "w": 1.75, "x": 13.5, "y": 3 },
+                { "matrix": [3, 14], "w": 2.75, "x": 13.5, "y": 3 },
+                { "matrix": [3, 15], "x": 15.25, "y": 3 },
+                { "matrix": [3, 17], "x": 17.5, "y": 3 },
+                { "matrix": [4, 0], "x": 0, "y": 4 },
+                { "matrix": [4, 1], "w": 1.5, "x": 1.25, "y": 4 },
+                { "matrix": [4, 2], "x": 2.75, "y": 4 },
+                { "matrix": [4, 3], "w": 1.5, "x": 3.75, "y": 4 },
+                { "matrix": [4, 5], "w": 3, "x": 5.25, "y": 4 },
+                { "matrix": [4, 7], "x": 8.25, "y": 4 },
+                { "matrix": [4, 9], "w": 3, "x": 9.25, "y": 4 },
+                { "matrix": [4, 11], "w": 1.5, "x": 12.25, "y": 4 },
+                { "matrix": [4, 13], "x": 13.75, "y": 4 },
+                { "matrix": [4, 15], "w": 1.5, "x": 14.75, "y": 4 },
+                { "matrix": [4, 16], "x": 16.5, "y": 4 },
+                { "matrix": [4, 17], "x": 17.5, "y": 4 },
+                { "matrix": [4, 18], "x": 18.5, "y": 4 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/lgbtkl/keymaps/default/keymap.c b/keyboards/lgbtkl/keymaps/default/keymap.c
new file mode 100644
index 000000000000..01dcedcc18de
--- /dev/null
+++ b/keyboards/lgbtkl/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2023 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[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_GRV,  KC_BSLS,	 KC_INS, KC_HOME, KC_PGUP,
+		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_BSPC,		 KC_DEL, KC_END,  KC_PGDN,
+		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_ENT,
+		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, 		XXXXXXX, MO(1),   			  KC_UP,
+		KC_F5,   	KC_LCTL, KC_LGUI, KC_LALT, 			KC_SPC, 		  KC_SPC,			KC_SPC,  				KC_RALT,      KC_RGUI, 		KC_RCTL,	 KC_LEFT, KC_DOWN, KC_RGHT
+	),
+
+	[1] = LAYOUT(
+		XXXXXXX, 	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, 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,
+		QK_BOOT, 	XXXXXXX, XXXXXXX, XXXXXXX, 			XXXXXXX, 		  XXXXXXX, 			XXXXXXX,		  XXXXXXX, 		XXXXXXX, 			XXXXXXX, 	 XXXXXXX, XXXXXXX, XXXXXXX
+	),
+
+};
diff --git a/keyboards/lgbtkl/keymaps/via/keymap.c b/keyboards/lgbtkl/keymaps/via/keymap.c
new file mode 100644
index 000000000000..2fc44ae8cc04
--- /dev/null
+++ b/keyboards/lgbtkl/keymaps/via/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2023 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[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_GRV,  KC_BSLS,	 KC_INS, KC_HOME, KC_PGUP,
+		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_BSPC,		 KC_DEL, KC_END,  KC_PGDN,
+		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_ENT,
+		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, 		XXXXXXX, MO(1),   			  KC_UP,
+		KC_F5,   	KC_LCTL, KC_LGUI, KC_LALT, 			KC_SPC, 		  KC_SPC,			KC_SPC,  				KC_RALT,      KC_RGUI, 		KC_RCTL,	 KC_LEFT, KC_DOWN, KC_RGHT
+	),
+
+	[1] = LAYOUT(
+		XXXXXXX, 	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, 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,
+		QK_BOOT, 	XXXXXXX, XXXXXXX, XXXXXXX, 			XXXXXXX, 		  XXXXXXX, 			XXXXXXX,		  XXXXXXX, 		XXXXXXX, 			XXXXXXX, 	 XXXXXXX, XXXXXXX, XXXXXXX
+	),
+
+
+};
diff --git a/keyboards/lgbtkl/keymaps/via/rules.mk b/keyboards/lgbtkl/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/lgbtkl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/lgbtkl/readme.md b/keyboards/lgbtkl/readme.md
new file mode 100644
index 000000000000..cd6f94b6e972
--- /dev/null
+++ b/keyboards/lgbtkl/readme.md
@@ -0,0 +1,26 @@
+# LGBTKL
+
+LGBTKL keyboard by Queertykeys
+
+* Keyboard Maintainer: [Liv](https://github.com/ojthetiny)
+* Hardware Supported: LGBTKL
+* Hardware Availability: Private GB
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make lgbtkl:default
+
+Flashing example for this keyboard:
+
+    make lgbtkl: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 using one of the following methods:
+
+* **Bootmagic reset**: Hold the F1 key while connecting the USB cable
+* **Physical reset button**: Hold the button labeled 'B/R' for a while to enter bootloader.
+* **Keycode in layout**: In the case of the default keymap, use the key combination Fn + F5
\ No newline at end of file
diff --git a/keyboards/lgbtkl/rules.mk b/keyboards/lgbtkl/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/lgbtkl/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/lily58/glow_enc/config.h b/keyboards/lily58/glow_enc/config.h
deleted file mode 100644
index cf58b0fe4573..000000000000
--- a/keyboards/lily58/glow_enc/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2017 F_YUUCHI
-Copyright 2020 Ben Roesner (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/>.
-*/
-
-#pragma once
-
-#define RGBLED_NUM 72    // Number of LEDs
-
-#define RGBLED_SPLIT { 36, 36 }
-#define RGBLIGHT_SPLIT
diff --git a/keyboards/lily58/glow_enc/info.json b/keyboards/lily58/glow_enc/info.json
index 79358416f590..006cf0aa2100 100644
--- a/keyboards/lily58/glow_enc/info.json
+++ b/keyboards/lily58/glow_enc/info.json
@@ -38,7 +38,9 @@
         "pin": "F4"
     },
     "rgblight": {
-        "max_brightness": 120
+        "led_count": 72,
+        "max_brightness": 120,
+        "split_count": [36, 36]
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/lily58/keymaps/chuan/config.h b/keyboards/lily58/keymaps/chuan/config.h
index d952ce457be7..b3a47769bf6f 100644
--- a/keyboards/lily58/keymaps/chuan/config.h
+++ b/keyboards/lily58/keymaps/chuan/config.h
@@ -30,8 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-// #define SSD1306OLED
-
 #define QUICK_TAP_TERM 0
 
 /* define tapping term */
diff --git a/keyboards/lily58/keymaps/chuan/keymap.c b/keyboards/lily58/keymaps/chuan/keymap.c
index fed5b6df6796..58a19ebd5f34 100644
--- a/keyboards/lily58/keymaps/chuan/keymap.c
+++ b/keyboards/lily58/keymaps/chuan/keymap.c
@@ -173,13 +173,6 @@ bool oled_task_user(void) {
 #endif //OLED_ENABLE
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef SSD1306OLED
-    // set_keylog(keycode, record);
-#endif
-    // set_timelog();
-  }
-
   switch (keycode) {
     case QWERTY:
       if (record->event.pressed) {
diff --git a/keyboards/lily58/keymaps/datadavd/config.h b/keyboards/lily58/keymaps/datadavd/config.h
index 19b372e569da..c851d7ad0ef3 100644
--- a/keyboards/lily58/keymaps/datadavd/config.h
+++ b/keyboards/lily58/keymaps/datadavd/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-// #define SSD1306OLED
-
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 50
 
diff --git a/keyboards/lily58/keymaps/domnantas/config.h b/keyboards/lily58/keymaps/domnantas/config.h
index 143a950ef244..830139cc033a 100644
--- a/keyboards/lily58/keymaps/domnantas/config.h
+++ b/keyboards/lily58/keymaps/domnantas/config.h
@@ -28,7 +28,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 #define EE_HANDS
 
-// #define SSD1306OLED
-
 #define QUICK_TAP_TERM 0
 #define TAPPING_TERM 100
diff --git a/keyboards/lily58/keymaps/drasbeck/rules.mk b/keyboards/lily58/keymaps/drasbeck/rules.mk
index 10228e36776a..f0442f1008c5 100644
--- a/keyboards/lily58/keymaps/drasbeck/rules.mk
+++ b/keyboards/lily58/keymaps/drasbeck/rules.mk
@@ -13,7 +13,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # OLED display
 ENCODER_ENABLE = yes        # Enable encoder
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
diff --git a/keyboards/lily58/keymaps/gshmu/rules.mk b/keyboards/lily58/keymaps/gshmu/rules.mk
index 4b7da61a0cb7..401abfb4cf61 100644
--- a/keyboards/lily58/keymaps/gshmu/rules.mk
+++ b/keyboards/lily58/keymaps/gshmu/rules.mk
@@ -1,6 +1,5 @@
 VIA_ENABLE = yes
 OLED_ENABLE = no
-OLED_DRIVER = SSD1306
 MOUSEKEY_ENABLE = yes
 EXTRAKEY_ENABLE = yes
 DYNAMIC_TAPPING_TERM_ENABLE = yes
diff --git a/keyboards/lily58/keymaps/hvp/config.h b/keyboards/lily58/keymaps/hvp/config.h
index ec0960470aff..35c0f25f2c2c 100644
--- a/keyboards/lily58/keymaps/hvp/config.h
+++ b/keyboards/lily58/keymaps/hvp/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define SSD1306OLED
-
 #define TAPPING_TERM 100
 #undef TAPPING_TERM
 #define TAPPING_TERM 150
diff --git a/keyboards/lily58/keymaps/hvp/keymap.c b/keyboards/lily58/keymaps/hvp/keymap.c
index 5ca0b73653bd..b94ea9397ce5 100644
--- a/keyboards/lily58/keymaps/hvp/keymap.c
+++ b/keyboards/lily58/keymaps/hvp/keymap.c
@@ -5,9 +5,6 @@
   #include "lufa.h"
   #include "split_util.h"
 #endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
 
 #ifdef RGBLIGHT_ENABLE
 //Following line allows macro to read current RGB settings
@@ -84,63 +81,9 @@ void matrix_init_user(void) {
     #ifdef RGBLIGHT_ENABLE
       RGB_current_mode = rgblight_config.mode;
     #endif
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init(!has_usb());   // turns on the display
-    #endif
-}
-
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-
-// 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);
-
-void matrix_scan_user(void) {
-   iota_gfx_task();
-}
-
-void matrix_render_user(struct CharacterMatrix *matrix) {
-  if (is_master) {
-    // If you want to change the display of OLED, you need to change here
-    matrix_write_ln(matrix, read_layer_state());
-    matrix_write_ln(matrix, read_keylog());
-    matrix_write_ln(matrix, read_keylogs());
-    //matrix_write_ln(matrix, read_mode_icon(keymap_config.swap_lalt_lgui));
-    //matrix_write_ln(matrix, read_host_led_state());
-    //matrix_write_ln(matrix, read_timelog());
-  } else {
-    matrix_write(matrix, read_logo());
-  }
 }
 
-void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-  matrix_clear(&matrix);
-  matrix_render_user(&matrix);
-  matrix_update(&display, &matrix);
-}
-#endif//SSD1306OLED
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef SSD1306OLED
-    set_keylog(keycode, record);
-#endif
-    // set_timelog();
-  }
-
   switch (keycode) {
     case QWERTY:
       if (record->event.pressed) {
diff --git a/keyboards/lily58/keymaps/jhelvy/config.h b/keyboards/lily58/keymaps/jhelvy/config.h
index dbd058a8b58b..08ddcd4e32b2 100644
--- a/keyboards/lily58/keymaps/jhelvy/config.h
+++ b/keyboards/lily58/keymaps/jhelvy/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define SSD1306OLED
-
 #define QUICK_TAP_TERM 0
 #undef TAPPING_TERM
 #define TAPPING_TERM 200
diff --git a/keyboards/lily58/keymaps/jhelvy/keymap.c b/keyboards/lily58/keymaps/jhelvy/keymap.c
index 03e56b1bd1b4..ae44d372c6aa 100644
--- a/keyboards/lily58/keymaps/jhelvy/keymap.c
+++ b/keyboards/lily58/keymaps/jhelvy/keymap.c
@@ -4,10 +4,6 @@
   #include "lufa.h"
   #include "split_util.h"
 #endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
-
 
 extern uint8_t is_master;
 
@@ -45,68 +41,3 @@ LGUI(KC_BSPC),MO(2),LGUI(KC_S),LGUI(KC_C),LGUI(KC_V),LGUI(KC_X),
                                   KC_NO,   KC_NO,KC_NO,  KC_NO,    KC_NO, KC_TRNS,     KC_NO,     KC_NO)
 
 };
-
-void matrix_init_user(void) {
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init(!has_usb());   // turns on the display
-    #endif
-}
-
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-
-// 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);
-
-void matrix_scan_user(void) {
-   iota_gfx_task();
-}
-
-void matrix_render_user(struct CharacterMatrix *matrix) {
-  if (is_master) {
-    // If you want to change the display of OLED, you need to change here
-    matrix_write_ln(matrix, read_layer_state());
-    matrix_write_ln(matrix, read_keylog());
-    matrix_write_ln(matrix, read_keylogs());
-    //matrix_write_ln(matrix, read_mode_icon(keymap_config.swap_lalt_lgui));
-    //matrix_write_ln(matrix, read_host_led_state());
-    //matrix_write_ln(matrix, read_timelog());
-  } else {
-    matrix_write(matrix, read_logo());
-  }
-}
-
-void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-  matrix_clear(&matrix);
-  matrix_render_user(&matrix);
-  matrix_update(&display, &matrix);
-}
-#endif//SSD1306OLED
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef SSD1306OLED
-    set_keylog(keycode, record);
-#endif
-    // set_timelog();
-  }
-  return true;
-}
diff --git a/keyboards/lily58/keymaps/mb_via/rules.mk b/keyboards/lily58/keymaps/mb_via/rules.mk
index d3528d52a1a2..3c1f402d2ad0 100644
--- a/keyboards/lily58/keymaps/mb_via/rules.mk
+++ b/keyboards/lily58/keymaps/mb_via/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 MOUSEKEY_ENABLE = yes
 EXTRAKEY_ENABLE = yes
diff --git a/keyboards/lily58/keymaps/mikefightsbears/keymap.c b/keyboards/lily58/keymaps/mikefightsbears/keymap.c
index 4bf723eb8d64..ce9aa64e35a3 100644
--- a/keyboards/lily58/keymaps/mikefightsbears/keymap.c
+++ b/keyboards/lily58/keymaps/mikefightsbears/keymap.c
@@ -4,9 +4,6 @@
   #include "lufa.h"
   #include "split_util.h"
 #endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
 
 #ifdef RGBLIGHT_ENABLE
 //Following line allows macro to read current RGB settings
diff --git a/keyboards/lily58/keymaps/muuko/rules.mk b/keyboards/lily58/keymaps/muuko/rules.mk
index 7c38d43f82bd..004fc910f653 100644
--- a/keyboards/lily58/keymaps/muuko/rules.mk
+++ b/keyboards/lily58/keymaps/muuko/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 EXTRAKEY_ENABLE = yes
 COMBO_ENABLE = yes
diff --git a/keyboards/lily58/keymaps/ninjonas/rules.mk b/keyboards/lily58/keymaps/ninjonas/rules.mk
index b7c57d87b9ed..9f00574d5d01 100644
--- a/keyboards/lily58/keymaps/ninjonas/rules.mk
+++ b/keyboards/lily58/keymaps/ninjonas/rules.mk
@@ -1,3 +1,2 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
diff --git a/keyboards/lily58/keymaps/via/rules.mk b/keyboards/lily58/keymaps/via/rules.mk
index d3528d52a1a2..3c1f402d2ad0 100644
--- a/keyboards/lily58/keymaps/via/rules.mk
+++ b/keyboards/lily58/keymaps/via/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 MOUSEKEY_ENABLE = yes
 EXTRAKEY_ENABLE = yes
diff --git a/keyboards/lily58/keymaps/yshrsmz/keymap.c b/keyboards/lily58/keymaps/yshrsmz/keymap.c
index 03269aa6a9b0..3ab9222b9d36 100644
--- a/keyboards/lily58/keymaps/yshrsmz/keymap.c
+++ b/keyboards/lily58/keymaps/yshrsmz/keymap.c
@@ -4,9 +4,6 @@
   #include "lufa.h"
   #include "split_util.h"
 #endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
 
 #ifdef RGBLIGHT_ENABLE
 //Following line allows macro to read current RGB settings
diff --git a/keyboards/lily58/keymaps/yuchi/config.h b/keyboards/lily58/keymaps/yuchi/config.h
index 8e07ec837fe9..55d05464bc03 100644
--- a/keyboards/lily58/keymaps/yuchi/config.h
+++ b/keyboards/lily58/keymaps/yuchi/config.h
@@ -28,7 +28,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-//#define OLED_DRIVER
-
 #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
index 1c87661113b4..c8c9eea5e9b8 100644
--- a/keyboards/lily58/keymaps/yuchi/keymap.c
+++ b/keyboards/lily58/keymaps/yuchi/keymap.c
@@ -4,9 +4,6 @@
   #include "lufa.h"
   #include "split_util.h"
 #endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
 
 extern uint8_t is_master;
 
diff --git a/keyboards/lily58/lib/layer_state_reader.c b/keyboards/lily58/lib/layer_state_reader.c
index ffc2c4e2c679..69b46130931b 100644
--- a/keyboards/lily58/lib/layer_state_reader.c
+++ b/keyboards/lily58/lib/layer_state_reader.c
@@ -13,7 +13,7 @@ const char *read_layer_state(void) {
   switch (layer_state)
   {
   case L_BASE:
-    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Default");
+    snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Base");
     break;
   case L_RAISE:
     snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Raise");
diff --git a/keyboards/lily58/light/config.h b/keyboards/lily58/light/config.h
deleted file mode 100644
index 88cb95c24387..000000000000
--- a/keyboards/lily58/light/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2017 F_YUUCHI
-Copyright 2020 Ben Roesner (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/>.
-*/
-
-#pragma once
-
-#define RGBLED_SPLIT { 35, 35 }
-#define RGBLED_NUM 70
-#define RGBLIGHT_SPLIT
diff --git a/keyboards/lily58/light/info.json b/keyboards/lily58/light/info.json
index 7cca1288a392..1c556e429a6a 100644
--- a/keyboards/lily58/light/info.json
+++ b/keyboards/lily58/light/info.json
@@ -39,7 +39,9 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 120
+        "led_count": 70,
+        "max_brightness": 120,
+        "split_count": [35, 35]
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/lily58/r2g/config.h b/keyboards/lily58/r2g/config.h
index da72735e2e56..955cf70161e3 100644
--- a/keyboards/lily58/r2g/config.h
+++ b/keyboards/lily58/r2g/config.h
@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-//#define SERIAL_USE_MULTI_TRANSACTION
-
 
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_MATRIX_LED_COUNT 74
diff --git a/keyboards/lily58/r2g/info.json b/keyboards/lily58/r2g/info.json
index e445d1d48fda..c7fe3e011e79 100644
--- a/keyboards/lily58/r2g/info.json
+++ b/keyboards/lily58/r2g/info.json
@@ -104,7 +104,7 @@
         }
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "split_count": [37, 37],
         "layout": [
             {"flags": 4, "matrix": [0, 5], "x": 72, "y": 4},   // L SW06
diff --git a/keyboards/lily58/rev1/config.h b/keyboards/lily58/rev1/config.h
deleted file mode 100644
index 8e94f9f62b74..000000000000
--- a/keyboards/lily58/rev1/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2017 F_YUUCHI
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should 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 RGBLED_NUM 12    // Number of LEDs
-
-/*
- * 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/lily58/rev1/info.json b/keyboards/lily58/rev1/info.json
index a3e89ec3a751..6f341915bfff 100644
--- a/keyboards/lily58/rev1/info.json
+++ b/keyboards/lily58/rev1/info.json
@@ -20,6 +20,9 @@
         "enabled": true,
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "led_count": 12
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/lily58/rules.mk b/keyboards/lily58/rules.mk
index 76ce166170dd..a63bd42ad37d 100644
--- a/keyboards/lily58/rules.mk
+++ b/keyboards/lily58/rules.mk
@@ -1,3 +1 @@
-OLED_DRIVER = SSD1306
-
 DEFAULT_FOLDER = lily58/rev1
diff --git a/keyboards/lime/rev1/config.h b/keyboards/lime/rev1/config.h
index 6ecfdf3034ae..ef4f99076da2 100644
--- a/keyboards/lime/rev1/config.h
+++ b/keyboards/lime/rev1/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define TAPPING_TERM 100
-
 /* joystick support */
 #ifdef JOYSTICK_ENABLE
 #   define JOYSTICK_AXIS_COUNT 2
@@ -25,8 +23,6 @@
 #   define JOYSTICK_AXIS_RESOLUTION 8
 #endif
 
-#define TAP_CODE_DELAY 10
-
 #define SPLIT_USB_DETECT
 
 #ifdef WPM_ENABLE
diff --git a/keyboards/lime/rev1/info.json b/keyboards/lime/rev1/info.json
index 215b47e10383..13caf33841e7 100644
--- a/keyboards/lime/rev1/info.json
+++ b/keyboards/lime/rev1/info.json
@@ -28,6 +28,12 @@
             }
         }
     },
+    "tapping": {
+        "term": 100
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/lime/rev1/rules.mk b/keyboards/lime/rev1/rules.mk
index f83c13ac8d68..8ef96fa9d06c 100644
--- a/keyboards/lime/rev1/rules.mk
+++ b/keyboards/lime/rev1/rules.mk
@@ -1,4 +1,3 @@
 ENCODER_ENABLE = yes
 ENCODER_RIGHT_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/linworks/dolice/info.json b/keyboards/linworks/dolice/info.json
index 9b4af1230562..23fb708cf646 100644
--- a/keyboards/linworks/dolice/info.json
+++ b/keyboards/linworks/dolice/info.json
@@ -25,9 +25,10 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
-        "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    "layout_aliases": {
+      "LAYOUT_all": "LAYOUT_alice_split_bs"
     },
+    "community_layouts": ["alice", "alice_split_bs"],
     "layouts": {
       "LAYOUT_alice": {
         "layout": [
diff --git a/keyboards/linworks/dolice/matrix_diagram.md b/keyboards/linworks/dolice/matrix_diagram.md
new file mode 100644
index 000000000000..c89f8f82225e
--- /dev/null
+++ b/keyboards/linworks/dolice/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for Linworks Dolice
+
+```
+                                                                       ┌───────┐
+                                                          2u Backspace │17     │
+                                                                       └───────┘
+  ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+  │00 │  │10 │01 │11 │02 │12 │03 │13 │         │14 │05 │15 │06 │16 │07 │17 │57 │
+ ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
+ │20 │  │30   │21 │22 │32 │23 │33 │          │24 │34 │25 │35 │26 │36 │27 │37    │
+┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤          └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐
+│40 │  │50    │41 │42 │52 │43 │53 │           │44 │54 │45 │55 │46 │56 │47        │
+└───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐
+      │70      │61 │62 │72 │63 │73 │        │64 │74 │65 │75 │66 │76 │67       │77 │
+      ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴──┐     ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘
+      │80   │     │81   │82     │83   │     │84        │85   │             │87   │
+      └─────┘     └─────┴───────┴─────┘     └──────────┴─────┘             └─────┘
+                                                                     ┌────────────┐
+                                                        2.75u RShift │67          │
+                                                                     └────────────┘
+                        ┌─────────┬───┐
+                        │82       │83 │ 2.25u-1u Left Space
+                        └─────────┴───┘
+```
diff --git a/keyboards/linworks/fave104/config.h b/keyboards/linworks/fave104/config.h
index 73e72a129f8d..41c1a917f39e 100644
--- a/keyboards/linworks/fave104/config.h
+++ b/keyboards/linworks/fave104/config.h
@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PWM_DRIVER PWMD2
 #define BACKLIGHT_PWM_CHANNEL 2
-#define BACKLIGHT_PAL_MODE 2
 #define BACKLIGHT_PWM_OUTPUT_FREQUENCY 1000 // Increases backlight PWM freq if compiled with an unmerged PR. Does no harm without it.
diff --git a/keyboards/linworks/fave104/rules.mk b/keyboards/linworks/fave104/rules.mk
index af31ae9eca18..d6925994b5f9 100644
--- a/keyboards/linworks/fave104/rules.mk
+++ b/keyboards/linworks/fave104/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/linworks/fave60/config.h b/keyboards/linworks/fave60/config.h
new file mode 100644
index 000000000000..55402104ddb0
--- /dev/null
+++ b/keyboards/linworks/fave60/config.h
@@ -0,0 +1,25 @@
+/*
+Copyright 2020 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/>.
+*/
+
+#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/linworks/fave60/info.json b/keyboards/linworks/fave60/info.json
new file mode 100644
index 000000000000..c801c594caee
--- /dev/null
+++ b/keyboards/linworks/fave60/info.json
@@ -0,0 +1,446 @@
+{
+    "manufacturer": "Lx3",
+    "keyboard_name": "fave60",
+    "maintainer": "keydler",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "backlight": {
+        "pin": "B7",
+        "breathing": true
+    },
+    "ws2812": {
+        "pin": "F5"
+    },
+     "rgblight": {
+        "led_count": 18,
+        "sleep": true,
+        "animations": {
+             "knight": true,
+             "rainbow_mood": true,
+             "rainbow_swirl": true,
+             "snake": true,
+             "twinkle": true
+        }
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["D6", "D4", "B5", "B4", "B6", "C6", "C7", "F4", "F0", "E6", "D1", "D2", "D3", "D5", "B0"],
+        "rows": ["F6", "F7", "D7", "F1", "D0"]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x000D",
+        "vid": "0x4C58"
+    },
+    "Layout_aliases": {
+        "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift"
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_tsangan",
+        "60_ansi_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, 14], "w": 2, "x": 13, "y": 0 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "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 },
+                { "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "matrix": [3, 1], "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, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "matrix": [4, 13], "w": 1.25, "x": 12.5, "y": 4 },
+                { "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "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": [0, 14], "x": 14, "y": 0 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "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 },
+                { "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "matrix": [3, 1], "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, 14], "x": 14, "y": 3 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "matrix": [4, 13], "w": 1.25, "x": 12.5, "y": 4 },
+                { "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "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, 14], "w": 2, "x": 13, "y": 0 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "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 },
+                { "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "matrix": [3, 1], "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, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "matrix": [4, 3], "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, 13], "x": 12.5, "y": 4 },
+                { "matrix": [4, 14], "w": 1.5, "x": 13.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": [0, 14], "x": 14, "y": 0 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "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 },
+                { "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "matrix": [3, 1], "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, 14], "x": 14, "y": 3 },
+                { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "matrix": [4, 3], "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, 13], "x": 12.5, "y": 4 },
+                { "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_winkeyless": {
+            "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], "w": 2, "x": 13, "y": 0 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "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 },
+                { "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "matrix": [3, 1], "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, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "matrix": [4, 3], "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, 14], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_winkeyless_split": {
+            "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], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 2], "x": 1.5, "y": 1 },
+                { "matrix": [1, 3], "x": 2.5, "y": 1 },
+                { "matrix": [1, 4], "x": 3.5, "y": 1 },
+                { "matrix": [1, 5], "x": 4.5, "y": 1 },
+                { "matrix": [1, 6], "x": 5.5, "y": 1 },
+                { "matrix": [1, 7], "x": 6.5, "y": 1 },
+                { "matrix": [1, 8], "x": 7.5, "y": 1 },
+                { "matrix": [1, 9], "x": 8.5, "y": 1 },
+                { "matrix": [1, 10], "x": 9.5, "y": 1 },
+                { "matrix": [1, 11], "x": 10.5, "y": 1 },
+                { "matrix": [1, 12], "x": 11.5, "y": 1 },
+                { "matrix": [1, 13], "x": 12.5, "y": 1 },
+                { "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "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 },
+                { "matrix": [2, 10], "x": 9.75, "y": 2 },
+                { "matrix": [2, 11], "x": 10.75, "y": 2 },
+                { "matrix": [2, 12], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "matrix": [3, 1], "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, 14], "x": 14, "y": 3 },
+                { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "matrix": [4, 3], "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, 14], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        }
+    }
+}
+
diff --git a/keyboards/linworks/fave60/keymaps/default/keymap.c b/keyboards/linworks/fave60/keymaps/default/keymap.c
new file mode 100644
index 000000000000..497aabde0fb2
--- /dev/null
+++ b/keyboards/linworks/fave60/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2020 noroadsleft
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [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, MO(1),   KC_MENU, KC_RCTL
+    ),
+    [1] = LAYOUT_60_ansi(
+        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, _______,
+        _______, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_LCBR, KC_RCBR, KC_PIPE,
+        _______, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, KC_COLN, KC_DQUO, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_LT,   KC_GT,   KC_QUES, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/linworks/fave60/keymaps/via/keymap.c b/keyboards/linworks/fave60/keymaps/via/keymap.c
new file mode 100644
index 000000000000..497aabde0fb2
--- /dev/null
+++ b/keyboards/linworks/fave60/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2020 noroadsleft
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [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, MO(1),   KC_MENU, KC_RCTL
+    ),
+    [1] = LAYOUT_60_ansi(
+        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, _______,
+        _______, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_LCBR, KC_RCBR, KC_PIPE,
+        _______, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, KC_COLN, KC_DQUO, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_LT,   KC_GT,   KC_QUES, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/linworks/fave60/keymaps/via/rules.mk b/keyboards/linworks/fave60/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/linworks/fave60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/linworks/fave60/readme.md b/keyboards/linworks/fave60/readme.md
new file mode 100644
index 000000000000..234010e00c6b
--- /dev/null
+++ b/keyboards/linworks/fave60/readme.md
@@ -0,0 +1,28 @@
+# linworks/fave60
+
+![linworks/fave60 front](https://i.imgur.com/lv97Ymuh.png)
+![linworks/fave60 back](https://i.imgur.com/xBLhQIoh.png)
+
+The Fave60 PCB is a 60 keys keyboard designed by Lx3 (Linworks).
+
+* Keyboard Maintainer: [keydler](https://github.com/duilchoi)
+* Hardware Supported: Fave 60 PCBs 
+* Hardware Availability: Groupbuy.Check the ongoing ones on [the Linworks Discord](https://discord.gg/UC8gTdVnsj)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make linworks/fave60:default
+
+Flashing example for this keyboard:
+
+    make linworks/fave60: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/linworks/fave60/rules.mk b/keyboards/linworks/fave60/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/linworks/fave60a/info.json b/keyboards/linworks/fave60a/info.json
index a0dd31e8c359..97b50f7e82e0 100644
--- a/keyboards/linworks/fave60a/info.json
+++ b/keyboards/linworks/fave60a/info.json
@@ -20,7 +20,7 @@
         "pin": "A10"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             { "flags": 4, "matrix": [4, 13], "x": 208, "y": 64 },
             { "flags": 4, "matrix": [4, 12], "x": 192, "y": 64 },
@@ -121,8 +121,15 @@
         "pid": "0x000C",
         "vid": "0x4C58"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_60_tsangan_hhkb"
+    },
+    "community_layouts": [
+        "60_tsangan_hhkb",
+        "60_ansi_tsangan"
+    ],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_60_tsangan_hhkb": {
             "layout": [
                 { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
                 { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
@@ -139,7 +146,8 @@
                 { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
                 { "label": "Bksp", "matrix": [0, 13], "x": 13, "y": 0 },
                 { "label": "K14", "matrix": [0, 14], "x": 14, "y": 0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+
+                { "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 },
@@ -152,8 +160,9 @@
                 { "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 Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 },
+
+                { "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 },
@@ -165,11 +174,12 @@
                 { "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": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 },
+
+                { "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": 3, "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 },
@@ -177,15 +187,84 @@
                 { "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, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75 },
                 { "label": "K54", "matrix": [3, 14], "x": 14, "y": 3 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+
+                { "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": "K58", "matrix": [4, 6], "x": 4, "y": 4, "w": 7 },
+                { "label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5 },
+                { "label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5 }
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                { "label": "Esc", "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": "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": "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": "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, 13], "x": 12.25, "y": 3, "w": 2.75 },
+
+                { "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], "w": 1.5, "x": 2.5, "y": 4 },
-                { "label": "K58", "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
-                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5 },
+                { "label": "K58", "matrix": [4, 6], "x": 4, "y": 4, "w": 7 },
+                { "label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5 },
                 { "label": "Fn", "matrix": [4, 12], "x": 12.5, "y": 4 },
-                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
+                { "label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5 }
             ]
         }
     }
diff --git a/keyboards/linworks/fave60a/keymaps/default/keymap.c b/keyboards/linworks/fave60a/keymaps/default/keymap.c
index 22e9c5f78219..c77f1b4143d6 100644
--- a/keyboards/linworks/fave60a/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave60a/keymaps/default/keymap.c
@@ -16,14 +16,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_60_tsangan_hhkb(
         KC_ESC,     KC_1,    KC_2, KC_3, KC_4, KC_5,   KC_6, KC_7, KC_8, KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_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_CAPS,    KC_A,    KC_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_TRNS,
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                               KC_RALT,   MO(1),  KC_RCTL
     ),
-    [1] = LAYOUT(
+    [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_DEL,   KC_DEL,
         KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PGUP,    KC_UP,  KC_PGDN,  KC_PSCR,  KC_SCRL,   KC_PAUS,  KC_TRNS,
         KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_INS,   KC_DEL,             KC_TRNS,
diff --git a/keyboards/linworks/fave60a/keymaps/via/keymap.c b/keyboards/linworks/fave60a/keymaps/via/keymap.c
index 22e9c5f78219..c77f1b4143d6 100644
--- a/keyboards/linworks/fave60a/keymaps/via/keymap.c
+++ b/keyboards/linworks/fave60a/keymaps/via/keymap.c
@@ -16,14 +16,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_60_tsangan_hhkb(
         KC_ESC,     KC_1,    KC_2, KC_3, KC_4, KC_5,   KC_6, KC_7, KC_8, KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_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_CAPS,    KC_A,    KC_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_TRNS,
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                               KC_RALT,   MO(1),  KC_RCTL
     ),
-    [1] = LAYOUT(
+    [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_DEL,   KC_DEL,
         KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PGUP,    KC_UP,  KC_PGDN,  KC_PSCR,  KC_SCRL,   KC_PAUS,  KC_TRNS,
         KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_INS,   KC_DEL,             KC_TRNS,
diff --git a/keyboards/linworks/fave60a/matrix_diagram.md b/keyboards/linworks/fave60a/matrix_diagram.md
new file mode 100644
index 000000000000..ccf0002be3a6
--- /dev/null
+++ b/keyboards/linworks/fave60a/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Lx3 fave60a
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+│30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │
+├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+│40   │41 │42   │46                         │4B   │4C │4D   │
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+                                                 ┌──────────┐
+                                    2.75u RShift │3D        │
+                                                 └──────────┘
+```
diff --git a/keyboards/linworks/fave65h/config.h b/keyboards/linworks/fave65h/config.h
index 2c8d4845b13b..3f549797d89b 100644
--- a/keyboards/linworks/fave65h/config.h
+++ b/keyboards/linworks/fave65h/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* Define RGB */
-#define RGBLED_NUM 67
 #define RGB_MATRIX_LED_COUNT 67
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/linworks/fave65h/info.json b/keyboards/linworks/fave65h/info.json
index c0fbdd690330..3bcfcb011642 100644
--- a/keyboards/linworks/fave65h/info.json
+++ b/keyboards/linworks/fave65h/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
diff --git a/keyboards/linworks/fave84h/info.json b/keyboards/linworks/fave84h/info.json
index 96e432e5ee66..01619e7bc678 100644
--- a/keyboards/linworks/fave84h/info.json
+++ b/keyboards/linworks/fave84h/info.json
@@ -23,7 +23,7 @@
         "rows": ["B1", "B2", "B3", "D3", "D1", "D0"]
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 1, "matrix": [3, 13], "x": 190, "y": 40},
             {"flags": 4, "matrix": [3, 11], "x": 167, "y": 40},
diff --git a/keyboards/linworks/fave87/config.h b/keyboards/linworks/fave87/config.h
deleted file mode 100644
index c46332b0077d..000000000000
--- a/keyboards/linworks/fave87/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2021 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/>.
-*/
-
-#pragma once
-
-/* Underglow */
-#define RGBLED_NUM 40
-#define RGBLIGHT_SLEEP // Turns LEDs off if the PC goes to sleep/shutdown
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/linworks/fave87/info.json b/keyboards/linworks/fave87/info.json
index e77af6d10dcf..8f551d8d3914 100644
--- a/keyboards/linworks/fave87/info.json
+++ b/keyboards/linworks/fave87/info.json
@@ -17,6 +17,15 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 40,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true
+        }
+    },
     "ws2812": {
         "pin": "E2"
     },
diff --git a/keyboards/linworks/fave87h/config.h b/keyboards/linworks/fave87h/config.h
index ef57446100df..e84a0ec92961 100644
--- a/keyboards/linworks/fave87h/config.h
+++ b/keyboards/linworks/fave87h/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* Define RGB */
-#define RGBLED_NUM 87
 #define RGB_MATRIX_LED_COUNT 87
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/linworks/fave87h/info.json b/keyboards/linworks/fave87h/info.json
index 4b7aff9ae383..c2008c4bb211 100644
--- a/keyboards/linworks/fave87h/info.json
+++ b/keyboards/linworks/fave87h/info.json
@@ -12,7 +12,7 @@
         "pin": "D2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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/info.json b/keyboards/linworks/favepada/info.json
index f80e3802d552..005d7d06d0cc 100644
--- a/keyboards/linworks/favepada/info.json
+++ b/keyboards/linworks/favepada/info.json
@@ -58,7 +58,7 @@
             "solid_splash": true,
             "solid_multisplash": true
         },
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             { "flags": 1, "matrix": [5, 2], "x": 149, "y": 59 },
             { "flags": 1, "matrix": [5, 0], "x": 0, "y": 59 },
diff --git a/keyboards/linworks/whale75/config.h b/keyboards/linworks/whale75/config.h
index e21a6d3974ba..629c1dcf701e 100644
--- a/keyboards/linworks/whale75/config.h
+++ b/keyboards/linworks/whale75/config.h
@@ -15,22 +15,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define BACKLIGHT_PWM_DRIVER PWMD1
-#define BACKLIGHT_PWM_CHANNEL 3
 #define BACKLIGHT_PAL_MODE 6
 #define BACKLIGHT_PWM_OUTPUT_FREQUENCY 1000 // Increases backlight PWM freq if compiled with an unmerged PR. Does no harm without it.
 
 /* Underglow */
 #define WS2812_EXTERNAL_PULLUP // This board uses a pull-up + 5 V tolerant GPIO in open drain config ro generate a 5 V signal
-#define RGBLED_NUM 18
 /* section for PWM WS2812 driver */
 #define WS2812_PWM_DRIVER PWMD4
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 2
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM7
 #define WS2812_DMA_CHANNEL 7
-#define RGBLIGHT_SLEEP
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/linworks/whale75/info.json b/keyboards/linworks/whale75/info.json
index b08d77e3074d..c5bd5d78b72e 100644
--- a/keyboards/linworks/whale75/info.json
+++ b/keyboards/linworks/whale75/info.json
@@ -8,6 +8,15 @@
         "device_version": "0.0.1",
         "force_nkro": true
     },
+    "rgblight": {
+        "led_count": 18,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true
+        }
+    },
     "ws2812": {
         "pin": "B9",
         "driver": "pwm"
@@ -22,6 +31,9 @@
             {"pin_a": "A15", "pin_b": "A14", "resolution": 2}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "backlight": {
         "pin": "A10",
         "levels": 5,
diff --git a/keyboards/linworks/whale75/rules.mk b/keyboards/linworks/whale75/rules.mk
index 2fd78a13f177..76b31f0a0a05 100644
--- a/keyboards/linworks/whale75/rules.mk
+++ b/keyboards/linworks/whale75/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/littlealby/mute/config.h b/keyboards/littlealby/mute/config.h
deleted file mode 100644
index 3a5b0356a94f..000000000000
--- a/keyboards/littlealby/mute/config.h
+++ /dev/null
@@ -1,20 +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/>.
- */
-#pragma once
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 1
-#endif
diff --git a/keyboards/littlealby/mute/info.json b/keyboards/littlealby/mute/info.json
index a6392a76e78c..a4a2a5822ecf 100644
--- a/keyboards/littlealby/mute/info.json
+++ b/keyboards/littlealby/mute/info.json
@@ -9,6 +9,9 @@
     "device_version": "0.0.1",
     "max_power": 100
   },
+  "rgblight": {
+    "led_count": 1
+  },
   "ws2812": {
     "pin": "B6"
   },
diff --git a/keyboards/ll3macorn/bongopad/config.h b/keyboards/ll3macorn/bongopad/config.h
index b4d4367f1db3..4ee4b5a99757 100644
--- a/keyboards/ll3macorn/bongopad/config.h
+++ b/keyboards/ll3macorn/bongopad/config.h
@@ -2,9 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-/* rgb underglow */
-#define RGBLED_NUM 6
-
 /* misc */
 #define LAYER_STATE_8BIT
 #define NO_ACTION_TAPPING
diff --git a/keyboards/ll3macorn/bongopad/info.json b/keyboards/ll3macorn/bongopad/info.json
index 6208b749f93f..cde72e5882f3 100644
--- a/keyboards/ll3macorn/bongopad/info.json
+++ b/keyboards/ll3macorn/bongopad/info.json
@@ -21,6 +21,9 @@
     "bootmagic": {
         "matrix": [1, 0]
     },
+    "rgblight": {
+        "led_count": 6
+    },
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/ll3macorn/bongopad/rules.mk b/keyboards/ll3macorn/bongopad/rules.mk
index c7f8935a0886..722f12e66eca 100644
--- a/keyboards/ll3macorn/bongopad/rules.mk
+++ b/keyboards/ll3macorn/bongopad/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
-WPM_ENABLE = yes
\ No newline at end of file
+WPM_ENABLE = yes
diff --git a/keyboards/lm_keyboard/lm60n/config.h b/keyboards/lm_keyboard/lm60n/config.h
index e40b0762d3a0..aea945a035d8 100644
--- a/keyboards/lm_keyboard/lm60n/config.h
+++ b/keyboards/lm_keyboard/lm60n/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-    #define RGBLED_NUM 41
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-
 /* 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/lm_keyboard/lm60n/info.json b/keyboards/lm_keyboard/lm60n/info.json
index ed8af5bc77a6..6698ed9f34dd 100644
--- a/keyboards/lm_keyboard/lm60n/info.json
+++ b/keyboards/lm_keyboard/lm60n/info.json
@@ -17,6 +17,24 @@
         "caps_lock": "C7",
         "num_lock": "B7"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 41,
+        "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": "B0"
     },
diff --git a/keyboards/loki65/config.h b/keyboards/loki65/config.h
index 750a12d64f08..3627f4c7e6d1 100644
--- a/keyboards/loki65/config.h
+++ b/keyboards/loki65/config.h
@@ -27,18 +27,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM5
 #define WS2812_DMA_CHANNEL 5
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
-
-#define RGBLED_NUM 37
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/loki65/info.json b/keyboards/loki65/info.json
index a1a5e3ef06cd..8424f7d437e9 100644
--- a/keyboards/loki65/info.json
+++ b/keyboards/loki65/info.json
@@ -8,6 +8,23 @@
         "pid": "0x4C36",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 37,
+        "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": "A9",
         "driver": "pwm"
diff --git a/keyboards/loki65/rules.mk b/keyboards/loki65/rules.mk
index 000ee78e21a2..cc9d7bb3f537 100644
--- a/keyboards/loki65/rules.mk
+++ b/keyboards/loki65/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/longnald/corin/config.h b/keyboards/longnald/corin/config.h
deleted file mode 100644
index caafcfd8a162..000000000000
--- a/keyboards/longnald/corin/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2020 Longnald <support@longnald.com>
- * Copyright (C) 2020 Seaton Jiang <seaton@vtrois.com>
- *
- * This program is free software: you can 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 RGBLED_NUM 64
-#    define RGBLIGHT_HUE_STEP 20
-#    define RGBLIGHT_SAT_STEP 20
-#    define RGBLIGHT_VAL_STEP 40
-#    define RGBLIGHT_SLEEP
-#    define RGBLIGHT_EFFECT_BREATHING
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#    define RGBLIGHT_EFFECT_SNAKE
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
diff --git a/keyboards/longnald/corin/info.json b/keyboards/longnald/corin/info.json
index 52964256bbc5..f3d420392226 100644
--- a/keyboards/longnald/corin/info.json
+++ b/keyboards/longnald/corin/info.json
@@ -12,7 +12,18 @@
     "pin": "D3"
   },
   "rgblight": {
-    "max_brightness": 200
+    "hue_steps": 20,
+    "saturation_steps": 20,
+    "brightness_steps": 40,
+    "led_count": 64,
+    "max_brightness": 200,
+    "sleep": true,
+    "animations": {
+      "breathing": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "static_gradient": true
+    }
   },
   "matrix_pins": {
     "cols": ["F7", "F6", "F1", "F5", "B1", "E6", "D4", "B7", "D1", "D2", "D0", "B4", "B6", "C6", "C7"],
diff --git a/keyboards/lucid/velvet_hotswap/info.json b/keyboards/lucid/velvet_hotswap/info.json
index 2cbecb782d84..4fa4ad46987c 100644
--- a/keyboards/lucid/velvet_hotswap/info.json
+++ b/keyboards/lucid/velvet_hotswap/info.json
@@ -4,7 +4,7 @@
     "url": "http://www.makerkeyboards.com",
     "maintainer": "Maker Keyboards",
     "usb": {
-        "device_version": "1.0.0",
+        "device_version": "1.0.1",
         "pid": "0x0008",
         "vid": "0x7667"
     },
@@ -14,9 +14,6 @@
         "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
     },
     "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true
diff --git a/keyboards/lucid/velvet_hotswap/keymaps/default/keymap.c b/keyboards/lucid/velvet_hotswap/keymaps/default/keymap.c
index 23e76c78544f..a8f6dae2ae0c 100644
--- a/keyboards/lucid/velvet_hotswap/keymaps/default/keymap.c
+++ b/keyboards/lucid/velvet_hotswap/keymaps/default/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 <hello@makerkeyboards.com>
+Copyright 2023 <hello@makerkeyboards.com>
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or
@@ -28,14 +28,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_CAPS, KC_A,    KC_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_UP,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_MENU, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_LAYER1] = LAYOUT_tkl_f13_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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      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/lucid/velvet_hotswap/keymaps/via/keymap.c b/keyboards/lucid/velvet_hotswap/keymaps/via/keymap.c
index b7257c8274be..2a0247c71599 100644
--- a/keyboards/lucid/velvet_hotswap/keymaps/via/keymap.c
+++ b/keyboards/lucid/velvet_hotswap/keymaps/via/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 <hello@makerkeyboards.com>
+Copyright 2023 <hello@makerkeyboards.com>
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or
@@ -30,32 +30,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_CAPS, KC_A,    KC_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_UP,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_MENU, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_LAYER1] = LAYOUT_tkl_f13_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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-
-    [_LAYER2] = LAYOUT_tkl_f13_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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-
-    [_LAYER3] = LAYOUT_tkl_f13_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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      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/lucid/velvet_hotswap/readme.md b/keyboards/lucid/velvet_hotswap/readme.md
index 7c6c72ee3816..1262386236b8 100644
--- a/keyboards/lucid/velvet_hotswap/readme.md
+++ b/keyboards/lucid/velvet_hotswap/readme.md
@@ -1,4 +1,6 @@
-# Velvet Hotswap PCB by Lucid
+# Velvet Hotswap PCB by Maker Keyboards
+
+![Maker Keyboards Velvet Hotswap](https://imgur.com/KfTWnCgh.jpg)
 
 The following is the QMK Firmware for the Velvet Hotswap PCB by [Maker Keyboards](http://www.makerkeyboards.com).
 * Keyboard Maintainer: Maker Keyboards
diff --git a/keyboards/lucid/velvet_solder/info.json b/keyboards/lucid/velvet_solder/info.json
index 1cc8e43cdbc3..b94b4160162b 100644
--- a/keyboards/lucid/velvet_solder/info.json
+++ b/keyboards/lucid/velvet_solder/info.json
@@ -4,7 +4,7 @@
     "url": "http://www.makerkeyboards.com",
     "maintainer": "Maker Keyboards",
     "usb": {
-        "device_version": "1.0.0",
+        "device_version": "1.0.1",
         "pid": "0x0007",
         "vid": "0x7667"
     },
@@ -14,9 +14,6 @@
         "rows": ["B4", "B5", "B6", "C0", "E1", "E0"]
     },
     "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true
diff --git a/keyboards/lucid/velvet_solder/keymaps/default/keymap.c b/keyboards/lucid/velvet_solder/keymaps/default/keymap.c
index 57fa9bf2bc02..7c120c645332 100644
--- a/keyboards/lucid/velvet_solder/keymaps/default/keymap.c
+++ b/keyboards/lucid/velvet_solder/keymaps/default/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 <hello@makerkeyboards.com>
+Copyright 2023 <hello@makerkeyboards.com>
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or
@@ -28,14 +28,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_CAPS, KC_A,    KC_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, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_RGUI, KC_MENU, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_LAYER1] = LAYOUT_all(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
     )
+
 };
diff --git a/keyboards/lucid/velvet_solder/keymaps/via/keymap.c b/keyboards/lucid/velvet_solder/keymaps/via/keymap.c
index 2c7cd72db8b4..6b7561754323 100644
--- a/keyboards/lucid/velvet_solder/keymaps/via/keymap.c
+++ b/keyboards/lucid/velvet_solder/keymaps/via/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 <hello@makerkeyboards.com>
+Copyright 2023 <hello@makerkeyboards.com>
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or
@@ -30,32 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_CAPS, KC_A,    KC_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, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_RGUI, KC_MENU, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_LAYER1] = LAYOUT_all(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-
-    [_LAYER2] = LAYOUT_all(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-
-    [_LAYER3] = LAYOUT_all(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
     )
+
 };
diff --git a/keyboards/lucid/velvet_solder/readme.md b/keyboards/lucid/velvet_solder/readme.md
index 83fd074047aa..120974634b74 100644
--- a/keyboards/lucid/velvet_solder/readme.md
+++ b/keyboards/lucid/velvet_solder/readme.md
@@ -1,4 +1,6 @@
-# Velvet Solder PCB by Lucid
+# Velvet Solder PCB by Maker Keyboards
+
+![Velvet Solder PCB](https://imgur.com/4lMWY6Dh.jpg)
 
 The following is the QMK Firmware for the Velvet Solder PCB by [Maker Keyboards](http://www.makerkeyboards.com).
 * Keyboard Maintainer: Maker Keyboards
diff --git a/keyboards/lxxt/lxxt.c b/keyboards/lxxt/lxxt.c
index 0c4401c32b15..67c9085d92b3 100644
--- a/keyboards/lxxt/lxxt.c
+++ b/keyboards/lxxt/lxxt.c
@@ -20,7 +20,7 @@
 #if defined(ENCODER_ENABLE)
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_kb(index, clockwise)) {
+    if (!encoder_update_user(index, clockwise)) {
       return false; /* Don't process further events if user function exists and returns false */
     }
     if (index == 0) { /* First encoder */
@@ -39,4 +39,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     return true;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/lyso1/lck75/config.h b/keyboards/lyso1/lck75/config.h
index ef5df5dd3d3f..b7ade40289af 100644
--- a/keyboards/lyso1/lck75/config.h
+++ b/keyboards/lyso1/lck75/config.h
@@ -21,8 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_SLEEP
-
 #define OLED_TIMEOUT 10000
 
 #define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
@@ -42,6 +40,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #define PERMISSIVE_HOLD
-#define TAPPING_TERM 200
 
 #define NO_ACTION_ONESHOT
diff --git a/keyboards/lyso1/lck75/rules.mk b/keyboards/lyso1/lck75/rules.mk
index db42ab6247ca..6f3aabc44fc1 100644
--- a/keyboards/lyso1/lck75/rules.mk
+++ b/keyboards/lyso1/lck75/rules.mk
@@ -15,7 +15,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 WPM_ENABLE = yes
 LTO_ENABLE = no
diff --git a/keyboards/lz/erghost/config.h b/keyboards/lz/erghost/config.h
index 4f298a1af80e..870f7003bdb3 100644
--- a/keyboards/lz/erghost/config.h
+++ b/keyboards/lz/erghost/config.h
@@ -36,22 +36,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 28
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#    define RGBLIGHT_EFFECT_STATIC_LIGHT
-#    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/lz/erghost/info.json b/keyboards/lz/erghost/info.json
index d7e266d134cf..68918a38f28d 100644
--- a/keyboards/lz/erghost/info.json
+++ b/keyboards/lz/erghost/info.json
@@ -12,6 +12,24 @@
         "pin": "B6",
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 28,
+        "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": "E2"
     },
diff --git a/keyboards/m10a/keymaps/gam3cat/keymap.c b/keyboards/m10a/keymaps/gam3cat/keymap.c
index bfe30b798117..8860bbd0108a 100644
--- a/keyboards/m10a/keymaps/gam3cat/keymap.c
+++ b/keyboards/m10a/keymaps/gam3cat/keymap.c
@@ -110,10 +110,6 @@ void matrix_init_user(void) {
   #endif
 }
 
-void matrix_scan_user(void) {
-
-}
-
 layer_state_t layer_state_set_user(layer_state_t state) {
     switch (get_highest_layer(state)) {
         case _L0:
@@ -152,7 +148,3 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     }
     return state;
 }
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/macro1/keymaps/default/keymap.c b/keyboards/macro1/keymaps/default/keymap.c
index 22cff4a718b0..047ea6980857 100644
--- a/keyboards/macro1/keymaps/default/keymap.c
+++ b/keyboards/macro1/keymaps/default/keymap.c
@@ -41,24 +41,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		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), };
-
-
+		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/macrocat/keymaps/oled/rules.mk b/keyboards/macrocat/keymaps/oled/rules.mk
index ca8d16ba670c..ab9d5c6ac2f8 100644
--- a/keyboards/macrocat/keymaps/oled/rules.mk
+++ b/keyboards/macrocat/keymaps/oled/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
\ No newline at end of file
diff --git a/keyboards/makrosu/config.h b/keyboards/makrosu/config.h
index 64f4553f9032..2977cd9d40a8 100644
--- a/keyboards/makrosu/config.h
+++ b/keyboards/makrosu/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/makrosu/info.json b/keyboards/makrosu/info.json
index 96eaf9fad620..ad6acdb100ad 100644
--- a/keyboards/makrosu/info.json
+++ b/keyboards/makrosu/info.json
@@ -18,6 +18,9 @@
             {"pin_a": "E6", "pin_b": "D1"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "bootmagic": {
         "matrix": [0, 5]
     },
diff --git a/keyboards/malevolti/lyra/rev1/config.h b/keyboards/malevolti/lyra/rev1/config.h
deleted file mode 100644
index 38a1a09cd343..000000000000
--- a/keyboards/malevolti/lyra/rev1/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
- /* Copyright 2021 Domanic Calleja
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have 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 100
diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/info.json
index 2b7f8fbd7130..7a9aa305acb1 100644
--- a/keyboards/malevolti/lyra/rev1/info.json
+++ b/keyboards/malevolti/lyra/rev1/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 100
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/malevolti/superlyra/rev1/config.h b/keyboards/malevolti/superlyra/rev1/config.h
deleted file mode 100644
index cffc2e9ff2e2..000000000000
--- a/keyboards/malevolti/superlyra/rev1/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
- /* Copyright 2021 Domanic Calleja
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have 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 100
diff --git a/keyboards/malevolti/superlyra/rev1/info.json b/keyboards/malevolti/superlyra/rev1/info.json
index 59cd50af421a..989e6baaa753 100644
--- a/keyboards/malevolti/superlyra/rev1/info.json
+++ b/keyboards/malevolti/superlyra/rev1/info.json
@@ -8,6 +8,9 @@
         "pid": "0x4C53",
         "device_version": "30.3.1"
     },
+    "tapping": {
+        "term": 100
+    },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"],
         "rows": ["B7", "B3", "B2", "B1", "B0"]
diff --git a/keyboards/manta60/config.h b/keyboards/manta60/config.h
index 918edbdbb048..cd3521fd6573 100644
--- a/keyboards/manta60/config.h
+++ b/keyboards/manta60/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SELECT_SOFT_SERIAL_SPEED 1
 
-#    define RGBLED_NUM 68
-#    define RGBLIGHT_SPLIT
-#    define RGBLED_SPLIT { 34, 34 }
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
 #    ifndef IOS_DEVICE_ENABLE
 #        define RGBLIGHT_VAL_STEP 16
 #        define RGBLIGHT_LIMIT_VAL 128 /* The maximum brightness level */
@@ -31,17 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define RGBLIGHT_VAL_STEP 4
 #        define RGBLIGHT_LIMIT_VAL 32 /* The maximum brightness level */
 #    endif
-//#    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
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 #    define USB_MAX_POWER_CONSUMPTION 400
diff --git a/keyboards/manta60/info.json b/keyboards/manta60/info.json
index ba48f72ad233..86637d4b6803 100644
--- a/keyboards/manta60/info.json
+++ b/keyboards/manta60/info.json
@@ -16,6 +16,23 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "led_count": 68,
+        "split_count": [34, 34],
+        "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": "D3"
     },
diff --git a/keyboards/manyboard/macro/config.h b/keyboards/manyboard/macro/config.h
deleted file mode 100644
index 392747371121..000000000000
--- a/keyboards/manyboard/macro/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2020 William Ehman
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should 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 Pins */
-#define RGBLED_NUM 2
diff --git a/keyboards/manyboard/macro/info.json b/keyboards/manyboard/macro/info.json
index 3df9a79430a1..10218337d96a 100644
--- a/keyboards/manyboard/macro/info.json
+++ b/keyboards/manyboard/macro/info.json
@@ -22,6 +22,7 @@
         "pin": "B6"
     },
     "rgblight": {
+        "led_count": 2,
         "max_brightness": 10
     },
     "processor": "atmega32u4",
diff --git a/keyboards/maple_computing/6ball/config.h b/keyboards/maple_computing/6ball/config.h
deleted file mode 100644
index 59679e27535d..000000000000
--- a/keyboards/maple_computing/6ball/config.h
+++ /dev/null
@@ -1,32 +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 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 TAPPING_TERM 200
diff --git a/keyboards/maple_computing/6ball/info.json b/keyboards/maple_computing/6ball/info.json
index b799baa28c75..56531d6fa253 100644
--- a/keyboards/maple_computing/6ball/info.json
+++ b/keyboards/maple_computing/6ball/info.json
@@ -8,6 +8,21 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 6,
+        "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": "F7"
     },
diff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json
index 0a19667957c7..e675f2f93277 100644
--- a/keyboards/maple_computing/christmas_tree/info.json
+++ b/keyboards/maple_computing/christmas_tree/info.json
@@ -13,6 +13,7 @@
   },
   "diode_direction": "COL2ROW",
   "backlight": {
+    "driver": "timer",
     "pin": "D2"
   },
   "processor": "atmega32u4",
diff --git a/keyboards/maple_computing/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/info.json
index 3b971cb67360..de89abee75cb 100644
--- a/keyboards/maple_computing/ivy/rev1/info.json
+++ b/keyboards/maple_computing/ivy/rev1/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "D2"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/maple_computing/jnao/info.json b/keyboards/maple_computing/jnao/info.json
index f1e753017f1d..73ddf107ecb9 100644
--- a/keyboards/maple_computing/jnao/info.json
+++ b/keyboards/maple_computing/jnao/info.json
@@ -14,6 +14,7 @@
   },
   "diode_direction": "COL2ROW",
   "backlight": {
+    "driver": "timer",
     "pin": "D0"
   },
   "processor": "atmega32u4",
diff --git a/keyboards/maple_computing/launchpad/keymaps/drashna/rules.mk b/keyboards/maple_computing/launchpad/keymaps/drashna/rules.mk
index c3b1e0a8b976..9fa73f2406c0 100644
--- a/keyboards/maple_computing/launchpad/keymaps/drashna/rules.mk
+++ b/keyboards/maple_computing/launchpad/keymaps/drashna/rules.mk
@@ -4,4 +4,4 @@ RGBLIGHT_ENABLE  = no
 AUDIO_ENABLE     = no
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
+RGB_MATRIX_DRIVER = ws2812
diff --git a/keyboards/maple_computing/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h
deleted file mode 100644
index 7cf73259b449..000000000000
--- a/keyboards/maple_computing/launchpad/rev1/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/>.
-*/
-
-#pragma once
-
-#define RGBLED_NUM 10
-#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/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json
index 81c23850ec43..a846dd83f501 100644
--- a/keyboards/maple_computing/launchpad/rev1/info.json
+++ b/keyboards/maple_computing/launchpad/rev1/info.json
@@ -8,6 +8,21 @@
         "pid": "0x6007",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 10,
+        "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": "F6"
     },
diff --git a/keyboards/maple_computing/lets_split_eh/eh/config.h b/keyboards/maple_computing/lets_split_eh/eh/config.h
index c64be02975a8..38cf73ae1e37 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/config.h
+++ b/keyboards/maple_computing/lets_split_eh/eh/config.h
@@ -18,21 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12    // Number of LEDs (each hand)
-#define RGBLED_SPLIT { 6, 6 }
-#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
-
-
 /* Split Defines */
 #define SPLIT_HAND_PIN D3
 
diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json
index 1908f56eeb1c..2b77267da816 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/info.json
+++ b/keyboards/maple_computing/lets_split_eh/eh/info.json
@@ -16,6 +16,22 @@
     "backlight": {
         "pin": "B7"
     },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6],
+        "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": "B2"
     },
diff --git a/keyboards/maple_computing/the_ruler/config.h b/keyboards/maple_computing/the_ruler/config.h
index e3b34d1bf007..b9449c4714bf 100644
--- a/keyboards/maple_computing/the_ruler/config.h
+++ b/keyboards/maple_computing/the_ruler/config.h
@@ -37,18 +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 RGBLED_NUM 1      // 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
diff --git a/keyboards/maple_computing/the_ruler/info.json b/keyboards/maple_computing/the_ruler/info.json
index 336d48af4c66..9ba1355fdd32 100644
--- a/keyboards/maple_computing/the_ruler/info.json
+++ b/keyboards/maple_computing/the_ruler/info.json
@@ -8,6 +8,22 @@
     "pid": "0x6007",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "hue_steps": 10,
+    "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
+    }
+  },
   "ws2812": {
     "pin": "E6"
   },
diff --git a/keyboards/mariorion_v25/halconf.h b/keyboards/mariorion_v25/halconf.h
new file mode 100644
index 000000000000..a25bad2c7f94
--- /dev/null
+++ b/keyboards/mariorion_v25/halconf.h
@@ -0,0 +1,10 @@
+// Copyright 2023 Maria (@toril940)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#define HAL_USE_SPI FALSE
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/mariorion_v25/keymaps/default/keymap.c b/keyboards/mariorion_v25/keymaps/default/keymap.c
new file mode 100644
index 000000000000..4bee23b27288
--- /dev/null
+++ b/keyboards/mariorion_v25/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 Maria (@toril940)
+// 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 │ - │ = │ Bk│ Bk│ │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 │ ; │ ' │  Enter │
+	 * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐
+	 * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shft │Fn │     │ ↑ │
+	 * ├────┼───┴┬──┴─┬─┴───┴───┼───┼───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐
+	 * │Ctrl│GUI │Alt │         │   │          │ Alt│ GUI│Menu│Ctrl│ │ ← │ ↓ │ → │
+	 * └────┴────┴────┴─────────┴───┴──────────┴────┴────┴────┴────┘ └───┴───┴───┘
+	 */
+	[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, EE_CLR,  QK_BOOT,
+
+			KC_GRV,  KC_1,    KC_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, RGB_TOG, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, RGB_MOD,                      KC_UP,
+			KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+	)
+};
diff --git a/keyboards/mariorion_v25/keymaps/via/keymap.c b/keyboards/mariorion_v25/keymaps/via/keymap.c
new file mode 100644
index 000000000000..95bbe9cfc289
--- /dev/null
+++ b/keyboards/mariorion_v25/keymaps/via/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 Maria (@toril940)
+// 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 │ - │ = │ Bk│ Bk│ │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 │ ; │ ' │  Enter │
+	 * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐
+	 * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shft │Fn │     │ ↑ │
+	 * ├────┼───┴┬──┴─┬─┴───┴───┼───┼───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐
+	 * │Ctrl│GUI │Alt │         │   │          │ Alt│ GUI│Menu│Ctrl│ │ ← │ ↓ │ → │
+	 * └────┴────┴────┴─────────┴───┴──────────┴────┴────┴────┴────┘ └───┴───┴───┘
+	 */
+	[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, RGB_TOG, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, RGB_MOD,                      KC_UP,
+			KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+	),
+};
diff --git a/keyboards/mariorion_v25/keymaps/via/rules.mk b/keyboards/mariorion_v25/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/mariorion_v25/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mariorion_v25/mariorion_v25.c b/keyboards/mariorion_v25/mariorion_v25.c
new file mode 100644
index 000000000000..7c57c29dfd1a
--- /dev/null
+++ b/keyboards/mariorion_v25/mariorion_v25.c
@@ -0,0 +1,72 @@
+// Copyright <year> <name> <email> @<github_username>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You 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"
+
+// Optional override functions below.
+// You can leave any or all of these undefined.
+// These are only required if you want to perform custom actions.
+
+void matrix_init_kb(void) {
+	// put your keyboard start-up code here
+	// runs once when the firmware starts up
+
+	setPinOutput(INDICATOR_0);
+	setPinOutput(INDICATOR_1);
+	setPinOutput(INDICATOR_2);
+	matrix_init_user();
+}
+
+layer_state_t layer_state_set_kb(layer_state_t state) {
+	switch (get_highest_layer(state)) {
+		case 1:
+			writePinHigh(INDICATOR_0);
+			writePinLow(INDICATOR_1);
+			writePinLow(INDICATOR_2);
+			break;
+		case 2:
+			writePinLow(INDICATOR_0);
+			writePinHigh(INDICATOR_1);
+			writePinLow(INDICATOR_2);
+			break;
+		case 3:
+			writePinLow(INDICATOR_0);
+			writePinLow(INDICATOR_1);
+			writePinHigh(INDICATOR_2);
+			break;
+		default:
+			writePinHigh(INDICATOR_0);
+			writePinHigh(INDICATOR_1);
+			writePinHigh(INDICATOR_2);
+			break;
+	}
+	return layer_state_set_user(state);
+}
+
+void suspend_power_down_kb(void) {
+	writePinLow(INDICATOR_0);
+	writePinLow(INDICATOR_1);
+	writePinLow(INDICATOR_2);
+
+	suspend_power_down_user();
+}
+
+void suspend_wakeup_init_kb(void) {
+	writePinHigh(INDICATOR_0);
+	writePinHigh(INDICATOR_1);
+	writePinHigh(INDICATOR_2);
+
+	suspend_wakeup_init_user();
+}
diff --git a/keyboards/mariorion_v25/matrix_diagram.md b/keyboards/mariorion_v25/matrix_diagram.md
new file mode 100644
index 000000000000..f37df5a6e109
--- /dev/null
+++ b/keyboards/mariorion_v25/matrix_diagram.md
@@ -0,0 +1,29 @@
+# Matrix Diagram for MariOrion v2.5
+```
+┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+│00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0F │0G │0H │
+└───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐     ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │2F │1G │1H │     │1D     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤     └─┬─────┤
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │3F │2G │2H │       │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘    ┌──┴┐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 │     │4G │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐
+│50  │51  │52  │55                      │5A  │5B  │5C  │5D  │ │5F │5G │5H │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+┌────────┐                                       ┌──────────┐
+│40      │ 2.25u LShift             2.75u RShift │4C        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│50   │51 │52   │55                         │5B   │5C │5D   │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+┌─────┬───┬─────┬───────────┬───┬───────────┬─────┬───┬─────┐
+│50   │51 │52   │53         │55 │57         │5B   │5C │5D   │ Split 7u Spacebar
+└─────┴───┴─────┴───────────┴───┴───────────┴─────┴───┴─────┘
+┌─────┬───┬───────────────────────────────────────┬───┬─────┐
+│50   │51 │55                                     │5C │5D   │ 10u Spacebar
+└─────┴───┴───────────────────────────────────────┴───┴─────┘
+```
\ No newline at end of file
diff --git a/keyboards/mariorion_v25/mcuconf.h b/keyboards/mariorion_v25/mcuconf.h
new file mode 100644
index 000000000000..c2cf95aef2e7
--- /dev/null
+++ b/keyboards/mariorion_v25/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Maria (@toril940)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#define STM32_PWM_USE_TIM17 TRUE
+#define STM32_TIM17_SUPPRESS_ISR
\ No newline at end of file
diff --git a/keyboards/mariorion_v25/prod/config.h b/keyboards/mariorion_v25/prod/config.h
new file mode 100644
index 000000000000..042f7662d8e9
--- /dev/null
+++ b/keyboards/mariorion_v25/prod/config.h
@@ -0,0 +1,16 @@
+// Copyright 2023 Maria (@toril940)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define WS2812_EXTERNAL_PULLUP
+
+#define WS2812_PWM_DRIVER PWMD17
+#define WS2812_PWM_CHANNEL 1
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM1
+#define WS2812_DMA_CHANNEL 1
+// #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM17_UP
+
+#define INDICATOR_0 C9
+#define INDICATOR_1 C8
+#define INDICATOR_2 C7
\ No newline at end of file
diff --git a/keyboards/mariorion_v25/prod/info.json b/keyboards/mariorion_v25/prod/info.json
new file mode 100644
index 000000000000..dd014be03aee
--- /dev/null
+++ b/keyboards/mariorion_v25/prod/info.json
@@ -0,0 +1,889 @@
+{
+    "manufacturer": "Maria",
+    "keyboard_name": "MariOrion v2.5",
+    "maintainer": "toril940",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight" : true
+    },
+    "indicators": {
+        "caps_lock": "A6",
+        "num_lock": "A15",
+        "on_state": 0
+    },
+    "rgblight": {
+        "led_count": 25,
+        "animations": {
+            "static_light": true,
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "christmas": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "driver": "ws2812",
+        "led_map": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 24, 23, 22, 21, 20],
+        "sleep": true
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "B9"
+    },
+    "matrix_pins": {
+        "cols": ["A4", "A5", "A7", "C4", "C5", "B0", "B1", "B2", "B10", "B11", "B13", "B14", "B15", "C6", "B12",
+            "F0", "C15", "C14"],
+        "rows": ["B5", "B4", "B3", "A2", "C13", "B8"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0002",
+        "vid": "0x6108"
+    },
+    "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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": [1, 17], "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": [2, 15], "x":15.25, "y":2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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": 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, 16], "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, 3], "x": 3.75, "y": 5.25, "w": 2.375},
+                {"matrix": [5, 5], "x": 6.25, "y": 5.25},
+                {"matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.375},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "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": [2, 15], "x":15.25, "y":2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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, 16], "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, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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": [1, 17], "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": [2, 15], "x":15.25, "y":2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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, 16], "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, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "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": [2, 15], "x":15.25, "y":2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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, 16], "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, 5], "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, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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": [1, 17], "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": [2, 15], "x":15.25, "y":2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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, 16], "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, 5], "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, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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, 16], "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, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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, 16], "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, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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, 16], "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, 5], "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, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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, 16], "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, 5], "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, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mariorion_v25/prod/rules.mk b/keyboards/mariorion_v25/prod/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/mariorion_v25/prod/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/mariorion_v25/proto/config.h b/keyboards/mariorion_v25/proto/config.h
new file mode 100644
index 000000000000..6865f2dbb01c
--- /dev/null
+++ b/keyboards/mariorion_v25/proto/config.h
@@ -0,0 +1,16 @@
+// Copyright 2023 Maria (@toril940)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define WS2812_EXTERNAL_PULLUP
+
+#define WS2812_PWM_DRIVER PWMD17
+#define WS2812_PWM_CHANNEL 1
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM1
+#define WS2812_DMA_CHANNEL 1
+// #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM17_UP
+
+#define INDICATOR_0 C8
+#define INDICATOR_1 C7
+#define INDICATOR_2 C6
\ No newline at end of file
diff --git a/keyboards/mariorion_v25/proto/info.json b/keyboards/mariorion_v25/proto/info.json
new file mode 100644
index 000000000000..be00d447d2b5
--- /dev/null
+++ b/keyboards/mariorion_v25/proto/info.json
@@ -0,0 +1,889 @@
+{
+    "manufacturer": "Maria",
+    "keyboard_name": "MariOrion v2.5",
+    "maintainer": "toril940",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "led_count": 25,
+        "animations": {
+            "static_light": true,
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "christmas": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "driver": "ws2812",
+        "led_map": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 24, 23, 22, 21, 20],
+        "sleep": true
+    },
+    "indicators": {
+        "caps_lock": "A5",
+        "num_lock": "A15",
+        "on_state": 0
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "B9"
+    },
+    "matrix_pins": {
+        "cols": ["A3", "A4", "A6", "A7", "C4", "C5", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "B11",
+            "F0", "C15", "C14"],
+        "rows": ["B5", "B4", "B3", "A2", "C13", "B8"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x6108"
+    },
+    "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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": [1, 17], "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": [2, 15], "x":15.25, "y":2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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": 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, 16], "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, 3], "x": 3.75, "y": 5.25, "w": 2.375},
+                {"matrix": [5, 5], "x": 6.25, "y": 5.25},
+                {"matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.375},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "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": [2, 15], "x":15.25, "y":2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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, 16], "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, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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": [1, 17], "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": [2, 15], "x":15.25, "y":2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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, 16], "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, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "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": [2, 15], "x":15.25, "y":2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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, 16], "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, 5], "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, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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": [1, 17], "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": [2, 15], "x":15.25, "y":2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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, 16], "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, 5], "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, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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, 16], "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, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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, 16], "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, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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, 16], "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, 5], "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, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "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, 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": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "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": [1, 17], "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, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "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, 16], "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, 5], "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, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mariorion_v25/proto/rules.mk b/keyboards/mariorion_v25/proto/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/mariorion_v25/proto/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/mariorion_v25/readme.md b/keyboards/mariorion_v25/readme.md
new file mode 100644
index 000000000000..13f2f9dc2abf
--- /dev/null
+++ b/keyboards/mariorion_v25/readme.md
@@ -0,0 +1,36 @@
+# MariOrion v2.5
+
+![mariorion_v25_1](https://i.imgur.com/PFb6AGo.jpg)
+![mariorion_v25_2](https://i.imgur.com/Fgdm2fx.jpg)
+
+This project was a revival of the Duck Orion v2.5, where we don't have very many PCBs with modern features, and
+especially Alps support as well. This PCB has both Alps and MX support as well as universal layout support! It also
+features a 3u/1u/3u split spacebar variant for fun :)
+
+The prototype version is for use only by Maria, and it's the r0 run in essence. Please do use prod unless otherwise
+stated (prod me if you're confused, @mawiaa on Discord)!
+
+* Keyboard Maintainer: [Maria](https://github.com/toril940)
+* Hardware Supported: MariOrion v2.5 PCB
+* Hardware Availability: Link coming soon, through Hineybush :)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mariorion_v25/prod:default
+    make mariorion_v25/proto:default
+
+Flashing example for this keyboard:
+
+    make mariorion_v25/prod:default:flash
+    make mariorion_v25/proto: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**: Hold the reset button on the back of the PCB for 4-10 seconds or so -
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/mariorion_v25/rules.mk b/keyboards/mariorion_v25/rules.mk
new file mode 100644
index 000000000000..f0bfa47284c0
--- /dev/null
+++ b/keyboards/mariorion_v25/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = mariorion_v25/prod
diff --git a/keyboards/marksard/leftover30/config.h b/keyboards/marksard/leftover30/config.h
index 8f87bd4f1aca..4d408c6e4bd6 100644
--- a/keyboards/marksard/leftover30/config.h
+++ b/keyboards/marksard/leftover30/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 6
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/marksard/leftover30/info.json b/keyboards/marksard/leftover30/info.json
index 44e8b9bca51c..139214ad4976 100644
--- a/keyboards/marksard/leftover30/info.json
+++ b/keyboards/marksard/leftover30/info.json
@@ -18,6 +18,24 @@
             {"pin_a": "F4", "pin_b": "F5"}
         ]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "D3"
     },
diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h
index d3250461b2d9..bd9aeeecdbe8 100644
--- a/keyboards/marksard/rhymestone/rev1/config.h
+++ b/keyboards/marksard/rhymestone/rev1/config.h
@@ -17,37 +17,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-  #define RGBLED_NUM 40
-  #define RGBLED_SPLIT {20, 20}
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 #ifdef RGB_MATRIX_ENABLE
-  #define RGBLED_NUM 40    // Number of LEDs
-  #define RGB_MATRIX_LED_COUNT RGBLED_NUM
+  #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
-  #define RGB_MATRIX_HUE_STEP 8
-  #define RGB_MATRIX_SAT_STEP 8
-  #define RGB_MATRIX_VAL_STEP 8
-  #define RGB_MATRIX_SPD_STEP 10
 
 //   #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
 //   #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/info.json
index fc4ee548d168..be8a846cfc28 100644
--- a/keyboards/marksard/rhymestone/rev1/info.json
+++ b/keyboards/marksard/rhymestone/rev1/info.json
@@ -9,7 +9,10 @@
         "device_version": "0.2.0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812",
+        "sat_steps": 8,
+        "val_steps": 8,
+        "speed_steps": 10
     },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4"],
@@ -23,7 +26,18 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 150
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 40,
+        "max_brightness": 150,
+        "sleep": true,
+        "split_count": [20, 20],
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "knight": true,
+            "static_gradient": true
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/marksard/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h
index 22435108df1d..0d26ca0cf0c1 100644
--- a/keyboards/marksard/treadstone32/lite/config.h
+++ b/keyboards/marksard/treadstone32/lite/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 6
   #ifndef IOS_DEVICE_ENABLE
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_VAL_STEP 8
@@ -25,18 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_LIMIT_VAL 50
     #define RGBLIGHT_VAL_STEP 4
   #endif
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #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
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for treadstone32 keyboard
diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/info.json
index 878b4db2ac27..4ca3d8b13898 100644
--- a/keyboards/marksard/treadstone32/lite/info.json
+++ b/keyboards/marksard/treadstone32/lite/info.json
@@ -3,6 +3,17 @@
     "usb": {
         "device_version": "0.1.5"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "led_count": 6,
+        "sleep": true,
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "knight": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/marksard/treadstone32/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h
index 1f3a9ec16844..fca4ba8f3dc6 100644
--- a/keyboards/marksard/treadstone32/rev1/config.h
+++ b/keyboards/marksard/treadstone32/rev1/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 6
   #ifndef IOS_DEVICE_ENABLE
     #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
     #define RGBLIGHT_VAL_STEP 8
@@ -25,18 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_LIMIT_VAL 50
     #define RGBLIGHT_VAL_STEP 4
   #endif
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #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
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for treadstone32 keyboard
diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/info.json
index 00538f7e8abc..7da6e2c24e84 100644
--- a/keyboards/marksard/treadstone32/rev1/info.json
+++ b/keyboards/marksard/treadstone32/rev1/info.json
@@ -3,6 +3,17 @@
     "usb": {
         "device_version": "0.1.0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "led_count": 6,
+        "sleep": true,
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "knight": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/marksard/treadstone48/common/oled_helper.c b/keyboards/marksard/treadstone48/common/oled_helper.c
index c3c8f23cbc51..e9a8cf564a3f 100644
--- a/keyboards/marksard/treadstone48/common/oled_helper.c
+++ b/keyboards/marksard/treadstone48/common/oled_helper.c
@@ -43,10 +43,10 @@ void render_key_status(void) {
 static char lock_buf[24] = "Lock state ready.\n";
 void update_lock_status(void) {
 
-  uint8_t leds = host_keyboard_leds();
-  char *num_lock = (leds & (1<<USB_LED_NUM_LOCK)) ? "Num" : "";
-  char *caps_lock = (leds & (1<<USB_LED_CAPS_LOCK)) ? "Caps" : "";
-  char *scrl_lock = (leds & (1<<USB_LED_SCROLL_LOCK)) ? "Scrn" : "";
+  led_t led_state = host_keyboard_led_state();
+  char *num_lock = led_state.num_lock ? "Num" : "";
+  char *caps_lock = led_state.caps_lock ? "Caps" : "";
+  char *scrl_lock = led_state.scroll_lock ? "Scrn" : "";
   snprintf(lock_buf, sizeof(lock_buf) - 1, "Lock:%s %s %s\n",
           num_lock, caps_lock, scrl_lock);
 }
diff --git a/keyboards/marksard/treadstone48/keymaps/default/rules.mk b/keyboards/marksard/treadstone48/keymaps/default/rules.mk
index 23c4ae9542cf..4ce2645eca12 100644
--- a/keyboards/marksard/treadstone48/keymaps/default/rules.mk
+++ b/keyboards/marksard/treadstone48/keymaps/default/rules.mk
@@ -2,7 +2,6 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
 
 # If you want to change the display of OLED, you need to change here
diff --git a/keyboards/marksard/treadstone48/keymaps/like_jis/rules.mk b/keyboards/marksard/treadstone48/keymaps/like_jis/rules.mk
index 23c4ae9542cf..4ce2645eca12 100644
--- a/keyboards/marksard/treadstone48/keymaps/like_jis/rules.mk
+++ b/keyboards/marksard/treadstone48/keymaps/like_jis/rules.mk
@@ -2,7 +2,6 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
 
 # If you want to change the display of OLED, you need to change here
diff --git a/keyboards/marksard/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h
index 63ec196632e6..3f43b16d2be3 100644
--- a/keyboards/marksard/treadstone48/rev1/config.h
+++ b/keyboards/marksard/treadstone48/rev1/config.h
@@ -24,19 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLED_NUM 32
     #define RGBLED_SPLIT {12, 20}
   #endif
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/marksard/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/rev1/info.json
index f4dfc35ec104..5c13e5b15c5b 100644
--- a/keyboards/marksard/treadstone48/rev1/info.json
+++ b/keyboards/marksard/treadstone48/rev1/info.json
@@ -20,7 +20,16 @@
     "pin": "D3"
   },
   "rgblight": {
-    "max_brightness": 180
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "max_brightness": 180,
+    "sleep": true,
+    "animations": {
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "knight": true,
+      "static_gradient": true
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/rules.mk b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/rules.mk
index fafe992d6f9a..6b041a7554fa 100644
--- a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/rules.mk
+++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/rules.mk
@@ -2,7 +2,6 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
 
 # If you use connection the Rhymestone, please enable RS_EXTRA_LED
diff --git a/keyboards/marksard/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h
index 4335ea06702b..4d408c6e4bd6 100644
--- a/keyboards/marksard/treadstone48/rev2/config.h
+++ b/keyboards/marksard/treadstone48/rev2/config.h
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 12
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json
index 6e39235dc1cb..59af38e55d90 100644
--- a/keyboards/marksard/treadstone48/rev2/info.json
+++ b/keyboards/marksard/treadstone48/rev2/info.json
@@ -12,7 +12,17 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 220
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "max_brightness": 220,
+        "sleep": true,
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "knight": true,
+            "static_gradient": true
+        }
     },
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
diff --git a/keyboards/marksard/treadstone48/rules.mk b/keyboards/marksard/treadstone48/rules.mk
index 78219bfaceb8..e9a2de4c2516 100644
--- a/keyboards/marksard/treadstone48/rules.mk
+++ b/keyboards/marksard/treadstone48/rules.mk
@@ -14,6 +14,5 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 DEFAULT_FOLDER = marksard/treadstone48/rev1
diff --git a/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c b/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
index edd906deb513..8df4376806b8 100644
--- a/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/charlesrocket/keymap.c
@@ -65,10 +65,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, LAG_SWP, LAG_NRM,                            _______,                            _______, TG(3),   _______, _______, _______
     ),
     [3] = LAYOUT(
-        XP(0,1), XP(2,3),   XP(4,5),   XP(6,7),   XP(8,9), XP(10,11), XP(12,13), XP(14,15), XP(16,17), XP(18,19), XP(20,21), XP(22,23), XP(24,25), _______, _______,
-        _______, KC_QUES,   XP(27,28), XP(29,31), X(32),   XP(33,34), X(35),     X(36),     XP(37,38), XP(39,40), XP(41,42), XP(43,44), XP(45,46), _______, _______,
-        _______, XP(47,48), X(49),     X(50),     KC_UNDS, XP(52,5),  XP(53,54), XP(55,56), KC_QUOT,   XP(59,60), XP(61,62), XP(63,64), _______, _______,
-        _______, XP(65,66), X(67),     XP(68,69), X(70),   X(71),     X(72),     X(73),     KC_PIPE,   XP(75,76), X(77),     XP(78,79), _______, _______,
+        UP(0,1), UP(2,3),   UP(4,5),   UP(6,7),   UP(8,9), UP(10,11), UP(12,13), UP(14,15), UP(16,17), UP(18,19), UP(20,21), UP(22,23), UP(24,25), _______, _______,
+        _______, KC_QUES,   UP(27,28), UP(29,31), UM(32),   UP(33,34), UM(35),     UM(36),     UP(37,38), UP(39,40), UP(41,42), UP(43,44), UP(45,46), _______, _______,
+        _______, UP(47,48), UM(49),     UM(50),     KC_UNDS, UP(52,5),  UP(53,54), UP(55,56), KC_QUOT,   UP(59,60), UP(61,62), UP(63,64), _______, _______,
+        _______, UP(65,66), UM(67),     UP(68,69), UM(70),   UM(71),     UM(72),     UM(73),     KC_PIPE,   UP(75,76), UM(77),     UP(78,79), _______, _______,
         _______, _______,   _______,   _______,   _______, TG(3),     _______,   _______,   _______
     ),
 };
diff --git a/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c b/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c
index 51772f1fa3ff..c974fb9e2b3d 100644
--- a/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/jdelkins_ss/keymap.c
@@ -26,7 +26,6 @@ uint16_t rgb_idle_seconds = 0;
 uint16_t rgb_timer;
 uint8_t save_layer;
 
-#define NUMLOCK_ON (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK))
 #define MODS_SHIFT (get_mods() & MOD_MASK_SHIFT)
 #define MODS_CTRL (get_mods() & MOD_MASK_CTRL)
 
@@ -143,7 +142,7 @@ static void set_rgb_layer(int layer) {
 void matrix_init_keymap(void) {
     set_rgb_layer(_QWERTY);
     // force numlock on upon startup
-    if (!NUMLOCK_ON) {
+    if (!host_keyboard_led_state().num_lock) {
         tap_code(KC_NUM_LOCK);
     }
 };
diff --git a/keyboards/matrix/abelx/config.h b/keyboards/matrix/abelx/config.h
index a1eaecf36e32..63b820214665 100644
--- a/keyboards/matrix/abelx/config.h
+++ b/keyboards/matrix/abelx/config.h
@@ -88,21 +88,6 @@
 #define I2C1_CLOCK_SPEED 400000
 #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
 
-
-// rgb light setting
-#define RGBLED_NUM 9
-#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 AW9523B_RGB_NUM 4
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE
diff --git a/keyboards/matrix/abelx/info.json b/keyboards/matrix/abelx/info.json
index 60a272dc1f64..35bc05981099 100644
--- a/keyboards/matrix/abelx/info.json
+++ b/keyboards/matrix/abelx/info.json
@@ -8,6 +8,21 @@
     "pid": "0xAB87",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "led_count": 9,
+    "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": "B4"
   },
diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h
index 017961460c49..9469d689d0c7 100644
--- a/keyboards/matrix/cain_re/config.h
+++ b/keyboards/matrix/cain_re/config.h
@@ -19,25 +19,6 @@
 
 #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 RGBLED_NUM 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-#define RGBLIGHT_LED_MAP { 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3 }
-
 #define CAPS_PIN    D3
 #define NUM_PIN     F7
 #define SCROLL_PIN  B0
diff --git a/keyboards/matrix/cain_re/info.json b/keyboards/matrix/cain_re/info.json
index 5b89ed83ef78..37e129f1f2f5 100644
--- a/keyboards/matrix/cain_re/info.json
+++ b/keyboards/matrix/cain_re/info.json
@@ -8,6 +8,25 @@
         "pid": "0x0106",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "sleep": true,
+        "led_map": [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3],
+        "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": "E6"
     },
diff --git a/keyboards/matrix/falcon/config.h b/keyboards/matrix/falcon/config.h
index d817e8b6f24a..9065dd0770a9 100644
--- a/keyboards/matrix/falcon/config.h
+++ b/keyboards/matrix/falcon/config.h
@@ -26,22 +26,6 @@
 /* disable print */
 //#define NO_PRINT
 
-//rgb light setting
-#define RGBLED_NUM      4
-#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
-
 //pin setting
 #define LED_POWER_PIN       D5
 #define CHG_EN_PIN          E6
diff --git a/keyboards/matrix/falcon/info.json b/keyboards/matrix/falcon/info.json
index 6c0bb7b085e9..4984562fe052 100644
--- a/keyboards/matrix/falcon/info.json
+++ b/keyboards/matrix/falcon/info.json
@@ -16,6 +16,23 @@
     "indicators": {
         "caps_lock": "E2"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 4,
+        "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": "D1"
     },
diff --git a/keyboards/matrix/m12og/rev1/config.h b/keyboards/matrix/m12og/rev1/config.h
index f0ad633575cd..6ecae7b42b59 100644
--- a/keyboards/matrix/m12og/rev1/config.h
+++ b/keyboards/matrix/m12og/rev1/config.h
@@ -30,19 +30,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* RGB */
-#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_SLEEP
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
diff --git a/keyboards/matrix/m12og/rev1/info.json b/keyboards/matrix/m12og/rev1/info.json
index b74c05900822..38a9de45acc6 100644
--- a/keyboards/matrix/m12og/rev1/info.json
+++ b/keyboards/matrix/m12og/rev1/info.json
@@ -12,6 +12,22 @@
         "caps_lock": "B6",
         "scroll_lock": "B5"
     },
+    "rgblight": {
+        "led_count": 16,
+        "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": "B8"
     },
diff --git a/keyboards/matrix/m12og/rev2/config.h b/keyboards/matrix/m12og/rev2/config.h
index 7fb34f500146..47955aa22003 100644
--- a/keyboards/matrix/m12og/rev2/config.h
+++ b/keyboards/matrix/m12og/rev2/config.h
@@ -4,19 +4,4 @@
 
 #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 RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
diff --git a/keyboards/matrix/m12og/rev2/info.json b/keyboards/matrix/m12og/rev2/info.json
index e6e77ba1eedf..2205db43fa57 100644
--- a/keyboards/matrix/m12og/rev2/info.json
+++ b/keyboards/matrix/m12og/rev2/info.json
@@ -8,6 +8,24 @@
     "pid": "0x8712",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 16,
+    "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": "B3"
   },
diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h
index 421773affc19..8d4c69bb9c33 100644
--- a/keyboards/matrix/m20add/config.h
+++ b/keyboards/matrix/m20add/config.h
@@ -78,20 +78,6 @@
 #define I2C1_CLOCK_SPEED 400000
 #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
 
-// rgb light setting
-#define RGBLED_NUM 20
-#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 DRIVER_ADDR_1 0b1110100
 #define DRIVER_COUNT 1
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 20
diff --git a/keyboards/matrix/m20add/info.json b/keyboards/matrix/m20add/info.json
index 7d88bb81f5b5..972aab9d0d27 100644
--- a/keyboards/matrix/m20add/info.json
+++ b/keyboards/matrix/m20add/info.json
@@ -8,6 +8,21 @@
     "pid": "0x20AD",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "led_count": 20,
+    "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": "B4"
   },
diff --git a/keyboards/matrix/m20add/rgb_ring.c b/keyboards/matrix/m20add/rgb_ring.c
index 4466ec3bea51..4567f0348d5e 100644
--- a/keyboards/matrix/m20add/rgb_ring.c
+++ b/keyboards/matrix/m20add/rgb_ring.c
@@ -135,13 +135,13 @@ static void testing_mode(void)
     if (timer_elapsed(animation_status.last_timer) > EFFECT_TEST_INTERVAL) {
         HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
         RGB c = hsv_to_rgb(h);
-        //IS31FL3731_set_color_all(c.r, c.g, c.b);
-        IS31FL3731_set_color_all(0, 0, 0);
-        IS31FL3731_set_color(rgb_ring.outer_index+RING_OUTER_BEGIN, c.r, c.g, c.b);
+        //is31fl3731_set_color_all(c.r, c.g, c.b);
+        is31fl3731_set_color_all(0, 0, 0);
+        is31fl3731_set_color(rgb_ring.outer_index+RING_OUTER_BEGIN, c.r, c.g, c.b);
         h.v = EFFECT_TEST_VAL_STEP*rgb_ring.outer_index;
         c = hsv_to_rgb(h);
         for (uint8_t i = RING_INNER_BEGIN; i <= RING_INNER_END; i++) {
-            IS31FL3731_set_color(i, c.r, c.g, c.b);
+            is31fl3731_set_color(i, c.r, c.g, c.b);
         }
         rgb_ring.outer_index = (rgb_ring.outer_index + 1) % RING_OUTER_SIZE;
         //rgb_ring.inner_index = (rgb_ring.inner_index + 1) % RING_INNER_SIZE;
@@ -183,7 +183,7 @@ static void ring_effect_no_1(void)
         HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
         for (uint8_t i = RING_OUTER_BEGIN; i <= RING_OUTER_END; i++) {
             RGB c = hsv_to_rgb(h);
-            IS31FL3731_set_color(i, c.r, c.g, c.b);
+            is31fl3731_set_color(i, c.r, c.g, c.b);
         }
         rgblight_config.hue += EFFECT_1_HUE_STEP;
         rgb_ring.effect_count++;
@@ -200,12 +200,12 @@ static void ring_effect_no_1(void)
 static void ring_effect_no_2(void)
 {
     if (need_update(EFFECT_2_INTERVAL)) {
-        IS31FL3731_set_color_all(0, 0, 0);
+        is31fl3731_set_color_all(0, 0, 0);
         HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
         RGB c = hsv_to_rgb(h);
 
-        IS31FL3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
-        IS31FL3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
+        is31fl3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
+        is31fl3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
 
         rgb_ring.led_begin = (rgb_ring.led_begin + 1) % RING_OUTER_SIZE;
         rgb_ring.led_end = (rgb_ring.led_end + RING_OUTER_SIZE - 1) % RING_OUTER_SIZE;
@@ -225,19 +225,19 @@ static void ring_effect_no_2(void)
 static void ring_effect_no_3(void)
 {
     if (rgb_ring.effect_count == 0) {
-        IS31FL3731_set_color_all(0, 0, 0);
+        is31fl3731_set_color_all(0, 0, 0);
     }
 
     if (need_update(EFFECT_3_INTERVAL)) {
         HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
 
         if (rgb_ring.led_clear) {
-            IS31FL3731_set_color(rgb_ring.led_begin, 0, 0, 0);
-            IS31FL3731_set_color(rgb_ring.led_end, 0, 0, 0);
+            is31fl3731_set_color(rgb_ring.led_begin, 0, 0, 0);
+            is31fl3731_set_color(rgb_ring.led_end, 0, 0, 0);
         } else {
             RGB c = hsv_to_rgb(h);
-            IS31FL3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
-            IS31FL3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
+            is31fl3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
+            is31fl3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
         }
 
         rgb_ring.led_begin = (rgb_ring.led_begin + 1) % RING_OUTER_SIZE;
@@ -273,12 +273,12 @@ static void ring_effect_no_3(void)
 static void ring_effect_no_4(void)
 {
     if (need_update(EFFECT_4_INTERVAL)) {
-        IS31FL3731_set_color_all(0, 0, 0);
+        is31fl3731_set_color_all(0, 0, 0);
         HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
         RGB c = hsv_to_rgb(h);
 
-        IS31FL3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
-        IS31FL3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
+        is31fl3731_set_color(rgb_ring.led_begin, c.r, c.g, c.b);
+        is31fl3731_set_color(rgb_ring.led_end, c.r, c.g, c.b);
 
         rgb_ring.led_begin = (rgb_ring.led_begin + EFFECT_4_STEP) % RING_OUTER_SIZE;
         rgb_ring.led_end = (rgb_ring.led_end + RING_OUTER_SIZE - EFFECT_4_STEP) % RING_OUTER_SIZE;
@@ -297,16 +297,16 @@ static void ring_effect_no_4(void)
 static void ring_effect_no_5(void)
 {
     if (need_update(EFFECT_5_INTERVAL)) {
-        IS31FL3731_set_color_all(0, 0, 0);
+        is31fl3731_set_color_all(0, 0, 0);
         for (uint8_t i = RING_INNER_BEGIN; i <= RING_INNER_END; i++) {
             HSV h = {rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
             RGB c = hsv_to_rgb(h);
-            IS31FL3731_set_color(i, c.r, c.g, c.b);
+            is31fl3731_set_color(i, c.r, c.g, c.b);
         }
         for (uint8_t i = RING_OUTER_BEGIN; i <= RING_OUTER_END; i++) {
             HSV h = {rgblight_config.hue+EFFECT_5_HUE_STEP, rgblight_config.sat, rgblight_config.val};
             RGB c = hsv_to_rgb(h);
-            IS31FL3731_set_color(i, c.r, c.g, c.b);
+            is31fl3731_set_color(i, c.r, c.g, c.b);
         }
         rgblight_config.hue += EFFECT_5_HUE_STEP;
         rgb_ring.effect_count++;
@@ -323,16 +323,16 @@ static void ring_effect_no_5(void)
 static void ring_effect_no_6(void)
 {
     if (need_update(EFFECT_6_INTERVAL)) {
-        IS31FL3731_set_color_all(0, 0, 0);
+        is31fl3731_set_color_all(0, 0, 0);
         for (uint8_t i = RING_INNER_BEGIN; i <= RING_INNER_END; i++) {
             HSV h = {rgblight_config.hue+i*EFFECT_I_HUE_STEP, rgblight_config.sat, rgblight_config.val};
             RGB c = hsv_to_rgb(h);
-            IS31FL3731_set_color(i, c.r, c.g, c.b);
+            is31fl3731_set_color(i, c.r, c.g, c.b);
         }
         for (uint8_t i = RING_OUTER_BEGIN; i <= RING_OUTER_END; i++) {
             HSV h = {rgblight_config.hue+i*EFFECT_O_HUE_STEP, rgblight_config.sat, rgblight_config.val};
             RGB c = hsv_to_rgb(h);
-            IS31FL3731_set_color(i, c.r, c.g, c.b);
+            is31fl3731_set_color(i, c.r, c.g, c.b);
         }
         rgblight_config.hue += EFFECT_I_HUE_STEP;
         rgb_ring.effect_count++;
@@ -364,7 +364,7 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
     }
 
     for (uint8_t i = 0; i < num_leds; i++) {
-        IS31FL3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
+        is31fl3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
     }
 }
 
@@ -372,12 +372,12 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
 void rgb_ring_init(void)
 {
     i2c_init();
-    IS31FL3731_init(DRIVER_ADDR_1);
+    is31fl3731_init(DRIVER_ADDR_1);
     for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
         bool enabled = true;
-        IS31FL3731_set_led_control_register(index, enabled, enabled, enabled);
+        is31fl3731_set_led_control_register(index, enabled, enabled, enabled);
     }
-    IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3731_update_led_control_registers(DRIVER_ADDR_1, 0);
 }
 
 void rgb_ring_task(void)
@@ -396,7 +396,7 @@ void rgb_ring_task(void)
             break;
     };
 
-    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record)
diff --git a/keyboards/matrix/me/config.h b/keyboards/matrix/me/config.h
deleted file mode 100644
index 8ee1b57bde7f..000000000000
--- a/keyboards/matrix/me/config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * config.h
- *
-  Copyright 2021 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-//rgb light setting
-#define RGBLED_NUM          4
-#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/matrix/me/info.json b/keyboards/matrix/me/info.json
index 935035317ccb..147fc7c5c871 100644
--- a/keyboards/matrix/me/info.json
+++ b/keyboards/matrix/me/info.json
@@ -17,6 +17,23 @@
     "caps_lock": "E6",
     "scroll_lock": "D2"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 4,
+    "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": "E2"
   },
diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h
index 5a74ab520683..452fef4ceee3 100644
--- a/keyboards/matrix/noah/config.h
+++ b/keyboards/matrix/noah/config.h
@@ -73,22 +73,3 @@
 #    define ENABLE_RGB_MATRIX_MULTISPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-/* indicator rgb */
-#define RGBLED_NUM 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
-
-
-// tapping setting
-//#define TAPPING_TERM 200
-//#define RETRO_TAPPING
-//#define PERMISSIVE_HOLD
diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json
index 33dedc6bce02..507c36120e6c 100644
--- a/keyboards/matrix/noah/info.json
+++ b/keyboards/matrix/noah/info.json
@@ -8,11 +8,27 @@
     "pid": "0x0065",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "driver": "custom",
+    "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": "B1"
   },
   "rgb_matrix": {
-    "driver": "IS31FL3731"
+    "driver": "is31fl3731"
   },
   "community_layouts": ["65_iso_blocker"],
   "layouts": {
diff --git a/keyboards/matrix/noah/noah.c b/keyboards/matrix/noah/noah.c
index 671d272d8557..0969998fa979 100644
--- a/keyboards/matrix/noah/noah.c
+++ b/keyboards/matrix/noah/noah.c
@@ -32,14 +32,14 @@ void rgblight_set(void) {
         }
     }
     if (noah_led_mode) {
-      uint8_t ind_led = host_keyboard_leds();
-      if (IS_LED_ON(ind_led, USB_LED_CAPS_LOCK)) {
+      led_t led_state = host_keyboard_led_state();
+      if (led_state.caps_lock) {
         noah_leds[0] = led[0];
       }
-      if (IS_LED_ON(ind_led, USB_LED_SCROLL_LOCK)) {
+      if (led_state.scroll_lock) {
         noah_leds[1] = led[1];
       }
-      if (IS_LED_ON(ind_led, USB_LED_NUM_LOCK)) {
+      if (led_state.num_lock) {
         noah_leds[2] = led[2];
       }
       for (int32_t i = 0; i < 4; i++) {
diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk
index 55ea2f42b074..3b75264222d4 100644
--- a/keyboards/matrix/noah/rules.mk
+++ b/keyboards/matrix/noah/rules.mk
@@ -27,7 +27,6 @@ NO_USB_STARTUP_CHECK = yes	# Disable initialization only when usb is plugged in
 RGB_MATRIX_ENABLE = yes
 
 RGBLIGHT_ENABLE = yes
-RGBLIGHT_CUSTOM_DRIVER = yes
 WS2812_DRIVER_REQUIRED = yes
 
 CUSTOM_MATRIX = yes
diff --git a/keyboards/maxr1998/phoebe/config.h b/keyboards/maxr1998/phoebe/config.h
index b6b67b1bcb31..a8824e486770 100644
--- a/keyboards/maxr1998/phoebe/config.h
+++ b/keyboards/maxr1998/phoebe/config.h
@@ -23,8 +23,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Selectively enable animation effects */
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_CHRISTMAS
 #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
diff --git a/keyboards/maxr1998/phoebe/info.json b/keyboards/maxr1998/phoebe/info.json
index f05898aed940..7bb3832cbef3 100644
--- a/keyboards/maxr1998/phoebe/info.json
+++ b/keyboards/maxr1998/phoebe/info.json
@@ -98,7 +98,12 @@
         "rows": ["B7", "B3", "B2", "B1", "D6"]
     },
     "rgblight": {
-        "led_count": 8
+        "led_count": 8,
+        "animations": {
+            "rainbow_swirl": true,
+            "snake": true,
+            "christmas": true
+        }
     },
     "ws2812": {
         "pin": "F0"
diff --git a/keyboards/maxr1998/pulse4k/config.h b/keyboards/maxr1998/pulse4k/config.h
index 0b552acfda01..804d1c386ed3 100644
--- a/keyboards/maxr1998/pulse4k/config.h
+++ b/keyboards/maxr1998/pulse4k/config.h
@@ -20,19 +20,6 @@
 /* Combo setup */
 #define COMBO_TERM 150
 
-/* RGB LED Setup */
-#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  // number of LEDs
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/maxr1998/pulse4k/info.json b/keyboards/maxr1998/pulse4k/info.json
index 2d3b6e8a4bec..5502edcb9ef3 100644
--- a/keyboards/maxr1998/pulse4k/info.json
+++ b/keyboards/maxr1998/pulse4k/info.json
@@ -8,6 +8,21 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "led_count": 2,
+    "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": "F7"
   },
diff --git a/keyboards/mazestudio/jocker/info.json b/keyboards/mazestudio/jocker/info.json
index 5c5d4d6c0877..7257866f21b4 100644
--- a/keyboards/mazestudio/jocker/info.json
+++ b/keyboards/mazestudio/jocker/info.json
@@ -32,9 +32,122 @@
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B2", "B3"],
         "rows": ["B1", "B0", "D1", "D0", "D5", "D3", "B7", "D2", "D4", "D6", "B4", "D7"]
     },
-
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ansi_split_bs"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [1,0], "x":0, "y":0},
+                {"label": "F1", "matrix": [0,0], "x":1.25, "y":0},
+                {"label": "F2", "matrix": [1,1], "x":2.25, "y":0},
+                {"label": "F3", "matrix": [0,1], "x":3.25, "y":0},
+                {"label": "F4", "matrix": [1,2], "x":4.25, "y":0},
+                {"label": "F5", "matrix": [0,2], "x":5.5, "y":0},
+                {"label": "F6", "matrix": [1,3], "x":6.5, "y":0},
+                {"label": "F7", "matrix": [0,3], "x":7.5, "y":0},
+                {"label": "F8", "matrix": [1,4], "x":8.5, "y":0},
+                {"label": "F9", "matrix": [1,5], "x":9.75, "y":0},
+                {"label": "F10", "matrix": [0,5], "x":10.75, "y":0},
+                {"label": "F11", "matrix": [1,6], "x":11.75, "y":0},
+                {"label": "F12", "matrix": [0,6], "x":12.75, "y":0},
+                {"label": "F13", "matrix": [1,7], "x":14, "y":0},
+                {"label": "Scroll Lock", "matrix": [0,7], "x":15.25, "y":0},
+                {"label": "Pause Break", "matrix": [1,8], "x":16.5, "y":0},
+                {"label": "Insert", "matrix": [0,8], "x":17.5, "y":0},
+                {"label": "Home", "matrix": [1,9], "x":18.5, "y":0},
+                {"label": "Print Screen", "matrix": [0,9], "x":19.5, "y":0},
+
+                {"label": "~", "matrix": [3,0], "x":0, "y":1.25},
+                {"label": "1", "matrix": [2,0], "x":1, "y":1.25},
+                {"label": "2", "matrix": [3,1], "x":2, "y":1.25},
+                {"label": "3", "matrix": [2,1], "x":3, "y":1.25},
+                {"label": "4", "matrix": [3,2], "x":4, "y":1.25},
+                {"label": "5", "matrix": [2,2], "x":5, "y":1.25},
+                {"label": "6", "matrix": [3,3], "x":6, "y":1.25},
+                {"label": "7", "matrix": [2,3], "x":7, "y":1.25},
+                {"label": "8", "matrix": [3,4], "x":8, "y":1.25},
+                {"label": "9", "matrix": [2,4], "x":9, "y":1.25},
+                {"label": "0", "matrix": [3,5], "x":10, "y":1.25},
+                {"label": "-", "matrix": [2,5], "x":11, "y":1.25},
+                {"label": "=", "matrix": [3,6], "x":12, "y":1.25},
+                {"label": "Delete", "matrix": [3,7], "x":13, "y":1.25, "w":2},
+                {"label": "Page Up", "matrix": [2,7], "x":15.25, "y":1.25},
+                {"label": "Num Lock", "matrix": [3,8], "x":16.5, "y":1.25},
+                {"label": "/", "matrix": [2,8], "x":17.5, "y":1.25},
+                {"label": "*", "matrix": [3,9], "x":18.5, "y":1.25},
+                {"label": "-", "matrix": [2,9], "x":19.5, "y":1.25},
+
+                {"label": "Tab", "matrix": [5,0], "x":0, "y":2.25, "w":1.5},
+                {"label": "Q", "matrix": [4,0], "x":1.5, "y":2.25},
+                {"label": "W", "matrix": [5,1], "x":2.5, "y":2.25},
+                {"label": "E", "matrix": [4,1], "x":3.5, "y":2.25},
+                {"label": "R", "matrix": [5,2], "x":4.5, "y":2.25},
+                {"label": "T", "matrix": [4,2], "x":5.5, "y":2.25},
+                {"label": "Y", "matrix": [5,3], "x":6.5, "y":2.25},
+                {"label": "U", "matrix": [4,3], "x":7.5, "y":2.25},
+                {"label": "I", "matrix": [5,4], "x":8.5, "y":2.25},
+                {"label": "O", "matrix": [4,4], "x":9.5, "y":2.25},
+                {"label": "P", "matrix": [5,5], "x":10.5, "y":2.25},
+                {"label": "[", "matrix": [4,5], "x":11.5, "y":2.25},
+                {"label": "]", "matrix": [5,6], "x":12.5, "y":2.25},
+                {"label": "Backspace", "matrix": [5,7], "x":13.5, "y":2.25, "w":1.5},
+                {"label": "Page Down", "matrix": [4,7], "x":15.25, "y":2.25},
+                {"label": "Num 7", "matrix": [5,8], "x":16.5, "y":2.25},
+                {"label": "Num 8", "matrix": [4,8], "x":17.5, "y":2.25},
+                {"label": "Num 9", "matrix": [5,9], "x":18.5, "y":2.25},
+                {"label": "Num Plus", "matrix": [4,9], "x":19.5, "y":2.25, "h":2},
+
+                {"label": "Caps Lock", "matrix": [7,0], "x":0, "y":3.25, "w":1.75},
+                {"label": "A", "matrix": [6,0], "x":1.75, "y":3.25},
+                {"label": "S", "matrix": [7,1], "x":2.75, "y":3.25},
+                {"label": "D", "matrix": [6,1], "x":3.75, "y":3.25},
+                {"label": "F", "matrix": [7,2], "x":4.75, "y":3.25},
+                {"label": "G", "matrix": [6,2], "x":5.75, "y":3.25},
+                {"label": "H", "matrix": [7,3], "x":6.75, "y":3.25},
+                {"label": "J", "matrix": [6,3], "x":7.75, "y":3.25},
+                {"label": "K", "matrix": [7,4], "x":8.75, "y":3.25},
+                {"label": "L", "matrix": [6,4], "x":9.75, "y":3.25},
+                {"label": ";", "matrix": [7,5], "x":10.75, "y":3.25},
+                {"label": "'", "matrix": [6,5], "x":11.75, "y":3.25},
+                {"label": "Enter", "matrix": [6,6], "x":12.75, "y":3.25, "w":2.25},
+                {"label": "Delete", "matrix": [6,7], "x":15.25, "y":3.25},
+                {"label": "Num 4", "matrix": [7,8], "x":16.5, "y":3.25},
+                {"label": "Num 5", "matrix": [6,8], "x":17.5, "y":3.25},
+                {"label": "Num 6", "matrix": [7,9], "x":18.5, "y":3.25},
+
+                {"label": "Left Shift", "matrix": [9,0], "x":0, "y":4.25, "w":2.25},
+                {"label": "Z", "matrix": [8,0], "x":2.25, "y":4.25},
+                {"label": "X", "matrix": [9,1], "x":3.25, "y":4.25},
+                {"label": "C", "matrix": [8,1], "x":4.25, "y":4.25},
+                {"label": "V", "matrix": [9,2], "x":5.25, "y":4.25},
+                {"label": "B", "matrix": [8,2], "x":6.25, "y":4.25},
+                {"label": "N", "matrix": [9,3], "x":7.25, "y":4.25},
+                {"label": "M", "matrix": [8,3], "x":8.25, "y":4.25},
+                {"label": ",", "matrix": [9,4], "x":9.25, "y":4.25},
+                {"label": ".", "matrix": [8,4], "x":10.25, "y":4.25},
+                {"label": "/", "matrix": [9,5], "x":11.25, "y":4.25},
+                {"label": "Right Shift", "matrix": [9,6], "x":12.25, "y":4.25, "w":1.75},
+                {"label": "Up", "matrix": [9,7], "x":14.25, "y":4.5},
+                {"label": "Num 1", "matrix": [9,8], "x":16.5, "y":4.25},
+                {"label": "Num 2", "matrix": [8,8], "x":17.5, "y":4.25},
+                {"label": "Num 3", "matrix": [9,9], "x":18.5, "y":4.25},
+                {"label": "Enter", "matrix": [8,9], "x":19.5, "y":4.25, "h":2},
+
+                {"label": "Left Ctrl", "matrix": [11,0], "x":0, "y":5.25, "w":1.25},
+                {"label": "Left Win", "matrix": [10,0], "x":1.25, "y":5.25, "w":1.25},
+                {"label": "Left Alt", "matrix": [11,1], "x":2.5, "y":5.25, "w":1.25},
+                {"label": "Space", "matrix": [10,2], "x":3.75, "y":5.25, "w":6.25},
+                {"label": "Right Alt", "matrix": [10,4], "x":10, "y":5.25, "w":1.5},
+                {"label": "Right Ctrl", "matrix": [10,5], "x":11.5, "y":5.25, "w":1.5},
+                {"label": "Left", "matrix": [10,6], "x":13.25, "y":5.5},
+                {"label": "Down", "matrix": [11,7], "x":14.25, "y":5.5},
+                {"label": "Right", "matrix": [10,7], "x":15.25, "y":5.5},
+                {"label": "Num 0", "matrix": [10,8], "x":16.5, "y":5.25, "w":2},
+                {"label": "Num Del", "matrix": [11,9], "x":18.5, "y":5.25}
+            ]
+        },
+        "LAYOUT_ansi_split_bs": {
             "layout": [
                 {"label": "Esc", "matrix": [1,0], "x":0, "y":0},
                 {"label": "F1", "matrix": [0,0], "x":1.25, "y":0}, 
@@ -145,6 +258,227 @@
                 {"label": "Num 0", "matrix": [10,8], "x":16.5, "y":5.25, "w":2}, 
                 {"label": "Num Del", "matrix": [11,9], "x":18.5, "y":5.25}
             ]
+        },
+        "LAYOUT_ansi_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [1,0], "x":0, "y":0},
+                {"label": "F1", "matrix": [0,0], "x":1.25, "y":0}, 
+                {"label": "F2", "matrix": [1,1], "x":2.25, "y":0}, 
+                {"label": "F3", "matrix": [0,1], "x":3.25, "y":0}, 
+                {"label": "F4", "matrix": [1,2], "x":4.25, "y":0}, 
+                {"label": "F5", "matrix": [0,2], "x":5.5, "y":0}, 
+                {"label": "F6", "matrix": [1,3], "x":6.5, "y":0}, 
+                {"label": "F7", "matrix": [0,3], "x":7.5, "y":0}, 
+                {"label": "F8", "matrix": [1,4], "x":8.5, "y":0}, 
+                {"label": "F9", "matrix": [1,5], "x":9.75, "y":0}, 
+                {"label": "F10", "matrix": [0,5], "x":10.75, "y":0}, 
+                {"label": "F11", "matrix": [1,6], "x":11.75, "y":0}, 
+                {"label": "F12", "matrix": [0,6], "x":12.75, "y":0}, 
+                {"label": "F13", "matrix": [1,7], "x":14, "y":0}, 
+                {"label": "Scroll Lock", "matrix": [0,7], "x":15.25, "y":0}, 
+                {"label": "Pause Break", "matrix": [1,8], "x":16.5, "y":0}, 
+                {"label": "Insert", "matrix": [0,8], "x":17.5, "y":0}, 
+                {"label": "Home", "matrix": [1,9], "x":18.5, "y":0}, 
+                {"label": "Print Screen", "matrix": [0,9], "x":19.5, "y":0},
+
+                {"label": "~", "matrix": [3,0], "x":0, "y":1.25}, 
+                {"label": "1", "matrix": [2,0], "x":1, "y":1.25}, 
+                {"label": "2", "matrix": [3,1], "x":2, "y":1.25}, 
+                {"label": "3", "matrix": [2,1], "x":3, "y":1.25}, 
+                {"label": "4", "matrix": [3,2], "x":4, "y":1.25}, 
+                {"label": "5", "matrix": [2,2], "x":5, "y":1.25}, 
+                {"label": "6", "matrix": [3,3], "x":6, "y":1.25}, 
+                {"label": "7", "matrix": [2,3], "x":7, "y":1.25}, 
+                {"label": "8", "matrix": [3,4], "x":8, "y":1.25}, 
+                {"label": "9", "matrix": [2,4], "x":9, "y":1.25}, 
+                {"label": "0", "matrix": [3,5], "x":10, "y":1.25}, 
+                {"label": "-", "matrix": [2,5], "x":11, "y":1.25}, 
+                {"label": "=", "matrix": [3,6], "x":12, "y":1.25}, 
+                {"label": "Delete", "matrix": [3,7], "x":13, "y":1.25, "w":2}, 
+                {"label": "Page Up", "matrix": [2,7], "x":15.25, "y":1.25}, 
+                {"label": "Num Lock", "matrix": [3,8], "x":16.5, "y":1.25}, 
+                {"label": "/", "matrix": [2,8], "x":17.5, "y":1.25}, 
+                {"label": "*", "matrix": [3,9], "x":18.5, "y":1.25}, 
+                {"label": "-", "matrix": [2,9], "x":19.5, "y":1.25},
+
+                {"label": "Tab", "matrix": [5,0], "x":0, "y":2.25, "w":1.5}, 
+                {"label": "Q", "matrix": [4,0], "x":1.5, "y":2.25}, 
+                {"label": "W", "matrix": [5,1], "x":2.5, "y":2.25}, 
+                {"label": "E", "matrix": [4,1], "x":3.5, "y":2.25}, 
+                {"label": "R", "matrix": [5,2], "x":4.5, "y":2.25}, 
+                {"label": "T", "matrix": [4,2], "x":5.5, "y":2.25}, 
+                {"label": "Y", "matrix": [5,3], "x":6.5, "y":2.25}, 
+                {"label": "U", "matrix": [4,3], "x":7.5, "y":2.25}, 
+                {"label": "I", "matrix": [5,4], "x":8.5, "y":2.25}, 
+                {"label": "O", "matrix": [4,4], "x":9.5, "y":2.25}, 
+                {"label": "P", "matrix": [5,5], "x":10.5, "y":2.25}, 
+                {"label": "[", "matrix": [4,5], "x":11.5, "y":2.25}, 
+                {"label": "]", "matrix": [5,6], "x":12.5, "y":2.25}, 
+                {"label": "Backspace", "matrix": [5,7], "x":13.5, "y":2.25, "w":1.5}, 
+                {"label": "Page Down", "matrix": [4,7], "x":15.25, "y":2.25}, 
+                {"label": "Num 7", "matrix": [5,8], "x":16.5, "y":2.25}, 
+                {"label": "Num 8", "matrix": [4,8], "x":17.5, "y":2.25}, 
+                {"label": "Num 9", "matrix": [5,9], "x":18.5, "y":2.25}, 
+                {"label": "Num Plus", "matrix": [4,9], "x":19.5, "y":2.25, "h":2},
+
+                {"label": "Caps Lock", "matrix": [7,0], "x":0, "y":3.25, "w":1.75}, 
+                {"label": "A", "matrix": [6,0], "x":1.75, "y":3.25}, 
+                {"label": "S", "matrix": [7,1], "x":2.75, "y":3.25}, 
+                {"label": "D", "matrix": [6,1], "x":3.75, "y":3.25}, 
+                {"label": "F", "matrix": [7,2], "x":4.75, "y":3.25}, 
+                {"label": "G", "matrix": [6,2], "x":5.75, "y":3.25}, 
+                {"label": "H", "matrix": [7,3], "x":6.75, "y":3.25}, 
+                {"label": "J", "matrix": [6,3], "x":7.75, "y":3.25}, 
+                {"label": "K", "matrix": [7,4], "x":8.75, "y":3.25}, 
+                {"label": "L", "matrix": [6,4], "x":9.75, "y":3.25}, 
+                {"label": ";", "matrix": [7,5], "x":10.75, "y":3.25}, 
+                {"label": "'", "matrix": [6,5], "x":11.75, "y":3.25}, 
+                {"label": "Enter", "matrix": [6,6], "x":12.75, "y":3.25, "w":2.25}, 
+                {"label": "Delete", "matrix": [6,7], "x":15.25, "y":3.25}, 
+                {"label": "Num 4", "matrix": [7,8], "x":16.5, "y":3.25}, 
+                {"label": "Num 5", "matrix": [6,8], "x":17.5, "y":3.25}, 
+                {"label": "Num 6", "matrix": [7,9], "x":18.5, "y":3.25}, 
+
+                {"label": "Left Shift", "matrix": [9,0], "x":0, "y":4.25, "w":2.25}, 
+                {"label": "Z", "matrix": [8,0], "x":2.25, "y":4.25}, 
+                {"label": "X", "matrix": [9,1], "x":3.25, "y":4.25}, 
+                {"label": "C", "matrix": [8,1], "x":4.25, "y":4.25}, 
+                {"label": "V", "matrix": [9,2], "x":5.25, "y":4.25}, 
+                {"label": "B", "matrix": [8,2], "x":6.25, "y":4.25}, 
+                {"label": "N", "matrix": [9,3], "x":7.25, "y":4.25}, 
+                {"label": "M", "matrix": [8,3], "x":8.25, "y":4.25}, 
+                {"label": ",", "matrix": [9,4], "x":9.25, "y":4.25}, 
+                {"label": ".", "matrix": [8,4], "x":10.25, "y":4.25}, 
+                {"label": "/", "matrix": [9,5], "x":11.25, "y":4.25}, 
+                {"label": "Right Shift", "matrix": [9,6], "x":12.25, "y":4.25, "w":1.75},
+                {"label": "Up", "matrix": [9,7], "x":14.25, "y":4.5}, 
+                {"label": "Num 1", "matrix": [9,8], "x":16.5, "y":4.25}, 
+                {"label": "Num 2", "matrix": [8,8], "x":17.5, "y":4.25}, 
+                {"label": "Num 3", "matrix": [9,9], "x":18.5, "y":4.25}, 
+                {"label": "Enter", "matrix": [8,9], "x":19.5, "y":4.25, "h":2}, 
+
+                {"label": "Left Ctrl", "matrix": [11,0], "x":0, "y":5.25, "w":1.5}, 
+                {"label": "Left Win", "matrix": [10,0], "x":1.5, "y":5.25, "w":1.5}, 
+                {"label": "Space", "matrix": [10,2], "x":3, "y":5.25, "w":7}, 
+                {"label": "Right Alt", "matrix": [10,4], "x":10, "y":5.25, "w":1.5}, 
+                {"label": "Right Ctrl", "matrix": [10,5], "x":11.5, "y":5.25, "w":1.5}, 
+                {"label": "Left", "matrix": [10,6], "x":13.25, "y":5.5}, 
+                {"label": "Down", "matrix": [11,7], "x":14.25, "y":5.5}, 
+                {"label": "Right", "matrix": [10,7], "x":15.25, "y":5.5}, 
+                {"label": "Num 0", "matrix": [10,8], "x":16.5, "y":5.25, "w":2}, 
+                {"label": "Num Del", "matrix": [11,9], "x":18.5, "y":5.25}
+            ]
+        },
+        "LAYOUT_ansi_wkl_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [1,0], "x":0, "y":0},
+                {"label": "F1", "matrix": [0,0], "x":1.25, "y":0}, 
+                {"label": "F2", "matrix": [1,1], "x":2.25, "y":0}, 
+                {"label": "F3", "matrix": [0,1], "x":3.25, "y":0}, 
+                {"label": "F4", "matrix": [1,2], "x":4.25, "y":0}, 
+                {"label": "F5", "matrix": [0,2], "x":5.5, "y":0}, 
+                {"label": "F6", "matrix": [1,3], "x":6.5, "y":0}, 
+                {"label": "F7", "matrix": [0,3], "x":7.5, "y":0}, 
+                {"label": "F8", "matrix": [1,4], "x":8.5, "y":0}, 
+                {"label": "F9", "matrix": [1,5], "x":9.75, "y":0}, 
+                {"label": "F10", "matrix": [0,5], "x":10.75, "y":0}, 
+                {"label": "F11", "matrix": [1,6], "x":11.75, "y":0}, 
+                {"label": "F12", "matrix": [0,6], "x":12.75, "y":0}, 
+                {"label": "F13", "matrix": [1,7], "x":14, "y":0}, 
+                {"label": "Scroll Lock", "matrix": [0,7], "x":15.25, "y":0}, 
+                {"label": "Pause Break", "matrix": [1,8], "x":16.5, "y":0}, 
+                {"label": "Insert", "matrix": [0,8], "x":17.5, "y":0}, 
+                {"label": "Home", "matrix": [1,9], "x":18.5, "y":0}, 
+                {"label": "Print Screen", "matrix": [0,9], "x":19.5, "y":0},
+
+                {"label": "~", "matrix": [3,0], "x":0, "y":1.25}, 
+                {"label": "1", "matrix": [2,0], "x":1, "y":1.25}, 
+                {"label": "2", "matrix": [3,1], "x":2, "y":1.25}, 
+                {"label": "3", "matrix": [2,1], "x":3, "y":1.25}, 
+                {"label": "4", "matrix": [3,2], "x":4, "y":1.25}, 
+                {"label": "5", "matrix": [2,2], "x":5, "y":1.25}, 
+                {"label": "6", "matrix": [3,3], "x":6, "y":1.25}, 
+                {"label": "7", "matrix": [2,3], "x":7, "y":1.25}, 
+                {"label": "8", "matrix": [3,4], "x":8, "y":1.25}, 
+                {"label": "9", "matrix": [2,4], "x":9, "y":1.25}, 
+                {"label": "0", "matrix": [3,5], "x":10, "y":1.25}, 
+                {"label": "-", "matrix": [2,5], "x":11, "y":1.25}, 
+                {"label": "=", "matrix": [3,6], "x":12, "y":1.25}, 
+                {"label": "|", "matrix": [2,6], "x":13, "y":1.25}, 
+                {"label": "Delete", "matrix": [3,7], "x":14, "y":1.25}, 
+                {"label": "Page Up", "matrix": [2,7], "x":15.25, "y":1.25}, 
+                {"label": "Num Lock", "matrix": [3,8], "x":16.5, "y":1.25}, 
+                {"label": "/", "matrix": [2,8], "x":17.5, "y":1.25}, 
+                {"label": "*", "matrix": [3,9], "x":18.5, "y":1.25}, 
+                {"label": "-", "matrix": [2,9], "x":19.5, "y":1.25},
+
+                {"label": "Tab", "matrix": [5,0], "x":0, "y":2.25, "w":1.5}, 
+                {"label": "Q", "matrix": [4,0], "x":1.5, "y":2.25}, 
+                {"label": "W", "matrix": [5,1], "x":2.5, "y":2.25}, 
+                {"label": "E", "matrix": [4,1], "x":3.5, "y":2.25}, 
+                {"label": "R", "matrix": [5,2], "x":4.5, "y":2.25}, 
+                {"label": "T", "matrix": [4,2], "x":5.5, "y":2.25}, 
+                {"label": "Y", "matrix": [5,3], "x":6.5, "y":2.25}, 
+                {"label": "U", "matrix": [4,3], "x":7.5, "y":2.25}, 
+                {"label": "I", "matrix": [5,4], "x":8.5, "y":2.25}, 
+                {"label": "O", "matrix": [4,4], "x":9.5, "y":2.25}, 
+                {"label": "P", "matrix": [5,5], "x":10.5, "y":2.25}, 
+                {"label": "[", "matrix": [4,5], "x":11.5, "y":2.25}, 
+                {"label": "]", "matrix": [5,6], "x":12.5, "y":2.25}, 
+                {"label": "Backspace", "matrix": [5,7], "x":13.5, "y":2.25, "w":1.5}, 
+                {"label": "Page Down", "matrix": [4,7], "x":15.25, "y":2.25}, 
+                {"label": "Num 7", "matrix": [5,8], "x":16.5, "y":2.25}, 
+                {"label": "Num 8", "matrix": [4,8], "x":17.5, "y":2.25}, 
+                {"label": "Num 9", "matrix": [5,9], "x":18.5, "y":2.25}, 
+                {"label": "Num Plus", "matrix": [4,9], "x":19.5, "y":2.25, "h":2},
+
+                {"label": "Caps Lock", "matrix": [7,0], "x":0, "y":3.25, "w":1.75}, 
+                {"label": "A", "matrix": [6,0], "x":1.75, "y":3.25}, 
+                {"label": "S", "matrix": [7,1], "x":2.75, "y":3.25}, 
+                {"label": "D", "matrix": [6,1], "x":3.75, "y":3.25}, 
+                {"label": "F", "matrix": [7,2], "x":4.75, "y":3.25}, 
+                {"label": "G", "matrix": [6,2], "x":5.75, "y":3.25}, 
+                {"label": "H", "matrix": [7,3], "x":6.75, "y":3.25}, 
+                {"label": "J", "matrix": [6,3], "x":7.75, "y":3.25}, 
+                {"label": "K", "matrix": [7,4], "x":8.75, "y":3.25}, 
+                {"label": "L", "matrix": [6,4], "x":9.75, "y":3.25}, 
+                {"label": ";", "matrix": [7,5], "x":10.75, "y":3.25}, 
+                {"label": "'", "matrix": [6,5], "x":11.75, "y":3.25}, 
+                {"label": "Enter", "matrix": [6,6], "x":12.75, "y":3.25, "w":2.25}, 
+                {"label": "Delete", "matrix": [6,7], "x":15.25, "y":3.25}, 
+                {"label": "Num 4", "matrix": [7,8], "x":16.5, "y":3.25}, 
+                {"label": "Num 5", "matrix": [6,8], "x":17.5, "y":3.25}, 
+                {"label": "Num 6", "matrix": [7,9], "x":18.5, "y":3.25}, 
+
+                {"label": "Left Shift", "matrix": [9,0], "x":0, "y":4.25, "w":2.25}, 
+                {"label": "Z", "matrix": [8,0], "x":2.25, "y":4.25}, 
+                {"label": "X", "matrix": [9,1], "x":3.25, "y":4.25}, 
+                {"label": "C", "matrix": [8,1], "x":4.25, "y":4.25}, 
+                {"label": "V", "matrix": [9,2], "x":5.25, "y":4.25}, 
+                {"label": "B", "matrix": [8,2], "x":6.25, "y":4.25}, 
+                {"label": "N", "matrix": [9,3], "x":7.25, "y":4.25}, 
+                {"label": "M", "matrix": [8,3], "x":8.25, "y":4.25}, 
+                {"label": ",", "matrix": [9,4], "x":9.25, "y":4.25}, 
+                {"label": ".", "matrix": [8,4], "x":10.25, "y":4.25}, 
+                {"label": "/", "matrix": [9,5], "x":11.25, "y":4.25}, 
+                {"label": "Right Shift", "matrix": [9,6], "x":12.25, "y":4.25, "w":1.75},
+                {"label": "Up", "matrix": [9,7], "x":14.25, "y":4.5}, 
+                {"label": "Num 1", "matrix": [9,8], "x":16.5, "y":4.25}, 
+                {"label": "Num 2", "matrix": [8,8], "x":17.5, "y":4.25}, 
+                {"label": "Num 3", "matrix": [9,9], "x":18.5, "y":4.25}, 
+                {"label": "Enter", "matrix": [8,9], "x":19.5, "y":4.25, "h":2}, 
+
+                {"label": "Left Ctrl", "matrix": [11,0], "x":0, "y":5.25, "w":1.5}, 
+                {"label": "Left Win", "matrix": [10,0], "x":1.5, "y":5.25, "w":1.5}, 
+                {"label": "Space", "matrix": [10,2], "x":3, "y":5.25, "w":7}, 
+                {"label": "Right Alt", "matrix": [10,4], "x":10, "y":5.25, "w":1.5}, 
+                {"label": "Right Ctrl", "matrix": [10,5], "x":11.5, "y":5.25, "w":1.5}, 
+                {"label": "Left", "matrix": [10,6], "x":13.25, "y":5.5}, 
+                {"label": "Down", "matrix": [11,7], "x":14.25, "y":5.5}, 
+                {"label": "Right", "matrix": [10,7], "x":15.25, "y":5.5}, 
+                {"label": "Num 0", "matrix": [10,8], "x":16.5, "y":5.25, "w":2}, 
+                {"label": "Num Del", "matrix": [11,9], "x":18.5, "y":5.25}
+            ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/mazestudio/jocker/keymaps/default/keymap.c b/keyboards/mazestudio/jocker/keymaps/default/keymap.c
index b64c4a299f0c..4d4f46b2e6ef 100644
--- a/keyboards/mazestudio/jocker/keymaps/default/keymap.c
+++ b/keyboards/mazestudio/jocker/keymaps/default/keymap.c
@@ -4,7 +4,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_ansi_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_SCRL, KC_PAUS, KC_INS, KC_HOME, 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_BSLS, KC_DEL, 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_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS,
diff --git a/keyboards/mazestudio/jocker/keymaps/via/keymap.c b/keyboards/mazestudio/jocker/keymaps/via/keymap.c
index b64c4a299f0c..4d4f46b2e6ef 100644
--- a/keyboards/mazestudio/jocker/keymaps/via/keymap.c
+++ b/keyboards/mazestudio/jocker/keymaps/via/keymap.c
@@ -4,7 +4,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_ansi_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_SCRL, KC_PAUS, KC_INS, KC_HOME, 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_BSLS, KC_DEL, 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_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS,
diff --git a/keyboards/mazestudio/jocker/matrix_diagram.md b/keyboards/mazestudio/jocker/matrix_diagram.md
new file mode 100644
index 000000000000..d7f37a70f8e2
--- /dev/null
+++ b/keyboards/mazestudio/jocker/matrix_diagram.md
@@ -0,0 +1,22 @@
+# Matrix Diagram for Maze Studio Jocker 1800
+
+```
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐┌───┬───┬───┬───┐
+│10 ││00 │11 │01 │12 ││02 │13 │03 │14 ││15 │05 │16 │06 ││17 ││07 ││18 │08 │19 │09 │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┘└───┴───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐   ┌───────┐
+│30 │20 │31 │21 │32 │22 │33 │23 │34 │24 │35 │25 │36 │26 │37 ││27 ││38 │28 │39 │29 │   │37     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤├───┼───┼───┼───┤   └───────┘
+│50   │40 │51 │41 │52 │42 │53 │43 │54 │44 │55 │45 │56 │57   ││47 ││58 │48 │59 │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┤├───┼───┼───┤49 │
+│70    │60 │71 │61 │72 │62 │73 │63 │74 │64 │75 │65 │66      ││67 ││78 │68 │79 │   │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘└───┘├───┼───┼───┼───┤
+│90      │80 │91 │81 │92 │82 │93 │83 │94 │84 │95 │96    │┌───┐    │98 │88 │99 │   │
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┘│97 │    ├───┴───┼───┤89 │
+│B0  │A0  │B1  │A2                      │A4   │A5   │┌───┼───┼───┐│A8     │B9 │   │
+└────┴────┴────┴────────────────────────┴─────┴─────┘│A6 │B7 │A7 │└───────┴───┴───┘
+                                                     └───┴───┴───┘
+┌─────┬─────┬───────────────────────────┬─────┬─────┐
+│B0   │A0   │A2                         │A4   │A5   │ WKL
+└─────┴─────┴───────────────────────────┴─────┴─────┘
+```
diff --git a/keyboards/mechanickeys/undead60m/config.h b/keyboards/mechanickeys/undead60m/config.h
deleted file mode 100644
index 9388d3da68a5..000000000000
--- a/keyboards/mechanickeys/undead60m/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2021 jfescobar18
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-*/ 
-
-#pragma once
-
-/* RGB Underglow */
-  #define RGBLED_NUM 16
-  #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
diff --git a/keyboards/mechanickeys/undead60m/info.json b/keyboards/mechanickeys/undead60m/info.json
index 5fd2c835142d..4c186431614e 100644
--- a/keyboards/mechanickeys/undead60m/info.json
+++ b/keyboards/mechanickeys/undead60m/info.json
@@ -8,6 +8,22 @@
         "pid": "0x3C4D",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 16,
+        "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": "F7"
     },
diff --git a/keyboards/mechbrewery/mb65s/config.h b/keyboards/mechbrewery/mb65s/config.h
deleted file mode 100644
index 603bf2a949e1..000000000000
--- a/keyboards/mechbrewery/mb65s/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2022 MechBrewery
- * Author: tuananhnguyen204 (https://github.com/AnthonyNguyen168) (tuananhnguyen204@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 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 RGBLIGHT_SLEEP
diff --git a/keyboards/mechbrewery/mb65s/info.json b/keyboards/mechbrewery/mb65s/info.json
index f73a11bcd7b1..b81ce87b2113 100644
--- a/keyboards/mechbrewery/mb65s/info.json
+++ b/keyboards/mechbrewery/mb65s/info.json
@@ -21,7 +21,23 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 240
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "max_brightness": 240,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/mechkeys/acr60/config.h b/keyboards/mechkeys/acr60/config.h
index 8f261b69f252..a55618488c58 100644
--- a/keyboards/mechkeys/acr60/config.h
+++ b/keyboards/mechkeys/acr60/config.h
@@ -21,18 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 20
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechkeys/acr60/info.json b/keyboards/mechkeys/acr60/info.json
index 422b3f6270a0..04012cf23421 100644
--- a/keyboards/mechkeys/acr60/info.json
+++ b/keyboards/mechkeys/acr60/info.json
@@ -21,6 +21,23 @@
         "caps_lock": "B2",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "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": "E2"
     },
diff --git a/keyboards/mechkeys/alu84/config.h b/keyboards/mechkeys/alu84/config.h
index 16e59303644c..1620751facfa 100755
--- a/keyboards/mechkeys/alu84/config.h
+++ b/keyboards/mechkeys/alu84/config.h
@@ -16,23 +16,6 @@
 
 #pragma once
 
-#if defined(RGBLIGHT_ENABLE)
-#    define RGBLED_NUM 16
-#    define RGBLIGHT_HUE_STEP 10
-#    define RGBLIGHT_SAT_STEP 10
-#    define RGBLIGHT_VAL_STEP 10
-#    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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/mechkeys/alu84/info.json b/keyboards/mechkeys/alu84/info.json
index 5251bc600b8c..73efa61268e3 100644
--- a/keyboards/mechkeys/alu84/info.json
+++ b/keyboards/mechkeys/alu84/info.json
@@ -17,6 +17,24 @@
         "pin": "B6",
         "breathing": true
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "saturation_steps": 10,
+        "brightness_steps": 10,
+        "led_count": 16,
+        "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": "E2"
     },
diff --git a/keyboards/mechkeys/espectro/config.h b/keyboards/mechkeys/espectro/config.h
index a7436fb00c12..41ccde970265 100755
--- a/keyboards/mechkeys/espectro/config.h
+++ b/keyboards/mechkeys/espectro/config.h
@@ -21,19 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define RGBLED_NUM 18
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
-
-#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/mechkeys/espectro/info.json b/keyboards/mechkeys/espectro/info.json
index 40d67108297c..53dbc75dcf1f 100644
--- a/keyboards/mechkeys/espectro/info.json
+++ b/keyboards/mechkeys/espectro/info.json
@@ -23,6 +23,24 @@
     "scroll_lock": "B1",
     "on_state": 0
   },
+  "rgblight": {
+    "hue_steps": 10,
+    "saturation_steps": 10,
+    "brightness_steps": 10,
+    "led_count": 18,
+    "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": "E2"
   },
diff --git a/keyboards/mechkeys/mechmini/v1/config.h b/keyboards/mechkeys/mechmini/v1/config.h
deleted file mode 100644
index f76d0f01e1ce..000000000000
--- a/keyboards/mechkeys/mechmini/v1/config.h
+++ /dev/null
@@ -1,31 +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
-
-/* RGB underglow */
-#define RGBLED_NUM 16
-#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/mechkeys/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/info.json
index eea1d15feba9..7dda26af2544 100644
--- a/keyboards/mechkeys/mechmini/v1/info.json
+++ b/keyboards/mechkeys/mechmini/v1/info.json
@@ -16,6 +16,21 @@
     "backlight": {
         "pin": "D4"
     },
+    "rgblight": {
+        "led_count": 16,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/mechkeys/mechmini/v2/config.h b/keyboards/mechkeys/mechmini/v2/config.h
index 9517f6a7317d..93c5aa9e24d7 100755
--- a/keyboards/mechkeys/mechmini/v2/config.h
+++ b/keyboards/mechkeys/mechmini/v2/config.h
@@ -20,18 +20,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mechkeys/mechmini/v2/info.json b/keyboards/mechkeys/mechmini/v2/info.json
index 53f60637f976..26d0b9300013 100644
--- a/keyboards/mechkeys/mechmini/v2/info.json
+++ b/keyboards/mechkeys/mechmini/v2/info.json
@@ -16,6 +16,23 @@
   "backlight": {
     "pin": "B6"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 14,
+    "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": "E2"
   },
diff --git a/keyboards/mechkeys/mk60/config.h b/keyboards/mechkeys/mk60/config.h
index 782b3a7381bc..b5b661bef2ab 100644
--- a/keyboards/mechkeys/mk60/config.h
+++ b/keyboards/mechkeys/mk60/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 12
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/mechkeys/mk60/info.json b/keyboards/mechkeys/mk60/info.json
index ef7658a1e13d..4cc03cec3b15 100644
--- a/keyboards/mechkeys/mk60/info.json
+++ b/keyboards/mechkeys/mk60/info.json
@@ -22,6 +22,24 @@
       "caps_lock": "B7",
       "on_state": 0
     },
+    "rgblight": {
+      "saturation_steps": 8,
+      "brightness_steps": 8,
+      "led_count": 12,
+      "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": "E6"
     },
diff --git a/keyboards/mechllama/g35/rules.mk b/keyboards/mechllama/g35/rules.mk
index 205f58723851..be2e71f9036a 100644
--- a/keyboards/mechllama/g35/rules.mk
+++ b/keyboards/mechllama/g35/rules.mk
@@ -1,6 +1,5 @@
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 RGBLIGHT_ENABLE = yes
 
 DEFAULT_FOLDER = mechllama/g35/v2
diff --git a/keyboards/mechllama/g35/v1/config.h b/keyboards/mechllama/g35/v1/config.h
deleted file mode 100644
index 1aee08380cab..000000000000
--- a/keyboards/mechllama/g35/v1/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2019 Kaylyn Bogle
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGBLED_NUM 41
diff --git a/keyboards/mechllama/g35/v1/info.json b/keyboards/mechllama/g35/v1/info.json
index c5d4c69e7b75..36d542dc586a 100644
--- a/keyboards/mechllama/g35/v1/info.json
+++ b/keyboards/mechllama/g35/v1/info.json
@@ -6,5 +6,8 @@
         "cols": ["D6", "D7", "B4", "B5", "B6", "F0", "D5"],
         "rows": ["F5", "F6", "F4", "F1", "D4"]
     },
-    "diode_direction": "COL2ROW"
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 41
+    }
 }
diff --git a/keyboards/mechllama/g35/v2/config.h b/keyboards/mechllama/g35/v2/config.h
deleted file mode 100644
index 7c15560a1a78..000000000000
--- a/keyboards/mechllama/g35/v2/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2019 Kaylyn Bogle
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGBLED_NUM 6
diff --git a/keyboards/mechllama/g35/v2/info.json b/keyboards/mechllama/g35/v2/info.json
index 563625f428b3..aa6bab752545 100644
--- a/keyboards/mechllama/g35/v2/info.json
+++ b/keyboards/mechllama/g35/v2/info.json
@@ -6,5 +6,8 @@
         "cols": ["D6", "D7", "B4", "B5", "B6", "F6", "D5"],
         "rows": ["F5", "F4", "F1", "F0", "D4"]
     },
-    "diode_direction": "COL2ROW"
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 6
+    }
 }
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
index 816b9414c16f..bdf9e7fdf5ae 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
@@ -4,7 +4,7 @@
         "pid": "0xAEC1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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 1e549f9a8982..d4b34ff48e12 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
@@ -1,20 +1,5 @@
 #pragma once
 
-#define RGBLED_NUM      23
-#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
-
 //rgb matrix setting
 // 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)
@@ -86,5 +71,3 @@
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 #define RGB_MATRIX_DISABLE_KEYCODES
-
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
index 4ac693f894cc..60fff3c7a787 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
@@ -4,7 +4,7 @@
         "pid": "0xAEC2"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A7"],
@@ -16,6 +16,26 @@
             {"pin_a": "A4", "pin_b": "A3"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 23,
+        "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": "A15"
     },
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
index c4f801b40de9..c4961c6492c5 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
@@ -17,24 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef  RGBLIGHT_ENABLE
 #define WS2812_SPI 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
-#define RGBLED_NUM      23
-#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 RGB_MATRIX_ENABLE
 //rgb matrix setting
@@ -108,5 +92,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
 
 #endif
-
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
index d1775ccb83bf..6064967f7f1a 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
@@ -4,7 +4,7 @@
         "pid": "0xAEC3"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["B10", "B11", "B2", "B1", "B0", "A6", "A5", "A10", "A9", "A15", "B3", "B4", "B5", "B8", "B9"],
@@ -16,6 +16,9 @@
             {"pin_a": "B12", "pin_b": "B13"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "indicators": {
@@ -23,6 +26,23 @@
         "num_lock": "A0",
         "scroll_lock": "C15"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 23,
+        "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": "A7",
         "driver": "spi"
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
index 5664ce68441a..e144301381d5 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
@@ -6,6 +6,3 @@ RGBLIGHT_ENABLE = yes
 ENCODER_ENABLE = yes
 CONSOLE_ENABLE = no        # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
-
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
\ No newline at end of file
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h
index 1c9b61b9df8a..d8e1a8fd39d7 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h
@@ -18,16 +18,3 @@ 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 RGBLED_NUM 23
-#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/mechlovin/adelais/standard_led/arm/info.json b/keyboards/mechlovin/adelais/standard_led/arm/info.json
index 9c6bd46a702b..578584cc541f 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/info.json
@@ -9,6 +9,21 @@
         "pin": "B0",
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 23,
+        "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": "A7"
     },
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h b/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h
deleted file mode 100644
index 254d20403810..000000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define TAP_CODE_DELAY 10
\ No newline at end of file
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
index a5ebef5b8750..46907dc7a9d6 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
@@ -9,6 +9,9 @@
             {"pin_a": "B7", "pin_b": "B6"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "STM32F303",
     "board": "QMK_PROTON_C",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h b/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h
deleted file mode 100644
index 7905be189159..000000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2021 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/>.
-*/
-#pragma once
-
-#define TAP_CODE_DELAY 10
\ No newline at end of file
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
index b6ee0c5b6700..f0d10942adc8 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
@@ -9,6 +9,9 @@
             {"pin_a": "B7", "pin_b": "B6"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_alice_split_bs"
     },
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
index 0e23efaf3ad2..dd04e29a7a35 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h
@@ -30,17 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-
-#define RGBLED_NUM 23
-#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 TAP_CODE_DELAY 10
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
index 31de7de95756..95aac7b0d41f 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
@@ -10,10 +10,28 @@
             {"pin_a": "C7", "pin_b": "C6"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "backlight": {
         "pin": "B5",
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 23,
+        "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": "E2"
     },
diff --git a/keyboards/mechlovin/delphine/mono_led/config.h b/keyboards/mechlovin/delphine/mono_led/config.h
deleted file mode 100644
index 61c495c889db..000000000000
--- a/keyboards/mechlovin/delphine/mono_led/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#pragma once
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 13
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
-#endif
diff --git a/keyboards/mechlovin/delphine/mono_led/info.json b/keyboards/mechlovin/delphine/mono_led/info.json
index 7f775f8c3633..e1b90d1191bb 100644
--- a/keyboards/mechlovin/delphine/mono_led/info.json
+++ b/keyboards/mechlovin/delphine/mono_led/info.json
@@ -3,6 +3,24 @@
         "pid": "0xDEF1",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 13,
+        "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": "E2"
     },
diff --git a/keyboards/mechlovin/delphine/rgb_led/config.h b/keyboards/mechlovin/delphine/rgb_led/config.h
index 7d9aa447f972..9498e8914f16 100644
--- a/keyboards/mechlovin/delphine/rgb_led/config.h
+++ b/keyboards/mechlovin/delphine/rgb_led/config.h
@@ -1,23 +1,5 @@
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 13
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
-#endif
-
 //rgb matrix setting// 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:
diff --git a/keyboards/mechlovin/delphine/rgb_led/info.json b/keyboards/mechlovin/delphine/rgb_led/info.json
index 3b9fb036e9d1..59127ea64fbf 100644
--- a/keyboards/mechlovin/delphine/rgb_led/info.json
+++ b/keyboards/mechlovin/delphine/rgb_led/info.json
@@ -3,10 +3,28 @@
         "pid": "0xDEF2",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 13,
+        "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": "E2"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     }
 }
diff --git a/keyboards/mechlovin/foundation/config.h b/keyboards/mechlovin/foundation/config.h
deleted file mode 100644
index cdcfe8572cd5..000000000000
--- a/keyboards/mechlovin/foundation/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-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/>.
-*/
-
-#pragma once
-
-#    define RGBLED_NUM 22
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
-#define TAP_CODE_DELAY 10
\ No newline at end of file
diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/info.json
index 7132ecb95361..bec0c883c5c7 100644
--- a/keyboards/mechlovin/foundation/info.json
+++ b/keyboards/mechlovin/foundation/info.json
@@ -18,10 +18,31 @@
             {"pin_a": "C13", "pin_b": "C14"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "indicators": {
         "caps_lock": "A1",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 22,
+        "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": "B15"
     },
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json
index 5e82c00c6644..3eeba2ab7e72 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json
@@ -12,7 +12,7 @@
         "pin": "A15"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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 81335f31be93..7e9a91849300 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/config.h
+++ b/keyboards/mechlovin/hannah60rgb/rev2/config.h
@@ -1,22 +1,5 @@
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-#    define RGBLED_NUM      18
-#    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
-
 //rgb matrix setting// 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:
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json
index 61ce6898c82c..84524c2331fc 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json
@@ -8,11 +8,28 @@
         "pid": "0x6002",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "A15"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "matrix_pins": {
         "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"],
diff --git a/keyboards/mechlovin/hannah65/config.h b/keyboards/mechlovin/hannah65/config.h
deleted file mode 100644
index 1686c861fb19..000000000000
--- a/keyboards/mechlovin/hannah65/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2020 Team 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 BACKLIGHT_PWM_DRIVER PWMD4
-#define BACKLIGHT_PWM_CHANNEL 3
diff --git a/keyboards/mechlovin/hannah910/config.h b/keyboards/mechlovin/hannah910/config.h
index ef401a6c2b7c..a6ae7f4a1066 100644
--- a/keyboards/mechlovin/hannah910/config.h
+++ b/keyboards/mechlovin/hannah910/config.h
@@ -17,17 +17,6 @@ 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
-
 /* 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/mechlovin/hannah910/rev1/config.h b/keyboards/mechlovin/hannah910/rev1/config.h
deleted file mode 100644
index 7b793c75b91b..000000000000
--- a/keyboards/mechlovin/hannah910/rev1/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 9
\ No newline at end of file
diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/info.json
index 49eb2af5c103..af20cffd4fbd 100644
--- a/keyboards/mechlovin/hannah910/rev1/info.json
+++ b/keyboards/mechlovin/hannah910/rev1/info.json
@@ -17,6 +17,21 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 9,
+        "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": "E2"
     },
diff --git a/keyboards/mechlovin/hannah910/rev2/config.h b/keyboards/mechlovin/hannah910/rev2/config.h
deleted file mode 100644
index c37c581ae61c..000000000000
--- a/keyboards/mechlovin/hannah910/rev2/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 28
\ No newline at end of file
diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/info.json
index 43f6ab51a102..a9cfe5f66bed 100644
--- a/keyboards/mechlovin/hannah910/rev2/info.json
+++ b/keyboards/mechlovin/hannah910/rev2/info.json
@@ -17,6 +17,21 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 28,
+        "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": "E2"
     },
diff --git a/keyboards/mechlovin/hannah910/rev3/config.h b/keyboards/mechlovin/hannah910/rev3/config.h
deleted file mode 100644
index fbb878ab6aab..000000000000
--- a/keyboards/mechlovin/hannah910/rev3/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 28
diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/info.json
index d6b606913d36..abeaa1e18247 100644
--- a/keyboards/mechlovin/hannah910/rev3/info.json
+++ b/keyboards/mechlovin/hannah910/rev3/info.json
@@ -17,6 +17,21 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 28,
+        "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": "E2"
     },
diff --git a/keyboards/mechlovin/hex4b/rev2/config.h b/keyboards/mechlovin/hex4b/rev2/config.h
deleted file mode 100644
index 14dfffbed3a6..000000000000
--- a/keyboards/mechlovin/hex4b/rev2/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2020 Team 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 BACKLIGHT_PWM_DRIVER PWMD4
diff --git a/keyboards/mechlovin/hex6c/config.h b/keyboards/mechlovin/hex6c/config.h
index a22137acf7b8..4cfcaebcdef3 100644
--- a/keyboards/mechlovin/hex6c/config.h
+++ b/keyboards/mechlovin/hex6c/config.h
@@ -18,9 +18,6 @@ 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 TAP_CODE_DELAY 10
 
 #define WEAR_LEVELING_BACKING_SIZE 4096
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
diff --git a/keyboards/mechlovin/hex6c/info.json b/keyboards/mechlovin/hex6c/info.json
index 4ae471cb4748..dfeb91e0bac6 100644
--- a/keyboards/mechlovin/hex6c/info.json
+++ b/keyboards/mechlovin/hex6c/info.json
@@ -18,6 +18,9 @@
             {"pin_a": "A15", "pin_b": "A2"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "backlight": {
         "pin": "B0",
         "breathing": true
diff --git a/keyboards/mechlovin/infinity87/rev1/config.h b/keyboards/mechlovin/infinity87/rev1/config.h
index 2265fff2d122..e21e5d019f7f 100644
--- a/keyboards/mechlovin/infinity87/rev1/config.h
+++ b/keyboards/mechlovin/infinity87/rev1/config.h
@@ -17,4 +17,3 @@
 #pragma once
 
 #define BACKLIGHT_PWM_DRIVER PWMD3
-#define BACKLIGHT_PWM_CHANNEL 3
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/config.h b/keyboards/mechlovin/infinity87/rev1/standard/config.h
deleted file mode 100644
index 7b3e497cdf05..000000000000
--- a/keyboards/mechlovin/infinity87/rev1/standard/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 Team 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 RGBLED_NUM 26
-#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
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/info.json b/keyboards/mechlovin/infinity87/rev1/standard/info.json
index c83cad4b0600..964a7a8cb9ac 100644
--- a/keyboards/mechlovin/infinity87/rev1/standard/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/standard/info.json
@@ -8,6 +8,22 @@
         "pid": "0x8701",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 26,
+        "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": "A15"
     },
diff --git a/keyboards/mechlovin/infinity87/rev2/config.h b/keyboards/mechlovin/infinity87/rev2/config.h
index 851a9f860e9d..39ae7c362fb1 100644
--- a/keyboards/mechlovin/infinity87/rev2/config.h
+++ b/keyboards/mechlovin/infinity87/rev2/config.h
@@ -33,21 +33,3 @@
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 24
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
-#endif
diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json
index d3b5cfc3ca52..42db9894ca12 100644
--- a/keyboards/mechlovin/infinity87/rev2/info.json
+++ b/keyboards/mechlovin/infinity87/rev2/info.json
@@ -17,6 +17,24 @@
         "num_lock": "D7",
         "scroll_lock": "B4"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 24,
+        "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": "E2"
     },
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
index b3fc9f63d3f5..347ea1b3112c 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "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/infinity875/info.json b/keyboards/mechlovin/infinity875/info.json
index fcec3c2afa87..bb249cf39be6 100644
--- a/keyboards/mechlovin/infinity875/info.json
+++ b/keyboards/mechlovin/infinity875/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "indicators": {
         "caps_lock": "D6",
diff --git a/keyboards/mechlovin/infinity88/config.h b/keyboards/mechlovin/infinity88/config.h
index 40bcfcfeb96e..c12d2db17812 100644
--- a/keyboards/mechlovin/infinity88/config.h
+++ b/keyboards/mechlovin/infinity88/config.h
@@ -18,17 +18,3 @@ 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 RGBLED_NUM 26
-#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations 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
diff --git a/keyboards/mechlovin/infinity88/info.json b/keyboards/mechlovin/infinity88/info.json
index fdbb45a7d6aa..3724d8a82d9d 100644
--- a/keyboards/mechlovin/infinity88/info.json
+++ b/keyboards/mechlovin/infinity88/info.json
@@ -21,6 +21,22 @@
         "caps_lock": "A4",
         "num_lock": "A3"
     },
+    "rgblight": {
+        "led_count": 26,
+        "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": "A15"
     },
diff --git a/keyboards/mechlovin/infinityce/config.h b/keyboards/mechlovin/infinityce/config.h
deleted file mode 100644
index 88c6c21dfa69..000000000000
--- a/keyboards/mechlovin/infinityce/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2020 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 RGBLED_NUM 31
-#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/mechlovin/infinityce/info.json b/keyboards/mechlovin/infinityce/info.json
index 1c49d5410659..0ded6a5eee84 100644
--- a/keyboards/mechlovin/infinityce/info.json
+++ b/keyboards/mechlovin/infinityce/info.json
@@ -17,6 +17,21 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 31,
+        "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": "E2"
     },
diff --git a/keyboards/mechlovin/kanu/config.h b/keyboards/mechlovin/kanu/config.h
deleted file mode 100644
index bfa290889036..000000000000
--- a/keyboards/mechlovin/kanu/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2020 Team 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 RGBLED_NUM 6
-#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/mechlovin/kanu/info.json b/keyboards/mechlovin/kanu/info.json
index 1e8dafd2d745..f8931cdff8cd 100644
--- a/keyboards/mechlovin/kanu/info.json
+++ b/keyboards/mechlovin/kanu/info.json
@@ -17,6 +17,21 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 6,
+        "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": "E2"
     },
diff --git a/keyboards/mechlovin/kay60/config.h b/keyboards/mechlovin/kay60/config.h
deleted file mode 100644
index bf5e80fc7531..000000000000
--- a/keyboards/mechlovin/kay60/config.h
+++ /dev/null
@@ -1,50 +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
-
-#    define RGBLED_NUM 22
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
-/*
- * 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/mechlovin/kay60/info.json b/keyboards/mechlovin/kay60/info.json
index 698247d76ba4..7e1ba1fa2d79 100644
--- a/keyboards/mechlovin/kay60/info.json
+++ b/keyboards/mechlovin/kay60/info.json
@@ -16,6 +16,24 @@
     "indicators": {
         "caps_lock": "B0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 22,
+        "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": "E2"
     },
diff --git a/keyboards/mechlovin/kay65/config.h b/keyboards/mechlovin/kay65/config.h
deleted file mode 100644
index 1fb8123364ef..000000000000
--- a/keyboards/mechlovin/kay65/config.h
+++ /dev/null
@@ -1,50 +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
-
-#    define RGBLED_NUM 24
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
-/*
- * 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/mechlovin/kay65/info.json b/keyboards/mechlovin/kay65/info.json
index fbd556217cac..9a8cf1b5d2f9 100644
--- a/keyboards/mechlovin/kay65/info.json
+++ b/keyboards/mechlovin/kay65/info.json
@@ -17,6 +17,24 @@
         "caps_lock": "D6",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 24,
+        "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": "E2"
     },
diff --git a/keyboards/mechlovin/mechlovin9/rev1/config.h b/keyboards/mechlovin/mechlovin9/rev1/config.h
deleted file mode 100644
index 3686536dfb5a..000000000000
--- a/keyboards/mechlovin/mechlovin9/rev1/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2021 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/>.
-*/
-
-#pragma once
-
-#define BACKLIGHT_PWM_DRIVER PWMD3
-#define BACKLIGHT_PWM_CHANNEL 3
diff --git a/keyboards/mechlovin/olly/bb/config.h b/keyboards/mechlovin/olly/bb/config.h
index e48a1c82a1bc..84a700e41011 100644
--- a/keyboards/mechlovin/olly/bb/config.h
+++ b/keyboards/mechlovin/olly/bb/config.h
@@ -33,19 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 #define MATRIX_ROW_PINS {D6, A5, A4, A3, A6}
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 24
-#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations 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
-#endif
diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json
index c3b55f95d86c..fddb89311363 100644
--- a/keyboards/mechlovin/olly/bb/info.json
+++ b/keyboards/mechlovin/olly/bb/info.json
@@ -12,6 +12,22 @@
         "pin": "D4",
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 24,
+        "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": "B3"
     },
diff --git a/keyboards/mechlovin/olly/jf/config.h b/keyboards/mechlovin/olly/jf/config.h
index c028a0455418..35480dc83c70 100644
--- a/keyboards/mechlovin/olly/jf/config.h
+++ b/keyboards/mechlovin/olly/jf/config.h
@@ -36,17 +36,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
-
-#define RGBLED_NUM 27
-#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations 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
diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json
index 0d49cb611a16..cb0ab92fb47f 100644
--- a/keyboards/mechlovin/olly/jf/info.json
+++ b/keyboards/mechlovin/olly/jf/info.json
@@ -17,6 +17,22 @@
         "num_lock": "B1",
         "scroll_lock": "B2"
     },
+    "rgblight": {
+        "led_count": 27,
+        "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": "B3"
     },
diff --git a/keyboards/mechlovin/olly/octagon/config.h b/keyboards/mechlovin/olly/octagon/config.h
index a1127f6aadb5..4e502b615429 100644
--- a/keyboards/mechlovin/olly/octagon/config.h
+++ b/keyboards/mechlovin/olly/octagon/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef  RGBLIGHT_ENABLE
-#define RGBLED_NUM      26
-#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 LED_MATRIX_ENABLE
 // 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)
diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json
index 81893874e0d4..3621f491d82e 100644
--- a/keyboards/mechlovin/olly/octagon/info.json
+++ b/keyboards/mechlovin/olly/octagon/info.json
@@ -8,11 +8,28 @@
         "pid": "0xD750",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 26,
+        "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": "A7"
     },
     "led_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "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/orion/config.h b/keyboards/mechlovin/olly/orion/config.h
deleted file mode 100644
index 9b3e98be7193..000000000000
--- a/keyboards/mechlovin/olly/orion/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-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/>.
-*/
-
-#pragma once
-
-#ifdef RGBLIGHT_ENABLE
-#    define RGBLED_NUM 24
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-#endif
diff --git a/keyboards/mechlovin/olly/orion/info.json b/keyboards/mechlovin/olly/orion/info.json
index ad792e81af44..0c0ee86c95cc 100644
--- a/keyboards/mechlovin/olly/orion/info.json
+++ b/keyboards/mechlovin/olly/orion/info.json
@@ -18,6 +18,24 @@
         "num_lock": "A13",
         "scroll_lock": "A14"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 24,
+        "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": "B15"
     },
diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h
deleted file mode 100644
index 5cc93f2d91e9..000000000000
--- a/keyboards/mechlovin/pisces/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 Team 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 RGBLED_NUM 12
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json
index 84fdaefd21f2..bf084ba863c6 100644
--- a/keyboards/mechlovin/pisces/info.json
+++ b/keyboards/mechlovin/pisces/info.json
@@ -19,6 +19,24 @@
     "indicators": {
         "caps_lock": "B2"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "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": "E2"
     },
diff --git a/keyboards/mechlovin/serratus/config.h b/keyboards/mechlovin/serratus/config.h
index 1efbadfd2994..5c7dc13e4be1 100644
--- a/keyboards/mechlovin/serratus/config.h
+++ b/keyboards/mechlovin/serratus/config.h
@@ -37,21 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 24
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
-#endif
diff --git a/keyboards/mechlovin/serratus/info.json b/keyboards/mechlovin/serratus/info.json
index 69a64066cd0f..780a369cb81c 100644
--- a/keyboards/mechlovin/serratus/info.json
+++ b/keyboards/mechlovin/serratus/info.json
@@ -17,6 +17,24 @@
         "num_lock": "D7",
         "scroll_lock": "B4"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 24,
+        "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": "E2"
     },
diff --git a/keyboards/mechlovin/tmkl/config.h b/keyboards/mechlovin/tmkl/config.h
index e604c6bcfad3..03e3beacd0f3 100644
--- a/keyboards/mechlovin/tmkl/config.h
+++ b/keyboards/mechlovin/tmkl/config.h
@@ -17,8 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define BACKLIGHT_PWM_DRIVER PWMD3
-#define BACKLIGHT_PWM_CHANNEL 3
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechlovin/zed60/config.h b/keyboards/mechlovin/zed60/config.h
index 01e1b51b1cc9..cdbbd6dd0ed6 100644
--- a/keyboards/mechlovin/zed60/config.h
+++ b/keyboards/mechlovin/zed60/config.h
@@ -17,24 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 22
-
 #define WS2812_SPI SPID1 // default: SPID1
 #define WS2812_SPI_MOSI_PAL_MODE 6 // MOSI pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
-
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
diff --git a/keyboards/mechlovin/zed60/info.json b/keyboards/mechlovin/zed60/info.json
index f02dfd89a5cb..83b8c3f449e0 100644
--- a/keyboards/mechlovin/zed60/info.json
+++ b/keyboards/mechlovin/zed60/info.json
@@ -16,6 +16,23 @@
     "indicators": {
         "caps_lock": "A4"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 22,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "A7",
         "driver": "spi"
diff --git a/keyboards/mechlovin/zed65/910/info.json b/keyboards/mechlovin/zed65/910/info.json
index 7874c09e2dd2..d1de863c0399 100644
--- a/keyboards/mechlovin/zed65/910/info.json
+++ b/keyboards/mechlovin/zed65/910/info.json
@@ -42,8 +42,14 @@
         "pin": "A7",
         "driver": "spi"
     },
+    "layout_aliases": {
+        "LAYOUT_65_iso_tsangan_split_bs": "LAYOUT_iso_split_bs",
+        "LAYOUT_65_ansi_tsangan": "LAYOUT_ansi",
+        "LAYOUT_65_ansi_blocker_tsangan": "LAYOUT_ansi_blocker_tsangan",
+        "LAYOUT_65_ansi_tsangan_split_bs": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT_65_iso_tsangan_split_bs": {
+        "LAYOUT_iso_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -120,7 +126,7 @@
                 {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
-        "LAYOUT_65_ansi_tsangan_split_bs": {
+        "LAYOUT_all": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -197,7 +203,7 @@
                 {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
-        "LAYOUT_65_ansi_tsangan": {
+        "LAYOUT_ansi": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -273,7 +279,7 @@
             ]
         },
         
-        "LAYOUT_65_ansi_blocker_tsangan": {
+        "LAYOUT_ansi_blocker_tsangan": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/mechlovin/zed65/910/keymaps/default/keymap.c b/keyboards/mechlovin/zed65/910/keymaps/default/keymap.c
index 1c530e8420b9..f4c829bedd39 100644
--- a/keyboards/mechlovin/zed65/910/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/zed65/910/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along 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_tsangan_split_bs(
+    [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,
diff --git a/keyboards/mechlovin/zed65/910/keymaps/via/keymap.c b/keyboards/mechlovin/zed65/910/keymaps/via/keymap.c
index d41ff0347229..80dee5ced0df 100644
--- a/keyboards/mechlovin/zed65/910/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/zed65/910/keymaps/via/keymap.c
@@ -18,7 +18,7 @@ along 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_tsangan_split_bs(
+    [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,
diff --git a/keyboards/mechlovin/zed65/910/matrix_diagram.md b/keyboards/mechlovin/zed65/910/matrix_diagram.md
new file mode 100644
index 000000000000..5cebdb1748b4
--- /dev/null
+++ b/keyboards/mechlovin/zed65/910/matrix_diagram.md
@@ -0,0 +1,27 @@
+# Matrix Diagram for Mechlovin Studio Zed65 910 Rev1
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2C │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┐      ┌─────┐
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2D  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │   │1D │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+│40  │41  │42  │46                      │49 │4A │4B │4C │4D │4E │
+└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+┌────────┐                                       ┌──────────┐
+│30      │ 2.25u LShift             2.75u RShift │3C        │
+└────────┘                                       └──────────┘
+┌────┬────┬────┬────────────────────────┬────┬────┐
+│40  │41  │42  │46                      │49  │4A  │ Blocker
+└────┴────┴────┴────────────────────────┴────┴────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┐
+│40   │41 │42   │46                         │4A   │ Blocker Tsangan
+└─────┴───┴─────┴───────────────────────────┴─────┘
+```
diff --git a/keyboards/mechlovin/zed65/mono_led/config.h b/keyboards/mechlovin/zed65/mono_led/config.h
index 9806ec92d61b..1ec1746456ab 100644
--- a/keyboards/mechlovin/zed65/mono_led/config.h
+++ b/keyboards/mechlovin/zed65/mono_led/config.h
@@ -60,19 +60,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define VIA_QMK_LED_MATRIX_ENABLE
 #endif
-
-#    define RGBLED_NUM 24
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/info.json
index c2133902cee6..228d2c50d54d 100644
--- a/keyboards/mechlovin/zed65/mono_led/info.json
+++ b/keyboards/mechlovin/zed65/mono_led/info.json
@@ -8,11 +8,29 @@
         "pid": "0x6503",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 24,
+        "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": "A7"
     },
     "led_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "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/no_backlight/retro66/config.h b/keyboards/mechlovin/zed65/no_backlight/retro66/config.h
deleted file mode 100644
index 6786e3b953ca..000000000000
--- a/keyboards/mechlovin/zed65/no_backlight/retro66/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-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 TAP_CODE_DELAY 10
\ No newline at end of file
diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json b/keyboards/mechlovin/zed65/no_backlight/retro66/info.json
index 791909056380..0709014f76b7 100644
--- a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/retro66/info.json
@@ -19,6 +19,9 @@
             {"pin_a": "B6", "pin_b": "B9"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "indicators": {
         "caps_lock": "C14"
     },
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
index 9f668f2c4795..5cb2a00b8854 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h
@@ -17,24 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 24
-
 #define WS2812_SPI SPID2 // default: SPID1
 #define WS2812_SPI_MOSI_PAL_MODE 0 // MOSI pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
-
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
index 264d20504c65..5b0df671dfc7 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
@@ -16,6 +16,23 @@
     "indicators": {
         "caps_lock": "C14"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 24,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "B15",
         "driver": "spi"
diff --git a/keyboards/mechlovin/zed65/rev1/info.json b/keyboards/mechlovin/zed65/rev1/info.json
index 55b3566b8b7f..20f04dbe655a 100644
--- a/keyboards/mechlovin/zed65/rev1/info.json
+++ b/keyboards/mechlovin/zed65/rev1/info.json
@@ -41,12 +41,27 @@
         "pin": "A7",
         "driver": "spi"
     },
-    "community_layouts": ["65_ansi_blocker_tsangan"],
+    "community_layouts": [
+        "65_ansi",
+        "65_ansi_split_bs",
+        "65_ansi_blocker",
+        "65_ansi_blocker_split_bs",
+        "65_ansi_blocker_tsangan",
+        "65_ansi_blocker_tsangan_split_bs",
+        "65_iso",
+        "65_iso_split_bs",
+        "65_iso_blocker",
+        "65_iso_blocker_split_bs",
+        "65_iso_blocker_tsangan",
+        "65_iso_blocker_tsangan_split_bs"
+    ],
     "layout_aliases": {
-        "LAYOUT_65_ansi_tsangan": "LAYOUT_65_ansi"
+        "LAYOUT_65_ansi_tsangan": "LAYOUT_65_ansi",
+        "LAYOUT_65_iso_tsangan_split_bs": "LAYOUT_65_iso_split_bs",
+        "LAYOUT_65_ansi_tsangan_split_bs": "LAYOUT_65_ansi_split_bs"
     },
     "layouts": {
-        "LAYOUT_65_iso_tsangan_split_bs": {
+        "LAYOUT_65_ansi": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -61,8 +76,7 @@
                 {"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": [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},
@@ -78,7 +92,7 @@
                 {"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, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"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},
@@ -93,11 +107,10 @@
                 {"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": 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, 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},
@@ -124,7 +137,7 @@
                 {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
-        "LAYOUT_65_ansi_tsangan_split_bs": {
+        "LAYOUT_65_ansi_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -174,8 +187,7 @@
                 {"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, 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},
@@ -202,7 +214,7 @@
                 {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
-        "LAYOUT_65_ansi": {
+        "LAYOUT_65_ansi_blocker": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -267,18 +279,92 @@
                 {"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, 1], "x": 1.25, "y": 4},
                 {"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, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "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": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "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},
+                {"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, "w": 1.25},
+                {"matrix": [4, 10], "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},
@@ -343,6 +429,540 @@
                 {"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, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "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": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "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, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "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_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, "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": [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, "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, 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}
+            ]
+        },
+        "LAYOUT_65_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": [2, 12], "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, 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": [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, "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, 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}
+            ]
+        },
+        "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, 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, 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": [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, "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, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "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_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": [2, 12], "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, 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": [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, "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, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "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_iso_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, 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": [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, "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, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "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_iso_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, 12], "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, 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": [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, "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},
diff --git a/keyboards/mechlovin/zed65/rev1/keymaps/default/keymap.c b/keyboards/mechlovin/zed65/rev1/keymaps/default/keymap.c
index 7a922d6b850c..1929a0084c29 100644
--- a/keyboards/mechlovin/zed65/rev1/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/zed65/rev1/keymaps/default/keymap.c
@@ -18,11 +18,11 @@ along 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_tsangan_split_bs(
+    [0] = 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_BSPC, KC_DEL,  KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
-        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LSFT,          KC_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
     )
-};
\ No newline at end of file
+};
diff --git a/keyboards/mechlovin/zed65/rev1/keymaps/via/keymap.c b/keyboards/mechlovin/zed65/rev1/keymaps/via/keymap.c
index 333f14ec70ef..a3ab29005f8c 100644
--- a/keyboards/mechlovin/zed65/rev1/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/zed65/rev1/keymaps/via/keymap.c
@@ -18,11 +18,11 @@ along 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_tsangan_split_bs(
+    [0] = 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_BSPC, KC_DEL,  KC_HOME,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
-        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     )
 };
diff --git a/keyboards/mechstudio/ud_40_ortho/config.h b/keyboards/mechstudio/ud_40_ortho/config.h
deleted file mode 100644
index 4dea48a87828..000000000000
--- a/keyboards/mechstudio/ud_40_ortho/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 David Dejaeghere
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-   #define RGBLED_NUM 10
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #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
diff --git a/keyboards/mechstudio/ud_40_ortho/info.json b/keyboards/mechstudio/ud_40_ortho/info.json
index fe3861496590..6b301e69e401 100644
--- a/keyboards/mechstudio/ud_40_ortho/info.json
+++ b/keyboards/mechstudio/ud_40_ortho/info.json
@@ -17,6 +17,24 @@
     "esc_input": "B7",
     "esc_output": "F0"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 10,
+    "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"
   },
diff --git a/keyboards/mechwild/bde/rev2/keymaps/miketronic/rules.mk b/keyboards/mechwild/bde/rev2/keymaps/miketronic/rules.mk
index 540fbaecb220..6cdd5981242e 100644
--- a/keyboards/mechwild/bde/rev2/keymaps/miketronic/rules.mk
+++ b/keyboards/mechwild/bde/rev2/keymaps/miketronic/rules.mk
@@ -8,6 +8,5 @@ LEADER_ENABLE     = yes
 ENCODER_ENABLE    = yes
 ENCODER_MAP_ENABLE = yes
 OLED_ENABLE = yes           # Enable OLED Screen
-OLED_DRIVER = SSD1306       # Set OLED Driver
 
-RGBLIGHT_ENABLE   = yes     # Enable keyboard RGB underglow
\ No newline at end of file
+RGBLIGHT_ENABLE   = yes     # Enable keyboard RGB underglow
diff --git a/keyboards/mechwild/bde/rev2/rules.mk b/keyboards/mechwild/bde/rev2/rules.mk
index 307b1ef79746..bade0749fc9e 100644
--- a/keyboards/mechwild/bde/rev2/rules.mk
+++ b/keyboards/mechwild/bde/rev2/rules.mk
@@ -1,3 +1,2 @@
 ENCODER_ENABLE = yes        # Enable encoder
 OLED_ENABLE = yes           # Enable OLED Screen
-OLED_DRIVER = SSD1306       # Set OLED Driver
diff --git a/keyboards/mechwild/clunker/rules.mk b/keyboards/mechwild/clunker/rules.mk
index 3e6a4da7dbed..a521203b3268 100644
--- a/keyboards/mechwild/clunker/rules.mk
+++ b/keyboards/mechwild/clunker/rules.mk
@@ -1 +1 @@
-HAPTIC_DRIVER += SOLENOID
+HAPTIC_DRIVER = solenoid
diff --git a/keyboards/mechwild/mercutio/config.h b/keyboards/mechwild/mercutio/config.h
index f9f13d9ac0da..7a7d9cfd15bf 100755
--- a/keyboards/mechwild/mercutio/config.h
+++ b/keyboards/mechwild/mercutio/config.h
@@ -17,8 +17,6 @@
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
 /* Define custom font */
 #define OLED_FONT_H "lib/mercutiofont.c"
 
diff --git a/keyboards/mechwild/mercutio/info.json b/keyboards/mechwild/mercutio/info.json
index f4b1fa141a6e..796d22e36398 100644
--- a/keyboards/mechwild/mercutio/info.json
+++ b/keyboards/mechwild/mercutio/info.json
@@ -18,6 +18,9 @@
             {"pin_a": "B4", "pin_b": "B5"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega328p",
     "bootloader": "usbasploader",
     "layouts": {
diff --git a/keyboards/mechwild/mercutio/rules.mk b/keyboards/mechwild/mercutio/rules.mk
index 27c445ca2fc7..a62bc3d00cd6 100644
--- a/keyboards/mechwild/mercutio/rules.mk
+++ b/keyboards/mechwild/mercutio/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h
index c8381bc63614..219a4ec7b005 100644
--- a/keyboards/mechwild/mokulua/mirrored/config.h
+++ b/keyboards/mechwild/mokulua/mirrored/config.h
@@ -3,36 +3,15 @@
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
 #define OLED_FONT_H "keyboards/mechwild/mokulua/glcdfont.c"
 
 #define MASTER_LEFT
 //#define MASTER_RIGHT
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 8, 8 }
 #define SPLIT_LAYER_STATE_ENABLE
 #define SPLIT_LED_STATE_ENABLE
 #define SPLIT_MODS_ENABLE
 #define SPLIT_OLED_ENABLE
 
-/* RGB options */
-#    define RGBLED_NUM 16
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== choose RGB 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
-
 /* 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/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json
index 5401c8898f23..5221238784c9 100644
--- a/keyboards/mechwild/mokulua/mirrored/info.json
+++ b/keyboards/mechwild/mokulua/mirrored/info.json
@@ -18,9 +18,23 @@
             {"pin_a": "D2", "pin_b": "B2"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "split": {
         "soft_serial_pin": "D3"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "sleep": true,
+        "split_count": [8, 8],
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true
+        }
+    },
     "ws2812": {
         "pin": "B6"
     },
diff --git a/keyboards/mechwild/mokulua/mirrored/rules.mk b/keyboards/mechwild/mokulua/mirrored/rules.mk
index c04e6937b06d..875d4311681b 100644
--- a/keyboards/mechwild/mokulua/mirrored/rules.mk
+++ b/keyboards/mechwild/mokulua/mirrored/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable encoder
 OLED_ENABLE = yes           # Enable OLED Screen
-OLED_DRIVER = SSD1306       # Define OLED Driver
-SPLIT_KEYBOARD = yes        # Define split functionality
\ No newline at end of file
+SPLIT_KEYBOARD = yes        # Define split functionality
diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h
index 7f902d0ca47f..f13e1e582ac7 100644
--- a/keyboards/mechwild/mokulua/standard/config.h
+++ b/keyboards/mechwild/mokulua/standard/config.h
@@ -3,36 +3,15 @@
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
 #define OLED_FONT_H "keyboards/mechwild/mokulua/glcdfont.c"
 
 #define MASTER_LEFT
 //#define MASTER_RIGHT
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 8, 8 }
 #define SPLIT_LAYER_STATE_ENABLE
 #define SPLIT_LED_STATE_ENABLE
 #define SPLIT_MODS_ENABLE
 #define SPLIT_OLED_ENABLE
 
-/* RGB options */
-#    define RGBLED_NUM 16
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== choose RGB 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
-
 /* 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/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json
index 4ab38d9d370f..05ca6775df01 100644
--- a/keyboards/mechwild/mokulua/standard/info.json
+++ b/keyboards/mechwild/mokulua/standard/info.json
@@ -18,9 +18,23 @@
             {"pin_a": "D2", "pin_b": "B2"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "split": {
         "soft_serial_pin": "D3"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "sleep": true,
+        "split_count": [8, 8],
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true
+        }
+    },
     "ws2812": {
         "pin": "B6"
     },
diff --git a/keyboards/mechwild/mokulua/standard/rules.mk b/keyboards/mechwild/mokulua/standard/rules.mk
index c04e6937b06d..875d4311681b 100644
--- a/keyboards/mechwild/mokulua/standard/rules.mk
+++ b/keyboards/mechwild/mokulua/standard/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable encoder
 OLED_ENABLE = yes           # Enable OLED Screen
-OLED_DRIVER = SSD1306       # Define OLED Driver
-SPLIT_KEYBOARD = yes        # Define split functionality
\ No newline at end of file
+SPLIT_KEYBOARD = yes        # Define split functionality
diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h
index 000ad097683d..6898c0a344cb 100644
--- a/keyboards/mechwild/murphpad/config.h
+++ b/keyboards/mechwild/murphpad/config.h
@@ -17,26 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
 #define OLED_FONT_H "keyboards/mechwild/murphpad/lib/murphpadfont.c"
 
-#    define RGBLED_NUM 8
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/mechwild/murphpad/info.json b/keyboards/mechwild/murphpad/info.json
index 29247492cae9..dd635fed599c 100644
--- a/keyboards/mechwild/murphpad/info.json
+++ b/keyboards/mechwild/murphpad/info.json
@@ -19,9 +19,30 @@
             {"pin_a": "D2", "pin_b": "D3"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "bootmagic": {
         "matrix": [0, 1]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "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": "F4"
     },
diff --git a/keyboards/mechwild/murphpad/rules.mk b/keyboards/mechwild/murphpad/rules.mk
index ddfffd4c4b0d..df9b208bb218 100644
--- a/keyboards/mechwild/murphpad/rules.mk
+++ b/keyboards/mechwild/murphpad/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable encoder
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable OLED Screen
diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h
index 300bb16ef562..d9eed88676a5 100644
--- a/keyboards/mechwild/obe/config.h
+++ b/keyboards/mechwild/obe/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
-/* RGB settings, uncomment this define to enable RGB */
-#    define RGBLED_NUM 10
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json
index f529efd1e6a6..98c70bef08af 100644
--- a/keyboards/mechwild/obe/info.json
+++ b/keyboards/mechwild/obe/info.json
@@ -18,6 +18,9 @@
             {"pin_a": "B5", "pin_b": "B4"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "indicators": {
         "caps_lock": "B9",
         "num_lock": "B8"
@@ -25,6 +28,24 @@
     "bootmagic": {
         "matrix": [5, 4]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "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": "A0"
     },
diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h
index 1df6c97bea14..53263d764e19 100644
--- a/keyboards/mechwild/puckbuddy/config.h
+++ b/keyboards/mechwild/puckbuddy/config.h
@@ -13,11 +13,6 @@
 /* set the tapping term for glidepoint pad to register a tap click */
 //#define CIRQUE_PINNACLE_TAPPING_TERM 0 // This is set to 0 to disable it
 
-/* TAPPING_TERM value is used for the CIRQUE_PINNACLE_TAPPING_TERM as well by default
- * defining it this way allows us to easily modify it with DYNAMIC_TAPPING_TERM_ENABLE
- */
-#define TAPPING_TERM 0
-
 /* spi config */
 #define SPI_DRIVER SPID1
 #define SPI_SCK_PIN A5
@@ -29,24 +24,6 @@
 #define CIRQUE_PINNACLE_SPI_DIVISOR 8
 #define CIRQUE_PINNACLE_SPI_CS_PIN A4
 
-#define TAP_CODE_DELAY 10
-
-/* RGB settings, uncomment this define to enable RGB */
-#    define RGBLED_NUM 3
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json
index b8e653be6be5..503d9b4429d6 100644
--- a/keyboards/mechwild/puckbuddy/info.json
+++ b/keyboards/mechwild/puckbuddy/info.json
@@ -19,10 +19,33 @@
             {"pin_a": "B3", "pin_b": "A15"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "indicators": {
         "caps_lock": "C13",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 3,
+        "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
+        }
+    },
+    "tapping": {
+        "term": 0
+    },
     "ws2812": {
         "pin": "A3"
     },
diff --git a/keyboards/mechwild/puckbuddy/rules.mk b/keyboards/mechwild/puckbuddy/rules.mk
index 4bddc4813fcd..980fe281cff7 100644
--- a/keyboards/mechwild/puckbuddy/rules.mk
+++ b/keyboards/mechwild/puckbuddy/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Encoder Enabled
 OLED_ENABLE = yes           # OLED Enabled
-OLED_DRIVER = SSD1306       # OLED Driver
 DIP_SWITCH_ENABLE = yes     # Dip Switch Enabled
 
 POINTING_DEVICE_ENABLE = yes                    # Pointing Device Enabled
diff --git a/keyboards/mechwild/sugarglider/config.h b/keyboards/mechwild/sugarglider/config.h
index 1512cc1528be..75aa26956cf1 100644
--- a/keyboards/mechwild/sugarglider/config.h
+++ b/keyboards/mechwild/sugarglider/config.h
@@ -19,10 +19,6 @@
 /* allows the "key" button on the blackpill to toggle caps lock for user testing before soldering */
 #define DIP_SWITCH_PINS { A0 }
 
-/* TAPPING_TERM value is used for the CIRQUE_PINNACLE_TAPPING_TERM as well by default
- * defining it this way allows us to easily modify it with DYNAMIC_TAPPING_TERM_ENABLE
- */
-#define TAPPING_TERM 0
 #define CIRQUE_PINNACLE_TAP_ENABLE
 #define POINTING_DEVICE_GESTURES_SCROLL_ENABLE
 
diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json
index 046776be4913..f8439dde1101 100644
--- a/keyboards/mechwild/sugarglider/info.json
+++ b/keyboards/mechwild/sugarglider/info.json
@@ -42,9 +42,15 @@
             "twinkle": true
         }
     },
+    "tapping": {
+        "term": 0
+    },
     "ws2812": {
         "pin": "B5"
     },
+    "build": {
+        "debounce_type": "sym_eager_pk"
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "B0", "pin_b": "A2", "resolution": 4},
diff --git a/keyboards/mechwild/sugarglider/rules.mk b/keyboards/mechwild/sugarglider/rules.mk
index acf0b6f1f4cd..9cfa6b77970f 100644
--- a/keyboards/mechwild/sugarglider/rules.mk
+++ b/keyboards/mechwild/sugarglider/rules.mk
@@ -2,7 +2,6 @@
 #   change yes to no to disable
 #
 OLED_ENABLE = yes                   # OLED Enabled
-OLED_DRIVER = SSD1306               # OLED Driver
 
 # Cirque touchpad settings
 POINTING_DEVICE_ENABLE = yes                    # Pointing Device Enabled
@@ -11,7 +10,6 @@ DYNAMIC_TAPPING_TERM_ENABLE = yes               # Enable Dynamic Tapping Term to
 
 # Custom matrix setup
 CUSTOM_MATRIX = lite
-DEBOUNCE_TYPE = sym_eager_pk
 
 VPATH += drivers/gpio
 SRC += mcp23018.c matrix.c
diff --git a/keyboards/mechwild/waka60/config.h b/keyboards/mechwild/waka60/config.h
index 21e197df4ccf..d9eed88676a5 100644
--- a/keyboards/mechwild/waka60/config.h
+++ b/keyboards/mechwild/waka60/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
-/* RGB settings, uncomment this define to enable RGB */
-#    define RGBLED_NUM 3
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/mechwild/waka60/info.json b/keyboards/mechwild/waka60/info.json
index 1014411ba02e..0d50b0f261b2 100644
--- a/keyboards/mechwild/waka60/info.json
+++ b/keyboards/mechwild/waka60/info.json
@@ -8,6 +8,24 @@
         "pid": "0x1709",
         "device_version": "1.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 3,
+        "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": "A1"
     },
@@ -21,6 +39,9 @@
             {"pin_a": "A3", "pin_b": "A2"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/mecxlabs/mp1/rules.mk b/keyboards/mecxlabs/mp1/rules.mk
index ee2a7c0d6a92..0ab54aaaf718 100644
--- a/keyboards/mecxlabs/mp1/rules.mk
+++ b/keyboards/mecxlabs/mp1/rules.mk
@@ -1,4 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/mehkee96/config.h b/keyboards/mehkee96/config.h
deleted file mode 100644
index e5f456306d9c..000000000000
--- a/keyboards/mehkee96/config.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 18
-#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
-/* key combination for command */
diff --git a/keyboards/mehkee96/info.json b/keyboards/mehkee96/info.json
index f192bb503635..9a81cba932a0 100644
--- a/keyboards/mehkee96/info.json
+++ b/keyboards/mehkee96/info.json
@@ -16,6 +16,21 @@
     "backlight": {
         "pin": "D4"
     },
+    "rgblight": {
+        "led_count": 18,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/meletrix/zoom65/config.h b/keyboards/meletrix/zoom65/config.h
deleted file mode 100644
index e5cc1f3e5b79..000000000000
--- a/keyboards/meletrix/zoom65/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 meletrix
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// Note:  array is { col, row )
-#define ENCODERS_CW_KEY  { { 5, 4 } }
-#define ENCODERS_CCW_KEY { { 3, 4 } }
diff --git a/keyboards/meletrix/zoom65/info.json b/keyboards/meletrix/zoom65/info.json
index 30e4962a2945..59de004989f7 100644
--- a/keyboards/meletrix/zoom65/info.json
+++ b/keyboards/meletrix/zoom65/info.json
@@ -43,9 +43,7 @@
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
                 {"matrix": [2, 13], "x": 14, "y": 0},
-                {"matrix": [4, 3], "x": 15, "y": 0, "w": 0.5},
                 {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [4, 5], "x": 16.5, "y": 0, "w": 0.5},
 
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "x": 1.5, "y": 1},
diff --git a/keyboards/meletrix/zoom65/keymaps/default/keymap.c b/keyboards/meletrix/zoom65/keymaps/default/keymap.c
index 3eab5dabb07f..b96eff2257f6 100644
--- a/keyboards/meletrix/zoom65/keymaps/default/keymap.c
+++ b/keyboards/meletrix/zoom65/keymaps/default/keymap.c
@@ -18,14 +18,14 @@
 
 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_BSPC,   KC_VOLD, KC_MUTE, KC_VOLU,
+        KC_ESC,  KC_1,    KC_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_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_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_LSFT, KC_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_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_MPRV, KC_MPLY, KC_MNXT,
+        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_MPLY,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
diff --git a/keyboards/meletrix/zoom65/keymaps/via/keymap.c b/keyboards/meletrix/zoom65/keymaps/via/keymap.c
index 62e10541c251..f593d408d511 100644
--- a/keyboards/meletrix/zoom65/keymaps/via/keymap.c
+++ b/keyboards/meletrix/zoom65/keymaps/via/keymap.c
@@ -18,31 +18,40 @@
 
 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_BSPC,   KC_VOLD, KC_MUTE, KC_VOLU,
+        KC_ESC,  KC_1,    KC_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_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_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_LSFT, KC_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_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_MPRV, KC_MPLY, KC_MNXT,
+        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_MPLY,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
         _______, _______, _______,                   _______, _______, _______,          _______, _______,          _______, _______, _______
     ),
     [2] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                   _______, _______, _______,          _______, _______,          _______, _______, _______
     ),
     [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                   _______, _______, _______,          _______, _______,          _______, _______, _______
     ),
 };
+
+#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_MPRV, KC_MNXT) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/meletrix/zoom65/keymaps/via/rules.mk b/keyboards/meletrix/zoom65/keymaps/via/rules.mk
index 43061db1dd46..1189f4ad1927 100644
--- a/keyboards/meletrix/zoom65/keymaps/via/rules.mk
+++ b/keyboards/meletrix/zoom65/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
+LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/meletrix/zoom65/zoom65.c b/keyboards/meletrix/zoom65/zoom65.c
deleted file mode 100644
index 10b48c7b2dbc..000000000000
--- a/keyboards/meletrix/zoom65/zoom65.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright 2021 meletrix
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You 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 VIA_ENABLE
-static uint8_t encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void)
-{
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
-
-void matrix_scan_kb(void)
-{
-    encoder_action_unregister();
-    matrix_scan_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise)
-{
-    encoder_action_register(index, clockwise);
-    return true;
-};
-#endif
diff --git a/keyboards/meletrix/zoom65_lite/config.h b/keyboards/meletrix/zoom65_lite/config.h
deleted file mode 100644
index e5cc1f3e5b79..000000000000
--- a/keyboards/meletrix/zoom65_lite/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 meletrix
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// Note:  array is { col, row )
-#define ENCODERS_CW_KEY  { { 5, 4 } }
-#define ENCODERS_CCW_KEY { { 3, 4 } }
diff --git a/keyboards/meletrix/zoom65_lite/info.json b/keyboards/meletrix/zoom65_lite/info.json
index b8b59a487da4..932dc8571e2a 100644
--- a/keyboards/meletrix/zoom65_lite/info.json
+++ b/keyboards/meletrix/zoom65_lite/info.json
@@ -43,9 +43,7 @@
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
                 {"matrix": [2, 13], "x": 14, "y": 0},
-                {"matrix": [4, 3], "x": 15, "y": 0, "w": 0.5},
                 {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [4, 5], "x": 16.5, "y": 0, "w": 0.5},
 
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "x": 1.5, "y": 1},
diff --git a/keyboards/meletrix/zoom65_lite/keymaps/default/keymap.c b/keyboards/meletrix/zoom65_lite/keymaps/default/keymap.c
index 9d9aa6755766..b96eff2257f6 100644
--- a/keyboards/meletrix/zoom65_lite/keymaps/default/keymap.c
+++ b/keyboards/meletrix/zoom65_lite/keymaps/default/keymap.c
@@ -18,14 +18,14 @@
 
 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_BSPC,   KC_VOLU, KC_MUTE, KC_VOLD,
+        KC_ESC,  KC_1,    KC_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_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_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_LSFT, KC_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_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_MNXT, KC_MPLY, KC_MPRV,
+        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_MPLY,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
diff --git a/keyboards/meletrix/zoom65_lite/keymaps/via/keymap.c b/keyboards/meletrix/zoom65_lite/keymaps/via/keymap.c
index 4adfaba69d77..f593d408d511 100644
--- a/keyboards/meletrix/zoom65_lite/keymaps/via/keymap.c
+++ b/keyboards/meletrix/zoom65_lite/keymaps/via/keymap.c
@@ -16,78 +16,42 @@
 
 #include QMK_KEYBOARD_H
 
-static uint8_t encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void)
-{
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
-
-void matrix_scan_kb(void)
-{
-    encoder_action_unregister();
-    matrix_scan_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise)
-{
-    encoder_action_register(index, clockwise);
-    return true;
-}
-
 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_BSPC,   KC_VOLU, KC_MUTE, KC_VOLD,
+        KC_ESC,  KC_1,    KC_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_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_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_LSFT, KC_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_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_MNXT, KC_MPLY, KC_MPRV,
+        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_MPLY,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
         _______, _______, _______,                   _______, _______, _______,          _______, _______,          _______, _______, _______
     ),
     [2] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                   _______, _______, _______,          _______, _______,          _______, _______, _______
     ),
     [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                   _______, _______, _______,          _______, _______,          _______, _______, _______
     ),
 };
+
+#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_MPRV, KC_MNXT) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/meletrix/zoom65_lite/keymaps/via/rules.mk b/keyboards/meletrix/zoom65_lite/keymaps/via/rules.mk
index 43061db1dd46..1189f4ad1927 100644
--- a/keyboards/meletrix/zoom65_lite/keymaps/via/rules.mk
+++ b/keyboards/meletrix/zoom65_lite/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
+LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/meletrix/zoom87/config.h b/keyboards/meletrix/zoom87/config.h
deleted file mode 100644
index 3cc2858e75f8..000000000000
--- a/keyboards/meletrix/zoom87/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2022 meletrix
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 20
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*======= RGB function=======*/
-#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/meletrix/zoom87/info.json b/keyboards/meletrix/zoom87/info.json
index be54c6ccd309..551bdc76aa9a 100644
--- a/keyboards/meletrix/zoom87/info.json
+++ b/keyboards/meletrix/zoom87/info.json
@@ -21,7 +21,23 @@
         "pin": "D2"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "max_brightness": 200,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/meletrix/zoom98/config.h b/keyboards/meletrix/zoom98/config.h
new file mode 100644
index 000000000000..88c82de3bfc9
--- /dev/null
+++ b/keyboards/meletrix/zoom98/config.h
@@ -0,0 +1,24 @@
+/*
+Copyright 2023 meletrix
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should 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/meletrix/zoom98/info.json b/keyboards/meletrix/zoom98/info.json
new file mode 100644
index 000000000000..0a57fc3bb640
--- /dev/null
+++ b/keyboards/meletrix/zoom98/info.json
@@ -0,0 +1,215 @@
+{
+  "keyboard_name": "zoom98",
+  "manufacturer": "meletrix",
+  "url": "https://meletrix.com/",
+  "maintainer": "spbgzh",
+  "usb": {
+    "vid": "0x36B5",
+    "pid": "0x27D6",
+    "device_version": "0.0.1"
+  },
+  "encoder": {
+    "rotary": [
+        {"pin_a": "B2", "pin_b": "B1", "resolution": 2}
+    ]
+  },
+  "diode_direction": "COL2ROW",
+  "dynamic_keymap": {
+    "layer_count": 3
+  },
+  "features": {
+    "bootmagic": true,
+    "command": false,
+    "console": false,
+    "rgb_matrix": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "encoder": true
+  },
+  "ws2812": {
+    "pin": "B7"
+  },
+  "rgb_matrix":{
+    "driver":"ws2812",
+    "max_brightness": 200,
+    "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_pinwheel": true,
+        "cycle_spiral": true,
+        "raindrops": true,
+        "hue_breathing": true,
+        "hue_pendulum": true,
+        "hue_wave": true,
+        "typing_heatmap": true,
+        "solid_reactive_simple": true,
+        "solid_reactive": true,
+        "solid_reactive_multinexus": true,
+        "splash": true,
+        "solid_splash": true
+    },
+    "layout": [
+        { "matrix": [0, 1], "x": 0, "y": 0, "flags": 4 },
+        { "matrix": [0, 2], "x": 0, "y": 0, "flags": 4 },
+        { "matrix": [2, 1], "x": 0, "y": 1, "flags": 4 },
+        { "matrix": [2, 2], "x": 0, "y": 1, "flags": 4 },
+        { "matrix": [4, 1], "x": 0, "y": 2, "flags": 4 },
+        { "matrix": [4, 2], "x": 0, "y": 2, "flags": 4 },
+        { "matrix": [6, 1], "x": 0, "y": 3, "flags": 4 },
+        { "matrix": [6, 2], "x": 0, "y": 3, "flags": 4 },
+        { "matrix": [8, 1], "x": 0, "y": 4, "flags": 4 },
+        { "matrix": [8, 2], "x": 0, "y": 4, "flags": 4 },
+        { "matrix": [1, 8], "x": 20.5, "y": 0, "flags": 4 },
+        { "matrix": [1, 7], "x": 20.5, "y": 0, "flags": 4 },
+        { "matrix": [3, 8], "x": 20.5, "y": 1, "flags": 4 },
+        { "matrix": [3, 7], "x": 20.5, "y": 1, "flags": 4 },
+        { "matrix": [5, 8], "x": 20.5, "y": 2, "flags": 4 },
+        { "matrix": [5, 7], "x": 20.5, "y": 2, "flags": 4 },
+        { "matrix": [7, 8], "x": 20.5, "y": 3, "flags": 4 },
+        { "matrix": [7, 7], "x": 20.5, "y": 3, "flags": 4 },
+        { "matrix": [9, 8], "x": 20.5, "y": 4, "flags": 4 },
+        { "matrix": [9, 7], "x": 20.5, "y": 4, "flags": 4 },
+        { "matrix": [6, 0], "x": 0, "y": 3.25, "flags": 1 }
+     ]
+  },
+  "matrix_pins": {
+    "rows": ["E6", "B0", "F1", "D0", "F0", "B3", "C7", "D6", "B6", "C6", "B5", "D4"],
+    "cols": ["F7", "F4", "F6", "D2", "F5", "D5", "D1", "D7", "D3", "B4"]
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+        {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0},
+        {"matrix": [1, 0], "label": "F10", "x": 10.75, "y": 0},
+        {"matrix": [1, 1], "label": "F11", "x": 11.75, "y": 0},
+        {"matrix": [1, 2], "label": "F12", "x": 12.75, "y": 0},
+        {"matrix": [1, 3], "label": "F13", "x": 14, "y": 0},
+        {"matrix": [1, 4], "label": "F14", "x": 15.25, "y": 0},
+        {"matrix": [1, 5], "label": "Mute", "x": 16.25, "y": 0},
+        {"matrix": [1, 6], "label": "Home", "x": 17.5, "y": 0},
+        {"matrix": [1, 7], "label": "Prtsc", "x": 18.5, "y": 0},
+        {"matrix": [1, 8], "label": "Scroll", "x": 19.5, "y": 0},
+        {"matrix": [1, 9], "label": "Pause", "x": 20.5, "y": 0},
+
+        {"matrix": [2, 0], "label": "~", "x": 0, "y": 1.25},
+        {"matrix": [2, 1], "label": "1", "x": 1, "y": 1.25},
+        {"matrix": [2, 2], "label": "2", "x": 2, "y": 1.25},
+        {"matrix": [2, 3], "label": "3", "x": 3, "y": 1.25},
+        {"matrix": [2, 4], "label": "4", "x": 4, "y": 1.25},
+        {"matrix": [2, 5], "label": "5", "x": 5, "y": 1.25},
+        {"matrix": [2, 6], "label": "6", "x": 6, "y": 1.25},
+        {"matrix": [2, 7], "label": "7", "x": 7, "y": 1.25},
+        {"matrix": [2, 8], "label": "8", "x": 8, "y": 1.25},
+        {"matrix": [2, 9], "label": "9", "x": 9, "y": 1.25},
+        {"matrix": [3, 0], "label": "0", "x": 10, "y": 1.25},
+        {"matrix": [3, 1], "label": "-", "x": 11, "y": 1.25},
+        {"matrix": [3, 2], "label": "=", "x": 12, "y": 1.25},
+        {"matrix": [3, 3], "label": "Backspace", "x": 13, "y": 1.25},
+        {"matrix": [7, 4], "label": "Backspace1", "x": 14, "y": 1.25},
+        {"matrix": [3, 4], "label": "Ins", "x": 15.25, "y": 1.25},
+        {"matrix": [3, 5], "label": "PageUp", "x": 16.25, "y": 1.25},
+        {"matrix": [3, 6], "label": "Num", "x": 17.5, "y": 1.25},
+        {"matrix": [3, 7], "label": "//", "x": 18.5, "y": 1.25},
+        {"matrix": [3, 8], "label": "*", "x": 19.5, "y": 1.25},
+        {"matrix": [3, 9], "label": "-", "x": 20.5, "y": 1.25},
+
+        {"matrix": [4, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [4, 1], "label": "Q", "x": 1.5, "y": 2.25},
+        {"matrix": [4, 2], "label": "W", "x": 2.5, "y": 2.25},
+        {"matrix": [4, 3], "label": "E", "x": 3.5, "y": 2.25},
+        {"matrix": [4, 4], "label": "R", "x": 4.5, "y": 2.25},
+        {"matrix": [4, 5], "label": "T", "x": 5.5, "y": 2.25},
+        {"matrix": [4, 6], "label": "Y", "x": 6.5, "y": 2.25},
+        {"matrix": [4, 7], "label": "U", "x": 7.5, "y": 2.25},
+        {"matrix": [4, 8], "label": "I", "x": 8.5, "y": 2.25},
+        {"matrix": [4, 9], "label": "O", "x": 9.5, "y": 2.25},
+        {"matrix": [5, 0], "label": "P", "x": 10.5, "y": 2.25},
+        {"matrix": [5, 1], "label": "[", "x": 11.5, "y": 2.25},
+        {"matrix": [5, 2], "label": "]", "x": 12.5, "y": 2.25},
+        {"matrix": [5, 3], "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5},
+        {"matrix": [5, 4], "label": "Delete", "x": 15.25, "y": 2.25},
+        {"matrix": [5, 5], "label": "PageDown", "x": 16.25, "y": 2.25},
+        {"matrix": [5, 6], "label": "7", "x": 17.5, "y": 2.25},
+        {"matrix": [5, 7], "label": "8", "x": 18.5, "y": 2.25},
+        {"matrix": [5, 8], "label": "9", "x": 19.5, "y": 2.25},
+
+        {"matrix": [6, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [6, 1], "label": "A", "x": 1.75, "y": 3.25},
+        {"matrix": [6, 2], "label": "S", "x": 2.75, "y": 3.25},
+        {"matrix": [6, 3], "label": "D", "x": 3.75, "y": 3.25},
+        {"matrix": [6, 4], "label": "F", "x": 4.75, "y": 3.25},
+        {"matrix": [6, 5], "label": "G", "x": 5.75, "y": 3.25},
+        {"matrix": [6, 6], "label": "H", "x": 6.75, "y": 3.25},
+        {"matrix": [6, 7], "label": "J", "x": 7.75, "y": 3.25},
+        {"matrix": [6, 8], "label": "K", "x": 8.75, "y": 3.25},
+        {"matrix": [6, 9], "label": "L", "x": 9.75, "y": 3.25},
+        {"matrix": [7, 0], "label": ";", "x": 10.75, "y": 3.25},
+        {"matrix": [7, 1], "label": "'", "x": 11.75, "y": 3.25},
+        {"matrix": [7, 2], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25},
+        {"matrix": [7, 6], "label": "4", "x": 17.5, "y": 3.25},
+        {"matrix": [7, 7], "label": "5", "x": 18.5, "y": 3.25},
+        {"matrix": [7, 8], "label": "6", "x": 19.5, "y": 3.25},
+        {"matrix": [7, 9], "label": "+", "x": 20.5, "y": 2.25,"h":2},
+
+        {"matrix": [8, 0], "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [8, 1], "label": "Shift2", "x": 1.25, "y": 4.25},
+        {"matrix": [8, 2], "label": "Z", "x": 2.25, "y": 4.25},
+        {"matrix": [8, 3], "label": "X", "x": 3.25, "y": 4.25},
+        {"matrix": [8, 4], "label": "C", "x": 4.25, "y": 4.25},
+        {"matrix": [8, 5], "label": "V", "x": 5.25, "y": 4.25},
+        {"matrix": [8, 6], "label": "B", "x": 6.25, "y": 4.25},
+        {"matrix": [8, 7], "label": "N", "x": 7.25, "y": 4.25},
+        {"matrix": [8, 8], "label": "M", "x": 8.25, "y": 4.25},
+        {"matrix": [8, 9], "label": ",", "x": 9.25, "y": 4.25},
+        {"matrix": [9, 0], "label": ".", "x": 10.25, "y": 4.25},
+        {"matrix": [9, 1], "label": "/", "x": 11.25, "y": 4.25},
+        {"matrix": [9, 2], "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [9, 3], "label": "Shift2", "x": 14, "y": 4.25},
+        {"matrix": [9, 4], "label": "\u2191", "x": 15.25, "y": 4.25},
+        {"matrix": [9, 6], "label": "1", "x": 17.5, "y": 4.25},
+        {"matrix": [9, 7], "label": "2", "x": 18.5, "y": 4.25},
+        {"matrix": [9, 8], "label": "3", "x": 19.5, "y": 4.25},
+
+        {"matrix": [10, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
+        {"matrix": [10, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
+        {"matrix": [10, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
+        {"matrix": [10, 5], "label": "Space", "x": 3.75, "y": 5.25, "w": 2.25},
+        {"matrix": [10, 6], "label": "Space", "x": 6, "y": 5.25, "w": 1.25},
+        {"matrix": [10, 7], "label": "Space", "x": 7.25, "y": 5.25, "w": 2.75},
+        {"matrix": [11, 0], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25},
+        {"matrix": [11, 1], "label": "Fn", "x": 11.25, "y": 5.25, "w": 1.25},
+        {"matrix": [11, 2], "label": "Ctrl", "x": 12.5, "y": 5.25, "w": 1.25},
+        {"matrix": [11, 3], "label": "\u2190", "x": 14.25, "y": 5.25},
+        {"matrix": [11, 4], "label": "\u2193", "x": 15.25, "y": 5.25},
+        {"matrix": [11, 5], "label": "\u2192", "x": 16.25, "y": 5.25},
+        {"matrix": [11, 7], "label": "0", "x": 17.5, "y": 5.25, "w": 2},
+        {"matrix": [11, 8], "label": ".", "x": 19.5, "y": 5.25},
+        {"matrix": [11, 9], "label": "Enter", "x": 20.5, "y": 4.25, "h": 2}
+      ]
+    }
+  }
+}
diff --git a/keyboards/meletrix/zoom98/keymaps/default/keymap.c b/keyboards/meletrix/zoom98/keymaps/default/keymap.c
new file mode 100644
index 000000000000..591c4bdf6895
--- /dev/null
+++ b/keyboards/meletrix/zoom98/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 meletrix
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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(KC_VOLD, KC_VOLU)  },
+    [1] =  { ENCODER_CCW_CW(KC_MPRV, KC_MNXT),  },
+};
+#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_F13,            KC_F14, KC_MUTE, KC_HOME, 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_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_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_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_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RIGHT,                  KC_P0,   KC_PDOT, KC_PENT
+    ),
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, KC_MPLY,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,          _______, _______, _______,          _______, _______, _______,                   _______, _______, _______
+    ),
+};
diff --git a/keyboards/meletrix/zoom98/keymaps/default/rules.mk b/keyboards/meletrix/zoom98/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/meletrix/zoom98/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/meletrix/zoom98/keymaps/via/keymap.c b/keyboards/meletrix/zoom98/keymaps/via/keymap.c
new file mode 100644
index 000000000000..7ffcdd8e38a2
--- /dev/null
+++ b/keyboards/meletrix/zoom98/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2023 meletrix
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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(KC_VOLD, KC_VOLU)  },
+    [1] = {  ENCODER_CCW_CW(KC_MNXT, KC_MPRV)  },
+};
+#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_F13,            KC_F14, KC_MUTE, KC_HOME, 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_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_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_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_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RIGHT,                  KC_P0,   KC_PDOT, KC_PENT
+    ),
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_MPLY, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          QK_BOOT, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,          _______, _______, _______,          _______, _______, _______,                   _______, _______, _______
+    ),
+};
diff --git a/keyboards/meletrix/zoom98/keymaps/via/rules.mk b/keyboards/meletrix/zoom98/keymaps/via/rules.mk
new file mode 100644
index 000000000000..5ed7f6a38cab
--- /dev/null
+++ b/keyboards/meletrix/zoom98/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/meletrix/zoom98/readme.md b/keyboards/meletrix/zoom98/readme.md
new file mode 100644
index 000000000000..42b8408e48a3
--- /dev/null
+++ b/keyboards/meletrix/zoom98/readme.md
@@ -0,0 +1,25 @@
+# Zoom98
+
+More Info at [Zoom98 Wired Version](https://meletrix.com/)
+​
+* Keyboard Maintainer: [spbgzh](https://github.com/spbgzh)
+* Hardware Supported: Zoom98 Wired Version
+* Hardware Availability: [zoom98](https://meletrix.com/)
+
+Make example for this keyboard (after setting up your build environment):  
+
+    make meletrix/zoom98:default
+
+Flashing example for this keyboard:
+
+    make meletrix/zoom98: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 using one of the following methods:
+
+* Tap the Reset switch mounted on the PCB
+* In the case of the default keymap, use the key combination Fn + Delete
+* Hold the Esc key while connecting the USB cable (also erases persistent settings)
diff --git a/keyboards/meletrix/zoom98/rules.mk b/keyboards/meletrix/zoom98/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/meletrix/zoom98/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/meletrix/zoom98/zoom98.c b/keyboards/meletrix/zoom98/zoom98.c
new file mode 100644
index 000000000000..5ebd292eca4e
--- /dev/null
+++ b/keyboards/meletrix/zoom98/zoom98.c
@@ -0,0 +1,31 @@
+/* Copyright 2023 meletrix
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You 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"
+
+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 (uint8_t i = led_min; i < led_max; i++) {
+            if (g_led_config.flags[i] & LED_FLAG_MODIFIER) {
+                rgb_matrix_set_color(i, RGB_WHITE);
+            }
+        }
+    }
+    return false;
+}
diff --git a/keyboards/melgeek/mach80/rev1/info.json b/keyboards/melgeek/mach80/rev1/info.json
index 3a1a27847dd5..1d7d87b76f16 100644
--- a/keyboards/melgeek/mach80/rev1/info.json
+++ b/keyboards/melgeek/mach80/rev1/info.json
@@ -1,6 +1,6 @@
 {
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"],
diff --git a/keyboards/melgeek/mach80/rev1/rev1.c b/keyboards/melgeek/mach80/rev1/rev1.c
index bb04eddd5b3f..da4c6b73d85f 100755
--- a/keyboards/melgeek/mach80/rev1/rev1.c
+++ b/keyboards/melgeek/mach80/rev1/rev1.c
@@ -153,21 +153,21 @@ const is31_led g_is31_indicator_leds[3] = {
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
         if (led_state.caps_lock) {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0xff);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0xff);
         } else {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
         }
 
         if (led_state.num_lock) {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0xff, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0xff, 0x00, 0x00);
         } else {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
         }
 
         if (led_state.scroll_lock) {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0xff, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0xff, 0x00);
         } else {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
         }
     }
     return true;
@@ -176,10 +176,10 @@ bool led_update_kb(led_t led_state) {
 void matrix_init_kb(void) {
     for (int i = 0; i < DRIVER_INDICATOR_LED_TOTAL; ++i) {
         is31_led led = g_is31_indicator_leds[i];
-        IS31FL3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
+        is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
     }
 
-    IS31FL3741_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3741_update_led_control_registers(DRIVER_ADDR_1, 0);
 
     matrix_init_user();
 }
diff --git a/keyboards/melgeek/mach80/rev2/info.json b/keyboards/melgeek/mach80/rev2/info.json
index 3a1a27847dd5..1d7d87b76f16 100644
--- a/keyboards/melgeek/mach80/rev2/info.json
+++ b/keyboards/melgeek/mach80/rev2/info.json
@@ -1,6 +1,6 @@
 {
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"],
diff --git a/keyboards/melgeek/mach80/rev2/rev2.c b/keyboards/melgeek/mach80/rev2/rev2.c
index 7e578c78b54d..632466376d30 100755
--- a/keyboards/melgeek/mach80/rev2/rev2.c
+++ b/keyboards/melgeek/mach80/rev2/rev2.c
@@ -151,21 +151,21 @@ const is31_led g_is31_indicator_leds[3] = {
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
         if (led_state.caps_lock) {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0xff);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0xff);
         } else {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
         }
 
         if (led_state.num_lock) {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0xff, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0xff, 0x00, 0x00);
         } else {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
         }
 
         if (led_state.scroll_lock) {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0xff, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0xff, 0x00);
         } else {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
         }
     }
     return true;
@@ -174,10 +174,10 @@ bool led_update_kb(led_t led_state) {
 void matrix_init_kb(void) {
     for (int i = 0; i < DRIVER_INDICATOR_LED_TOTAL; ++i) {
         is31_led led = g_is31_indicator_leds[i];
-        IS31FL3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
+        is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
     }
 
-    IS31FL3741_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3741_update_led_control_registers(DRIVER_ADDR_1, 0);
 
     matrix_init_user();
 }
diff --git a/keyboards/melgeek/mj61/rev1/info.json b/keyboards/melgeek/mj61/rev1/info.json
index c146adef0433..705023fb8e4a 100644
--- a/keyboards/melgeek/mj61/rev1/info.json
+++ b/keyboards/melgeek/mj61/rev1/info.json
@@ -1,6 +1,6 @@
 {
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
diff --git a/keyboards/melgeek/mj61/rev2/info.json b/keyboards/melgeek/mj61/rev2/info.json
index 330137a02abd..62b2c58f157a 100644
--- a/keyboards/melgeek/mj61/rev2/info.json
+++ b/keyboards/melgeek/mj61/rev2/info.json
@@ -1,6 +1,6 @@
 {
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
diff --git a/keyboards/melgeek/mj63/rev1/info.json b/keyboards/melgeek/mj63/rev1/info.json
index c146adef0433..705023fb8e4a 100644
--- a/keyboards/melgeek/mj63/rev1/info.json
+++ b/keyboards/melgeek/mj63/rev1/info.json
@@ -1,6 +1,6 @@
 {
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
diff --git a/keyboards/melgeek/mj63/rev2/info.json b/keyboards/melgeek/mj63/rev2/info.json
index 330137a02abd..62b2c58f157a 100644
--- a/keyboards/melgeek/mj63/rev2/info.json
+++ b/keyboards/melgeek/mj63/rev2/info.json
@@ -1,6 +1,6 @@
 {
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
diff --git a/keyboards/melgeek/mj64/rev1/info.json b/keyboards/melgeek/mj64/rev1/info.json
index c146adef0433..705023fb8e4a 100644
--- a/keyboards/melgeek/mj64/rev1/info.json
+++ b/keyboards/melgeek/mj64/rev1/info.json
@@ -1,6 +1,6 @@
 {
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
diff --git a/keyboards/melgeek/mj64/rev2/info.json b/keyboards/melgeek/mj64/rev2/info.json
index c146adef0433..705023fb8e4a 100644
--- a/keyboards/melgeek/mj64/rev2/info.json
+++ b/keyboards/melgeek/mj64/rev2/info.json
@@ -1,6 +1,6 @@
 {
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
diff --git a/keyboards/melgeek/mj64/rev3/info.json b/keyboards/melgeek/mj64/rev3/info.json
index 330137a02abd..62b2c58f157a 100644
--- a/keyboards/melgeek/mj64/rev3/info.json
+++ b/keyboards/melgeek/mj64/rev3/info.json
@@ -1,6 +1,6 @@
 {
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
diff --git a/keyboards/melgeek/mj65/info.json b/keyboards/melgeek/mj65/info.json
index 71fce4cf7a93..061b4bc83e0b 100644
--- a/keyboards/melgeek/mj65/info.json
+++ b/keyboards/melgeek/mj65/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "B14"],
diff --git a/keyboards/melgeek/mj6xy/rev3/config.h b/keyboards/melgeek/mj6xy/rev3/config.h
index dbe73b7e3d73..288c8e3a3e70 100755
--- a/keyboards/melgeek/mj6xy/rev3/config.h
+++ b/keyboards/melgeek/mj6xy/rev3/config.h
@@ -16,20 +16,5 @@
 
 #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_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
 #    define RGBLIGHT_DEFAULT_SPD 10
-#    define RGBLED_NUM 16
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP
diff --git a/keyboards/melgeek/mj6xy/rev3/info.json b/keyboards/melgeek/mj6xy/rev3/info.json
index 5dd66001c510..dba086e493b6 100644
--- a/keyboards/melgeek/mj6xy/rev3/info.json
+++ b/keyboards/melgeek/mj6xy/rev3/info.json
@@ -5,10 +5,27 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
-        "driver": "software",
         "pin": "B7",
         "levels": 10
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "C6"
     }
diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/info.json
index c5dcb5d4109e..7e160d0c59f8 100755
--- a/keyboards/melgeek/mojo68/info.json
+++ b/keyboards/melgeek/mojo68/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "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/rev1.c b/keyboards/melgeek/mojo68/rev1/rev1.c
index cadc625adbeb..bea523c84e67 100755
--- a/keyboards/melgeek/mojo68/rev1/rev1.c
+++ b/keyboards/melgeek/mojo68/rev1/rev1.c
@@ -121,21 +121,21 @@ const is31_led g_is31_indicator_leds[3] = {
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
         if (led_state.caps_lock) {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0xff, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0xff, 0x00, 0x00);
         } else {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
         }
 
         if (led_state.num_lock) {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0xff, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0xff, 0x00);
         } else {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
         }
 
         if (led_state.scroll_lock) {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0xff);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0xff);
         } else {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
         }
     }
     return true;
@@ -144,10 +144,10 @@ bool led_update_kb(led_t led_state) {
 void matrix_init_kb(void) {
     for (int i = 0; i < DRIVER_INDICATOR_LED_TOTAL; ++i) {
         is31_led led = g_is31_indicator_leds[i];
-        IS31FL3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
+        is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
     }
 
-    IS31FL3741_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3741_update_led_control_registers(DRIVER_ADDR_1, 0);
 
     matrix_init_user();
 }
diff --git a/keyboards/melgeek/mojo75/info.json b/keyboards/melgeek/mojo75/info.json
index 7d7c6db3ff29..c22c5710a5e8 100644
--- a/keyboards/melgeek/mojo75/info.json
+++ b/keyboards/melgeek/mojo75/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["B12", "B13", "B14", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
diff --git a/keyboards/melgeek/tegic/info.json b/keyboards/melgeek/tegic/info.json
index 31aa06732308..c54f53ca61cf 100644
--- a/keyboards/melgeek/tegic/info.json
+++ b/keyboards/melgeek/tegic/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
diff --git a/keyboards/melgeek/z70ultra/info.json b/keyboards/melgeek/z70ultra/info.json
index 697d107a4f29..ae555e046bd9 100644
--- a/keyboards/melgeek/z70ultra/info.json
+++ b/keyboards/melgeek/z70ultra/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "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 9ff2e778c63e..d0b23c3bf861 100644
--- a/keyboards/melgeek/z70ultra/z70ultra.c
+++ b/keyboards/melgeek/z70ultra/z70ultra.c
@@ -129,27 +129,27 @@ const is31_led g_is31_indicator_leds[6] = {
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
         if (led_state.caps_lock) {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0xff, 0x00, 0x00);
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[3], 0xff, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0xff, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[3], 0xff, 0x00, 0x00);
         } else {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[3], 0x00, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[3], 0x00, 0x00, 0x00);
         }
 
         if (led_state.num_lock) {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0xff, 0x00);
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[4], 0x00, 0xff, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0xff, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[4], 0x00, 0xff, 0x00);
         } else {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[4], 0x00, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[4], 0x00, 0x00, 0x00);
         }
 
         if (led_state.scroll_lock) {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0xff);
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[5], 0x00, 0x00, 0xff);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0xff);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[5], 0x00, 0x00, 0xff);
         } else {
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
-            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[5], 0x00, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
+            is31fl3741_set_pwm_buffer(&g_is31_indicator_leds[5], 0x00, 0x00, 0x00);
         }
     }
     return true;
@@ -158,10 +158,10 @@ bool led_update_kb(led_t led_state) {
 void matrix_init_kb(void) {
     for (int i = 0; i < DRIVER_INDICATOR_LED_TOTAL; ++i) {
         is31_led led = g_is31_indicator_leds[i];
-        IS31FL3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
+        is31fl3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
     }
 
-    IS31FL3741_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3741_update_led_control_registers(DRIVER_ADDR_1, 0);
 
     matrix_init_user();
 }
diff --git a/keyboards/meow48/config.h b/keyboards/meow48/config.h
index 2cd54cde397b..f0ecc58d8075 100644
--- a/keyboards/meow48/config.h
+++ b/keyboards/meow48/config.h
@@ -19,24 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define OLED_BRIGHTNESS 100
 
-    #define RGBLED_NUM 48
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
-/*== all animations 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
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/meow48/info.json b/keyboards/meow48/info.json
index b5d80286c775..a38eee886bfb 100644
--- a/keyboards/meow48/info.json
+++ b/keyboards/meow48/info.json
@@ -12,7 +12,23 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 100
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 48,
+        "max_brightness": 100,
+        "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": ["F6", "F7", "B1", "B3", "B2", "B6"],
diff --git a/keyboards/meow48/rules.mk b/keyboards/meow48/rules.mk
index b38f37579e1d..50a1438ecd39 100644
--- a/keyboards/meow48/rules.mk
+++ b/keyboards/meow48/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
\ No newline at end of file
diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h
deleted file mode 100644
index 945f7535995f..000000000000
--- a/keyboards/merge/uc1/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
- /* Copyright 2021 duoshock
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#pragma once
-
-#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 10
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json
index 95de5a2e20d8..b1f032417f14 100644
--- a/keyboards/merge/uc1/info.json
+++ b/keyboards/merge/uc1/info.json
@@ -8,6 +8,25 @@
     "pid": "0x5543",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "hue_steps": 10,
+    "saturation_steps": 10,
+    "brightness_steps": 10,
+    "led_count": 12,
+    "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": "B5"
   },
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
index bbc2f5b5fbbd..04569dc98940 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -20,14 +20,10 @@
 #define MASTER_LEFT
 #define SPLIT_MODS_ENABLE
 
-#define RGBLIGHT_SPLIT
-#define RGBLED_NUM 83
-#define RGBLED_SPLIT { 39, 44 }
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    define RGB_MATRIX_LED_COUNT 83
+#    define RGB_MATRIX_SPLIT { 39, 44 }
 #endif
-#define RGBLIGHT_SLEEP
 
 #define B6_AUDIO
 
diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json
index 84f44ba6d141..95f3bb1cea28 100644
--- a/keyboards/merge/um70/info.json
+++ b/keyboards/merge/um70/info.json
@@ -25,7 +25,10 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 150
+        "led_count": 83,
+        "max_brightness": 150,
+        "sleep": true,
+        "split_count": [39, 44]
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/merge/um70/rules.mk b/keyboards/merge/um70/rules.mk
index de0aec2ab239..11776618e226 100644
--- a/keyboards/merge/um70/rules.mk
+++ b/keyboards/merge/um70/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 SPLIT_KEYBOARD = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h
index 84b23cd33b76..70a5d7ba590a 100644
--- a/keyboards/merge/um80/config.h
+++ b/keyboards/merge/um80/config.h
@@ -20,14 +20,10 @@
 #define MASTER_LEFT
 #define SPLIT_MODS_ENABLE
 
-#define RGBLIGHT_SPLIT
-#define RGBLED_NUM 100
-#define RGBLED_SPLIT { 48, 52 }
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    define RGB_MATRIX_LED_COUNT 100
+#    define RGB_MATRIX_SPLIT { 48, 52 }
 #endif
-#define RGBLIGHT_SLEEP
 
 #define AUDIO_PIN B6
 
diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json
index 2223b3d4c045..554d1997a361 100644
--- a/keyboards/merge/um80/info.json
+++ b/keyboards/merge/um80/info.json
@@ -25,7 +25,10 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 120
+        "led_count": 100,
+        "max_brightness": 120,
+        "sleep": true,
+        "split_count": [48, 52]
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/merge/um80/rules.mk b/keyboards/merge/um80/rules.mk
index de0aec2ab239..11776618e226 100644
--- a/keyboards/merge/um80/rules.mk
+++ b/keyboards/merge/um80/rules.mk
@@ -13,4 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 SPLIT_KEYBOARD = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/merge/uma/rules.mk b/keyboards/merge/uma/rules.mk
index 1fec8e42150b..8bd01d2bb4ce 100644
--- a/keyboards/merge/uma/rules.mk
+++ b/keyboards/merge/uma/rules.mk
@@ -14,4 +14,3 @@ ENCODER_ENABLE = yes
 SPLIT_KEYBOARD = yes
 LTO_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/meson/config.h b/keyboards/meson/config.h
index e89409d47742..a84e55df1f22 100644
--- a/keyboards/meson/config.h
+++ b/keyboards/meson/config.h
@@ -19,24 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define USE_I2C
 
-   #define RGBLED_NUM 10
-   #define RGBLIGHT_SPLIT
-   #define RGBLED_SPLIT { 5, 5 }
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #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
-
 /* 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/meson/info.json b/keyboards/meson/info.json
index 62aa154c0b4a..55b4591f1fb9 100644
--- a/keyboards/meson/info.json
+++ b/keyboards/meson/info.json
@@ -15,6 +15,25 @@
     "split": {
       "soft_serial_pin": "D0"
     },
+    "rgblight": {
+      "saturation_steps": 8,
+      "brightness_steps": 8,
+      "led_count": 10,
+      "sleep": true,
+      "split_count": [5, 5],
+      "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": "B5"
     },
diff --git a/keyboards/mexsistor/ludmila/config.h b/keyboards/mexsistor/ludmila/config.h
index 8d8aaed5c7eb..d23f6af9d6bc 100644
--- a/keyboards/mexsistor/ludmila/config.h
+++ b/keyboards/mexsistor/ludmila/config.h
@@ -37,16 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-
-#define RGBLED_NUM 4
-#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
diff --git a/keyboards/mexsistor/ludmila/info.json b/keyboards/mexsistor/ludmila/info.json
index fcfecd0fd789..6e44d33913c5 100644
--- a/keyboards/mexsistor/ludmila/info.json
+++ b/keyboards/mexsistor/ludmila/info.json
@@ -13,6 +13,22 @@
             {"pin_a": "F6", "pin_b": "F5"}
         ]
     },
+    "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": "D1"
     },
diff --git a/keyboards/miiiw/blackio83/blackio83.c b/keyboards/miiiw/blackio83/blackio83.c
new file mode 100644
index 000000000000..0d8412624e2d
--- /dev/null
+++ b/keyboards/miiiw/blackio83/blackio83.c
@@ -0,0 +1,189 @@
+/* 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"
+#include "usb_main.h"
+#include "usb_util.h"
+
+#define LOOP_10HZ_PERIOD    100
+deferred_token loop10hz_token  = INVALID_DEFERRED_TOKEN;
+uint32_t loop_10Hz(uint32_t trigger_time, void *cb_arg);
+
+static const SerialConfig mwproto_uart_config = {
+    .speed = MWPROTO_BITRATE,
+};
+
+static void POWER_EnterSleep(void) {
+    /* Clear Wake-up flag */
+    PWR->CR |= PWR_CR_CWUF | PWR_CR_CSBF;
+    /* Select Sleep mode */
+    /* PWR->CR |= PWR_CR_PDDS | PWR_CR_LPDS; */
+    /* Set SLEEPDEEP bit of Cortex System Control Register */
+    SCB->SCR |= SCB_SCR_SLEEPDEEP_Msk;
+    /* Request Wait For Interrupt */
+    __WFI();
+    /* Reset SLEEPDEEP bit of Cortex System Control Register */
+    SCB->SCR &= ~SCB_SCR_SLEEPDEEP_Msk;
+    NVIC_SystemReset();
+}
+
+extern void ws2812_poweron(void);
+extern void ws2812_poweroff(void);
+
+static bool p_setup = false;
+static bool s_init = false;
+void ws2812_poweron(void) {
+    if(p_setup) return;
+    p_setup = true;
+    s_init = false;
+    setPinOutput(RGB_EN_PIN);
+    writePinHigh(RGB_EN_PIN);
+}
+
+void ws2812_poweroff(void) {
+    if(!p_setup) return;
+    p_setup = false;
+    setPinInputLow(WS2812_DI_PIN);
+    writePinLow(RGB_EN_PIN);
+}
+
+void keyboard_pre_init_kb() {
+	keyboard_pre_init_user();
+
+    setPinInputLow(MWPROTO_STATUS_PIN);
+    setPinOutput(MWPROTO_WAKEUP_PIN);
+    writePinLow(MWPROTO_WAKEUP_PIN);
+    wait_ms(2);
+    writePinHigh(MWPROTO_WAKEUP_PIN);
+
+	palSetLineMode(MWPROTO_TX_PIN, PAL_MODE_ALTERNATE(MWPROTO_TX_PAL_MODE) | PAL_OUTPUT_TYPE_OPENDRAIN);
+	sdStart(&MWPROTO_DRIVER, &mwproto_uart_config);
+}
+
+void keyboard_post_init_kb(void) {
+    keyboard_post_init_user();
+
+    print(/* clang-format off */
+        "\n<--QMK Keyboard-->\n"
+        "Vendor: " STR(MANUFACTURER) "(" STR(VENDOR_ID) ")\n"
+        "Product: " STR(PRODUCT) " (" STR(PRODUCT_ID) ")\n"
+        "Version: " STR(DEVICE_VER) "\n"
+        "BUILD: " __DATE__ "\n"
+    ); /* clang-format on */
+
+    writePinLow(MWPROTO_WAKEUP_PIN);
+    wait_ms(50);
+    sdPutI(&MWPROTO_DRIVER, 0xA5);
+    sdPutI(&MWPROTO_DRIVER, 0x12);
+    sdPutI(&MWPROTO_DRIVER, 0x01);
+    sdPutI(&MWPROTO_DRIVER, 0x02);
+    sdPutI(&MWPROTO_DRIVER, 0xB4);
+    writePinHigh(MWPROTO_WAKEUP_PIN);
+
+    ws2812_poweron();
+    loop10hz_token = defer_exec(LOOP_10HZ_PERIOD, loop_10Hz, NULL);
+}
+
+__attribute__((weak)) void shutdown_user(void) {
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_set_suspend_state(true);
+#endif  // RGB_MATRIX_ENABLE
+    wait_ms(10);
+    ws2812_poweroff();
+}
+
+#ifdef DIP_SWITCH_ENABLE
+bool dip_switch_update_mask_kb(uint32_t state) {
+    if (!dip_switch_update_mask_user(state)) { return false; }
+    
+    if(state & 0x01) {
+        led_suspend();
+        usbDisconnectBus(&USB_DRIVER);
+        usbStop(&USB_DRIVER);
+        shutdown_user();
+        setPinInputHigh(POWER_SWITCH_PIN);
+        palEnableLineEvent(POWER_SWITCH_PIN, PAL_EVENT_MODE_RISING_EDGE);
+        POWER_EnterSleep();
+    }
+    
+    return true;
+}
+#endif
+
+uint32_t loop_10Hz(uint32_t trigger_time, void *cb_arg) {
+    
+    if(last_input_activity_elapsed() > 1000) {
+        static uint32_t pmu_timer = 0;
+        if(timer_elapsed32(pmu_timer) > 3000) {
+            pmu_timer = timer_read32();
+            writePinLow(MWPROTO_WAKEUP_PIN);
+            if(readPin(MWPROTO_STATUS_PIN))
+                wait_us(500);
+            else
+                wait_us(1500);
+            sdPutI(&MWPROTO_DRIVER, 0xA5);
+            sdPutI(&MWPROTO_DRIVER, 0x28);
+            sdPutI(&MWPROTO_DRIVER, 0x00);
+            sdPutI(&MWPROTO_DRIVER, 0x8D);
+            writePinHigh(MWPROTO_WAKEUP_PIN);
+        }
+    }
+
+    extern matrix_row_t matrix[MATRIX_ROWS];
+    static uint32_t restore_tick = 0;
+    if(matrix[0] == 0x4000 && matrix[1] == 0 && 
+       matrix[2] == 0 && matrix[3] == 0 && matrix[4] == 0 && matrix[5] == 0x201) {
+        if(restore_tick++ > 50) {
+            restore_tick = 0;
+            writePinLow(MWPROTO_WAKEUP_PIN);
+            if(readPin(MWPROTO_STATUS_PIN))
+                wait_us(500);
+            else
+                wait_us(1500);
+            sdPutI(&MWPROTO_DRIVER, 0xA5);
+            sdPutI(&MWPROTO_DRIVER, 0x1F);
+            sdPutI(&MWPROTO_DRIVER, 0x01);
+            sdPutI(&MWPROTO_DRIVER, 0x0F);
+            sdPutI(&MWPROTO_DRIVER, 0xB4);
+            writePinHigh(MWPROTO_WAKEUP_PIN);
+            wait_ms(50);
+            eeconfig_init();
+    #ifdef RGB_MATRIX_ENABLE
+            extern void rgb_matrix_update_pwm_buffers(void);
+            for(int i = 0; i < 5; i++) {
+                rgb_matrix_set_color_all(RGB_WHITE);
+                rgb_matrix_update_pwm_buffers();
+                wait_ms(500);
+                rgb_matrix_set_color_all(RGB_OFF);
+                rgb_matrix_update_pwm_buffers();
+                wait_ms(500);
+            }
+    #endif
+            wait_ms(500);
+            soft_reset_keyboard();
+        }
+    } else {
+        restore_tick = 0;
+    }
+
+    static uint32_t debug_tick = 0;
+	if (debug_tick++ > 9 ) {
+        dprintf("trigger %d\n", trigger_time);
+		debug_tick = 0;
+	}
+
+    return LOOP_10HZ_PERIOD;
+}
diff --git a/keyboards/miiiw/blackio83/blackio83.h b/keyboards/miiiw/blackio83/blackio83.h
new file mode 100644
index 000000000000..ea371443e30e
--- /dev/null
+++ b/keyboards/miiiw/blackio83/blackio83.h
@@ -0,0 +1,30 @@
+/* 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/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+enum custom_keycodes {
+    DEV_BT1 = QK_KB,
+    DEV_BT2,
+    DEV_BT3,
+    DEV_RF24,
+    ALT_TAB,
+    RGB_RST,
+};
\ No newline at end of file
diff --git a/keyboards/miiiw/blackio83/config.h b/keyboards/miiiw/blackio83/config.h
new file mode 100644
index 000000000000..73c98722e9d4
--- /dev/null
+++ b/keyboards/miiiw/blackio83/config.h
@@ -0,0 +1,56 @@
+/* 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/>.
+ */
+
+#pragma once
+
+// 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/halconf.h b/keyboards/miiiw/blackio83/halconf.h
new file mode 100644
index 000000000000..037108a3923b
--- /dev/null
+++ b/keyboards/miiiw/blackio83/halconf.h
@@ -0,0 +1,32 @@
+/* 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/geekboards/macropad_v2/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_SERIAL TRUE
+
+#define HAL_USE_I2C TRUE
+
+// This enables interrupt-driven mode
+#define PAL_USE_WAIT TRUE
+#define USB_USE_WAIT TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/miiiw/blackio83/info.json b/keyboards/miiiw/blackio83/info.json
new file mode 100644
index 000000000000..40fc6b7d8937
--- /dev/null
+++ b/keyboards/miiiw/blackio83/info.json
@@ -0,0 +1,216 @@
+{
+    "manufacturer": "MIIIW",
+    "keyboard_name": "MIIIW BlackIO 83",
+    "maintainer": "ArthurCyy",
+    "bootloader": "stm32-dfu",
+    "debounce": 3,
+    "diode_direction": "COL2ROW",
+    "features": {
+        "backlight": false,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "deferred_exec": true,
+        "dip_switch": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "rgblight": false
+    },
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "B14"
+    },
+    "matrix_pins": {
+        "cols": ["H0", "H1", "H2", "H3", "H4", "H5", "H6", "H7", "H8", "H9", "H10", "H11", "H12", "H13", "H14", "H15"],
+        "rows": ["A7", "A6", "A5", "A4", "A3", "A2"]
+    },
+    "processor": "STM32F072",
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 10, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 18, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 26, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 34, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 44, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 52, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 60, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 68, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 78, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 86, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 94, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 102, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [0, 15], "x": 124, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 124, "y": 20, "flags": 4},
+            {"matrix": [1, 1], "x": 108, "y": 20, "flags": 4},
+            {"matrix": [1, 2], "x": 96, "y": 20, "flags": 4},
+            {"matrix": [1, 3], "x": 88, "y": 20, "flags": 4},
+            {"matrix": [1, 4], "x": 80, "y": 20, "flags": 4},
+            {"matrix": [1, 5], "x": 72, "y": 20, "flags": 4},
+            {"matrix": [1, 6], "x": 64, "y": 20, "flags": 4},
+            {"matrix": [1, 7], "x": 56, "y": 20, "flags": 4},
+            {"matrix": [1, 8], "x": 48, "y": 20, "flags": 4},
+            {"matrix": [1, 9], "x": 40, "y": 20, "flags": 4},
+            {"matrix": [1, 10], "x": 32, "y": 20, "flags": 4},
+            {"matrix": [1, 11], "x": 24, "y": 20, "flags": 4},
+            {"matrix": [1, 12], "x": 16, "y": 20, "flags": 4},
+            {"matrix": [1, 13], "x": 8, "y": 20, "flags": 4},
+            {"matrix": [1, 15], "x": 0, "y": 20, "flags": 4},
+            {"matrix": [2, 0], "x": 2, "y": 36, "flags": 4},
+            {"matrix": [2, 1], "x": 12, "y": 36, "flags": 4},
+            {"matrix": [2, 2], "x": 20, "y": 36, "flags": 4},
+            {"matrix": [2, 3], "x": 28, "y": 36, "flags": 4},
+            {"matrix": [2, 4], "x": 36, "y": 36, "flags": 4},
+            {"matrix": [2, 5], "x": 44, "y": 36, "flags": 4},
+            {"matrix": [2, 6], "x": 52, "y": 36, "flags": 4},
+            {"matrix": [2, 7], "x": 60, "y": 36, "flags": 4},
+            {"matrix": [2, 8], "x": 68, "y": 36, "flags": 4},
+            {"matrix": [2, 9], "x": 76, "y": 36, "flags": 4},
+            {"matrix": [2, 10], "x": 84, "y": 36, "flags": 4},
+            {"matrix": [2, 11], "x": 92, "y": 36, "flags": 4},
+            {"matrix": [2, 12], "x": 100, "y": 36, "flags": 4},
+            {"matrix": [2, 13], "x": 110, "y": 36, "flags": 4},
+            {"matrix": [2, 15], "x": 124, "y": 36, "flags": 4},
+            {"matrix": [3, 0], "x": 124, "y": 52, "flags": 4},
+            {"matrix": [3, 1], "x": 107, "y": 52, "flags": 4},
+            {"matrix": [3, 2], "x": 94, "y": 52, "flags": 4},
+            {"matrix": [3, 3], "x": 86, "y": 52, "flags": 4},
+            {"matrix": [3, 4], "x": 78, "y": 52, "flags": 4},
+            {"matrix": [3, 5], "x": 70, "y": 52, "flags": 4},
+            {"matrix": [3, 6], "x": 62, "y": 52, "flags": 4},
+            {"matrix": [3, 7], "x": 54, "y": 52, "flags": 4},
+            {"matrix": [3, 8], "x": 46, "y": 52, "flags": 4},
+            {"matrix": [3, 9], "x": 38, "y": 52, "flags": 4},
+            {"matrix": [3, 10], "x": 30, "y": 52, "flags": 4},
+            {"matrix": [3, 11], "x": 22, "y": 52, "flags": 4},
+            {"matrix": [3, 12], "x": 14, "y": 52, "flags": 4},
+            {"matrix": [3, 15], "x": 3, "y": 52, "flags": 4},
+            {"matrix": [4, 0], "x": 5, "y": 68, "flags": 4},
+            {"matrix": [4, 1], "x": 18, "y": 68, "flags": 4},
+            {"matrix": [4, 2], "x": 26, "y": 68, "flags": 4},
+            {"matrix": [4, 3], "x": 34, "y": 68, "flags": 4},
+            {"matrix": [4, 4], "x": 42, "y": 68, "flags": 4},
+            {"matrix": [4, 5], "x": 50, "y": 68, "flags": 4},
+            {"matrix": [4, 6], "x": 58, "y": 68, "flags": 4},
+            {"matrix": [4, 7], "x": 66, "y": 68, "flags": 4},
+            {"matrix": [4, 8], "x": 74, "y": 68, "flags": 4},
+            {"matrix": [4, 9], "x": 82, "y": 68, "flags": 4},
+            {"matrix": [4, 10], "x": 90, "y": 68, "flags": 4},
+            {"matrix": [4, 11], "x": 104, "y": 68, "flags": 4},
+            {"matrix": [4, 13], "x": 114, "y": 68, "flags": 4},
+            {"matrix": [4, 15], "x": 124, "y": 68, "flags": 4},
+            {"matrix": [5, 0], "x": 122, "y": 84, "flags": 4},
+            {"matrix": [5, 1], "x": 114, "y": 84, "flags": 4},
+            {"matrix": [5, 2], "x": 106, "y": 84, "flags": 4},
+            {"matrix": [5, 5], "x": 96, "y": 84, "flags": 4},
+            {"matrix": [5, 8], "x": 88, "y": 84, "flags": 4},
+            {"matrix": [5, 9], "x": 80, "y": 84, "flags": 4},
+            {"matrix": [5, 10], "x": 50, "y": 84, "flags": 4},
+            {"matrix": [5, 12], "x": 20, "y": 88, "flags": 4},
+            {"matrix": [5, 13], "x": 10, "y": 88, "flags": 4},
+            {"matrix": [5, 14], "x": 1, "y": 88, "flags": 4}
+        ]
+    },
+    "url": "https://github.com/ArthurCyy",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x83A1",
+        "vid": "0x3044"
+    },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.25, "y": 0},
+                {"matrix": [0, 3], "x": 2.25, "y": 0},
+                {"matrix": [0, 4], "x": 3.25, "y": 0},
+                {"matrix": [0, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "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.25, "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.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": [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, 15], "x": 15.25, "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, 13], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.25, "y": 4.25},
+                {"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, 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/miiiw/blackio83/keymaps/default/keymap.c b/keyboards/miiiw/blackio83/keymaps/default/keymap.c
new file mode 100644
index 000000000000..dc906f7e2c85
--- /dev/null
+++ b/keyboards/miiiw/blackio83/keymaps/default/keymap.c
@@ -0,0 +1,71 @@
+/* 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 QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum keymap_layers {
+    WIN_BL,
+    WIN_FL,
+    MAC_BL,
+    MAC_FL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap WIN_BL: Win Base Layer (Default Layer)
+   */
+    [WIN_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_DEL,  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_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(WIN_FL), KC_RCTL,       KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+  /* Keymap WIN_FL: Win Function Layer
+   */
+	[WIN_FL] = LAYOUT(
+        RGB_RST,          KC_BRID, KC_BRIU, ALT_TAB, G(KC_D), KC_WBAK, KC_WSCH, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_VAI,          _______,
+        _______, _______, _______,                   _______,                   _______, _______, _______,         RGB_RMOD, RGB_VAD, RGB_MOD
+	),
+
+  /* Keymap MAC_BL: Mac Base Layer
+   */
+    [MAC_BL] = LAYOUT(
+        KC_ESC,           KC_BRID, KC_BRIU,C(KC_UP),C(KC_DOWN),KC_F11,G(KC_SPC),KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,  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_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_RGUI, MO(MAC_FL), KC_RALT,       KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+  /* Keymap MAC_FL: Mac Function Layer
+   */
+	[MAC_FL] = LAYOUT(
+        RGB_RST,          KC_F1,   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_VAI,          _______,
+        _______, _______, _______,                   _______,                   _______, _______, _______,         RGB_RMOD, RGB_VAD, RGB_MOD
+	),
+};
diff --git a/keyboards/miiiw/blackio83/keymaps/via/keymap.c b/keyboards/miiiw/blackio83/keymaps/via/keymap.c
new file mode 100644
index 000000000000..dc906f7e2c85
--- /dev/null
+++ b/keyboards/miiiw/blackio83/keymaps/via/keymap.c
@@ -0,0 +1,71 @@
+/* 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 QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum keymap_layers {
+    WIN_BL,
+    WIN_FL,
+    MAC_BL,
+    MAC_FL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap WIN_BL: Win Base Layer (Default Layer)
+   */
+    [WIN_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_DEL,  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_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(WIN_FL), KC_RCTL,       KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+  /* Keymap WIN_FL: Win Function Layer
+   */
+	[WIN_FL] = LAYOUT(
+        RGB_RST,          KC_BRID, KC_BRIU, ALT_TAB, G(KC_D), KC_WBAK, KC_WSCH, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_VAI,          _______,
+        _______, _______, _______,                   _______,                   _______, _______, _______,         RGB_RMOD, RGB_VAD, RGB_MOD
+	),
+
+  /* Keymap MAC_BL: Mac Base Layer
+   */
+    [MAC_BL] = LAYOUT(
+        KC_ESC,           KC_BRID, KC_BRIU,C(KC_UP),C(KC_DOWN),KC_F11,G(KC_SPC),KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,  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_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_RGUI, MO(MAC_FL), KC_RALT,       KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+  /* Keymap MAC_FL: Mac Function Layer
+   */
+	[MAC_FL] = LAYOUT(
+        RGB_RST,          KC_F1,   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_VAI,          _______,
+        _______, _______, _______,                   _______,                   _______, _______, _______,         RGB_RMOD, RGB_VAD, RGB_MOD
+	),
+};
diff --git a/keyboards/miiiw/blackio83/keymaps/via/rules.mk b/keyboards/miiiw/blackio83/keymaps/via/rules.mk
new file mode 100644
index 000000000000..36b7ba9cbc98
--- /dev/null
+++ b/keyboards/miiiw/blackio83/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/miiiw/blackio83/matrix.c b/keyboards/miiiw/blackio83/matrix.c
new file mode 100644
index 000000000000..841ff3c16e69
--- /dev/null
+++ b/keyboards/miiiw/blackio83/matrix.c
@@ -0,0 +1,139 @@
+/* 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 "quantum.h"
+#include "matrix.h"
+#include "common/shift_register.h"
+
+static uint8_t read_rows(void);
+static void    init_cols(void);
+static void    select_col(uint8_t col);
+static void    unselect_col(uint8_t col);
+static void    unselect_cols(void);
+
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+
+#ifdef DIP_SWITCH_PINS
+#    define NUMBER_OF_DIP_SWITCHES (sizeof(dip_switch_pad) / sizeof(pin_t))
+static pin_t dip_switch_pad[] = DIP_SWITCH_PINS;
+#endif
+
+void matrix_init_custom(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        setPinInputLow(row_pins[row]);
+    }
+    
+    shift_init();
+    init_cols();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool changed = false;
+
+    for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+        select_col(col);
+        waitInputPinDelay();
+        uint8_t rows = read_rows();
+        for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+            bool prev_bit = ((uint32_t)(current_matrix[row]) & (matrix_row_t)(1UL << col)) ? 1 : 0;
+            bool curr_bit = ((uint32_t)rows & (uint32_t)(1UL << row)) ? 1 : 0;
+            if (prev_bit != curr_bit) {
+                current_matrix[row] = (uint32_t)(current_matrix[row]) ^ (uint32_t)(1UL << col);
+                changed = true;
+            }
+        }
+        unselect_col(col);
+    }
+
+    return changed;
+}
+
+void matrix_power_up(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        palDisableLineEvent(row_pins[row]);
+        setPinInputLow(row_pins[row]);
+    }
+    init_cols();
+#ifdef DIP_SWITCH_PINS
+    for (uint8_t i = 1; i < NUMBER_OF_DIP_SWITCHES; i++) {
+        setPinInputHigh(dip_switch_pad[i]);
+    }
+#endif
+}
+
+void matrix_power_down(void) {
+    unselect_cols();
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        setPinInputLow(row_pins[row]);
+        palEnableLineEvent(row_pins[row], PAL_EVENT_MODE_RISING_EDGE);
+    }
+#ifdef DIP_SWITCH_PINS
+    for (uint8_t i = 1; i < NUMBER_OF_DIP_SWITCHES; i++) {
+        setPinInputLow(dip_switch_pad[i]);
+    }
+#endif
+}
+
+static uint8_t read_rows(void) {
+    uint8_t row_value = 0;
+    for(uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        row_value |= (readPin(row_pins[row]) << row);
+    }
+    return row_value;
+}
+
+static void init_cols(void) {
+    shift_writeAll(0);
+    for(uint8_t col = 0; col < MATRIX_COLS; col++) {
+        if(col_pins[col] < H0) {
+            setPinOutput(col_pins[col]);
+            writePinLow(col_pins[col]);
+        }
+    }
+}
+
+static void select_col(uint8_t col) {
+    if(col_pins[col] < H0){
+        writePinHigh(col_pins[col]);
+        waitInputPinDelay();
+        waitInputPinDelay();
+        waitInputPinDelay();
+        waitInputPinDelay();
+        waitInputPinDelay();
+        waitInputPinDelay();
+    }else{
+        shift_writePin(col_pins[col], 1);
+    }
+}
+
+static void unselect_col(uint8_t col) {
+    if(col_pins[col] < H0){
+        writePinLow(col_pins[col]);
+    }else{
+        shift_writePin(col_pins[col], 0);
+    }
+}
+
+static void unselect_cols(void) {
+    shift_writeAll(1);
+    for(uint8_t col = 0; col < MATRIX_COLS; col++) {
+        if(col_pins[col] < H0) {
+            setPinOutput(col_pins[col]);
+            writePinHigh(col_pins[col]);
+        }
+    }
+}
diff --git a/keyboards/miiiw/blackio83/mcuconf.h b/keyboards/miiiw/blackio83/mcuconf.h
new file mode 100644
index 000000000000..89038eba8251
--- /dev/null
+++ b/keyboards/miiiw/blackio83/mcuconf.h
@@ -0,0 +1,33 @@
+/* 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/geekboards/macropad_v2/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+#undef STM32_I2C_USE_DMA
+#define STM32_I2C_USE_DMA FALSE
diff --git a/keyboards/miiiw/blackio83/readme.md b/keyboards/miiiw/blackio83/readme.md
new file mode 100644
index 000000000000..ecb42fac261b
--- /dev/null
+++ b/keyboards/miiiw/blackio83/readme.md
@@ -0,0 +1,30 @@
+# MIIIW BlackIO83
+
+![BlackIO83](https://i.imgur.com/jZ7HrTCh.jpg)
+![BlackIO83](https://i.imgur.com/AnlUIfph.jpg)
+
+A customizable 75% keyboard.
+
+* Keyboard Maintainer: [ArthurCyy](https://github.com/ArthurCyy)
+* Hardware Supported: BlackIO83 rev_0100
+* Hardware Availability: [MIIIW](https://www.miiiw.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make miiiw/blackio83/rev_0100:default
+
+Flashing example for this keyboard:
+
+    make miiiw/blackio83/rev_0100: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**: With the power switch off, hold down the key at (0,0) in the matrix (Escape) and plug in the keyboard.
+* **Physical button**: With the power switch off, hold the small metal button on the right side under the spacebar keycap and plug in the keyboard.
+* **Keycode in layout**:
+  * (Official firmware only) With the power switch on, press and hold the left Shift+ Fn+ upper right DEL.
+  * (Unofficial firmware) With the power switch on, press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/miiiw/blackio83/rev_0100/config.h b/keyboards/miiiw/blackio83/rev_0100/config.h
new file mode 100644
index 000000000000..803c8a8a3b2d
--- /dev/null
+++ b/keyboards/miiiw/blackio83/rev_0100/config.h
@@ -0,0 +1,70 @@
+/* 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/>.
+ */
+
+#pragma once
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+
+/* Dip Switch */
+#define POWER_SWITCH_PIN B0
+#define DIP_SWITCH_PINS { B0, B1, B8, B12 }
+
+/* 16 with dummy columns for shift registers */
+#define SHR_SERIES_NUM 2
+#define SHR_CLOCK_PIN A0
+#define SHR_DATA_PIN A1
+#define SHR_LATCH_PIN C15
+
+/* MIIIW Protocol Driver */
+#define MWPROTO_BITRATE 256000
+#define MWPROTO_DRIVER SD1
+#define MWPROTO_TX_PIN A9
+#define MWPROTO_TX_PAL_MODE 1
+#define MWPROTO_RX_PIN A10
+#define MWPROTO_RX_PAL_MODE 1
+#define MWPROTO_WAKEUP_PIN A15
+#define MWPROTO_STATUS_PIN C13
+
+/* 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
+#define WS2812_TRST_US 200
+
+// 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
diff --git a/keyboards/miiiw/blackio83/rev_0100/rev_0100.c b/keyboards/miiiw/blackio83/rev_0100/rev_0100.c
new file mode 100644
index 000000000000..b28ac84acb41
--- /dev/null
+++ b/keyboards/miiiw/blackio83/rev_0100/rev_0100.c
@@ -0,0 +1,17 @@
+/* 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/miiiw/blackio83/rev_0100/rules.mk b/keyboards/miiiw/blackio83/rev_0100/rules.mk
new file mode 100644
index 000000000000..5558efa95d72
--- /dev/null
+++ b/keyboards/miiiw/blackio83/rev_0100/rules.mk
@@ -0,0 +1,7 @@
+CUSTOM_MATRIX = lite
+
+WS2812_DRIVER_REQUIRED := yes
+
+# Project specific files
+SRC += matrix.c \
+	   common/shift_register.c
diff --git a/keyboards/miiiw/common/shift_register.c b/keyboards/miiiw/common/shift_register.c
new file mode 100644
index 000000000000..1f21c1246836
--- /dev/null
+++ b/keyboards/miiiw/common/shift_register.c
@@ -0,0 +1,90 @@
+/* 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 "quantum.h"
+#include "shift_register.h"
+
+static void shift_out(void);
+
+static uint8_t shift_values[SHR_SERIES_NUM] = {0};
+
+void shift_init(void) {
+#ifdef SHR_OE_PIN
+    setPinOutput(SHR_OE_PIN);
+    writePinHigh(SHR_OE_PIN);
+#endif
+    setPinOutput(SHR_DATA_PIN);
+    setPinOutput(SHR_LATCH_PIN);
+    setPinOutput(SHR_CLOCK_PIN);
+}
+
+void shift_enable(void) {
+#ifdef SHR_OE_PIN
+    writePinLow(SHR_OE_PIN);
+#endif
+    writePinLow(SHR_DATA_PIN);
+    writePinLow(SHR_LATCH_PIN);
+    writePinLow(SHR_CLOCK_PIN);
+}
+
+void shift_disable(void) {
+#ifdef SHR_OE_PIN
+    writePinHigh(SHR_OE_PIN);
+#endif
+    writePinLow(SHR_DATA_PIN);
+    writePinLow(SHR_LATCH_PIN);
+    writePinLow(SHR_CLOCK_PIN);
+}
+
+void shift_writePin(pin_t pin, int level) {
+	uint8_t group = (pin - H0) >> 3;
+	uint8_t	bit = 0x01 << ((pin - H0)&0x07);
+
+    if(group >= SHR_SERIES_NUM) 
+        return;
+
+    if(level)
+        shift_values[group] |= bit;
+    else
+        shift_values[group] &= ~bit;
+    shift_out();
+}
+
+void shift_writeGroup(int group, uint8_t value) {
+    if(group >= SHR_SERIES_NUM) 
+        return;
+
+    shift_values[group] = value;
+    shift_out();
+}
+
+void shift_writeAll(int level) {
+    memset(shift_values, level ? 0xFF : 0, sizeof(shift_values));
+    shift_out();
+}
+
+static void shift_out(void) {
+    uint8_t n = SHR_SERIES_NUM;
+    writePinLow(SHR_LATCH_PIN);
+    while(n--){
+        for (uint8_t i = 0; i < 8; i++) {
+            writePinLow(SHR_CLOCK_PIN);
+            writePin(SHR_DATA_PIN, shift_values[n] & (0x80 >> i));
+            writePinHigh(SHR_CLOCK_PIN);
+	    }
+    }
+    writePinHigh(SHR_LATCH_PIN);
+}
diff --git a/keyboards/miiiw/common/shift_register.h b/keyboards/miiiw/common/shift_register.h
new file mode 100644
index 000000000000..f9895e63f827
--- /dev/null
+++ b/keyboards/miiiw/common/shift_register.h
@@ -0,0 +1,34 @@
+/* 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/>.
+ */
+
+#pragma once
+
+#include "gpio.h"
+
+#ifndef GPIOH_BASE
+#   define GPIOH_BASE  (0xFF595A00U)
+#endif
+
+#ifndef SHR_SERIES_NUM
+#   define SHR_SERIES_NUM 1
+#endif
+
+extern void shift_init(void);
+extern void shift_enable(void);
+extern void shift_disable(void);
+extern void shift_writePin(pin_t pin, int level);
+extern void shift_writeGroup(int group, uint8_t value);
+extern void shift_writeAll(int level);
diff --git a/keyboards/miller/gm862/info.json b/keyboards/miller/gm862/info.json
index c66bba782f4f..952bb34397bf 100644
--- a/keyboards/miller/gm862/info.json
+++ b/keyboards/miller/gm862/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
diff --git a/keyboards/millet/doksin/info.json b/keyboards/millet/doksin/info.json
new file mode 100644
index 000000000000..7a848662cd4f
--- /dev/null
+++ b/keyboards/millet/doksin/info.json
@@ -0,0 +1,31 @@
+{
+    "manufacturer": "millet",
+    "keyboard_name": "doksin",
+    "maintainer": "millet",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["D4"]
+        ]
+    },
+    "processor": "atmega32u2",
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x1919",
+        "vid": "0xBDD1"
+    },
+    "community_layouts": ["ortho_1x1"],
+    "layouts": {
+        "LAYOUT_ortho_1x1": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/millet/doksin/keymaps/default/keymap.c b/keyboards/millet/doksin/keymaps/default/keymap.c
new file mode 100644
index 000000000000..2d9e565f3a4e
--- /dev/null
+++ b/keyboards/millet/doksin/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+/* 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_1x1(
+    KC_1
+  ),
+};
diff --git a/keyboards/millet/doksin/keymaps/default/readme.md b/keyboards/millet/doksin/keymaps/default/readme.md
new file mode 100644
index 000000000000..5ddd4572c40e
--- /dev/null
+++ b/keyboards/millet/doksin/keymaps/default/readme.md
@@ -0,0 +1 @@
+# default keymap for DOKSIN
\ No newline at end of file
diff --git a/keyboards/millet/doksin/keymaps/via/keymap.c b/keyboards/millet/doksin/keymaps/via/keymap.c
new file mode 100644
index 000000000000..56d8f970841f
--- /dev/null
+++ b/keyboards/millet/doksin/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+/* 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_1x1( /* Base */
+    KC_1
+  ),
+
+};
diff --git a/keyboards/millet/doksin/keymaps/via/rules.mk b/keyboards/millet/doksin/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/millet/doksin/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/millet/doksin/readme.md b/keyboards/millet/doksin/readme.md
new file mode 100644
index 000000000000..175416eb8b69
--- /dev/null
+++ b/keyboards/millet/doksin/readme.md
@@ -0,0 +1,19 @@
+# DOKСИН
+
+![DOKСИН](https://i.imgur.com/OaDlfwrh.jpg)
+
+Can be used as a keyboard...
+
+* Keyboard Maintainer: [millet](https://github.com/milletmilletmilletmilletmilletmilletmil)
+* Hardware Supported: The DOKСИН PCB
+* Hardware Availability: None
+
+Make example for this keyboard (after setting up your build environment):
+
+    make millet/doksin:default
+
+Flashing example for this keyboard:
+
+    make millet/doksin: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/millet/doksin/rules.mk b/keyboards/millet/doksin/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/mincedshon/ecila/config.h b/keyboards/mincedshon/ecila/config.h
deleted file mode 100644
index 0b3c4eb59a0b..000000000000
--- a/keyboards/mincedshon/ecila/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2022 mincedshon (@mincedshon)
-// 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 RGBLED_NUM 6
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/mincedshon/ecila/info.json b/keyboards/mincedshon/ecila/info.json
index 9ca79d218670..fe7173e34a64 100644
--- a/keyboards/mincedshon/ecila/info.json
+++ b/keyboards/mincedshon/ecila/info.json
@@ -11,7 +11,23 @@
         "pin": "B0"
     },
     "rgblight": {
-        "max_brightness": 150
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "max_brightness": 150,
+        "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
+        }
     },
     "bootloader": "atmel-dfu",
     "features": {
diff --git a/keyboards/miniaxe/config.h b/keyboards/miniaxe/config.h
index 8d0955d7695d..716fdf387a83 100644
--- a/keyboards/miniaxe/config.h
+++ b/keyboards/miniaxe/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Uncomment below if use underglow */
-#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
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* 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/miniaxe/info.json b/keyboards/miniaxe/info.json
index 6f6c68d8d09c..9b7f3104a0c9 100644
--- a/keyboards/miniaxe/info.json
+++ b/keyboards/miniaxe/info.json
@@ -11,6 +11,23 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "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": "F4"
     },
diff --git a/keyboards/minimacro5/config.h b/keyboards/minimacro5/config.h
deleted file mode 100644
index 317e15093591..000000000000
--- a/keyboards/minimacro5/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
-
-//speed for double tap
-#define TAPPING_TERM 200
-
-/* ws2812 RGB LED */
-#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 5    // Number of LEDs
diff --git a/keyboards/minimacro5/info.json b/keyboards/minimacro5/info.json
index e417a689ae4b..4396783673a5 100644
--- a/keyboards/minimacro5/info.json
+++ b/keyboards/minimacro5/info.json
@@ -8,6 +8,21 @@
     "pid": "0x0007",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "led_count": 5,
+    "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": "B5"
   },
diff --git a/keyboards/minimon/index_tab/config.h b/keyboards/minimon/index_tab/config.h
index 1d1616ee258d..52607b345c28 100644
--- a/keyboards/minimon/index_tab/config.h
+++ b/keyboards/minimon/index_tab/config.h
@@ -20,17 +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 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
diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json
index c38679502491..62a8d2df942f 100644
--- a/keyboards/minimon/index_tab/info.json
+++ b/keyboards/minimon/index_tab/info.json
@@ -9,6 +9,22 @@
         "pid": "0x1306",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 10,
+        "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": "E6"
     },
diff --git a/keyboards/mino_plus/hotswap/config.h b/keyboards/mino_plus/hotswap/config.h
new file mode 100644
index 000000000000..b8c00079386d
--- /dev/null
+++ b/keyboards/mino_plus/hotswap/config.h
@@ -0,0 +1,15 @@
+// Copyright 2023 ShandonCodes (@ShandonCodes)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#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
+
diff --git a/keyboards/mino_plus/hotswap/halconf.h b/keyboards/mino_plus/hotswap/halconf.h
new file mode 100644
index 000000000000..fb8ce45220b1
--- /dev/null
+++ b/keyboards/mino_plus/hotswap/halconf.h
@@ -0,0 +1,7 @@
+// Copyright 2023 ShandonCodes (@ShandonCodes)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/mino_plus/hotswap/hotswap.c b/keyboards/mino_plus/hotswap/hotswap.c
new file mode 100644
index 000000000000..a5920b26173b
--- /dev/null
+++ b/keyboards/mino_plus/hotswap/hotswap.c
@@ -0,0 +1,8 @@
+// Copyright 2023 ShandonCodes (@ShandonCodes)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "quantum.h"
+
+void board_init(void) {
+  SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
+  SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
+}
\ No newline at end of file
diff --git a/keyboards/mino_plus/hotswap/info.json b/keyboards/mino_plus/hotswap/info.json
new file mode 100644
index 000000000000..b7cda6d71ff2
--- /dev/null
+++ b/keyboards/mino_plus/hotswap/info.json
@@ -0,0 +1,100 @@
+{
+    "manufacturer": "ShandonCodes",
+    "keyboard_name": "Mino Plus (Hotswap)",
+    "maintainer": "ShandonCodes",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B12", "A15", "B3", "B2", "B0", "A7", "A5", "A4", "A3", "A2", "A1", "F1", "A0", "A8", "A10"],
+        "rows": ["B14", "B10", "F0", "C15", "C14"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0004",
+        "vid": "0x7877"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Del", "matrix": [0, 14], "x": 14, "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": "Ins", "matrix": [1, 14], "x": 15, "y": 1},
+                {"label": "Caps", "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": 10.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Pgup", "matrix": [2, 14], "x": 14, "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": "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": "Shift", "matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 12], "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": "Super", "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, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Meta", "matrix": [4, 9], "x": 10, "y": 4},
+                {"label": "Win", "matrix": [4, 10], "x": 11, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4},
+                {"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/mino_plus/hotswap/keymaps/default/keymap.c b/keyboards/mino_plus/hotswap/keymaps/default/keymap.c
new file mode 100644
index 000000000000..f068c662153f
--- /dev/null
+++ b/keyboards/mino_plus/hotswap/keymaps/default/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2023 ShandonCodes (@ShandonCodes)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT(
+        KC_ESCAPE, KC_1, KC_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_ENTER, KC_PGUP,
+        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_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [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, 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
+    )
+};
\ No newline at end of file
diff --git a/keyboards/mino_plus/hotswap/keymaps/via/keymap.c b/keyboards/mino_plus/hotswap/keymaps/via/keymap.c
new file mode 100644
index 000000000000..901adcb3d270
--- /dev/null
+++ b/keyboards/mino_plus/hotswap/keymaps/via/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 ShandonCodes (@ShandonCodes)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT(
+        KC_ESCAPE, KC_1, KC_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_ENTER, KC_PGUP,
+        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_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [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, 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
+    )
+};
\ No newline at end of file
diff --git a/keyboards/mino_plus/hotswap/keymaps/via/rules.mk b/keyboards/mino_plus/hotswap/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/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/mino_plus/hotswap/mcuconf.h
new file mode 100644
index 000000000000..7b8a66123e5a
--- /dev/null
+++ b/keyboards/mino_plus/hotswap/mcuconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 ShandonCodes (@ShandonCodes)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
\ No newline at end of file
diff --git a/keyboards/mino_plus/hotswap/rules.mk b/keyboards/mino_plus/hotswap/rules.mk
new file mode 100644
index 000000000000..76e55c05f483
--- /dev/null
+++ b/keyboards/mino_plus/hotswap/rules.mk
@@ -0,0 +1,2 @@
+OLED_ENABLE = yes
+WPM_ENABLE = yes
diff --git a/keyboards/mino_plus/mino_plus.c b/keyboards/mino_plus/mino_plus.c
index 62434016f72e..cd651b6d1712 100644
--- a/keyboards/mino_plus/mino_plus.c
+++ b/keyboards/mino_plus/mino_plus.c
@@ -1,4 +1,4 @@
-// Copyright 2022 ShandonCodes (@ShandonCodes)
+// Copyright 2023 ShandonCodes (@ShandonCodes)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #include "quantum.h"
 
diff --git a/keyboards/mino_plus/readme.md b/keyboards/mino_plus/readme.md
index 0730e30d63a8..0a85b6dc5800 100644
--- a/keyboards/mino_plus/readme.md
+++ b/keyboards/mino_plus/readme.md
@@ -11,10 +11,12 @@ A 65% keyboard, inspried by tetrominos.
 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).
 
diff --git a/keyboards/mino_plus/keymaps/default/keymap.c b/keyboards/mino_plus/soldered/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mino_plus/keymaps/default/keymap.c
rename to keyboards/mino_plus/soldered/keymaps/default/keymap.c
diff --git a/keyboards/mino_plus/keymaps/via/keymap.c b/keyboards/mino_plus/soldered/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mino_plus/keymaps/via/keymap.c
rename to keyboards/mino_plus/soldered/keymaps/via/keymap.c
diff --git a/keyboards/mino_plus/soldered/keymaps/via/rules.mk b/keyboards/mino_plus/soldered/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/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/rules.mk b/keyboards/mino_plus/soldered/rules.mk
index 842350f40ead..76e55c05f483 100644
--- a/keyboards/mino_plus/soldered/rules.mk
+++ b/keyboards/mino_plus/soldered/rules.mk
@@ -1,3 +1,2 @@
 OLED_ENABLE = yes
 WPM_ENABLE = yes
-OLED_DRIVER = SSD1306
\ No newline at end of file
diff --git a/keyboards/mint60/config.h b/keyboards/mint60/config.h
index 41c0f7e8ebfa..a93b381c85b3 100644
--- a/keyboards/mint60/config.h
+++ b/keyboards/mint60/config.h
@@ -22,23 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 8
-#define RGBLIGHT_SPLIT
-
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-
-#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
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/mint60/info.json b/keyboards/mint60/info.json
index bd51052853f9..4f2f658a2052 100644
--- a/keyboards/mint60/info.json
+++ b/keyboards/mint60/info.json
@@ -16,6 +16,23 @@
   "split": {
     "soft_serial_pin": "D2"
   },
+  "rgblight": {
+    "hue_steps": 10,
+    "led_count": 8,
+    "split": 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": "D3"
   },
diff --git a/keyboards/misonoworks/chocolatebar/config.h b/keyboards/misonoworks/chocolatebar/config.h
deleted file mode 100644
index 55e57fb8728a..000000000000
--- a/keyboards/misonoworks/chocolatebar/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2021 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/>.
-*/
-
-#pragma once
-
-#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
diff --git a/keyboards/misonoworks/chocolatebar/info.json b/keyboards/misonoworks/chocolatebar/info.json
index 65087ac48186..51ce82d1bac0 100644
--- a/keyboards/misonoworks/chocolatebar/info.json
+++ b/keyboards/misonoworks/chocolatebar/info.json
@@ -9,6 +9,18 @@
         "device_version": "0.0.1",
         "force_nkro": true
     },
+    "rgblight": {
+        "led_count": 12,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
         "pin": "B1"
     },
diff --git a/keyboards/misonoworks/chocolatebar/rules.mk b/keyboards/misonoworks/chocolatebar/rules.mk
index de4cbe598cf4..e61a4270e14c 100644
--- a/keyboards/misonoworks/chocolatebar/rules.mk
+++ b/keyboards/misonoworks/chocolatebar/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/misonoworks/karina/config.h b/keyboards/misonoworks/karina/config.h
index eba5475d833f..d36739d42b35 100644
--- a/keyboards/misonoworks/karina/config.h
+++ b/keyboards/misonoworks/karina/config.h
@@ -22,15 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define RGBLED_NUM 19
-#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/misonoworks/karina/info.json b/keyboards/misonoworks/karina/info.json
index 2fc140cba619..d7bfaf11f02c 100644
--- a/keyboards/misonoworks/karina/info.json
+++ b/keyboards/misonoworks/karina/info.json
@@ -9,6 +9,21 @@
         "device_version": "0.0.1",
         "force_nkro": true
     },
+    "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
+        }
+    },
     "ws2812": {
         "pin": "D1"
     },
diff --git a/keyboards/misterknife/knife66/config.h b/keyboards/misterknife/knife66/config.h
index 167cffb91445..7f7e11730321 100644
--- a/keyboards/misterknife/knife66/config.h
+++ b/keyboards/misterknife/knife66/config.h
@@ -17,22 +17,6 @@ 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_SLEEP
-#define RGBLED_NUM 6
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 #define WS2812_PWM_DRIVER PWMD1  // default: PWMD1
 #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
diff --git a/keyboards/misterknife/knife66/info.json b/keyboards/misterknife/knife66/info.json
index d0ecc011bfe0..aa196e14821a 100644
--- a/keyboards/misterknife/knife66/info.json
+++ b/keyboards/misterknife/knife66/info.json
@@ -13,7 +13,23 @@
         "driver": "pwm"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "max_brightness": 200,
+        "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": ["B2", "B1", "B0", "A7", "A6", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
diff --git a/keyboards/misterknife/knife66/rules.mk b/keyboards/misterknife/knife66/rules.mk
index 0f15f10b2081..0098dc473ac4 100644
--- a/keyboards/misterknife/knife66/rules.mk
+++ b/keyboards/misterknife/knife66/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/misterknife/knife66_iso/config.h b/keyboards/misterknife/knife66_iso/config.h
index bbe55dcc48f5..cb847450baa1 100644
--- a/keyboards/misterknife/knife66_iso/config.h
+++ b/keyboards/misterknife/knife66_iso/config.h
@@ -17,22 +17,6 @@ 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_SLEEP
-#define RGBLED_NUM 6
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 #define WS2812_PWM_DRIVER PWMD1  // default: PWMD1
 #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
diff --git a/keyboards/misterknife/knife66_iso/info.json b/keyboards/misterknife/knife66_iso/info.json
index 18d66368b578..98fb591a40cc 100644
--- a/keyboards/misterknife/knife66_iso/info.json
+++ b/keyboards/misterknife/knife66_iso/info.json
@@ -13,7 +13,23 @@
         "driver": "pwm"
     },
     "rgblight": {
-        "max_brightness": 160
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "max_brightness": 160,
+        "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": ["B2", "B1", "B0", "A7", "A6", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
diff --git a/keyboards/misterknife/knife66_iso/rules.mk b/keyboards/misterknife/knife66_iso/rules.mk
index 0f15f10b2081..0098dc473ac4 100644
--- a/keyboards/misterknife/knife66_iso/rules.mk
+++ b/keyboards/misterknife/knife66_iso/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/miuni32/config.h b/keyboards/miuni32/config.h
index 76fa3df3f42a..b9449c4714bf 100644
--- a/keyboards/miuni32/config.h
+++ b/keyboards/miuni32/config.h
@@ -37,18 +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 RGBLED_NUM 17     // 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
diff --git a/keyboards/miuni32/info.json b/keyboards/miuni32/info.json
index 0c1c5d7c44e7..f9c9b5b72754 100644
--- a/keyboards/miuni32/info.json
+++ b/keyboards/miuni32/info.json
@@ -8,6 +8,22 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 17,
+        "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": "D0"
     },
diff --git a/keyboards/miuni32/keymaps/kifinnsson/keymap.c b/keyboards/miuni32/keymaps/kifinnsson/keymap.c
index 3ce4e1457576..51a0b6fefa1f 100644
--- a/keyboards/miuni32/keymaps/kifinnsson/keymap.c
+++ b/keyboards/miuni32/keymaps/kifinnsson/keymap.c
@@ -74,12 +74,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
 //planck like tri layer
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
@@ -112,37 +106,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
   return true;
 }
-
-void led_set_user(uint8_t usb_led) {
-
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_KANA)) {
-
-  } else {
-
-  }
-
-}
diff --git a/keyboards/mixi/config.h b/keyboards/mixi/config.h
index ad57ad01d6d6..b24301443d29 100644
--- a/keyboards/mixi/config.h
+++ b/keyboards/mixi/config.h
@@ -6,20 +6,5 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 5
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYER_BLINK
diff --git a/keyboards/mixi/info.json b/keyboards/mixi/info.json
index aa31b758e9a8..44b1d0aad903 100644
--- a/keyboards/mixi/info.json
+++ b/keyboards/mixi/info.json
@@ -8,6 +8,24 @@
         "pid": "0x4D49",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 5,
+        "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": "B5"
     },
diff --git a/keyboards/mk65/config.h b/keyboards/mk65/config.h
deleted file mode 100644
index 7fa60c79f830..000000000000
--- a/keyboards/mk65/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 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 TAP_CODE_DELAY 10
\ No newline at end of file
diff --git a/keyboards/mk65/info.json b/keyboards/mk65/info.json
index 0ad147641915..44a8e15f153a 100644
--- a/keyboards/mk65/info.json
+++ b/keyboards/mk65/info.json
@@ -13,6 +13,9 @@
             {"pin_a": "B1", "pin_b": "B2"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "matrix_pins": {
diff --git a/keyboards/mkh_studio/bully/rules.mk b/keyboards/mkh_studio/bully/rules.mk
index 10a3d3bfb41e..84467251b04a 100644
--- a/keyboards/mkh_studio/bully/rules.mk
+++ b/keyboards/mkh_studio/bully/rules.mk
@@ -1,2 +1 @@
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF # allow for APM32 MCU
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/ml/gas75/info.json b/keyboards/ml/gas75/info.json
index 990b45f1cecd..9831c7beb604 100644
--- a/keyboards/ml/gas75/info.json
+++ b/keyboards/ml/gas75/info.json
@@ -10,7 +10,7 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D1", "D2", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "E6", "B0", "B1", "B2", "B3"],
@@ -49,9 +49,7 @@
 
                 {"matrix": [0, 13], "x": 14, "y": 0},
 
-                {"matrix": [5, 4], "x": 15, "y": 0, "w": 0.5},
                 {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [5, 3], "x": 16.5, "y": 0, "w": 0.5},
 
                 {"matrix": [1, 0], "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "x": 1, "y": 1.25},
diff --git a/keyboards/ml/gas75/keymaps/default/keymap.c b/keyboards/ml/gas75/keymaps/default/keymap.c
index aa72a3c8531c..7fe790e6015f 100644
--- a/keyboards/ml/gas75/keymaps/default/keymap.c
+++ b/keyboards/ml/gas75/keymaps/default/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3      4      5      6       7      8      9        10       11       12       13                14              */
     [_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_ESC,  KC_F1,   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,
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13                14              */
     [_FN]   = LAYOUT(
-                QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______,
+                QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_HUI,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_HUD,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
@@ -158,25 +158,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (layer_state_is(_BASE)) {
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_VOLD);
-            }
-        } else if (layer_state_is(_FN)) {
-            if (clockwise) {
-                rgb_matrix_step();
-            } else {
-                rgb_matrix_step_reverse();
-            }
-        }
-	}
-    return true;
-}
+#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(RGB_RMOD, RGB_MOD) },
+};
 #endif
 
 bool rgb_matrix_indicators_user(void) {
diff --git a/keyboards/ml/gas75/keymaps/via/keymap.c b/keyboards/ml/gas75/keymaps/via/keymap.c
index 615e36557a8d..a533571bebe0 100644
--- a/keyboards/ml/gas75/keymaps/via/keymap.c
+++ b/keyboards/ml/gas75/keymaps/via/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3      4      5      6       7      8      9        10       11       12       13                14              */
     [_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_VOLD, KC_MUTE, KC_VOLU,
+                KC_ESC,  KC_F1,   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,
@@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13                 14              */
     [_FN]   = LAYOUT(
-                QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_TOG, RGB_MOD,
+                QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           RGB_HUI,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           RGB_HUD,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,           _______,
@@ -158,45 +158,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-#ifdef ENCODER_ENABLE
-static uint8_t  encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS]    = {{3, 5}};
-static keypos_t encoder_ccw[NUM_ENCODERS]   = {{4, 5}};
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    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] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
+};
 #endif
 
 bool rgb_matrix_indicators_user(void) {
diff --git a/keyboards/ml/gas75/keymaps/via/rules.mk b/keyboards/ml/gas75/keymaps/via/rules.mk
index 36b7ba9cbc98..1189f4ad1927 100644
--- a/keyboards/ml/gas75/keymaps/via/rules.mk
+++ b/keyboards/ml/gas75/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mlego/m48/rev1/config.h b/keyboards/mlego/m48/rev1/config.h
index 303b7ae5b546..ed9619f3e54d 100644
--- a/keyboards/mlego/m48/rev1/config.h
+++ b/keyboards/mlego/m48/rev1/config.h
@@ -15,19 +15,4 @@
  */
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
 #define RGBLIGHT_LAYERS
-
-#define RGBLED_NUM 20
-#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/mlego/m48/rev1/info.json b/keyboards/mlego/m48/rev1/info.json
index 4ccf9ede92be..a1f42260a24e 100644
--- a/keyboards/mlego/m48/rev1/info.json
+++ b/keyboards/mlego/m48/rev1/info.json
@@ -18,6 +18,21 @@
         "num_lock": "B12",
         "scroll_lock": "B13"
     },
+    "rgblight": {
+        "led_count": 20,
+        "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"
     },
diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h
index dc6c4c225da9..ed9619f3e54d 100644
--- a/keyboards/mlego/m60/rev1/config.h
+++ b/keyboards/mlego/m60/rev1/config.h
@@ -15,19 +15,4 @@
  */
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-
 #define RGBLIGHT_LAYERS
-
-#define RGBLED_NUM 20
-#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/mlego/m60/rev1/info.json b/keyboards/mlego/m60/rev1/info.json
index bbe9f861129c..293041db82f2 100644
--- a/keyboards/mlego/m60/rev1/info.json
+++ b/keyboards/mlego/m60/rev1/info.json
@@ -18,6 +18,21 @@
         "num_lock": "B12",
         "scroll_lock": "B13"
     },
+    "rgblight": {
+        "led_count": 20,
+        "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"
     },
diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h
index f6f86beed1cd..b351e66d2c4c 100644
--- a/keyboards/mlego/m60_split/rev1/config.h
+++ b/keyboards/mlego/m60_split/rev1/config.h
@@ -23,24 +23,5 @@
 #define SERIAL_USART_TX_PIN B6
 #define SERIAL_USART_SPEED 921600
 
-#ifdef RGBLIGHT_ENABLE
-#define RGBLIGHT_SPLIT
 #define RGBLIGHT_LAYERS
-
 #define RGBLIGHT_DEFAULT_HUE 213
-
-#define RGBLED_NUM 16
-#define RGBLED_SPLIT \
-    { 8, 8 }
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json
index 6fe572fcf1a4..3d66633ac962 100644
--- a/keyboards/mlego/m60_split/rev1/info.json
+++ b/keyboards/mlego/m60_split/rev1/info.json
@@ -22,7 +22,21 @@
         "pin": "B15"
     },
     "rgblight": {
-        "max_brightness": 128
+        "led_count": 16,
+        "max_brightness": 128,
+        "split_count": [8, 8],
+        "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
+        }
     },
     "split": {
         "bootmagic": {
diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h
index cfcb26edc104..bf60a6966c0e 100644
--- a/keyboards/mlego/m60_split/rev2/config.h
+++ b/keyboards/mlego/m60_split/rev2/config.h
@@ -24,21 +24,4 @@
 
 #define SERIAL_USART_SPEED 921600
 
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLIGHT_SPLIT
 #define RGBLIGHT_LAYERS
-#define RGBLED_NUM 16
-#define RGBLED_SPLIT \
-    { 8, 8 }
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json
index 40718aa64795..1ba28e0a52cb 100644
--- a/keyboards/mlego/m60_split/rev2/info.json
+++ b/keyboards/mlego/m60_split/rev2/info.json
@@ -18,6 +18,22 @@
         "num_lock": "B12",
         "scroll_lock": "B13"
     },
+    "rgblight": {
+        "led_count": 16,
+        "split_count": [8, 8],
+        "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"
     },
diff --git a/keyboards/mlego/m65/keymaps/uk/keymap.c b/keyboards/mlego/m65/keymaps/uk/keymap.c
index 8a711234b52c..ee4887243316 100644
--- a/keyboards/mlego/m65/keymaps/uk/keymap.c
+++ b/keyboards/mlego/m65/keymaps/uk/keymap.c
@@ -190,9 +190,9 @@ MS - mouse directions
 */
  [_LWR] = 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,      UK_EQL,
-     KC_BTN3,XP(lq,lQ),XP(lw,lW),XP(le,lE),XP(lr,lR),XP(lt,lT),XP(ly,lY),XP(lu,lU),XP(li,lI),  XP(lo,lO),  XP(lp,lP),     _______,     _______,
-     KC_BTN2,XP(la,lA),XP(ls,lS),XP(ld,lD),XP(lf,lF),XP(lg,lG),XP(lh,lH),XP(lj,lJ),XP(lk,lK),  XP(ll,lL),XP(ll1,lL1), XP(lk1,lK1),     _______,
-     _______,  KC_BTN1,XP(lz,lZ),XP(lx,lX),XP(lc,lC),XP(lv,lV),XP(lb,lB),XP(ln,lN),XP(lm,lM),XP(lc1,lC1),XP(lp1,lP1),     KC_MS_U, XP(lq1,lQ1),
+     KC_BTN3,UP(lq,lQ),UP(lw,lW),UP(le,lE),UP(lr,lR),UP(lt,lT),UP(ly,lY),UP(lu,lU),UP(li,lI),  UP(lo,lO),  UP(lp,lP),     _______,     _______,
+     KC_BTN2,UP(la,lA),UP(ls,lS),UP(ld,lD),UP(lf,lF),UP(lg,lG),UP(lh,lH),UP(lj,lJ),UP(lk,lK),  UP(ll,lL),UP(ll1,lL1), UP(lk1,lK1),     _______,
+     _______,  KC_BTN1,UP(lz,lZ),UP(lx,lX),UP(lc,lC),UP(lv,lV),UP(lb,lB),UP(ln,lN),UP(lm,lM),UP(lc1,lC1),UP(lp1,lP1),     KC_MS_U, UP(lq1,lQ1),
      _______,  KC_BTN4,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    KC_MS_L,     KC_MS_D,    KC_MS_R),
 
 /*
@@ -224,9 +224,9 @@ raise layer shifted
 */
   [_RSE] = 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  ,
-      _______,XP(ra1,rA1),   _______, _______,  _______,XP(rt,rT), _______, _______,XP(ri,rI), _______, _______, _______, _______ ,
-      KC_CAPS,  XP(ra,rA), XP(rs,rS), _______,  _______,  _______, _______, _______,  _______, _______, _______, _______, _______ ,
-      _______,    KC_F20 ,   _______, _______,XP(rc,rC),  _______, _______, _______,  _______, _______, _______, KC_WH_U, _______ ,
+      _______,UP(ra1,rA1),   _______, _______,  _______,UP(rt,rT), _______, _______,UP(ri,rI), _______, _______, _______, _______ ,
+      KC_CAPS,  UP(ra,rA), UP(rs,rS), _______,  _______,  _______, _______, _______,  _______, _______, _______, _______, _______ ,
+      _______,    KC_F20 ,   _______, _______,UP(rc,rC),  _______, _______, _______,  _______, _______, _______, KC_WH_U, _______ ,
       _______,    _______,   _______, _______,  _______,  _______, _______, _______,  _______, _______, KC_WH_L, KC_WH_D, KC_WH_R),
 /*
 adj layer
diff --git a/keyboards/mlego/m65/rev1/config.h b/keyboards/mlego/m65/rev1/config.h
index 2ed846b1708c..847dd118233a 100644
--- a/keyboards/mlego/m65/rev1/config.h
+++ b/keyboards/mlego/m65/rev1/config.h
@@ -18,18 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGBLIGHT_LAYERS
-
-#undef RGBLED_NUM
-#define RGBLED_NUM 20
-#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
diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json
index 3c939ef4c28e..960b9325c8c9 100644
--- a/keyboards/mlego/m65/rev1/info.json
+++ b/keyboards/mlego/m65/rev1/info.json
@@ -18,6 +18,22 @@
         "num_lock": "B12",
         "scroll_lock": "B13"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "led_count": 20,
+        "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"
     },
diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h
index 791b73e2f6fa..666d296ede50 100644
--- a/keyboards/mlego/m65/rev2/config.h
+++ b/keyboards/mlego/m65/rev2/config.h
@@ -19,21 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLIGHT_LAYERS
 
-#undef RGBLED_NUM
-#define RGBLED_NUM 20
-#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 EEPROM_PAGE_SIZE
 #define FEE_PAGE_SIZE 0x800
 #define FEE_PAGE_COUNT 4
diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json
index 64df0a2ba6fe..8d822ae4e74b 100644
--- a/keyboards/mlego/m65/rev2/info.json
+++ b/keyboards/mlego/m65/rev2/info.json
@@ -18,6 +18,22 @@
         "num_lock": "B12",
         "scroll_lock": "B13"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "led_count": 20,
+        "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"
     },
diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h
index 81f02bc4111f..847dd118233a 100644
--- a/keyboards/mlego/m65/rev3/config.h
+++ b/keyboards/mlego/m65/rev3/config.h
@@ -17,21 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-
 #define RGBLIGHT_LAYERS
-#undef RGBLED_NUM
-#define RGBLED_NUM 20
-#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
-#endif
diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json
index b72b70658778..4f9b86656570 100644
--- a/keyboards/mlego/m65/rev3/info.json
+++ b/keyboards/mlego/m65/rev3/info.json
@@ -18,6 +18,22 @@
         "num_lock": "B12",
         "scroll_lock": "B13"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "led_count": 20,
+        "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"
     },
diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h
index 942f36068834..d0475aabafe3 100644
--- a/keyboards/mlego/m65/rev4/config.h
+++ b/keyboards/mlego/m65/rev4/config.h
@@ -17,25 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-
 #define RGBLIGHT_LAYERS
-#undef RGBLED_NUM
-#define RGBLED_NUM 20
-#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
-
-#endif
 
 #ifdef OLED_ENABLE
 #    define OLED_DISPLAY_128X32
diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json
index d671845e6263..a97c734ff8b1 100644
--- a/keyboards/mlego/m65/rev4/info.json
+++ b/keyboards/mlego/m65/rev4/info.json
@@ -18,6 +18,22 @@
         "num_lock": "B12",
         "scroll_lock": "B13"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "led_count": 20,
+        "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"
     },
diff --git a/keyboards/mlego/m65/rev4/rules.mk b/keyboards/mlego/m65/rev4/rules.mk
index bf9405e1d19b..3e44c80fe0a8 100644
--- a/keyboards/mlego/m65/rev4/rules.mk
+++ b/keyboards/mlego/m65/rev4/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 AUDIO_ENABLE = no          # Audio output
 ENCODER_ENABLE = yes       # Enable encoder
 OLED_ENABLE = yes          # Enable OLED
-OLED_DRIVER = SSD1306      # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
 WPM_ENABLE = yes           # Enable WPM Counter 
diff --git a/keyboards/mmkzoo65/config.h b/keyboards/mmkzoo65/config.h
deleted file mode 100644
index 99f9e80b3ede..000000000000
--- a/keyboards/mmkzoo65/config.h
+++ /dev/null
@@ -1,20 +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
-
-/* 将USB 轮询速率更改为 1000hz 并为精英游戏每次扫描使用更大的密钥*/
-#define USB_POLLING_INTERVAL_MS  2
diff --git a/keyboards/mmkzoo65/info.json b/keyboards/mmkzoo65/info.json
index 558d1fa0dc74..504e7b106129 100644
--- a/keyboards/mmkzoo65/info.json
+++ b/keyboards/mmkzoo65/info.json
@@ -7,7 +7,8 @@
         "vid": "0x7BA1",
         "pid": "0x6505",
         "device_version": "0.0.1",
-        "force_nkro": true
+        "force_nkro": true,
+        "polling_interval": 2
     },
     "matrix_pins": {
         "cols": ["B1", "F0", "F1", "F4", "F5", "F6", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
diff --git a/keyboards/mnk1800s/rules.mk b/keyboards/mnk1800s/rules.mk
old mode 100755
new mode 100644
index 7000bb65710c..7c0709f41e6c
--- a/keyboards/mnk1800s/rules.mk
+++ b/keyboards/mnk1800s/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/mnk50/rules.mk b/keyboards/mnk50/rules.mk
old mode 100755
new mode 100644
index 7000bb65710c..7c0709f41e6c
--- a/keyboards/mnk50/rules.mk
+++ b/keyboards/mnk50/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/mnk75/rules.mk b/keyboards/mnk75/rules.mk
old mode 100755
new mode 100644
index ae3dafb3debb..50f3a3d15112
--- a/keyboards/mnk75/rules.mk
+++ b/keyboards/mnk75/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/mntre/config.h b/keyboards/mntre/config.h
index 55a7a8457e44..c12ca236724e 100644
--- a/keyboards/mntre/config.h
+++ b/keyboards/mntre/config.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#define BACKLIGHT_CUSTOM_RESOLUTION 0x400
+#define BACKLIGHT_RESOLUTION 0x400
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mode/m256wh/info.json b/keyboards/mode/m256wh/info.json
index 3e2d0eb27644..6caaa754ed3f 100644
--- a/keyboards/mode/m256wh/info.json
+++ b/keyboards/mode/m256wh/info.json
@@ -40,8 +40,15 @@
     "ws2812": {
         "pin": "B15"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker"
+    },
+    "community_layouts": [
+        "65_ansi_blocker",
+        "65_ansi_blocker_tsangan"
+    ],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_ansi_blocker": {
             "layout": [
                 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
                 {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
@@ -111,6 +118,80 @@
                 {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
                 {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
             ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Del", "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": "Page Up", "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": "Page Down", "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": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [5, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [5, 15], "x": 4, "y": 4, "w": 7},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/mode/m256wh/keymaps/badger/keymap.c b/keyboards/mode/m256wh/keymaps/badger/keymap.c
new file mode 100644
index 000000000000..9dc86abb16bd
--- /dev/null
+++ b/keyboards/mode/m256wh/keymaps/badger/keymap.c
@@ -0,0 +1,52 @@
+/*
+Copyright 2023 Dan White <opensource@bluetufa.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "badger.h"
+
+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_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,\
+     MOVE_MAC,  KC_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,                                 LT_FUNC,  J_MACRO,             KC_LEFT,  KC_DOWN,  KC_RIGHT),
+
+  [_MOVE]       = LAYOUT(\
+     MAC_FRC,   MM_LEFT,  MM_RGHT,  KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  P_PAREN,  KC_RPRN,  KC_UNDS,   KC_PLUS,  WD_DELE,  _______, \
+     _______,   IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_RUN,   IJ_STOP,  IJ_TOP,   WD_BACK,  KC_HOME,  KC_END,   WD_FRWD,  IJ_BACK,   IJ_FWD,   KC_PIPE,  _______, \
+     _______,   MM_LH,    MM_MAX,   MM_RH,    IJ_FIND,  IJ_LINE,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_COLN,  KC_DQUO,   _______,            _______, \
+     _______,   MM_UH,    MM_BH,    MAC_CPY,  MAC_SPS,  SHEBANG,  IJ_BOTT,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,             _______,  _______,  _______, \
+     _______,   _______,  _______,                      _______,                                _______,  _______,             _______,  _______,  _______),
+
+  [_FUNCTION]   = 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,   _______, \
+     _______,   _______,  _______,  _______,  IJ_RFMT,  IJ_TERM,  KC_MPLY,  KC_PGUP,  _______,  _______,  KC_PGDN,  KC_VOLD,   KC_VOLU,  KC_INS,   _______, \
+     _______,   _______,  _______,  IJ_DEBG,  IJ_FILE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,            _______, \
+     _______,   _______,  _______,  KC_CAPS,  _______,  _______,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  KC_WSCH,             _______,  _______,  _______, \
+     _______,   _______,  _______,                      _______,                                _______,  CONFIG,              _______,  _______,  _______),
+
+  [_MACRO]     = LAYOUT(\
+     _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, \
+     _______,   SELECT,   KC_UP,    _______,  SED,      KC_MSTP,  _______,  _______,  BASH_IF,  _______,  _______,  P_BRACK,  _______,  _______,  _______, \
+     _______,   KC_LEFT,  KC_DOWN,  KC_RGHT,  FOR_LOOP, _______,  _______,  _______,  _______,  FOR_LOOP, _______,  _______,  _______,            _______, \
+     _______,   _______,  _______,  CONST,    _______,  SHEBANG,  TS_IMPT,  _______,  _______,  _______,  _______,            _______,  _______,  _______, \
+     _______,   _______,  _______,                      _______,                                _______,  _______,            _______,  _______,  _______),
+
+  [_CONFIG]     = LAYOUT(\
+     _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, \
+     _______,   _______,  _______,  EE_CLR,   QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, \
+     _______,   _______,  _______,  DB_TOGG,  RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,  _______,            _______, \
+     _______,   _______,  _______,  _______,  RGB_RMOD, RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,            _______,  _______,  _______, \
+     _______,   _______,  _______,                      _______,                                _______,  _______,            _______,  _______,  _______)
+};
diff --git a/keyboards/mode/m256wh/keymaps/default/keymap.c b/keyboards/mode/m256wh/keymaps/default/keymap.c
index fcf350323047..a81d66345068 100644
--- a/keyboards/mode/m256wh/keymaps/default/keymap.c
+++ b/keyboards/mode/m256wh/keymaps/default/keymap.c
@@ -16,14 +16,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT( /* Base */
+[0] = LAYOUT_65_ansi_blocker( /* 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_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_LEFT, KC_DOWN, KC_RGHT
 ),
-[1] = LAYOUT(
+[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 , KC_TRNS, KC_MUTE,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
diff --git a/keyboards/mode/m256wh/keymaps/via/keymap.c b/keyboards/mode/m256wh/keymaps/via/keymap.c
index fcf350323047..a81d66345068 100644
--- a/keyboards/mode/m256wh/keymaps/via/keymap.c
+++ b/keyboards/mode/m256wh/keymaps/via/keymap.c
@@ -16,14 +16,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT( /* Base */
+[0] = LAYOUT_65_ansi_blocker( /* 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_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_LEFT, KC_DOWN, KC_RGHT
 ),
-[1] = LAYOUT(
+[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 , KC_TRNS, KC_MUTE,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
diff --git a/keyboards/mode/m256wh/matrix_diagram.md b/keyboards/mode/m256wh/matrix_diagram.md
new file mode 100644
index 000000000000..fb7f5f118987
--- /dev/null
+++ b/keyboards/mode/m256wh/matrix_diagram.md
@@ -0,0 +1,18 @@
+# Matrix Diagram for Mode Designs M256W-H
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D     │0E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+│30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+│50  │51  │52  │5F                      │49  │4A  │ │4B │4C │4D │
+└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+┌─────┬───┬─────┬───────────────────────────┬─────┐
+│50   │51 │52   │5F                         │4A   │ Blocker Tsangan
+└─────┴───┴─────┴───────────────────────────┴─────┘
+```
diff --git a/keyboards/mode/m256ws/info.json b/keyboards/mode/m256ws/info.json
index 8f837e316c29..6a36d4af8e46 100644
--- a/keyboards/mode/m256ws/info.json
+++ b/keyboards/mode/m256ws/info.json
@@ -43,8 +43,21 @@
     "ws2812": {
         "pin": "B15"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "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": {
+        "LAYOUT_all": {
             "layout": [
                 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
                 {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
@@ -117,6 +130,610 @@
                 {"label": "Page Up", "matrix": [4, 14], "x": 15, "y": 1},
                 {"label": "Caps Lock", "matrix": [5, 0], "x": 0, "y": 2, "w": 1.75}
             ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [1, 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": "Page Up", "matrix": [4, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [5, 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": "Page Down", "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": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "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, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_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": [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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Delete", "matrix": [1, 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": "Page Up", "matrix": [4, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [5, 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": "Page Down", "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": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "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, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [1, 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": "Page Up", "matrix": [4, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [5, 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": "Page Down", "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": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "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, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_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": [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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Delete", "matrix": [1, 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": "Page Up", "matrix": [4, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [5, 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": "Page Down", "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": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "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, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "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\u00a3", "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [1, 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": "Page Up", "matrix": [4, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [5, 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": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "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": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "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, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_split_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\u00a3", "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Delete", "matrix": [1, 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": "Page Up", "matrix": [4, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [5, 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": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "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": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "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, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan": {
+            "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\u00a3", "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [1, 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": "Page Up", "matrix": [4, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [5, 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": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "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": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "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, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan_split_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\u00a3", "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": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Delete", "matrix": [1, 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": "Page Up", "matrix": [4, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [5, 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": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "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": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "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, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/mode/m256ws/keymaps/default/keymap.c b/keyboards/mode/m256ws/keymaps/default/keymap.c
index 03b49aac2226..ab77f7af20ef 100644
--- a/keyboards/mode/m256ws/keymaps/default/keymap.c
+++ b/keyboards/mode/m256ws/keymaps/default/keymap.c
@@ -16,14 +16,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT( /* Base */
+[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_TAB , KC_Q   , KC_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_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_LEFT, KC_DOWN, KC_RGHT, KC_PGUP, KC_CAPS
 ),
-[1] = LAYOUT(
+[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_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_VOLD,
diff --git a/keyboards/mode/m256ws/keymaps/via/keymap.c b/keyboards/mode/m256ws/keymaps/via/keymap.c
index 03b49aac2226..ab77f7af20ef 100644
--- a/keyboards/mode/m256ws/keymaps/via/keymap.c
+++ b/keyboards/mode/m256ws/keymaps/via/keymap.c
@@ -16,14 +16,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT( /* Base */
+[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_TAB , KC_Q   , KC_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_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_LEFT, KC_DOWN, KC_RGHT, KC_PGUP, KC_CAPS
 ),
-[1] = LAYOUT(
+[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_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_VOLD,
diff --git a/keyboards/mode/m256ws/matrix_diagram.md b/keyboards/mode/m256ws/matrix_diagram.md
new file mode 100644
index 000000000000..9d30315cdba5
--- /dev/null
+++ b/keyboards/mode/m256ws/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for Mode Designs M256W-S
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │1E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      ┌─────┐
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │4E │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2D  │ ISO Enter
+│50    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │   │2C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+│40  │41  │42  │46                      │49  │4A  │ │4B │4C │4D │
+└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+┌────────┐
+│30      │ 2.25u LShift
+└────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┐
+│40   │41 │42   │46                         │4A   │ Blocker Tsangan
+└─────┴───┴─────┴───────────────────────────┴─────┘
+```
diff --git a/keyboards/mode/m65ha_alpha/keymaps/badger/keymap.c b/keyboards/mode/m65ha_alpha/keymaps/badger/keymap.c
new file mode 100644
index 000000000000..d118e3255e20
--- /dev/null
+++ b/keyboards/mode/m65ha_alpha/keymaps/badger/keymap.c
@@ -0,0 +1,52 @@
+/*
+Copyright 2023 Dan White <opensource@bluetufa.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "badger.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_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_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,\
+     MOVE_MAC,  KC_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,                                 LT_FUNC,  J_MACRO,             KC_LEFT,  KC_DOWN,  KC_RIGHT),
+
+  [_MOVE]       = LAYOUT_65_ansi_blocker(\
+     MAC_FRC,   MM_LEFT,  MM_RGHT,  KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  P_PAREN,  KC_RPRN,  KC_UNDS,   KC_PLUS,  WD_DELE,  _______, \
+     _______,   IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_RUN,   IJ_STOP,  IJ_TOP,   WD_BACK,  KC_HOME,  KC_END,   WD_FRWD,  IJ_BACK,   IJ_FWD,   KC_PIPE,  _______, \
+     _______,   MM_LH,    MM_MAX,   MM_RH,    IJ_FIND,  IJ_LINE,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_COLN,  KC_DQUO,   _______,            _______, \
+     _______,   MM_UH,    MM_BH,    MAC_CPY,  MAC_SPS,  SHEBANG,  IJ_BOTT,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,             _______,  _______,  _______, \
+     _______,   _______,  _______,                      _______,                                _______,  _______,             _______,  _______,  _______),
+
+  [_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,   _______, \
+     _______,   _______,  _______,  _______,  IJ_RFMT,  IJ_TERM,  KC_MPLY,  KC_PGUP,  _______,  _______,  KC_PGDN,  KC_VOLD,   KC_VOLU,  KC_INS,   _______, \
+     _______,   _______,  _______,  IJ_DEBG,  IJ_FILE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,            _______, \
+     _______,   _______,  _______,  KC_CAPS,  _______,  _______,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  KC_WSCH,             _______,  _______,  _______, \
+     _______,   _______,  _______,                      _______,                                _______,  CONFIG,              _______,  _______,  _______),
+
+  [_MACRO]     = LAYOUT_65_ansi_blocker(\
+     _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, \
+     _______,   SELECT,   KC_UP,    _______,  SED,      KC_MSTP,  _______,  _______,  BASH_IF,  _______,  _______,  P_BRACK,  _______,  _______,  _______, \
+     _______,   KC_LEFT,  KC_DOWN,  KC_RGHT,  FOR_LOOP, _______,  _______,  _______,  _______,  FOR_LOOP, _______,  _______,  _______,            _______, \
+     _______,   _______,  _______,  CONST,    _______,  SHEBANG,  TS_IMPT,  _______,  _______,  _______,  _______,            _______,  _______,  _______, \
+     _______,   _______,  _______,                      _______,                                _______,  _______,            _______,  _______,  _______),
+
+  [_CONFIG]     = LAYOUT_65_ansi_blocker(\
+     _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, \
+     _______,   _______,  _______,  EE_CLR,   QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, \
+     _______,   _______,  _______,  DB_TOGG,  RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,  _______,            _______, \
+     _______,   _______,  _______,  _______,  RGB_RMOD, RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,            _______,  _______,  _______, \
+     _______,   _______,  _______,                      _______,                                _______,  _______,            _______,  _______,  _______)
+};
diff --git a/keyboards/mode/m65ha_alpha/keymaps/default/keymap.c b/keyboards/mode/m65ha_alpha/keymaps/default/keymap.c
index a1db5641b19f..726ab53ec3ca 100755
--- a/keyboards/mode/m65ha_alpha/keymaps/default/keymap.c
+++ b/keyboards/mode/m65ha_alpha/keymaps/default/keymap.c
@@ -22,8 +22,7 @@ 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_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_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_UP  , KC_END ,        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, MO(1)  , KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [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 , KC_TRNS, KC_MUTE,
diff --git a/keyboards/mode/m65ha_alpha/m65ha_alpha.c b/keyboards/mode/m65ha_alpha/m65ha_alpha.c
index 60a9a89927e4..afb093058f73 100644
--- a/keyboards/mode/m65ha_alpha/m65ha_alpha.c
+++ b/keyboards/mode/m65ha_alpha/m65ha_alpha.c
@@ -21,7 +21,6 @@ void board_init(void) {
     setPinInput(B10);
 }
 
-#define LED_PIN_ON_STATE 1
 void led_init_ports(void) {
 
 /** If the OPENDRAIN_INDICATORS option is not defined in config.h, the indicator
diff --git a/keyboards/mode/m65ha_alpha/rules.mk b/keyboards/mode/m65ha_alpha/rules.mk
index 71de5b0a9fd7..da4b493847f6 100644
--- a/keyboards/mode/m65ha_alpha/rules.mk
+++ b/keyboards/mode/m65ha_alpha/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 EEPROM_DRIVER = i2c
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/mode/m65hi_alpha/m65hi_alpha.c b/keyboards/mode/m65hi_alpha/m65hi_alpha.c
index 60a9a89927e4..afb093058f73 100644
--- a/keyboards/mode/m65hi_alpha/m65hi_alpha.c
+++ b/keyboards/mode/m65hi_alpha/m65hi_alpha.c
@@ -21,7 +21,6 @@ void board_init(void) {
     setPinInput(B10);
 }
 
-#define LED_PIN_ON_STATE 1
 void led_init_ports(void) {
 
 /** If the OPENDRAIN_INDICATORS option is not defined in config.h, the indicator
diff --git a/keyboards/mode/m65hi_alpha/rules.mk b/keyboards/mode/m65hi_alpha/rules.mk
index 71de5b0a9fd7..da4b493847f6 100644
--- a/keyboards/mode/m65hi_alpha/rules.mk
+++ b/keyboards/mode/m65hi_alpha/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 EEPROM_DRIVER = i2c
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/mode/m65s/config.h b/keyboards/mode/m65s/config.h
index ed3faacae0c2..80d31d8d7562 100644
--- a/keyboards/mode/m65s/config.h
+++ b/keyboards/mode/m65s/config.h
@@ -45,5 +45,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 TAP_CODE_DELAY 50
diff --git a/keyboards/mode/m65s/info.json b/keyboards/mode/m65s/info.json
index 06e49f7667a7..0a0c93f3f890 100644
--- a/keyboards/mode/m65s/info.json
+++ b/keyboards/mode/m65s/info.json
@@ -8,6 +8,9 @@
         "pid": "0x6583",
         "device_version": "0.0.1"
     },
+    "qmk": {
+        "tap_keycode_delay": 50
+    },
     "matrix_pins": {
         "cols": ["C7", "A8", "A10", "A4", "A5", "A6", "C10", "A7", "C4", "C5", "A15", "B0", "B1", "B12", "B10", "B13"],
         "rows": ["A3", "B14", "B15", "C9", "C6", "C11"]
diff --git a/keyboards/mode/m65s/m65s.c b/keyboards/mode/m65s/m65s.c
index 70aa52c46141..954644310bee 100644
--- a/keyboards/mode/m65s/m65s.c
+++ b/keyboards/mode/m65s/m65s.c
@@ -21,7 +21,6 @@ void board_init(void) {
     setPinInput(B10);
 }
 
-#define LED_PIN_ON_STATE 1
 void led_init_ports(void) {
 
 /** If the OPENDRAIN_INDICATORS option is not defined in config.h, the indicator
diff --git a/keyboards/mode/m65s/rules.mk b/keyboards/mode/m65s/rules.mk
index 91bc99f944d5..5dd8d547ab77 100644
--- a/keyboards/mode/m65s/rules.mk
+++ b/keyboards/mode/m65s/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 EEPROM_DRIVER = i2c
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/mode/m75h/rules.mk b/keyboards/mode/m75h/rules.mk
index 5302cbfc1927..328eece1f91f 100644
--- a/keyboards/mode/m75h/rules.mk
+++ b/keyboards/mode/m75h/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no          # Audio output
 LTO_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/mode/m75s/config.h b/keyboards/mode/m75s/config.h
index c17bf51b35cd..7fdb18d26ab9 100644
--- a/keyboards/mode/m75s/config.h
+++ b/keyboards/mode/m75s/config.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_DEFAULT_LEVEL 20
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 1
-#define BACKLIGHT_PAL_MODE 2
 
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE 4096
diff --git a/keyboards/mode/m75s/rules.mk b/keyboards/mode/m75s/rules.mk
index bd7d6a84c5fa..760b9cb9e61b 100644
--- a/keyboards/mode/m75s/rules.mk
+++ b/keyboards/mode/m75s/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/mode/m80v1/m80h/rules.mk b/keyboards/mode/m80v1/m80h/rules.mk
index 8c9d2aea9698..5742215e0a06 100644
--- a/keyboards/mode/m80v1/m80h/rules.mk
+++ b/keyboards/mode/m80v1/m80h/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/mode/m80v1/m80s/rules.mk b/keyboards/mode/m80v1/m80s/rules.mk
index 8c9d2aea9698..5742215e0a06 100644
--- a/keyboards/mode/m80v1/m80s/rules.mk
+++ b/keyboards/mode/m80v1/m80s/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/mode/m80v2/m80v2h/rules.mk b/keyboards/mode/m80v2/m80v2h/rules.mk
index 113eb5ade880..475d3a239cf5 100644
--- a/keyboards/mode/m80v2/m80v2h/rules.mk
+++ b/keyboards/mode/m80v2/m80v2h/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/mode/m80v2/m80v2s/rules.mk b/keyboards/mode/m80v2/m80v2s/rules.mk
index 113eb5ade880..475d3a239cf5 100644
--- a/keyboards/mode/m80v2/m80v2s/rules.mk
+++ b/keyboards/mode/m80v2/m80v2s/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/modelh/readme.md b/keyboards/modelh/readme.md
deleted file mode 100644
index 8cd68c111a8b..000000000000
--- a/keyboards/modelh/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Model H - A USB capable PCB for the IBM Model M keyboard
-
-![modelh](https://i.imgur.com/4ymGdkM.jpg)
-
-This conversion kit allows you to replace your IBM Model M's original internal controller board with a modern USB board. This aims to match the footprint of the original controller and plugs into the original keyboard matrix, but exposes a USB port through the original SDL connector.
-
-* Keyboard Maintainer: [John Hawthorn](https://github.com/jhawthorn)
-* Hardware Supported: IBM Model M
-* Hardware Availability: [www.modelh.club](www.modelh.club)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make modelh:default
-
-Flashing example for this keyboard:
-
-    make modelh: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/momoka_ergo/config.h b/keyboards/momoka_ergo/config.h
index 014b1f93a5f2..54d60e9963fe 100644
--- a/keyboards/momoka_ergo/config.h
+++ b/keyboards/momoka_ergo/config.h
@@ -19,18 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SELECT_SOFT_SERIAL_SPEED 5
 
-#define RGBLED_NUM 22
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_SPLIT { 11, 11 }
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* 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/momoka_ergo/info.json b/keyboards/momoka_ergo/info.json
index fa116fd1c0cb..d45bb124b066 100644
--- a/keyboards/momoka_ergo/info.json
+++ b/keyboards/momoka_ergo/info.json
@@ -16,6 +16,20 @@
     "split": {
         "soft_serial_pin": "D1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 22,
+        "split_count": [11, 11],
+        "animations": {
+            "breathing": true,
+            "rainbow_swirl": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
         "pin": "C7"
     },
diff --git a/keyboards/momokai/aurora/config.h b/keyboards/momokai/aurora/config.h
new file mode 100644
index 000000000000..b12313ff2cbd
--- /dev/null
+++ b/keyboards/momokai/aurora/config.h
@@ -0,0 +1,78 @@
+// 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 10
+#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
new file mode 100644
index 000000000000..58aa75ad0163
--- /dev/null
+++ b/keyboards/momokai/aurora/info.json
@@ -0,0 +1,73 @@
+{
+    "manufacturer": "momokai",
+    "keyboard_name": "momokai/aurora",
+    "maintainer": "peepeetee",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
+    "matrix_pins": {
+        "direct": [
+            ["NO_PIN", "B0", "NO_PIN" ],
+            ["B4", "D2", "D1" ],
+            ["D7", "D4", "D6" ]
+        ]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0009",
+        "vid": "0x69F9"
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {
+                "pin_a": "B2",
+                "pin_b": "B1"
+            }
+        ]
+    },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "layout": [
+            { "flags": 4, "matrix": [2, 0], "x": 51, "y": 51 },
+            { "flags": 4, "matrix": [1, 0], "x": 51, "y": 38 },
+            { "flags": 4, "matrix": [1, 1], "x": 102, "y": 38 },
+            { "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 },
+            { "flags": 2,  "x": 77, "y": 12 },
+            { "flags": 2,  "x": 128, "y": 26 },
+            { "flags": 2,  "x": 77, "y": 26 },
+            { "flags": 2,  "x": 128, "y": 12 }
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/momokai/aurora/keymaps/default/keymap.c b/keyboards/momokai/aurora/keymaps/default/keymap.c
new file mode 100644
index 000000000000..cb84cc87d9d9
--- /dev/null
+++ b/keyboards/momokai/aurora/keymaps/default/keymap.c
@@ -0,0 +1,19 @@
+// 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,
+        KC_Z,   KC_X,   KC_C,
+        KC_GRV,   KC_ESC,   KC_F2
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0]   =  { ENCODER_CCW_CW(KC_VOLD,  KC_VOLU) }
+    
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/momokai/aurora/keymaps/default/rules.mk b/keyboards/momokai/aurora/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/momokai/aurora/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/momokai/aurora/keymaps/via/keymap.c b/keyboards/momokai/aurora/keymaps/via/keymap.c
new file mode 100644
index 000000000000..710f1d57bb1d
--- /dev/null
+++ b/keyboards/momokai/aurora/keymaps/via/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] = {
+    [0] = LAYOUT(
+                KC_MUTE,
+        KC_Z,   KC_X,   KC_C,
+        KC_GRV,   KC_ESC,   KC_F2
+    ),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0]   =  { ENCODER_CCW_CW(KC_VOLD,  KC_VOLU) },
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/momokai/aurora/keymaps/via/rules.mk b/keyboards/momokai/aurora/keymaps/via/rules.mk
new file mode 100644
index 000000000000..293c5ffdeb9f
--- /dev/null
+++ b/keyboards/momokai/aurora/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/momokai/aurora/readme.md b/keyboards/momokai/aurora/readme.md
new file mode 100644
index 000000000000..7bbf885bbaae
--- /dev/null
+++ b/keyboards/momokai/aurora/readme.md
@@ -0,0 +1,24 @@
+# Momokai 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/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make momokai/aurora:default
+
+Flashing example for this keyboard:
+
+    make momokai/aurora: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 (1,0) in the matrix (the top left physical key) and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/momokai/aurora/rules.mk b/keyboards/momokai/aurora/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/momokai/aurora/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/momokai/tap_duo/info.json b/keyboards/momokai/tap_duo/info.json
index 96f600b3aaee..262576b31a36 100644
--- a/keyboards/momokai/tap_duo/info.json
+++ b/keyboards/momokai/tap_duo/info.json
@@ -12,7 +12,7 @@
         "pin": "F0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["E6", "B2", "D1", "D2", "D3"],
diff --git a/keyboards/momokai/tap_trio/info.json b/keyboards/momokai/tap_trio/info.json
index e3f2f2965eb5..afc5aa20158d 100644
--- a/keyboards/momokai/tap_trio/info.json
+++ b/keyboards/momokai/tap_trio/info.json
@@ -12,7 +12,7 @@
         "pin": "F0"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["E6", "B2", "B7", "D1", "D2", "D3"],
diff --git a/keyboards/monarch/info.json b/keyboards/monarch/info.json
index 95daea5cdbe1..ff47a1be3e15 100644
--- a/keyboards/monarch/info.json
+++ b/keyboards/monarch/info.json
@@ -262,10 +262,7 @@
 
                 {"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},
-
-                {"matrix": [5, 0], "x": 0, "y": 5},
-                {"matrix": [5, 1], "x": 1, "y": 5}
+                {"matrix": [4, 15], "x": 15.25, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/monarch/keymaps/default/keymap.c b/keyboards/monarch/keymaps/default/keymap.c
index a9f67ee904a4..76d64c356354 100644
--- a/keyboards/monarch/keymaps/default/keymap.c
+++ b/keyboards/monarch/keymaps/default/keymap.c
@@ -33,12 +33,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______, _______,                                     BL_TOGG,                            _______,          BL_DOWN, BL_OFF,  BL_UP
   )
 };
-
-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/monarch/keymaps/iso/keymap.c b/keyboards/monarch/keymaps/iso/keymap.c
index e707b2104b5f..5df9e560d0c0 100644
--- a/keyboards/monarch/keymaps/iso/keymap.c
+++ b/keyboards/monarch/keymaps/iso/keymap.c
@@ -33,12 +33,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______, _______,                                     BL_TOGG,                            _______,          BL_DOWN, BL_OFF,  BL_UP
   )
 };
-
-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/monarch/keymaps/via/keymap.c b/keyboards/monarch/keymaps/via/keymap.c
index c70f9c213b97..39ad94fb8ebc 100644
--- a/keyboards/monarch/keymaps/via/keymap.c
+++ b/keyboards/monarch/keymaps/via/keymap.c
@@ -23,70 +23,35 @@ 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_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,
-      KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    MO(1),                     KC_LEFT, KC_DOWN, KC_RGHT,
-      KC_VOLD, KC_VOLU
+      KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    MO(1),                     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_DEL,           _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          BL_ON,
-      _______, _______, _______,                                      BL_TOGG,                   _______,                  BL_DOWN, BL_OFF,  BL_UP,
-      _______, _______
+      _______, _______, _______,                                      BL_TOGG,                   _______,                  BL_DOWN, BL_OFF,  BL_UP
   ),
   [2] = LAYOUT_all(
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      _______, _______, _______,                                     _______,                   _______,                   _______, _______, _______,
-      _______, _______
+      _______, _______, _______,                                     _______,                   _______,                   _______, _______, _______
   ),
   [3] = LAYOUT_all(
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      _______, _______, _______,                                     _______,                   _______,                   _______, _______, _______,
-      _______, _______
+      _______, _______, _______,                                     _______,                   _______,                   _______, _______, _______
   )
 };
-
-keyevent_t encoder_ccw = {
-    .key = (keypos_t){.row = 5, .col = 0},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-keyevent_t encoder_cw = {
-    .key = (keypos_t){.row = 5, .col = 1},
-    .pressed = false,
-    .type = KEY_EVENT
+#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(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
 };
-
-void matrix_scan_user(void) {
-    if (encoder_ccw.pressed) {
-        encoder_ccw.pressed = false;
-        encoder_ccw.time = timer_read();
-        action_exec(encoder_ccw);
-    }
-
-    if (encoder_cw.pressed) {
-        encoder_cw.pressed = false;
-        encoder_cw.time = timer_read();
-        action_exec(encoder_cw);
-    }
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-        encoder_cw.pressed = true;
-        encoder_cw.time = timer_read();
-        action_exec(encoder_cw);
-    } else {
-        encoder_ccw.pressed = true;
-        encoder_ccw.time = timer_read();
-        action_exec(encoder_ccw);
-    }
-    return true;
-}
+#endif
diff --git a/keyboards/monarch/keymaps/via/rules.mk b/keyboards/monarch/keymaps/via/rules.mk
index 1e5b99807cb7..f1adcab005e8 100644
--- a/keyboards/monarch/keymaps/via/rules.mk
+++ b/keyboards/monarch/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/monarch/rules.mk b/keyboards/monarch/rules.mk
index 5a2c15a821f4..195a2958ce7e 100644
--- a/keyboards/monarch/rules.mk
+++ b/keyboards/monarch/rules.mk
@@ -13,5 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 SLEEP_LED_ENABLE = yes
 ENCODER_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/monsgeek/m1/info.json b/keyboards/monsgeek/m1/info.json
index 17d028fb5617..4de1803818f6 100644
--- a/keyboards/monsgeek/m1/info.json
+++ b/keyboards/monsgeek/m1/info.json
@@ -32,7 +32,7 @@
         ]
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733",
+        "driver": "is31fl3733",
         "max_brightness": 200,
         "val_steps": 20,
         "animations": {
@@ -246,7 +246,7 @@
                 { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
                 { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
                 { "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 },
-                { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
+                { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.5 },
                 { "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 },
                 { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
                 { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
@@ -255,9 +255,9 @@
                 { "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, 13], "x": 13.25, "y": 5.25 },
-                { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25 },
-                { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25 }
+                { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.5 },
+                { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.5 },
+                { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.5 }
             ]
         },
         "LAYOUT_ansi": {
@@ -333,7 +333,7 @@
                 { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
                 { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
                 { "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 },
-                { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
+                { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.5 },
                 { "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 },
                 { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
                 { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
@@ -342,9 +342,9 @@
                 { "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, 13], "x": 13.25, "y": 5.25 },
-                { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25 },
-                { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25 }
+                { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.5 },
+                { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.5 },
+                { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.5 }
             ]
         },
         "LAYOUT_iso": {
@@ -421,7 +421,7 @@
                 { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
                 { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
                 { "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 },
-                { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
+                { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.5 },
                 { "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 },
                 { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
                 { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
@@ -430,9 +430,9 @@
                 { "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, 13], "x": 13.25, "y": 5.25 },
-                { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25 },
-                { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25 }
+                { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.5 },
+                { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.5 },
+                { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.5 }
             ]
         }
     }
diff --git a/keyboards/monsgeek/m3/config.h b/keyboards/monsgeek/m3/config.h
new file mode 100644
index 000000000000..85eb5b8e99e7
--- /dev/null
+++ b/keyboards/monsgeek/m3/config.h
@@ -0,0 +1,50 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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 Indicators */
+#define LED_MAC_OS_PIN C10
+#define LED_WIN_LOCK_PIN C11
+
+/* 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
+
+/* 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
+#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
+
+/* I2C Config for LED Driver */
+#define DRIVER_COUNT 2
+#define DRIVER_ADDR_1 0b1110100
+#define DRIVER_ADDR_2 0b1110111
+#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/halconf.h b/keyboards/monsgeek/m3/halconf.h
new file mode 100644
index 000000000000..55bfe5c97794
--- /dev/null
+++ b/keyboards/monsgeek/m3/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have 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
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/monsgeek/m3/info.json b/keyboards/monsgeek/m3/info.json
new file mode 100644
index 000000000000..db646103f12c
--- /dev/null
+++ b/keyboards/monsgeek/m3/info.json
@@ -0,0 +1,249 @@
+{
+    "keyboard_name": "M3",
+    "manufacturer": "MonsGeek",
+    "maintainer": "jonylee@hfd",
+    "usb": {
+        "vid": "0xFFFE",
+        "pid": "0x0009",
+        "device_version": "1.0.5",
+        "suspend_wakeup_delay": 400,
+        "force_nkro": true
+    },
+    "processor": "WB32FQ95",
+    "bootloader": "wb32-dfu",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "dynamic_keymap": {
+        "layer_count": 6
+    },
+    "matrix_pins": {
+        "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2", "B10"],
+        "rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
+    },
+    "diode_direction": "ROW2COL",
+    "indicators": {
+        "caps_lock": "A15"
+    }, 
+    "rgb_matrix": {
+        "driver": "ckled2001",
+        "max_brightness": 160,
+        "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,
+            "solid_reactive_cross": true,
+            "multisplash": true
+        },
+        "layout":[
+            { "flags": 4, "matrix": [0, 0],  "x":  0, "y": 0},
+            { "flags": 4, "matrix": [0, 1],  "x": 24, "y": 0},
+            { "flags": 4, "matrix": [0, 2],  "x": 38, "y": 0},
+            { "flags": 4, "matrix": [0, 3],  "x": 52, "y": 0},
+            { "flags": 4, "matrix": [0, 4],  "x": 66, "y": 0},
+            { "flags": 4, "matrix": [0, 5],  "x": 82, "y": 0},
+            { "flags": 4, "matrix": [0, 6],  "x": 96, "y": 0},
+            { "flags": 4, "matrix": [0, 7],  "x":110, "y": 0},
+            { "flags": 4, "matrix": [0, 8],  "x":124, "y": 0},
+            { "flags": 4, "matrix": [0, 9],  "x":140, "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":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": 12},
+            { "flags": 4, "matrix": [1, 1],  "x": 13, "y": 12},
+            { "flags": 4, "matrix": [1, 2],  "x": 26, "y": 12},
+            { "flags": 4, "matrix": [1, 3],  "x": 39, "y": 12},
+            { "flags": 4, "matrix": [1, 4],  "x": 52, "y": 12},
+            { "flags": 4, "matrix": [1, 5],  "x": 65, "y": 12},
+            { "flags": 4, "matrix": [1, 6],  "x": 79, "y": 12},
+            { "flags": 4, "matrix": [1, 7],  "x": 92, "y": 12},
+            { "flags": 4, "matrix": [1, 8],  "x":105, "y": 12},
+            { "flags": 4, "matrix": [1, 9],  "x":118, "y": 12},
+            { "flags": 4, "matrix": [1, 10], "x":131, "y": 12},
+            { "flags": 4, "matrix": [1, 11], "x":144, "y": 12},
+            { "flags": 4, "matrix": [1, 12], "x":158, "y": 12},
+            { "flags": 4, "matrix": [1, 13], "x":171, "y": 12},
+            { "flags": 4, "matrix": [1, 14], "x":184, "y": 12},
+            { "flags": 4, "matrix": [1, 15], "x":197, "y": 12},
+            { "flags": 4, "matrix": [1, 16], "x":210, "y": 12},
+
+            { "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": 38},
+            { "flags": 4, "matrix": [3, 1],  "x": 14, "y": 38},
+            { "flags": 4, "matrix": [3, 2],  "x": 28, "y": 38},
+            { "flags": 4, "matrix": [3, 3],  "x": 42, "y": 38},
+            { "flags": 4, "matrix": [3, 4],  "x": 56, "y": 38},
+            { "flags": 4, "matrix": [3, 5],  "x": 70, "y": 38},
+            { "flags": 4, "matrix": [3, 6],  "x": 84, "y": 38},
+            { "flags": 4, "matrix": [3, 7],  "x": 98, "y": 38},
+            { "flags": 4, "matrix": [3, 8],  "x":112, "y": 38},
+            { "flags": 4, "matrix": [3, 9],  "x":126, "y": 38},
+            { "flags": 4, "matrix": [3, 10], "x":140, "y": 38},
+            { "flags": 4, "matrix": [3, 11], "x":154, "y": 38},
+            { "flags": 4, "matrix": [3, 13], "x":182, "y": 38},
+
+            { "flags": 4, "matrix": [4, 0],  "x":  0, "y": 51},
+            { "flags": 4, "matrix": [4, 1],  "x": 14, "y": 51},
+            { "flags": 4, "matrix": [4, 2],  "x": 28, "y": 51},
+            { "flags": 4, "matrix": [4, 3],  "x": 42, "y": 51},
+            { "flags": 4, "matrix": [4, 4],  "x": 56, "y": 51},
+            { "flags": 4, "matrix": [4, 5],  "x": 70, "y": 51},
+            { "flags": 4, "matrix": [4, 6],  "x": 84, "y": 51},
+            { "flags": 4, "matrix": [4, 7],  "x": 98, "y": 51},
+            { "flags": 4, "matrix": [4, 8],  "x":112, "y": 51},
+            { "flags": 4, "matrix": [4, 9],  "x":126, "y": 51},
+            { "flags": 4, "matrix": [4, 10], "x":140, "y": 51},
+            { "flags": 4, "matrix": [4, 13], "x":154, "y": 51},
+            { "flags": 4, "matrix": [4, 15], "x":182, "y": 51},
+
+            { "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, 5],  "x": 70, "y": 64},
+            { "flags": 4, "matrix": [5, 9],  "x":126, "y": 64},
+            { "flags": 4, "matrix": [5, 10], "x":140, "y": 64},
+            { "flags": 4, "matrix": [5, 11], "x":154, "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}
+        ]
+    },
+    "community_layouts": ["tkl_ansi"],
+    "layouts": {
+        "LAYOUT_tkl_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": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0 },
+                { "label": "ScrLk", "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, 13], "x": 13, "y": 1.25, "w": 2 },
+                { "label": "Ins", "matrix": [1, 14], "x": 15.25, "y": 1.25 },
+                { "label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25 },
+                { "label": "PgUp", "matrix": [1, 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": "Del", "matrix": [2, 14], "x": 15.25, "y": 2.25 },
+                { "label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25 },
+                { "label": "PgDn", "matrix": [2, 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, 1], "x": 2.25, "y": 4.25 },
+                { "label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25 },
+                { "label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25 },
+                { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25 },
+                { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25 },
+                { "label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25 },
+                { "label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
+                { "label": "<", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
+                { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
+                { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
+                { "label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75 },
+                { "label": "Up", "matrix": [4, 15], "x": 16.25, "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 },
+                { "label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25 },
+                { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25 },
+                { "label": "Win", "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, 13], "x": 13.75, "y": 5.25, "w": 1.25 },
+                { "label": "Left", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
+                { "label": "Down", "matrix": [5, 15], "x": 16.25, "y": 5.25 },
+                { "label": "Right", "matrix": [5, 16], "x": 17.25, "y": 5.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/monsgeek/m3/keymaps/default/keymap.c b/keyboards/monsgeek/m3/keymaps/default/keymap.c
new file mode 100644
index 000000000000..d075b6067f34
--- /dev/null
+++ b/keyboards/monsgeek/m3/keymaps/default/keymap.c
@@ -0,0 +1,79 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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_B,
+    WIN_W,
+    WIN_FN,
+    MAC_B,
+    MAC_W,
+    MAC_FN
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [WIN_B] = LAYOUT_tkl_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_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(WIN_FN),       KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_W] = LAYOUT_tkl_ansi( /* Base */
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          KC_W,
+        _______, _______, _______,                   _______,                            _______, _______, MO(WIN_FN),       _______, KC_A,    KC_S,    KC_D),
+
+
+    [WIN_FN] = LAYOUT_tkl_ansi( /* FN */
+	    _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______,_______,  _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
+        _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, _______, DF(MAC_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,          RGB_VAI,
+        _______, GU_TOGG, _______,                   _______,                            _______, _______, _______,          _______, RGB_SAD, RGB_VAD, RGB_SAI),
+
+    [MAC_B] = LAYOUT_tkl_ansi( /* Base */
+        KC_ESC,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5,   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_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, KC_RALT, MO(MAC_FN),       KC_RCTL, KC_LEFT, KC_DOWN,   KC_RGHT),
+
+    [MAC_W] = LAYOUT_tkl_ansi( /* Base */
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          KC_W,
+        _______, _______, _______,                   _______,                            _______, _______, MO(MAC_FN),       _______, KC_A,    KC_S,    KC_D),
+    [MAC_FN] = LAYOUT_tkl_ansi( /* FN */
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  _______,  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
+        _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, _______, DF(WIN_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,          RGB_VAI,
+        _______, _______, _______,                   _______,                            _______, _______, _______,          _______, RGB_SAD, RGB_VAD, RGB_SAI)
+};
+// clang-format on
diff --git a/keyboards/monsgeek/m3/keymaps/via/keymap.c b/keyboards/monsgeek/m3/keymaps/via/keymap.c
new file mode 100644
index 000000000000..d075b6067f34
--- /dev/null
+++ b/keyboards/monsgeek/m3/keymaps/via/keymap.c
@@ -0,0 +1,79 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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_B,
+    WIN_W,
+    WIN_FN,
+    MAC_B,
+    MAC_W,
+    MAC_FN
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [WIN_B] = LAYOUT_tkl_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_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(WIN_FN),       KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_W] = LAYOUT_tkl_ansi( /* Base */
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          KC_W,
+        _______, _______, _______,                   _______,                            _______, _______, MO(WIN_FN),       _______, KC_A,    KC_S,    KC_D),
+
+
+    [WIN_FN] = LAYOUT_tkl_ansi( /* FN */
+	    _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______,_______,  _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
+        _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, _______, DF(MAC_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,          RGB_VAI,
+        _______, GU_TOGG, _______,                   _______,                            _______, _______, _______,          _______, RGB_SAD, RGB_VAD, RGB_SAI),
+
+    [MAC_B] = LAYOUT_tkl_ansi( /* Base */
+        KC_ESC,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5,   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_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, KC_RALT, MO(MAC_FN),       KC_RCTL, KC_LEFT, KC_DOWN,   KC_RGHT),
+
+    [MAC_W] = LAYOUT_tkl_ansi( /* Base */
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          KC_W,
+        _______, _______, _______,                   _______,                            _______, _______, MO(MAC_FN),       _______, KC_A,    KC_S,    KC_D),
+    [MAC_FN] = LAYOUT_tkl_ansi( /* FN */
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  _______,  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
+        _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, _______, DF(WIN_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          RGB_HUI,
+        _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,          RGB_VAI,
+        _______, _______, _______,                   _______,                            _______, _______, _______,          _______, RGB_SAD, RGB_VAD, RGB_SAI)
+};
+// clang-format on
diff --git a/keyboards/monsgeek/m3/keymaps/via/rules.mk b/keyboards/monsgeek/m3/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/monsgeek/m3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/monsgeek/m3/m3.c b/keyboards/monsgeek/m3/m3.c
new file mode 100644
index 000000000000..95bfb34789b5
--- /dev/null
+++ b/keyboards/monsgeek/m3/m3.c
@@ -0,0 +1,192 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You 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"
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       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},
+
+    /*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},
+
+    /*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},
+
+    /*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},
+
+    /*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},
+
+    /*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},
+};
+#endif // RGB_MATRIX_ENABLE
+
+// clang-format on
+enum __layers {
+    WIN_B,
+    WIN_W,
+    WIN_FN,
+    MAC_B,
+    MAC_W,
+    MAC_FN,
+};
+
+void matrix_init_kb(void) {
+    setPinOutput(LED_MAC_OS_PIN); // LDE2 MAC\WIN
+    writePinLow(LED_MAC_OS_PIN);
+    setPinOutput(LED_WIN_LOCK_PIN); // LED3 Win Lock
+    writePinLow(LED_WIN_LOCK_PIN);
+}
+
+void housekeeping_task_kb(void){
+    writePin(LED_MAC_OS_PIN, (get_highest_layer(default_layer_state) == 3));
+    writePin(LED_WIN_LOCK_PIN, keymap_config.no_gui);
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+    switch (keycode) {
+        case DF(WIN_B):
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(WIN_B);
+            }
+            return false;
+        case DF(MAC_B):
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(MAC_B);
+                keymap_config.no_gui = 0;
+                eeconfig_update_keymap(keymap_config.raw);
+            }
+            return false;
+        case GU_TOGG:
+            if (record->event.pressed) {
+                writePin(LED_WIN_LOCK_PIN, !keymap_config.no_gui);
+            }
+            return true;
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    } break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                    } break;
+                }
+            }
+            if (!rgb_matrix_is_enabled()) {
+                rgb_matrix_set_flags(LED_FLAG_ALL);
+                rgb_matrix_enable();
+            }
+            return false;
+        default:
+            return true;
+    }
+}
diff --git a/keyboards/monsgeek/m3/mcuconf.h b/keyboards/monsgeek/m3/mcuconf.h
new file mode 100644
index 000000000000..e2884f3828f6
--- /dev/null
+++ b/keyboards/monsgeek/m3/mcuconf.h
@@ -0,0 +1,24 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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
+
+#undef WB32_I2C_USE_I2C1
+#define WB32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/monsgeek/m3/readme.md b/keyboards/monsgeek/m3/readme.md
new file mode 100644
index 000000000000..32e9112276b3
--- /dev/null
+++ b/keyboards/monsgeek/m3/readme.md
@@ -0,0 +1,24 @@
+# MonsGeek M3
+
+A customizable 80% keyboard.
+
+* Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986)
+* Hardware Supported: MonsGeek M3 PCB
+* Hardware Availability: [monsgeek](https://www.monsgeek.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make monsgeek/m3:default
+
+Flashing example for this keyboard:
+
+    make monsgeek/m3: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
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/monsgeek/m3/rules.mk b/keyboards/monsgeek/m3/rules.mk
new file mode 100644
index 000000000000..24d5f6f52ecc
--- /dev/null
+++ b/keyboards/monsgeek/m3/rules.mk
@@ -0,0 +1,2 @@
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/monsgeek/m5/info.json b/keyboards/monsgeek/m5/info.json
index 03711c9a1b62..4e504b866311 100644
--- a/keyboards/monsgeek/m5/info.json
+++ b/keyboards/monsgeek/m5/info.json
@@ -30,7 +30,7 @@
         "caps_lock": "C10"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733",
+        "driver": "is31fl3733",
         "max_brightness": 180,
         "animations": {
             "breathing": true,
diff --git a/keyboards/monsgeek/m6/info.json b/keyboards/monsgeek/m6/info.json
index 78d6c1bf943c..d23d2f83222d 100644
--- a/keyboards/monsgeek/m6/info.json
+++ b/keyboards/monsgeek/m6/info.json
@@ -26,7 +26,7 @@
     },
     "diode_direction": "ROW2COL",
     "rgb_matrix": {
-        "driver": "IS31FL3733",
+        "driver": "is31fl3733",
         "max_brightness": 200,
         "val_steps": 20,
         "animations": {
diff --git a/keyboards/monstargear/xo87/rgb/config.h b/keyboards/monstargear/xo87/rgb/config.h
index 34d301311b9b..770c20f01947 100644
--- a/keyboards/monstargear/xo87/rgb/config.h
+++ b/keyboards/monstargear/xo87/rgb/config.h
@@ -22,7 +22,6 @@
 #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
-#define RGBLED_NUM 110
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/monstargear/xo87/rgb/info.json b/keyboards/monstargear/xo87/rgb/info.json
index ebbfa848c189..96b0319945c6 100644
--- a/keyboards/monstargear/xo87/rgb/info.json
+++ b/keyboards/monstargear/xo87/rgb/info.json
@@ -12,7 +12,7 @@
     "pin": "D7"
   },
   "rgb_matrix": {
-    "driver": "WS2812"
+    "driver": "ws2812"
   },
   "rgblight": {
     "max_brightness": 100
diff --git a/keyboards/monstargear/xo87/solderable/config.h b/keyboards/monstargear/xo87/solderable/config.h
index f8e73dccb85b..088e09dc81a7 100644
--- a/keyboards/monstargear/xo87/solderable/config.h
+++ b/keyboards/monstargear/xo87/solderable/config.h
@@ -24,19 +24,5 @@
 #define KEYLED_ROW_PINS { E5,B4,B5,F0,C6,D5 }
 #define KEYLED_COL_PINS { C4,C2,C0,E0,D4,E4,B6,B2,F4,A0,F2,A4,F1,A7,D3,A3 }
 
-#define RGB_MATRIX_LED_COUNT 21
-#define DRIVER_COUNT 2
-#define RGBLED_NUM 21
-#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 LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/monstargear/xo87/solderable/info.json b/keyboards/monstargear/xo87/solderable/info.json
index 9a3896861806..4c569a89dfdb 100644
--- a/keyboards/monstargear/xo87/solderable/info.json
+++ b/keyboards/monstargear/xo87/solderable/info.json
@@ -17,6 +17,21 @@
         "driver": "custom",
         "pin": "F0"
     },
+    "rgblight": {
+        "led_count": 21,
+        "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": "D7"
     },
@@ -331,9 +346,9 @@
                 {"label": "\u2191", "matrix": [4, 14], "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.25, "y": 5.25},
+                {"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": 3.75, "y": 5.25, "w": 7},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
                 {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
                 {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.25},
                 {"label": "Ctrl", "matrix": [4, 15], "x": 13.5, "y": 5.25, "w": 1.5},
diff --git a/keyboards/montsinger/palmetto/config.h b/keyboards/montsinger/palmetto/config.h
new file mode 100755
index 000000000000..423a60477f4c
--- /dev/null
+++ b/keyboards/montsinger/palmetto/config.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Ross Montsinger
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+#define RP2040_FLASH_GENERIC_03H
diff --git a/keyboards/montsinger/palmetto/info.json b/keyboards/montsinger/palmetto/info.json
new file mode 100755
index 000000000000..efe81dd9c301
--- /dev/null
+++ b/keyboards/montsinger/palmetto/info.json
@@ -0,0 +1,649 @@
+{
+    "manufacturer": "Montsinger",
+    "keyboard_name": "Palmetto",
+    "maintainer": "Rossman360",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": false
+    },
+    "matrix_pins": {
+        "cols": ["GP28", "GP27", "GP29", "GP0", "GP1", "GP9", "GP26", "GP18", "GP10", "GP11", "GP25", "GP24", "GP12", "GP21", "GP13"],
+        "rows": ["GP5", "GP4", "GP3", "GP2", "GP15"]
+    },
+    "processor": "RP2040",
+    "url": "https://carolinamech.com",
+    "usb": {
+        "device_version": "2.0.1",
+        "pid": "0x0006",
+        "vid": "0x524D"
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan",
+        "60_tsangan_hhkb",
+        "60_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, 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, 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, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "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": [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, 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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "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, 13], "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, 12], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 12.5, "y": 4},
+                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "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": [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, 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, 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, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "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": [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": [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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 13], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "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": [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, 13], "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, 12], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 12.5, "y": 4},
+                {"matrix": [4, 14], "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": [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, 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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 12], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 12.5, "y": 4},
+                {"matrix": [4, 14], "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": [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, 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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 12], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 12.5, "y": 4}
+            ]
+        },
+        "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": [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": [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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "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, 12], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 12.5, "y": 4},
+                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/montsinger/palmetto/keymaps/default/keymap.c b/keyboards/montsinger/palmetto/keymaps/default/keymap.c
new file mode 100644
index 000000000000..5d7b042b27ae
--- /dev/null
+++ b/keyboards/montsinger/palmetto/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 Ross Montsinger
+// 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 layer_names {
+    _BASE,
+    _FN1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = 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(_FN1), KC_RCTL
+  ),
+
+  [_FN1] = 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,
+    RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+    KC_GRV,  _______, _______, _______,                                                       _______, _______, _______, QK_BOOT
+  )
+};
diff --git a/keyboards/montsinger/palmetto/keymaps/via/keymap.c b/keyboards/montsinger/palmetto/keymaps/via/keymap.c
new file mode 100644
index 000000000000..5d7b042b27ae
--- /dev/null
+++ b/keyboards/montsinger/palmetto/keymaps/via/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 Ross Montsinger
+// 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 layer_names {
+    _BASE,
+    _FN1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = 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(_FN1), KC_RCTL
+  ),
+
+  [_FN1] = 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,
+    RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    BL_UP,   BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+    KC_GRV,  _______, _______, _______,                                                       _______, _______, _______, QK_BOOT
+  )
+};
diff --git a/keyboards/montsinger/palmetto/keymaps/via/rules.mk b/keyboards/montsinger/palmetto/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/montsinger/palmetto/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/montsinger/palmetto/readme.md b/keyboards/montsinger/palmetto/readme.md
new file mode 100644
index 000000000000..d237f9c91cbe
--- /dev/null
+++ b/keyboards/montsinger/palmetto/readme.md
@@ -0,0 +1,26 @@
+# Palmetto PCB
+
+Palmetto PCB from Montsinger (https://i.imgur.com/VmmAW97.jpeg)
+
+* Keyboard Maintainer: [Ross Montsinger](https://github.com/rossman360)
+* Hardware Supported: RP2040
+* Hardware Availability: [Carolina Mech](https://carolinamech.com)
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make montsinger/palmetto:default
+    
+Flashing example for this keyboard:
+
+    make montsinger/palmetto: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**: Hold the "BOOTMODE" button on the back of the PCB and briefly press 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/montsinger/palmetto/rules.mk b/keyboards/montsinger/palmetto/rules.mk
new file mode 100755
index 000000000000..8b137891791f
--- /dev/null
+++ b/keyboards/montsinger/palmetto/rules.mk
@@ -0,0 +1 @@
+
diff --git a/keyboards/montsinger/rebound/rev4/config.h b/keyboards/montsinger/rebound/rev4/config.h
index b0b9bb6c179b..274c715a937d 100644
--- a/keyboards/montsinger/rebound/rev4/config.h
+++ b/keyboards/montsinger/rebound/rev4/config.h
@@ -18,6 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 17
diff --git a/keyboards/montsinger/rebound/rev4/info.json b/keyboards/montsinger/rebound/rev4/info.json
index 9f4e89497e01..565e56701f98 100644
--- a/keyboards/montsinger/rebound/rev4/info.json
+++ b/keyboards/montsinger/rebound/rev4/info.json
@@ -18,6 +18,9 @@
             {"pin_a": "D2", "pin_b": "D3"}
         ]
     },
+    "rgblight": {
+        "led_count": 17
+    },
     "ws2812": {
         "pin": "B6"
     },
diff --git a/keyboards/moonlander/info.json b/keyboards/moonlander/info.json
index fc09859f8260..acbb278a332f 100644
--- a/keyboards/moonlander/info.json
+++ b/keyboards/moonlander/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/moonlander/moonlander.h b/keyboards/moonlander/moonlander.h
index f68b60379c23..0e5282c511a6 100644
--- a/keyboards/moonlander/moonlander.h
+++ b/keyboards/moonlander/moonlander.h
@@ -34,37 +34,6 @@ extern bool mcp23018_leds[];
 #define ML_LED_5(status) mcp23018_leds[1] = (bool)status
 #define ML_LED_6(status) mcp23018_leds[2] = (bool)status
 
-
-// clang-format off
-#define LED_LAYOUT_moonlander( \
-    l00, l01, l02, l03, l04, l05, l06,   l60, l61, l62, l63, l64, l65, l66, \
-    l10, l11, l12, l13, l14, l15, l16,   l70, l71, l72, l73, l74, l75, l76, \
-    l20, l21, l22, l23, l24, l25, l26,   l80, l81, l82, l83, l84, l85, l86, \
-    l30, l31, l32, l33, l34, l35,             l91, l92, l93, l94, l95, l96, \
-    l40, l41, l42, l43, l44,      l53,   lb3,      la2, la3, la4, la5, la6, \
-                        l50, l51, l52,   lb4, lb5, lb6 \
-) \
-{ \
-    l00, l10, l20, l30, l40, \
-    l01, l11, l21, l31, l41, \
-    l02, l12, l22, l32, l42, \
-    l03, l13, l23, l33, l43, \
-    l04, l14, l24, l34, l44, \
-    l05, l15, l25, l35, \
-    l06, l16, l26, \
-    l50, l51, l52, l53, \
-\
-    l66, l76, l86, l96, la6, \
-    l65, l75, l85, l95, la5, \
-    l64, l74, l84, l94, la4, \
-    l63, l73, l83, l93, la3, \
-    l62, l72, l82, l92, la2, \
-    l61, l71, l81, l91, \
-    l60, l70, l80, \
-    lb6, lb5, lb4, lb3 \
-}
-// clang-format on
-
 enum planck_ez_keycodes {
     TOGGLE_LAYER_COLOR = QK_KB_0,
     LED_LEVEL,
diff --git a/keyboards/ms_sculpt/info.json b/keyboards/ms_sculpt/info.json
index 7afd13d96df2..3536d4501f13 100644
--- a/keyboards/ms_sculpt/info.json
+++ b/keyboards/ms_sculpt/info.json
@@ -12,12 +12,16 @@
         "mousekey": false,
         "nkro": false
     },
+    "build": {
+        "debounce_type": "sym_eager_pk"
+    },
     "matrix_pins": {
         "rows": ["B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
         "cols": ["A2", "B8", "A0", "C15", "C14", "A14", "A13", "B7", "B6", "B5", "B4", "B3", "A15", "A10", "A8", "B15", "B14", "B12"],
         "ghost": true,
         "io_delay": 5
     },
+    "debounce": 3,
     "processor": "STM32F401",
     "url": "",
     "usb": {
diff --git a/keyboards/ms_sculpt/rules.mk b/keyboards/ms_sculpt/rules.mk
index d64abe822d77..6e7633bfe015 100644
--- a/keyboards/ms_sculpt/rules.mk
+++ b/keyboards/ms_sculpt/rules.mk
@@ -1,3 +1 @@
 # This file intentionally left blank
-DEBOUNCE_TYPE = sym_eager_pk
-DEBOUNCE = 3
diff --git a/keyboards/mss_studio/m63_rgb/info.json b/keyboards/mss_studio/m63_rgb/info.json
index 16577a21e88b..197a78a92456 100644
--- a/keyboards/mss_studio/m63_rgb/info.json
+++ b/keyboards/mss_studio/m63_rgb/info.json
@@ -13,7 +13,7 @@
         "pin": "B15"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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/info.json b/keyboards/mss_studio/m64_rgb/info.json
index 6f300fbbb23a..c1850d1191b8 100644
--- a/keyboards/mss_studio/m64_rgb/info.json
+++ b/keyboards/mss_studio/m64_rgb/info.json
@@ -13,7 +13,7 @@
         "pin": "B15"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B10", "A7", "A6", "A5", "A4", "B5", "B6", "A1", "B7", "B8", "B9"],
diff --git a/keyboards/mt/blocked65/config.h b/keyboards/mt/blocked65/config.h
index b61be3ea8f56..28be4f1a5b44 100644
--- a/keyboards/mt/blocked65/config.h
+++ b/keyboards/mt/blocked65/config.h
@@ -21,17 +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 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
diff --git a/keyboards/mt/blocked65/info.json b/keyboards/mt/blocked65/info.json
index db328f8dadc0..d260a51b6075 100644
--- a/keyboards/mt/blocked65/info.json
+++ b/keyboards/mt/blocked65/info.json
@@ -8,6 +8,21 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 14,
+        "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": "E2"
     },
diff --git a/keyboards/mt/mt40/config.h b/keyboards/mt/mt40/config.h
deleted file mode 100644
index bb9013743628..000000000000
--- a/keyboards/mt/mt40/config.h
+++ /dev/null
@@ -1,51 +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
-
-#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
-
-/* 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/mt/mt40/info.json b/keyboards/mt/mt40/info.json
index 4d3cab4ebab5..83980bf7943b 100644
--- a/keyboards/mt/mt40/info.json
+++ b/keyboards/mt/mt40/info.json
@@ -14,8 +14,24 @@
   },
   "diode_direction": "COL2ROW",
   "backlight": {
+    "driver": "timer",
     "pin": "D2"
   },
+  "rgblight": {
+    "led_count": 12,
+    "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": {
     "driver": "i2c"
   },
diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h
index afcb90c5d27f..0d877306e318 100644
--- a/keyboards/mt/mt64rgb/config.h
+++ b/keyboards/mt/mt64rgb/config.h
@@ -80,22 +80,6 @@
 
 #endif
 
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-// #define RGBLIGHT_EFFECT_RGB_TEST
-// #define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 18
-#define RGBLIGHT_HUE_STEP 5
-#define RGBLIGHT_SAT_STEP 5
-#define RGBLIGHT_VAL_STEP 5
-#define RGBLIGHT_SLEEP
-
 /* 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 58ded7742c17..f2723823ee9d 100644
--- a/keyboards/mt/mt64rgb/info.json
+++ b/keyboards/mt/mt64rgb/info.json
@@ -8,11 +8,28 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 5,
+        "saturation_steps": 5,
+        "brightness_steps": 5,
+        "led_count": 18,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
         "pin": "B0"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"],
diff --git a/keyboards/mt/mt84/config.h b/keyboards/mt/mt84/config.h
index 1a2d49d73445..67aae9a1fd57 100644
--- a/keyboards/mt/mt84/config.h
+++ b/keyboards/mt/mt84/config.h
@@ -83,15 +83,6 @@
 
 #endif
 
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#    define RGBLIGHT_EFFECT_BREATHING
-#    define RGBLED_NUM 18
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP
-
 /* 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/mt84/info.json b/keyboards/mt/mt84/info.json
index e7a7507d7ee9..74343e358399 100644
--- a/keyboards/mt/mt84/info.json
+++ b/keyboards/mt/mt84/info.json
@@ -8,11 +8,22 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_swirl": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "B0"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3737"
+        "driver": "is31fl3737"
     },
     "matrix_pins": {
         "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7", "E6"],
diff --git a/keyboards/mt/mt980/config.h b/keyboards/mt/mt980/config.h
index eff34dc5217f..5f360813239b 100644
--- a/keyboards/mt/mt980/config.h
+++ b/keyboards/mt/mt980/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 24
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mt/mt980/info.json b/keyboards/mt/mt980/info.json
index 809474914fe8..b27bf8aae811 100644
--- a/keyboards/mt/mt980/info.json
+++ b/keyboards/mt/mt980/info.json
@@ -26,7 +26,22 @@
     "pin": "E2"
   },
   "rgblight": {
-    "max_brightness": 185
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 24,
+    "max_brightness": 185,
+    "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
+    }
   },
   "bootmagic": {
     "matrix": [5, 0]
diff --git a/keyboards/mt/mt980/keymaps/walker/keymap.c b/keyboards/mt/mt980/keymaps/walker/keymap.c
index e98a1d71de47..f0817dd33d59 100644
--- a/keyboards/mt/mt980/keymaps/walker/keymap.c
+++ b/keyboards/mt/mt980/keymaps/walker/keymap.c
@@ -89,8 +89,8 @@ tap_dance_action_t tap_dance_actions[] = {
   [ALT_L1] = ACTION_TAP_DANCE_FN_ADVANCED(NULL,alt_finished, alt_reset)
 };
 
-void led_set_keymap(uint8_t usb_led) {
-  if (usb_led & (1<<USB_LED_NUM_LOCK)) {
+bool led_update_keymap(led_t led_state) {
+  if (led_state.num_lock) {
     numlock_on = true;
   }
   else {
diff --git a/keyboards/mt/ncr80/hotswap/config.h b/keyboards/mt/ncr80/hotswap/config.h
deleted file mode 100644
index 59b05a0f9b94..000000000000
--- a/keyboards/mt/ncr80/hotswap/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2022 Jordan Duabe
- * 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_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 81
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mt/ncr80/hotswap/info.json b/keyboards/mt/ncr80/hotswap/info.json
index f02a2f740550..b79a30709f3d 100644
--- a/keyboards/mt/ncr80/hotswap/info.json
+++ b/keyboards/mt/ncr80/hotswap/info.json
@@ -23,7 +23,22 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 180
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 81,
+        "max_brightness": 180,
+        "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",
diff --git a/keyboards/mt/split75/config.h b/keyboards/mt/split75/config.h
index f954d5fd9566..1a2fa71644b9 100644
--- a/keyboards/mt/split75/config.h
+++ b/keyboards/mt/split75/config.h
@@ -7,17 +7,4 @@
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 14
 
-#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_SLEEP
-
 #define I2C_START_RETRY_COUNT 1
diff --git a/keyboards/mt/split75/info.json b/keyboards/mt/split75/info.json
index dc20f93dbcb1..e03d528a2a45 100644
--- a/keyboards/mt/split75/info.json
+++ b/keyboards/mt/split75/info.json
@@ -11,6 +11,22 @@
     "backlight": {
         "pin": "D4"
     },
+    "rgblight": {
+        "led_count": 8,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/mtbkeys/mtb60/hotswap/config.h b/keyboards/mtbkeys/mtb60/hotswap/config.h
index 8d1741231380..56a9edf0aaba 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/config.h
+++ b/keyboards/mtbkeys/mtb60/hotswap/config.h
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#   define RGBLED_NUM 16
-#   define RGBLIGHT_HUE_STEP 8
-#   define RGBLIGHT_SAT_STEP 8
-#   define RGBLIGHT_VAL_STEP 8
-#   define RGBLIGHT_SLEEP         /* Turn RGB light off when the host goes to sleep */
-#   define RGBLIGHT_EFFECT_ALTERNATING
-#   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
 #   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 */
diff --git a/keyboards/mtbkeys/mtb60/hotswap/info.json b/keyboards/mtbkeys/mtb60/hotswap/info.json
index c1acbc3b86a0..deb6f6a0fe82 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/info.json
+++ b/keyboards/mtbkeys/mtb60/hotswap/info.json
@@ -8,6 +8,24 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "D4"
     },
diff --git a/keyboards/mtbkeys/mtb60/solder/config.h b/keyboards/mtbkeys/mtb60/solder/config.h
index 8d1741231380..56a9edf0aaba 100644
--- a/keyboards/mtbkeys/mtb60/solder/config.h
+++ b/keyboards/mtbkeys/mtb60/solder/config.h
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#   define RGBLED_NUM 16
-#   define RGBLIGHT_HUE_STEP 8
-#   define RGBLIGHT_SAT_STEP 8
-#   define RGBLIGHT_VAL_STEP 8
-#   define RGBLIGHT_SLEEP         /* Turn RGB light off when the host goes to sleep */
-#   define RGBLIGHT_EFFECT_ALTERNATING
-#   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
 #   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 */
diff --git a/keyboards/mtbkeys/mtb60/solder/info.json b/keyboards/mtbkeys/mtb60/solder/info.json
index 5cf3a327a1bb..9fdca32a3e4c 100644
--- a/keyboards/mtbkeys/mtb60/solder/info.json
+++ b/keyboards/mtbkeys/mtb60/solder/info.json
@@ -8,6 +8,24 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "B0"
     },
diff --git a/keyboards/mwstudio/alicekk/config.h b/keyboards/mwstudio/alicekk/config.h
index 2e8b3f3bec2d..654ec7e363fc 100644
--- a/keyboards/mwstudio/alicekk/config.h
+++ b/keyboards/mwstudio/alicekk/config.h
@@ -18,19 +18,3 @@
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
 #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#define RGBLED_NUM 87
-
-#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/mwstudio/alicekk/info.json b/keyboards/mwstudio/alicekk/info.json
index b77bbd8bdfed..75b65279d648 100644
--- a/keyboards/mwstudio/alicekk/info.json
+++ b/keyboards/mwstudio/alicekk/info.json
@@ -21,7 +21,22 @@
         "pin": "B1"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 87,
+        "max_brightness": 200,
+        "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",
diff --git a/keyboards/mwstudio/alicekk/keymaps/via/keymap.c b/keyboards/mwstudio/alicekk/keymaps/via/keymap.c
index 92e893d5c524..5c3ae235b14f 100644
--- a/keyboards/mwstudio/alicekk/keymaps/via/keymap.c
+++ b/keyboards/mwstudio/alicekk/keymaps/via/keymap.c
@@ -51,44 +51,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-
-#ifdef ENCODER_ENABLE
-static uint8_t  encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS] = {{6, 4}};
-static keypos_t encoder_ccw[NUM_ENCODERS] = {{7, 4}};
-
-void encoder_action_unregister(void) {
-    for (uint8_t index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    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] = {
+    [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/mwstudio/alicekk/keymaps/via/rules.mk b/keyboards/mwstudio/alicekk/keymaps/via/rules.mk
index 541a15608aeb..f1adcab005e8 100644
--- a/keyboards/mwstudio/alicekk/keymaps/via/rules.mk
+++ b/keyboards/mwstudio/alicekk/keymaps/via/rules.mk
@@ -1,2 +1,2 @@
 VIA_ENABLE = yes
-LTO_ENABLE = no
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mwstudio/mw65_black/config.h b/keyboards/mwstudio/mw65_black/config.h
deleted file mode 100644
index f987360d4a4f..000000000000
--- a/keyboards/mwstudio/mw65_black/config.h
+++ /dev/null
@@ -1,22 +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 RGBLED_NUM 21
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mwstudio/mw65_black/info.json b/keyboards/mwstudio/mw65_black/info.json
index baa73a6e3bfd..264634065870 100644
--- a/keyboards/mwstudio/mw65_black/info.json
+++ b/keyboards/mwstudio/mw65_black/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6500",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 21
+    },
     "ws2812": {
         "pin": "C7"
     },
diff --git a/keyboards/mwstudio/mw65_rgb/info.json b/keyboards/mwstudio/mw65_rgb/info.json
index c2a8a6c18829..73e3c0ea2470 100644
--- a/keyboards/mwstudio/mw65_rgb/info.json
+++ b/keyboards/mwstudio/mw65_rgb/info.json
@@ -12,7 +12,7 @@
         "pin": "B3"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
@@ -43,10 +43,7 @@
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [4, 4], "x": 15, "y": 0, "w": 0.5},
                 {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [4, 3], "x": 16.5, "y": 0, "w": 0.5},
 
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "x": 1.5, "y": 1},
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/default/keymap.c b/keyboards/mwstudio/mw65_rgb/keymaps/default/keymap.c
index 8153790b1435..77750b517431 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/default/keymap.c
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 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_VOLD, KC_DEL,  KC_VOLU,
+        KC_ESC,  KC_1,    KC_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,   RGB_TOG,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
 	[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,  _______,   _______, RGB_HUI, _______,
+        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_HUI,
         RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_SAI,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD,
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap.c b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap.c
index ef5ea90b6113..6179d4cdc1c0 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap.c
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3        4        5     6         7     8     9        10       11       12       13       14     */
 	[_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_VOLD, KC_HOME, KC_VOLU,
+                KC_ESC,  KC_1,    KC_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,
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13        14     */
 	[_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_HOME,    _______, _______, _______,
+                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_PAUSE, KC_INS,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PSCR,  KC_DEL,
                 _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap_stuff.h b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap_stuff.h
index 7fadbdc39c87..bd979e9c8187 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap_stuff.h
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap_stuff.h
@@ -273,19 +273,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) {
-    if (clockwise) {
-        tap_code(dynamic_keymap_get_keycode(biton32(layer_state), 4, 3));
-    } else {
-        tap_code(dynamic_keymap_get_keycode(biton32(layer_state), 4, 4));
-    }
-  }
-  return true;
-}
-#endif
-
 bool rgb_matrix_indicators_user(void) {
     switch (biton32(layer_state)) {
         case _FN:
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/keymap.c b/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/keymap.c
index f4625bf7a7c6..e51a5e3ab8ab 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/keymap.c
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3        4        5     6         7     8     9        10       11       12       13       14     */
 	[_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_VOLD, KC_HOME, KC_VOLU,
+                KC_ESC,  KC_1,    KC_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,
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12        13        14     */
 	[_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_HOME,    _______, _______, _______,
+                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,  _______,
                 QK_BOOT, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______,  KC_PAUSE, KC_INS,
                 _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, _______, _______,           KC_PSCR,  KC_DEL,
                 _______,          _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______,  RGB_VAI,  RGB_TOG,
@@ -168,19 +168,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) {
-    if (clockwise) {
-        tap_code(dynamic_keymap_get_keycode(biton32(layer_state), 4, 3));
-    } else {
-        tap_code(dynamic_keymap_get_keycode(biton32(layer_state), 4, 4));
-    }
-  }
-  return true;
-}
-#endif
-
 bool rgb_matrix_indicators_user(void) {
     HSV      hsv = rgb_matrix_config.hsv;
     uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c b/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
index a1b54a8411cf..827cd0db3829 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
@@ -34,7 +34,7 @@ enum custom_keycodes {
 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_VOLD, KC_DEL,  KC_VOLU,
+        KC_ESC,  KC_1,    KC_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,   RGB_TOG,
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
 	[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,  _______,   _______, RGB_HUI, _______,
+        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_HUI,
         RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          USER00,  RGB_SAI,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, USER01,  RGB_VAI, RGB_SAD,
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
 	[2] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
 	[3] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -96,17 +96,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
 }
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) {
-    if (clockwise) {
-        tap_code(dynamic_keymap_get_keycode(get_highest_layer(layer_state), 4, 3));
-    } else {
-        tap_code(dynamic_keymap_get_keycode(get_highest_layer(layer_state), 4, 4));
-    }
-  }
-  return true;
-}
+#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(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
 #endif
 
 bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/via/rules.mk b/keyboards/mwstudio/mw65_rgb/keymaps/via/rules.mk
index 36b7ba9cbc98..1189f4ad1927 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/via/rules.mk
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mwstudio/mw660/config.h b/keyboards/mwstudio/mw660/config.h
index 8c5cad9beff8..87659c1f67c7 100644
--- a/keyboards/mwstudio/mw660/config.h
+++ b/keyboards/mwstudio/mw660/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-#define DRIVER_LED_TOTAL 34
-#define RGBLED_NUM 34
-
 #define WS2812_PWM_DRIVER PWMD4               // default: PWMD2
 #define WS2812_PWM_CHANNEL 3                  // default: 2
 //#define WS2812_PWM_COMPLEMENTARY_OUTPUT       // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy).
diff --git a/keyboards/mwstudio/mw660/info.json b/keyboards/mwstudio/mw660/info.json
index 5d1edb296f59..fdbd7564a7b1 100644
--- a/keyboards/mwstudio/mw660/info.json
+++ b/keyboards/mwstudio/mw660/info.json
@@ -12,6 +12,9 @@
         "nkro": true,
         "rgblight": true
     },
+    "rgblight": {
+        "led_count": 34
+    },
     "ws2812": {
         "pin": "B8"
     },
diff --git a/keyboards/mwstudio/mw75/config.h b/keyboards/mwstudio/mw75/config.h
index 0a9b073ce180..e5dd4fd03c62 100644
--- a/keyboards/mwstudio/mw75/config.h
+++ b/keyboards/mwstudio/mw75/config.h
@@ -16,12 +16,9 @@
 
 #pragma once
 
-#define RGBLIGHT_SLEEP
-
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
 #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGB_MATRIX_LED_COUNT 97
-#define RGBLED_NUM 97
 #define RGB_MATRIX_KEYPRESSES
 
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
@@ -68,7 +65,3 @@
 #define ENABLE_RGB_MATRIX_MULTISPLASH
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mwstudio/mw75/info.json b/keyboards/mwstudio/mw75/info.json
index cc2e3dc40816..197a58d7ab9d 100644
--- a/keyboards/mwstudio/mw75/info.json
+++ b/keyboards/mwstudio/mw75/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
@@ -24,6 +24,12 @@
     "bootmagic": {
         "matrix": [0, 1]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 97,
+        "sleep": true
+    },
     "ws2812": {
         "pin": "B3"
     },
diff --git a/keyboards/mwstudio/mw75r2/config.h b/keyboards/mwstudio/mw75r2/config.h
index ded31181aa6d..863a090d47ec 100644
--- a/keyboards/mwstudio/mw75r2/config.h
+++ b/keyboards/mwstudio/mw75r2/config.h
@@ -16,12 +16,9 @@
 
 #pragma once
 
-#define RGBLIGHT_SLEEP
-
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
 #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #define RGB_MATRIX_LED_COUNT 21
-#define RGBLED_NUM 21
 
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_BREATHING
@@ -43,7 +40,3 @@
 #define ENABLE_RGB_MATRIX_HUE_WAVE
 #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/mwstudio/mw75r2/info.json b/keyboards/mwstudio/mw75r2/info.json
index f86df57fe5ae..8f9d19e016de 100644
--- a/keyboards/mwstudio/mw75r2/info.json
+++ b/keyboards/mwstudio/mw75r2/info.json
@@ -8,11 +8,17 @@
         "pid": "0x7502",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 21,
+        "sleep": true
+    },
     "ws2812": {
         "pin": "B3"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "F7", "F6", "E6", "F0", "F1", "F4", "F5"],
diff --git a/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c b/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
index 633629abc791..777a0dd6f478 100644
--- a/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
+++ b/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
@@ -104,48 +104,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
 }
 
-#ifdef ENCODER_ENABLE
-static uint8_t  encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS] = {{3, 5}};
-static keypos_t encoder_ccw[NUM_ENCODERS] = {{4, 5}};
-
-void encoder_action_unregister(void) {
-    for (uint8_t index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    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 true;
+#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(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
 };
 #endif
 
-
 bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 
     if (user_config.top_rgb_change)
diff --git a/keyboards/mwstudio/mw75r2/keymaps/via/rules.mk b/keyboards/mwstudio/mw75r2/keymaps/via/rules.mk
index 36b7ba9cbc98..1189f4ad1927 100644
--- a/keyboards/mwstudio/mw75r2/keymaps/via/rules.mk
+++ b/keyboards/mwstudio/mw75r2/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mxss/config.h b/keyboards/mxss/config.h
index d33ee88ce812..bfa2338678c0 100644
--- a/keyboards/mxss/config.h
+++ b/keyboards/mxss/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Basic RGB configuration */
-#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
-
 /* 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/mxss/info.json b/keyboards/mxss/info.json
index 7828803ae18a..7b24c4671793 100644
--- a/keyboards/mxss/info.json
+++ b/keyboards/mxss/info.json
@@ -8,6 +8,23 @@
     "pid": "0x5353",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 20,
+    "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": "C7"
   },
diff --git a/keyboards/nack/config.h b/keyboards/nack/config.h
index 7240672afe7d..adb2cf5d8777 100644
--- a/keyboards/nack/config.h
+++ b/keyboards/nack/config.h
@@ -17,18 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAPPING_TOGGLE 2
-
 #ifdef RGB_MATRIX_ENABLE
     #define WS2812_SPI SPID1
     #define WS2812_SPI_MOSI_PAL_MODE 5
-    #define RGBLED_NUM 52
-    #define RGB_MATRIX_LED_COUNT RGBLED_NUM
+    #define RGB_MATRIX_LED_COUNT 52
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128 // Max brightness of LEDs
     #define RGB_MATRIX_DEFAULT_VAL 64
-    #define RGB_MATRIX_HUE_STEP 10
-    #define RGB_MATRIX_SAT_STEP 10
-    #define RGB_MATRIX_VAL_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
diff --git a/keyboards/nack/info.json b/keyboards/nack/info.json
index 827e0fec0e70..4fd998114521 100644
--- a/keyboards/nack/info.json
+++ b/keyboards/nack/info.json
@@ -13,7 +13,10 @@
         "driver": "spi"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812",
+        "hue_steps": 10,
+        "sat_steps": 10,
+        "val_steps": 10
     },
     "matrix_pins": {
         "cols": ["A6", "A7", "A8", "A9", "A10", "B0", "B1", "B2", "B6", "B7", "C13", "C14", "C15"],
@@ -23,6 +26,9 @@
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",
+    "tapping": {
+        "toggle": 2
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_ortho_4x13"
     },
diff --git a/keyboards/nacly/splitreus62/config.h b/keyboards/nacly/splitreus62/config.h
index 9c6773547e8d..fe1acecf248b 100644
--- a/keyboards/nacly/splitreus62/config.h
+++ b/keyboards/nacly/splitreus62/config.h
@@ -25,9 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 12    // Number of LEDs
-
-#define RGBLED_SPLIT { 6, 6 }
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json
index 5c61b6f5fe42..c4992778890a 100644
--- a/keyboards/nacly/splitreus62/info.json
+++ b/keyboards/nacly/splitreus62/info.json
@@ -16,6 +16,10 @@
     "split": {
       "soft_serial_pin": "D0"
     },
+    "rgblight": {
+      "led_count": 12,
+      "split_count": [6, 6]
+    },
     "ws2812": {
       "pin": "B1"
     },
diff --git a/keyboards/nacly/ua62/config.h b/keyboards/nacly/ua62/config.h
index 0391f174c954..643a3b52db99 100644
--- a/keyboards/nacly/ua62/config.h
+++ b/keyboards/nacly/ua62/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 TAPPING_TERM 200
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/nasu/rules.mk b/keyboards/nasu/rules.mk
index 7000bb65710c..7c0709f41e6c 100644
--- a/keyboards/nasu/rules.mk
+++ b/keyboards/nasu/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/ncc1701kb/config.h b/keyboards/ncc1701kb/config.h
deleted file mode 100644
index bd03d32227fe..000000000000
--- a/keyboards/ncc1701kb/config.h
+++ /dev/null
@@ -1,20 +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 TAPPING_TERM 200
diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h
index ef9b51892005..606ac53b7c87 100644
--- a/keyboards/neito/config.h
+++ b/keyboards/neito/config.h
@@ -16,25 +16,3 @@
 #pragma once
 
 #define GRAVE_ESC_CTRL_OVERRIDE
-
-/* RGB Light Configuration */
-
-#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
-#define RGBLIGHT_LED_MAP { 4, 3, 2, 1, 0, 10, 9, 8, 7, 6, 5 }
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-/* Handle volume control issue with rotary encoder */
-
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json
index a226d236c315..fcf24c68c8ee 100644
--- a/keyboards/neito/info.json
+++ b/keyboards/neito/info.json
@@ -18,6 +18,9 @@
             {"pin_a": "B7", "pin_b": "B0"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "backlight": {
         "pin": "B5",
         "levels": 5,
@@ -30,7 +33,23 @@
         "pin": "D5"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 11,
+        "max_brightness": 200,
+        "led_map": [4, 3, 2, 1, 0, 10, 9, 8, 7, 6, 5],
+        "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",
diff --git a/keyboards/nek_type_a/info.json b/keyboards/nek_type_a/info.json
index b81bb4b2ce76..6cb972b17f6c 100644
--- a/keyboards/nek_type_a/info.json
+++ b/keyboards/nek_type_a/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/nek_type_a/rules.mk b/keyboards/nek_type_a/rules.mk
index ca61554f78e2..f79051ebceb9 100644
--- a/keyboards/nek_type_a/rules.mk
+++ b/keyboards/nek_type_a/rules.mk
@@ -16,6 +16,5 @@ AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = yes
 DEBUG_ENABLE = yes
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
 
 SRC += matrix.c mcp23017.c
diff --git a/keyboards/nemui/rules.mk b/keyboards/nemui/rules.mk
index 0aeca0dd9f35..7f4f202a1b70 100644
--- a/keyboards/nemui/rules.mk
+++ b/keyboards/nemui/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/neokeys/g67/element_hs/config.h b/keyboards/neokeys/g67/element_hs/config.h
deleted file mode 100644
index e71dda27815c..000000000000
--- a/keyboards/neokeys/g67/element_hs/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 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
-
-#if defined(RGBLIGHT_ENABLE)
-    #define RGBLED_NUM 77
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations 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
-#endif
diff --git a/keyboards/neokeys/g67/element_hs/info.json b/keyboards/neokeys/g67/element_hs/info.json
index b744c334b580..707993d4a3c1 100644
--- a/keyboards/neokeys/g67/element_hs/info.json
+++ b/keyboards/neokeys/g67/element_hs/info.json
@@ -17,7 +17,23 @@
         "pin": "F0"
     },
     "rgblight": {
-        "max_brightness": 150
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 77,
+        "max_brightness": 150,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/neokeys/g67/hotswap/config.h b/keyboards/neokeys/g67/hotswap/config.h
deleted file mode 100644
index 3165d58b2f39..000000000000
--- a/keyboards/neokeys/g67/hotswap/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 James Young (@noroadsleft)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#if defined(RGBLIGHT_ENABLE)
-    #define RGBLED_NUM 77
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-#endif
diff --git a/keyboards/neokeys/g67/hotswap/info.json b/keyboards/neokeys/g67/hotswap/info.json
index 1ae8869ee9fc..526da4ba06d8 100644
--- a/keyboards/neokeys/g67/hotswap/info.json
+++ b/keyboards/neokeys/g67/hotswap/info.json
@@ -17,7 +17,23 @@
         "pin": "F0"
     },
     "rgblight": {
-        "max_brightness": 150
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 77,
+        "max_brightness": 150,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/neokeys/g67/soldered/config.h b/keyboards/neokeys/g67/soldered/config.h
deleted file mode 100644
index 1dfb4e03acf4..000000000000
--- a/keyboards/neokeys/g67/soldered/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 James Young (@noroadsleft)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#if defined(RGBLIGHT_ENABLE)
-    #define RGBLED_NUM 18
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-#endif
diff --git a/keyboards/neokeys/g67/soldered/info.json b/keyboards/neokeys/g67/soldered/info.json
index 87c4d0c03f97..567a56d92687 100644
--- a/keyboards/neokeys/g67/soldered/info.json
+++ b/keyboards/neokeys/g67/soldered/info.json
@@ -22,7 +22,23 @@
         "pin": "F0"
     },
     "rgblight": {
-        "max_brightness": 150
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "max_brightness": 150,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/neopad/config.h b/keyboards/neopad/config.h
deleted file mode 100755
index 6200d5a594ac..000000000000
--- a/keyboards/neopad/config.h
+++ /dev/null
@@ -1,20 +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/>.
-*/
-#pragma once
-
-/* Reduce tapdance required taps from 5 to 2 */
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/neopad/rev1/info.json b/keyboards/neopad/rev1/info.json
index 8a8f357c96f4..0a0340c06df9 100755
--- a/keyboards/neopad/rev1/info.json
+++ b/keyboards/neopad/rev1/info.json
@@ -21,6 +21,9 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "tapping": {
+        "toggle": 2
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/neson_design/700e/700e.c b/keyboards/neson_design/700e/700e.c
index a5a5ad9120f7..cf31b6b72b3d 100644
--- a/keyboards/neson_design/700e/700e.c
+++ b/keyboards/neson_design/700e/700e.c
@@ -107,12 +107,12 @@ static void self_testing(void)
     switch(rgb_state.testing) {
         case ST_STAGE_1:
             if (rgb_state.index !=0 ) {
-                IS31FL3731_set_color_all(0, 0, 0);
+                is31fl3731_set_color_all(0, 0, 0);
             }
 
             if (rgb_state.index >= ST_LEFT_END) {
                 for (int i = rgb_state.index - 1; i < RGB_MATRIX_LED_COUNT - rgb_state.index + 1; i++) {
-                    IS31FL3731_set_color(i, led.r, led.g, led.b);
+                    is31fl3731_set_color(i, led.r, led.g, led.b);
                 }
                 if (rgb_state.index == ST_LEFT_END) {
                     rgb_state.index = ST_LEFT_BEGIN;
@@ -131,20 +131,20 @@ static void self_testing(void)
         break;
         case ST_STAGE_2: {
             // clear all
-            IS31FL3731_set_color_all(0, 0, 0);
+            is31fl3731_set_color_all(0, 0, 0);
             int i = 0;
             // light left and right
             for (i = 0; i < ST_LEFT_SIZE; i++) {
-                IS31FL3731_set_color(ST_LEFT_BEGIN+i, led.r, led.g, led.b);
+                is31fl3731_set_color(ST_LEFT_BEGIN+i, led.r, led.g, led.b);
             }
             for (i = 0; i < ST_RIGHT_SIZE; i++) {
-                IS31FL3731_set_color(ST_RIGHT_BEGIN+i, led.r, led.g, led.b);
+                is31fl3731_set_color(ST_RIGHT_BEGIN+i, led.r, led.g, led.b);
 
             }
             if (rgb_state.dir) {
                 // left to right
                 for (int i = rgb_state.index; i < rgb_state.index+ST_LEFT_SIZE+ST_RIGHT_SIZE; i++) {
-                    IS31FL3731_set_color(i, led.r, led.g, led.b);
+                    is31fl3731_set_color(i, led.r, led.g, led.b);
                 }
                 rgb_state.index += ST_LEFT_SIZE+ST_RIGHT_SIZE;
                 if (rgb_state.index == ST_RIGHT_BEGIN) {
@@ -154,7 +154,7 @@ static void self_testing(void)
             } else {
                 // right to left
                 for (int i = rgb_state.index - ST_RIGHT_SIZE; i < rgb_state.index; i++) {
-                    IS31FL3731_set_color(i, led.r, led.g, led.b);
+                    is31fl3731_set_color(i, led.r, led.g, led.b);
                 }
                 rgb_state.index -= ST_LEFT_SIZE + ST_RIGHT_SIZE;
                 if (rgb_state.index == ST_LEFT_BEGIN+ST_LEFT_SIZE) {
@@ -174,7 +174,7 @@ static void self_testing(void)
         break;
         case ST_STAGE_3:
             if (rgb_state.index != RGB_MATRIX_LED_COUNT/2) {
-                IS31FL3731_set_color_all(0, 0, 0);
+                is31fl3731_set_color_all(0, 0, 0);
             }
 
             // light left and right
@@ -193,11 +193,11 @@ static void self_testing(void)
             } else {
                 // left
                 for (int i = 0; i < rgb_state.index+1; i++) {
-                    IS31FL3731_set_color(i, led.r, led.g, led.b);
+                    is31fl3731_set_color(i, led.r, led.g, led.b);
                 }
                 // right
                 for (int i = ST_RIGHT_END; i > ST_RIGHT_END - rgb_state.index - 1; i--) {
-                    IS31FL3731_set_color(i, led.r, led.g, led.b);
+                    is31fl3731_set_color(i, led.r, led.g, led.b);
                 }
                 rgb_state.index ++;
             }
@@ -295,16 +295,16 @@ void matrix_init_kb(void)
     writePinLow(LED_CAPS_LOCK_PIN);
 
     i2c_init();
-    IS31FL3731_init(DRIVER_ADDR_1);
+    is31fl3731_init(DRIVER_ADDR_1);
 #ifdef DRIVER_ADDR_2
-    IS31FL3731_init(DRIVER_ADDR_2);
+    is31fl3731_init(DRIVER_ADDR_2);
 #endif
     for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
-        IS31FL3731_set_led_control_register(index, true, true, true);
+        is31fl3731_set_led_control_register(index, true, true, true);
     }
-    IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3731_update_led_control_registers(DRIVER_ADDR_1, 0);
 #ifdef DRIVER_ADDR_2
-    IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1);
+    is31fl3731_update_led_control_registers(DRIVER_ADDR_2, 1);
 #endif
     update_ticks();
     matrix_init_user();
@@ -321,7 +321,7 @@ void housekeeping_task_kb(void)
         self_testing();
     } else if (rgb_state.state == CAPS_ALERT) {
         if (rgb_state.alert) {
-            IS31FL3731_set_color_all(ALERM_LED_R, ALERM_LED_G, ALERM_LED_B);
+            is31fl3731_set_color_all(ALERM_LED_R, ALERM_LED_G, ALERM_LED_B);
             LED_TYPE leds[4];
             for (int i = 0; i < 4; i++) {
                 leds[i].r = ALERM_LED_G;
@@ -330,7 +330,7 @@ void housekeeping_task_kb(void)
             }
             ws2812_setleds(leds, 4);
         } else {
-            IS31FL3731_set_color_all(0, 0, 0);
+            is31fl3731_set_color_all(0, 0, 0);
             LED_TYPE leds[4] = {0};
             ws2812_setleds(leds, 4);
         }
@@ -341,9 +341,9 @@ void housekeeping_task_kb(void)
         }
     }
 
-    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
 #ifdef DRIVER_ADDR_2
-    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
+    is31fl3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
 #endif
 
     housekeeping_task_user();
@@ -354,7 +354,7 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
     if (rgb_state.state != NORMAL) return;
 
     for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        IS31FL3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
+        is31fl3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
     }
     LED_TYPE leds[4];
     for (int i = 0; i < 4; i++) {
diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h
index e35f0c4d0a4b..cf89616aa87d 100644
--- a/keyboards/neson_design/700e/config.h
+++ b/keyboards/neson_design/700e/config.h
@@ -37,19 +37,4 @@
 #define DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
 
-//rgb light setting
-#define RGBLED_NUM          68
-#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_HUE_STEP   8
-#define RGBLIGHT_SAT_STEP   8
-#define RGBLIGHT_VAL_STEP   8
-
 #define USB_SUSPEND_WAKEUP_DELAY 1000
diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json
index 3f339ad55487..12a979ab117c 100644
--- a/keyboards/neson_design/700e/info.json
+++ b/keyboards/neson_design/700e/info.json
@@ -16,6 +16,22 @@
     "indicators": {
         "caps_lock": "F5"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 68,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        }
+    },
     "ws2812": {
         "pin": "D5"
     },
diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h
index 9a4c8240c06c..91d96c6a4d12 100644
--- a/keyboards/neson_design/n6/config.h
+++ b/keyboards/neson_design/n6/config.h
@@ -36,19 +36,3 @@
 #define DRIVER_ADDR_2 0b1110111
 #define DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
-
-//rgb light setting
-#define RGBLED_NUM          65
-#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/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json
index 770748fa29d0..3f383b4f8fe3 100644
--- a/keyboards/neson_design/n6/info.json
+++ b/keyboards/neson_design/n6/info.json
@@ -20,7 +20,22 @@
         "pin": "B3"
     },
     "rgblight": {
-        "max_brightness": 192
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 65,
+        "max_brightness": 192,
+        "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",
diff --git a/keyboards/neson_design/n6/n6.c b/keyboards/neson_design/n6/n6.c
index 5727ab655f26..cf99404641fc 100644
--- a/keyboards/neson_design/n6/n6.c
+++ b/keyboards/neson_design/n6/n6.c
@@ -111,12 +111,12 @@ static void self_testing(void)
     switch(rgb_state.testing) {
         case ST_STAGE_1:
             if (rgb_state.index !=0 ) {
-                IS31FL3731_set_color_all(0, 0, 0);
+                is31fl3731_set_color_all(0, 0, 0);
             }
 
             if (rgb_state.index >= ST_LEFT_END) {
                 for (int i = rgb_state.index - 1; i < RGB_MATRIX_LED_COUNT - rgb_state.index + 1; i++) {
-                    IS31FL3731_set_color(i, led.r, led.g, led.b);
+                    is31fl3731_set_color(i, led.r, led.g, led.b);
                 }
                 if (rgb_state.index == ST_LEFT_END) {
                     rgb_state.index = ST_LEFT_BEGIN;
@@ -135,20 +135,20 @@ static void self_testing(void)
         break;
         case ST_STAGE_2: {
             // clear all
-            IS31FL3731_set_color_all(0, 0, 0);
+            is31fl3731_set_color_all(0, 0, 0);
             int i = 0;
             // light left and right
             for (i = 0; i < ST_LEFT_SIZE; i++) {
-                IS31FL3731_set_color(ST_LEFT_BEGIN+i, led.r, led.g, led.b);
+                is31fl3731_set_color(ST_LEFT_BEGIN+i, led.r, led.g, led.b);
             }
             for (i = 0; i < ST_RIGHT_SIZE; i++) {
-                IS31FL3731_set_color(ST_RIGHT_BEGIN+i, led.r, led.g, led.b);
+                is31fl3731_set_color(ST_RIGHT_BEGIN+i, led.r, led.g, led.b);
 
             }
             if (rgb_state.dir) {
                 // left to right
                 for (int i = rgb_state.index; i < rgb_state.index+ST_LEFT_SIZE+ST_RIGHT_SIZE; i++) {
-                    IS31FL3731_set_color(i, led.r, led.g, led.b);
+                    is31fl3731_set_color(i, led.r, led.g, led.b);
                 }
                 rgb_state.index += ST_LEFT_SIZE+ST_RIGHT_SIZE;
                 if (rgb_state.index == ST_RIGHT_BEGIN) {
@@ -158,7 +158,7 @@ static void self_testing(void)
             } else {
                 // right to left
                 for (int i = rgb_state.index - ST_RIGHT_SIZE; i < rgb_state.index; i++) {
-                    IS31FL3731_set_color(i, led.r, led.g, led.b);
+                    is31fl3731_set_color(i, led.r, led.g, led.b);
                 }
                 rgb_state.index -= ST_LEFT_SIZE + ST_RIGHT_SIZE;
                 if (rgb_state.index == ST_LEFT_BEGIN+ST_LEFT_SIZE) {
@@ -178,7 +178,7 @@ static void self_testing(void)
         break;
         case ST_STAGE_3:
             if (rgb_state.index != RGB_MATRIX_LED_COUNT/2) {
-                IS31FL3731_set_color_all(0, 0, 0);
+                is31fl3731_set_color_all(0, 0, 0);
             }
 
             // light left and right
@@ -197,11 +197,11 @@ static void self_testing(void)
             } else {
                 // left
                 for (int i = 0; i < rgb_state.index+1; i++) {
-                    IS31FL3731_set_color(i, led.r, led.g, led.b);
+                    is31fl3731_set_color(i, led.r, led.g, led.b);
                 }
                 // right
                 for (int i = ST_RIGHT_END; i > ST_RIGHT_END - rgb_state.index - 1; i--) {
-                    IS31FL3731_set_color(i, led.r, led.g, led.b);
+                    is31fl3731_set_color(i, led.r, led.g, led.b);
                 }
                 rgb_state.index ++;
             }
@@ -299,16 +299,16 @@ void matrix_init_kb(void)
     writePinLow(LED_CAPS_LOCK_PIN);
 
     i2c_init();
-    IS31FL3731_init(DRIVER_ADDR_1);
+    is31fl3731_init(DRIVER_ADDR_1);
 #ifdef DRIVER_ADDR_2
-    IS31FL3731_init(DRIVER_ADDR_2);
+    is31fl3731_init(DRIVER_ADDR_2);
 #endif
     for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
-        IS31FL3731_set_led_control_register(index, true, true, true);
+        is31fl3731_set_led_control_register(index, true, true, true);
     }
-    IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3731_update_led_control_registers(DRIVER_ADDR_1, 0);
 #ifdef DRIVER_ADDR_2
-    IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1);
+    is31fl3731_update_led_control_registers(DRIVER_ADDR_2, 1);
 #endif
     update_ticks();
     matrix_init_user();
@@ -327,13 +327,13 @@ void housekeeping_task_kb(void)
             .b = 0x00,
         };
         if (rgb_state.alert) {
-            IS31FL3731_set_color_all(led.r, led.g, led.b);
+            is31fl3731_set_color_all(led.r, led.g, led.b);
             ws2812_setleds(&led, 1);
         } else {
             led.r = 0;
             led.g = 0;
             led.b = 0;
-            IS31FL3731_set_color_all(0, 0, 0);
+            is31fl3731_set_color_all(0, 0, 0);
             ws2812_setleds(&led, 1);
         }
 
@@ -343,9 +343,9 @@ void housekeeping_task_kb(void)
         }
     }
 
-    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
 #ifdef DRIVER_ADDR_2
-    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
+    is31fl3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
 #endif
 
     housekeeping_task_user();
@@ -356,7 +356,7 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
     if (rgb_state.state != NORMAL) return;
 
     for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        IS31FL3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
+        is31fl3731_set_color(i, start_led[i].r, start_led[i].g, start_led[i].b);
     }
     ws2812_setleds(start_led+RGB_MATRIX_LED_COUNT, 1);
 }
diff --git a/keyboards/neson_design/nico/info.json b/keyboards/neson_design/nico/info.json
index f21b644f569b..477ac3ba7cb6 100644
--- a/keyboards/neson_design/nico/info.json
+++ b/keyboards/neson_design/nico/info.json
@@ -34,8 +34,11 @@
         "pid": "0x6E65",
         "vid": "0x4E65"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_xt_ansi_blocker_split_bs"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_xt_ansi_blocker_split_bs": {
             "layout": [
                 { "label": "K017", "matrix": [0, 15], "x": 0, "y": 0 },
                 { "label": "K018", "matrix": [0, 16], "x": 1, "y": 0 },
@@ -116,6 +119,275 @@
                 { "label": "K4C", "matrix": [4, 12], "x": 16.5, "y": 4 },
                 { "label": "K4D", "matrix": [4, 13], "x": 17.5, "y": 4 }
             ]
+        },
+        "LAYOUT_65_xt_ansi_blocker": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 15], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 16], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 2.5, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 3.5, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 4.5, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 6.5, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 7.5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 8.5, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 9.5, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 10.5, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 11.5, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 12.5, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 13.5, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 14.5, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 15.5, "y": 0, "w": 2},
+                {"label": "Print Screen", "matrix": [4, 14], "x": 17.5, "y": 0},
+
+                {"label": "F3", "matrix": [1, 15], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [1, 16], "x": 1, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 4, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 6, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 7, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 8, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 9, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 10, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 11, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 12, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 13, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 14, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 15, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 16, "y": 1, "w": 1.5},
+                {"label": "Home", "matrix": [1, 14], "x": 17.5, "y": 1},
+
+                {"label": "F5", "matrix": [2, 15], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [2, 16], "x": 1, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 4.25, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 5.25, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 6.25, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 7.25, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 8.25, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 9.25, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 10.25, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 11.25, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 12.25, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 13.25, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 14.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 15.25, "y": 2, "w": 2.25},
+                {"label": "End", "matrix": [2, 14], "x": 17.5, "y": 2},
+
+                {"label": "F7", "matrix": [3, 15], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [3, 16], "x": 1, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 4.75, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 5.75, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 6.75, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 7.75, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 8.75, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 9.75, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 10.75, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 11.75, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 12.75, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 13.75, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 14.75, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 16.5, "y": 3},
+                {"label": "Fn", "matrix": [3, 14], "x": 17.5, "y": 3},
+
+                {"label": "F9", "matrix": [4, 15], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [4, 16], "x": 1, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 3.75, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 10], "x": 13.75, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 11], "x": 15.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 16.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 17.5, "y": 4}
+            ]
+        },
+        "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 15], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 16], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 2.5, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 3.5, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 4.5, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 6.5, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 7.5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 8.5, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 9.5, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 10.5, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 11.5, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 12.5, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 13.5, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 14.5, "y": 0},
+                {"label": "Delete", "matrix": [0, 13], "x": 15.5, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 16.5, "y": 0},
+                {"label": "Print Screen", "matrix": [4, 14], "x": 17.5, "y": 0},
+
+                {"label": "F3", "matrix": [1, 15], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [1, 16], "x": 1, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 4, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 6, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 7, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 8, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 9, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 10, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 11, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 12, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 13, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 14, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 15, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 16, "y": 1, "w": 1.5},
+                {"label": "Home", "matrix": [1, 14], "x": 17.5, "y": 1},
+
+                {"label": "F5", "matrix": [2, 15], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [2, 16], "x": 1, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 4.25, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 5.25, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 6.25, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 7.25, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 8.25, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 9.25, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 10.25, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 11.25, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 12.25, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 13.25, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 14.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 15.25, "y": 2, "w": 2.25},
+                {"label": "End", "matrix": [2, 14], "x": 17.5, "y": 2},
+
+                {"label": "F7", "matrix": [3, 15], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [3, 16], "x": 1, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 4.75, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 5.75, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 6.75, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 7.75, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 8.75, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 9.75, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 10.75, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 11.75, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 12.75, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 13.75, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 14.75, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 16.5, "y": 3},
+                {"label": "Fn", "matrix": [3, 14], "x": 17.5, "y": 3},
+
+                {"label": "F9", "matrix": [4, 15], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [4, 16], "x": 1, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.5, "y": 4, "w": 7},
+                {"label": "GUI", "matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 11], "x": 15.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 16.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 17.5, "y": 4}
+            ]
+        },
+        "LAYOUT_65_xt_ansi_blocker_tsangan": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 15], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 16], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 2.5, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 3.5, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 4.5, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 6.5, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 7.5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 8.5, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 9.5, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 10.5, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 11.5, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 12.5, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 13.5, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 14.5, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 15.5, "y": 0, "w": 2},
+                {"label": "Print Screen", "matrix": [4, 14], "x": 17.5, "y": 0},
+
+                {"label": "F3", "matrix": [1, 15], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [1, 16], "x": 1, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 4, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 6, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 7, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 8, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 9, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 10, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 11, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 12, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 13, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 14, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 15, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 16, "y": 1, "w": 1.5},
+                {"label": "Home", "matrix": [1, 14], "x": 17.5, "y": 1},
+
+                {"label": "F5", "matrix": [2, 15], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [2, 16], "x": 1, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 4.25, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 5.25, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 6.25, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 7.25, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 8.25, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 9.25, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 10.25, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 11.25, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 12.25, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 13.25, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 14.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 15.25, "y": 2, "w": 2.25},
+                {"label": "End", "matrix": [2, 14], "x": 17.5, "y": 2},
+
+                {"label": "F7", "matrix": [3, 15], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [3, 16], "x": 1, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 4.75, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 5.75, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 6.75, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 7.75, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 8.75, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 9.75, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 10.75, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 11.75, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 12.75, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 13.75, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 14.75, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 16.5, "y": 3},
+                {"label": "Fn", "matrix": [3, 14], "x": 17.5, "y": 3},
+
+                {"label": "F9", "matrix": [4, 15], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [4, 16], "x": 1, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.5, "y": 4, "w": 7},
+                {"label": "GUI", "matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 11], "x": 15.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 16.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 17.5, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/neson_design/nico/keymaps/default/keymap.c b/keyboards/neson_design/nico/keymaps/default/keymap.c
index d481379e210c..845d7fdc4fb0 100644
--- a/keyboards/neson_design/nico/keymaps/default/keymap.c
+++ b/keyboards/neson_design/nico/keymaps/default/keymap.c
@@ -18,17 +18,19 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = 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_DEL, KC_BSPC, 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_HOME,
-      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_END,
-      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,   MO(1),
-      KC_F9,KC_F10,     KC_LCTL,  KC_LGUI,  KC_LALT,                        KC_SPC,                  KC_RALT,KC_RGUI,                KC_LEFT,KC_DOWN, KC_RIGHT),
+    [0] = LAYOUT_65_xt_ansi_blocker_split_bs(
+        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_DEL,  KC_BSPC, 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_HOME,
+        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_END,
+        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,   MO(1),
+        KC_F9,   KC_F10,     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI,          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_PSCR,_______,
-      _______, _______, QK_BOOT,          RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,_______,
-      _______, _______, _______,        _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME, KC_END,        _______,_______,
-      _______, _______, _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,
-      _______, _______, _______,_______,_______,                        _______,                        _______,_______,        _______,_______,_______),
+    [1] = LAYOUT_65_xt_ansi_blocker_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_PSCR, _______,
+        _______, _______,    QK_BOOT, RGB_TOG, RGB_MOD, _______, KC_F16,  KC_F17,  _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,          _______,
+        _______, _______,    _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_HOME, KC_END,           _______,          _______,
+        _______, _______,    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______,    _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+    ),
 };
diff --git a/keyboards/neson_design/nico/keymaps/via/keymap.c b/keyboards/neson_design/nico/keymaps/via/keymap.c
index 9de688505e45..845d7fdc4fb0 100644
--- a/keyboards/neson_design/nico/keymaps/via/keymap.c
+++ b/keyboards/neson_design/nico/keymaps/via/keymap.c
@@ -18,17 +18,19 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = 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_DEL, KC_BSPC, 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_HOME,
-      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_END,
-      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,   MO(1),
-      KC_F9,KC_F10,     KC_LCTL,  KC_LGUI,  KC_LALT,                        KC_SPC,                  KC_RALT,KC_RGUI,                KC_LEFT,KC_DOWN, KC_RIGHT),
+    [0] = LAYOUT_65_xt_ansi_blocker_split_bs(
+        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_DEL,  KC_BSPC, 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_HOME,
+        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_END,
+        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,   MO(1),
+        KC_F9,   KC_F10,     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-    [1] = LAYOUT(
-      _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-      _______, _______, QK_BOOT,        RGB_TOG,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-      _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,
-      _______, _______, _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,
-      _______, _______, _______,_______,_______,                        _______,                        _______,_______,        _______,_______,_______)
+    [1] = LAYOUT_65_xt_ansi_blocker_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_PSCR, _______,
+        _______, _______,    QK_BOOT, RGB_TOG, RGB_MOD, _______, KC_F16,  KC_F17,  _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,          _______,
+        _______, _______,    _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_HOME, KC_END,           _______,          _______,
+        _______, _______,    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______,    _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+    ),
 };
diff --git a/keyboards/neson_design/nico/matrix_diagram.md b/keyboards/neson_design/nico/matrix_diagram.md
new file mode 100644
index 000000000000..b761512be737
--- /dev/null
+++ b/keyboards/neson_design/nico/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Neson Design Nico
+
+```
+                                                              ┌───────┐
+                                                 2u Backspace │0E     │
+                                                              └───────┘
+┌───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│0F │0G │ │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
+├───┼───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+│1F │1G │ │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │
+├───┼───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+│2F │2G │ │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │
+├───┼───┤ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+│3F │3G │ │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
+├───┼───┤ ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+│4F │4G │ │40  │41  │42  │48                      │49  │4A  │ │4B │4C │4D │
+└───┴───┘ └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+          ┌─────┬───┬─────┬───────────────────────────┬─────┐
+          │40   │41 │42   │48                         │4A   │ Blocker Tsangan
+          └─────┴───┴─────┴───────────────────────────┴─────┘
+```
diff --git a/keyboards/newgame40/config.h b/keyboards/newgame40/config.h
index 18c605eb622f..13a391974596 100644
--- a/keyboards/newgame40/config.h
+++ b/keyboards/newgame40/config.h
@@ -17,39 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* ws2812 RGB LED */
-#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 25    // Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-
-#ifndef IOS_DEVICE_ENABLE
-  #if RGBLED_NUM <= 6
-    #define RGBLIGHT_LIMIT_VAL 255
-  #else
-    #define RGBLIGHT_LIMIT_VAL 130
-  #endif
-  #define RGBLIGHT_VAL_STEP 17
-#else
-  #if RGBLED_NUM <= 6
-    #define RGBLIGHT_LIMIT_VAL 90
-  #else
-    #define RGBLIGHT_LIMIT_VAL 45
-  #endif
-  #define RGBLIGHT_VAL_STEP 4
-#endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
   #define USB_MAX_POWER_CONSUMPTION 400
 #else
@@ -57,5 +24,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   // iOS device need lessthan 100
   #define USB_MAX_POWER_CONSUMPTION 100
 #endif
-
-#define TAPPING_TERM 200
diff --git a/keyboards/newgame40/info.json b/keyboards/newgame40/info.json
index 2cbb4c117d14..809d685ed1f5 100644
--- a/keyboards/newgame40/info.json
+++ b/keyboards/newgame40/info.json
@@ -13,6 +13,22 @@
     "rows": ["F7", "B1", "B3", "B2"]
   },
   "diode_direction": "COL2ROW",
+  "rgblight": {
+    "hue_steps": 10,
+    "led_count": 25,
+    "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": "F6"
   },
diff --git a/keyboards/newgame40/post_config.h b/keyboards/newgame40/post_config.h
new file mode 100644
index 000000000000..247178beec9e
--- /dev/null
+++ b/keyboards/newgame40/post_config.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#ifndef IOS_DEVICE_ENABLE
+#    if RGBLED_NUM <= 6
+#        define RGBLIGHT_LIMIT_VAL 255
+#    else
+#        define RGBLIGHT_LIMIT_VAL 130
+#    endif
+#    define RGBLIGHT_VAL_STEP 17
+#else
+#    if RGBLED_NUM <= 6
+#        define RGBLIGHT_LIMIT_VAL 90
+#    else
+#        define RGBLIGHT_LIMIT_VAL 45
+#    endif
+#    define RGBLIGHT_VAL_STEP 4
+#endif
diff --git a/keyboards/nibiria/stream15/rules.mk b/keyboards/nibiria/stream15/rules.mk
index 9e42693cb694..c3b8e77d77a9 100644
--- a/keyboards/nibiria/stream15/rules.mk
+++ b/keyboards/nibiria/stream15/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/nightly_boards/adellein/adellein.c b/keyboards/nightly_boards/adellein/adellein.c
deleted file mode 100644
index 8ae826d49ec0..000000000000
--- a/keyboards/nightly_boards/adellein/adellein.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "adellein.h"
-
-void matrix_scan_kb(void) {
-    encoder_action_unregister();
-    matrix_scan_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-//    if (!encoder_update_user(index, clockwise)) return false;
-    encoder_action_register(index, clockwise);
-    return true;
-};
diff --git a/keyboards/nightly_boards/adellein/adellein.h b/keyboards/nightly_boards/adellein/adellein.h
deleted file mode 100644
index 33cf8e0b6893..000000000000
--- a/keyboards/nightly_boards/adellein/adellein.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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"
-#include "encoder_action.h"
diff --git a/keyboards/nightly_boards/adellein/config.h b/keyboards/nightly_boards/adellein/config.h
index d1703c1c80fd..549b82fe0d88 100644
--- a/keyboards/nightly_boards/adellein/config.h
+++ b/keyboards/nightly_boards/adellein/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 14
-#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
-
-/* Encoders */
-#define ENCODERS_CW_KEY  { { 3, 3 } }
-#define ENCODERS_CCW_KEY { { 1, 3 } }
-
 /* 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/nightly_boards/adellein/encoder_action.c b/keyboards/nightly_boards/adellein/encoder_action.c
deleted file mode 100644
index 522fb58d5a07..000000000000
--- a/keyboards/nightly_boards/adellein/encoder_action.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can 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 "encoder_action.h"
-
-static uint8_t encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
diff --git a/keyboards/nightly_boards/adellein/encoder_action.h b/keyboards/nightly_boards/adellein/encoder_action.h
deleted file mode 100644
index fb226326324d..000000000000
--- a/keyboards/nightly_boards/adellein/encoder_action.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can 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 "quantum.h"
-
-void encoder_action_unregister(void);
-
-void encoder_action_register(uint8_t index, bool clockwise);
\ No newline at end of file
diff --git a/keyboards/nightly_boards/adellein/info.json b/keyboards/nightly_boards/adellein/info.json
index 81e21e937712..192f8005c3c1 100644
--- a/keyboards/nightly_boards/adellein/info.json
+++ b/keyboards/nightly_boards/adellein/info.json
@@ -18,6 +18,21 @@
             {"pin_a": "C7", "pin_b": "C6"}
         ]
     },
+    "rgblight": {
+        "led_count": 14,
+        "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": "D5"
     },
@@ -80,66 +95,6 @@
                 {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25},
                 {"matrix": [3, 12], "x": 14.75, "y": 3, "w": 1.25}
             ]
-        },
-        "LAYOUT_40ergo_split_ent_encoder": {
-            "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": 5.5, "y": 0},
-
-                {"matrix": [0, 6], "x": 8.25, "y": 0},
-                {"matrix": [0, 7], "x": 9.25, "y": 0},
-                {"matrix": [0, 8], "x": 10.25, "y": 0},
-                {"matrix": [0, 9], "x": 11.25, "y": 0},
-                {"matrix": [0, 10], "x": 12.25, "y": 0},
-                {"matrix": [0, 11], "x": 13.25, "y": 0},
-                {"matrix": [0, 12], "x": 14.25, "y": 0, "w": 1.5},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1, "w": 1.25},
-                {"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": 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": [1, 10], "x": 12.75, "y": 1},
-                {"matrix": [1, 11], "x": 13.75, "y": 1},
-                {"matrix": [1, 12], "x": 14.75, "y": 1, "w": 1.25},
-
-                {"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": 8.5, "y": 2},
-                {"matrix": [2, 7], "x": 9.5, "y": 2},
-                {"matrix": [2, 8], "x": 10.5, "y": 2},
-                {"matrix": [2, 9], "x": 11.5, "y": 2},
-                {"matrix": [2, 10], "x": 12.5, "y": 2},
-                {"matrix": [2, 11], "x": 13.5, "y": 2},
-                {"matrix": [2, 12], "x": 14.5, "y": 2, "w": 1.75},
-
-                {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
-                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-
-                {"matrix": [3, 7], "x": 8, "y": 3, "w": 2.75},
-                {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25},
-                {"matrix": [3, 12], "x": 14.75, "y": 3, "w": 1.25},
-
-                {"matrix": [3, 1], "x": 5.75, "y": 4},
-                {"matrix": [3, 3], "x": 6.75, "y": 4}
-            ]
         }
     }
 }
diff --git a/keyboards/nightly_boards/adellein/keymaps/via/keymap.c b/keyboards/nightly_boards/adellein/keymaps/via/keymap.c
index c4c0adffe351..acfac215a4a4 100644
--- a/keyboards/nightly_boards/adellein/keymaps/via/keymap.c
+++ b/keyboards/nightly_boards/adellein/keymaps/via/keymap.c
@@ -15,35 +15,39 @@
  */
 #include QMK_KEYBOARD_H
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_40ergo_split_ent_encoder(
+    [0] = LAYOUT_40ergo_split_ent(
          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_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_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_SPC,           KC_RALT,                            KC_RCTL,
-		                                           KC_VOLD, KC_VOLU
+         KC_LCTL,            KC_LALT, KC_SPC,           KC_SPC,                  KC_SPC,           KC_RALT,                            KC_RCTL
     ),
-    [1] = LAYOUT_40ergo_split_ent_encoder(
+    [1] = LAYOUT_40ergo_split_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_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
          KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-         KC_TRNS,            KC_TRNS, KC_TRNS,          KC_TRNS,                 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_40ergo_split_ent_encoder(
+    [2] = LAYOUT_40ergo_split_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_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
          KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-         KC_TRNS,            KC_TRNS, KC_TRNS,          KC_TRNS,                 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_40ergo_split_ent_encoder(
+    [3] = LAYOUT_40ergo_split_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_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
          KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-         KC_TRNS,            KC_TRNS, KC_TRNS,          KC_TRNS,                 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(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/nightly_boards/adellein/keymaps/via/rules.mk b/keyboards/nightly_boards/adellein/keymaps/via/rules.mk
index 43061db1dd46..1189f4ad1927 100644
--- a/keyboards/nightly_boards/adellein/keymaps/via/rules.mk
+++ b/keyboards/nightly_boards/adellein/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
+LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nightly_boards/adellein/rules.mk b/keyboards/nightly_boards/adellein/rules.mk
index 8daf6a353a67..aa619121b980 100644
--- a/keyboards/nightly_boards/adellein/rules.mk
+++ b/keyboards/nightly_boards/adellein/rules.mk
@@ -11,6 +11,3 @@ BACKLIGHT_ENABLE = no         # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes         # Enable keyboard RGB underglow
 ENCODER_ENABLE = yes          # Enable Rotary Encoders
 LTO_ENABLE = yes
-
-# Added encoder Action
-SRC += encoder_action.c
\ No newline at end of file
diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h
index 658863389059..3223a5a19be1 100644
--- a/keyboards/nightly_boards/alter/rev1/config.h
+++ b/keyboards/nightly_boards/alter/rev1/config.h
@@ -14,22 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 18
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
-
 /* 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/nightly_boards/alter/rev1/info.json b/keyboards/nightly_boards/alter/rev1/info.json
index e0ea3294e9b6..48e8da0c9ae0 100644
--- a/keyboards/nightly_boards/alter/rev1/info.json
+++ b/keyboards/nightly_boards/alter/rev1/info.json
@@ -18,6 +18,24 @@
         "num_lock": "D7",
         "scroll_lock": "B4"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "F1"
     },
diff --git a/keyboards/nightly_boards/conde60/config.h b/keyboards/nightly_boards/conde60/config.h
index 541d2e289e3d..3d0b7f438c86 100644
--- a/keyboards/nightly_boards/conde60/config.h
+++ b/keyboards/nightly_boards/conde60/config.h
@@ -17,18 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#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
-
 /* 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/nightly_boards/conde60/info.json b/keyboards/nightly_boards/conde60/info.json
index e318151c8c87..acc375ea3587 100644
--- a/keyboards/nightly_boards/conde60/info.json
+++ b/keyboards/nightly_boards/conde60/info.json
@@ -13,6 +13,21 @@
         "rows": ["B1", "B2", "F0", "F1", "F4"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 12,
+        "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": "D5"
     },
diff --git a/keyboards/nightly_boards/n2/config.h b/keyboards/nightly_boards/n2/config.h
index 0fec21c752d1..3223a5a19be1 100644
--- a/keyboards/nightly_boards/n2/config.h
+++ b/keyboards/nightly_boards/n2/config.h
@@ -14,22 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 2
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
-
 /* 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/nightly_boards/n2/info.json b/keyboards/nightly_boards/n2/info.json
index f925eba5774d..2a068e1a2e96 100644
--- a/keyboards/nightly_boards/n2/info.json
+++ b/keyboards/nightly_boards/n2/info.json
@@ -13,6 +13,24 @@
         "rows": ["F1", "C7"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 2,
+        "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": "D4"
     },
diff --git a/keyboards/nightly_boards/n40_o/config.h b/keyboards/nightly_boards/n40_o/config.h
index 474742b6af10..27a82c8acdac 100644
--- a/keyboards/nightly_boards/n40_o/config.h
+++ b/keyboards/nightly_boards/n40_o/config.h
@@ -17,26 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#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
-
-/* Encoders */
-#define ENCODERS_CW_KEY  { { 2, 4 },{ 4, 4 },{ 6, 4 } }
-#define ENCODERS_CCW_KEY { { 1, 4 },{ 3, 4 },{ 5, 4 } }
-
-/* Audio */
-
-#define AUDIO_PIN B7
-
 #define AUDIO_CLICKY
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/nightly_boards/n40_o/encoder_action.c b/keyboards/nightly_boards/n40_o/encoder_action.c
deleted file mode 100644
index 522fb58d5a07..000000000000
--- a/keyboards/nightly_boards/n40_o/encoder_action.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can 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 "encoder_action.h"
-
-static uint8_t encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
diff --git a/keyboards/nightly_boards/n40_o/encoder_action.h b/keyboards/nightly_boards/n40_o/encoder_action.h
deleted file mode 100644
index fb226326324d..000000000000
--- a/keyboards/nightly_boards/n40_o/encoder_action.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can 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 "quantum.h"
-
-void encoder_action_unregister(void);
-
-void encoder_action_register(uint8_t index, bool clockwise);
\ No newline at end of file
diff --git a/keyboards/nightly_boards/n40_o/info.json b/keyboards/nightly_boards/n40_o/info.json
index ec403fb64705..1f341441a4e2 100644
--- a/keyboards/nightly_boards/n40_o/info.json
+++ b/keyboards/nightly_boards/n40_o/info.json
@@ -3,6 +3,16 @@
     "manufacturer": "Neil Brian Ramirez",
     "url": "",
     "maintainer": "Neil Brian Ramirez",
+    "features": {
+      "bootmagic": true,
+      "mousekey": true,
+      "extrakey": true,
+      "rgblight": true,
+      "encoder": true
+    },
+    "build": {
+      "lto": true
+    },
     "usb": {
         "vid": "0xD812",
         "pid": "0x0009",
@@ -10,7 +20,7 @@
     },
     "matrix_pins": {
         "cols": ["B5", "C7", "D6", "D4", "B3", "B2", "B1", "B0", "D5", "D3", "D2", "D1", "D0"],
-        "rows": ["E6", "F0", "F1", "D7", null]
+        "rows": ["E6", "F0", "F1", "D7"]
     },
     "diode_direction": "COL2ROW",
     "encoder": {
@@ -20,77 +30,30 @@
             {"pin_a": "B6", "pin_b": "C6"}
         ]
     },
+    "rgblight": {
+        "led_count": 12,
+        "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": "B4"
     },
+    "audio": {
+      "pins": ["B7"]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
-        "LAYOUT_ortho_4x13_encoders": {
-            "layout": [
-                {"matrix": [4, 1], "x": 0, "y": 0},
-                {"matrix": [4, 2], "x": 1, "y": 0},
-                {"matrix": [0, 0], "x": 2.25, "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": 9.5, "y": 0},
-                {"matrix": [0, 8], "x": 10.5, "y": 0},
-                {"matrix": [0, 9], "x": 11.5, "y": 0},
-                {"matrix": [0, 10], "x": 12.5, "y": 0},
-                {"matrix": [0, 11], "x": 13.5, "y": 0},
-                {"matrix": [0, 12], "x": 14.5, "y": 0},
-
-                {"matrix": [4, 3], "x": 0, "y": 1},
-                {"matrix": [4, 4], "x": 1, "y": 1},
-                {"matrix": [1, 0], "x": 2.25, "y": 1},
-                {"matrix": [1, 1], "x": 3.5, "y": 1},
-                {"matrix": [1, 2], "x": 4.5, "y": 1},
-                {"matrix": [1, 3], "x": 5.5, "y": 1},
-                {"matrix": [1, 4], "x": 6.5, "y": 1},
-                {"matrix": [1, 5], "x": 7.5, "y": 1},
-                {"matrix": [1, 6], "x": 8.5, "y": 1},
-                {"matrix": [1, 7], "x": 9.5, "y": 1},
-                {"matrix": [1, 8], "x": 10.5, "y": 1},
-                {"matrix": [1, 9], "x": 11.5, "y": 1},
-                {"matrix": [1, 10], "x": 12.5, "y": 1},
-                {"matrix": [1, 11], "x": 13.5, "y": 1},
-                {"matrix": [1, 12], "x": 14.5, "y": 1},
-
-                {"matrix": [4, 5], "x": 0, "y": 2},
-                {"matrix": [4, 6], "x": 1, "y": 2},
-                {"matrix": [2, 0], "x": 2.25, "y": 2},
-                {"matrix": [2, 1], "x": 3.5, "y": 2},
-                {"matrix": [2, 2], "x": 4.5, "y": 2},
-                {"matrix": [2, 3], "x": 5.5, "y": 2},
-                {"matrix": [2, 4], "x": 6.5, "y": 2},
-                {"matrix": [2, 5], "x": 7.5, "y": 2},
-                {"matrix": [2, 6], "x": 8.5, "y": 2},
-                {"matrix": [2, 7], "x": 9.5, "y": 2},
-                {"matrix": [2, 8], "x": 10.5, "y": 2},
-                {"matrix": [2, 9], "x": 11.5, "y": 2},
-                {"matrix": [2, 10], "x": 12.5, "y": 2},
-                {"matrix": [2, 11], "x": 13.5, "y": 2},
-                {"matrix": [2, 12], "x": 14.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 2.25, "y": 3},
-                {"matrix": [3, 1], "x": 3.5, "y": 3},
-                {"matrix": [3, 2], "x": 4.5, "y": 3},
-                {"matrix": [3, 3], "x": 5.5, "y": 3},
-                {"matrix": [3, 4], "x": 6.5, "y": 3},
-                {"matrix": [3, 5], "x": 7.5, "y": 3},
-                {"matrix": [3, 6], "x": 8.5, "y": 3},
-                {"matrix": [3, 7], "x": 9.5, "y": 3},
-                {"matrix": [3, 8], "x": 10.5, "y": 3},
-                {"matrix": [3, 9], "x": 11.5, "y": 3},
-                {"matrix": [3, 10], "x": 12.5, "y": 3},
-                {"matrix": [3, 11], "x": 13.5, "y": 3},
-                {"matrix": [3, 12], "x": 14.5, "y": 3}
-            ]
-        },
         "LAYOUT_ortho_4x13": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/nightly_boards/n40_o/keymaps/default/keymap.c b/keyboards/nightly_boards/n40_o/keymaps/default/keymap.c
index 658b43689a22..bd57f61055cb 100644
--- a/keyboards/nightly_boards/n40_o/keymaps/default/keymap.c
+++ b/keyboards/nightly_boards/n40_o/keymaps/default/keymap.c
@@ -15,12 +15,11 @@
  */
 #include QMK_KEYBOARD_H
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_ortho_4x13(
 		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_BSPC,
 		KC_SPC, 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_SPC, 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_SPC, KC_SPC,  KC_LCTL, KC_LALT, KC_LGUI, MO(1),   KC_SPC,  KC_SPC,  MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT		
-    ),
+		KC_SPC, KC_SPC,  KC_LCTL, KC_LALT, KC_LGUI, KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    )
 };
diff --git a/keyboards/nightly_boards/n40_o/keymaps/ortho_4x13_1x2u_c/keymap.c b/keyboards/nightly_boards/n40_o/keymaps/ortho_4x13_1x2u_c/keymap.c
index 55f22cdc498d..cda2bb60508c 100644
--- a/keyboards/nightly_boards/n40_o/keymaps/ortho_4x13_1x2u_c/keymap.c
+++ b/keyboards/nightly_boards/n40_o/keymaps/ortho_4x13_1x2u_c/keymap.c
@@ -15,12 +15,11 @@
  */
 #include QMK_KEYBOARD_H
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_ortho_4x13_1x2u_c(
 		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_BSPC,
 		KC_SPC, 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_SPC, 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_SPC, KC_SPC,  KC_LCTL, KC_LALT, KC_LGUI, MO(1),   	KC_SPC,        MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
+		KC_SPC, KC_SPC,  KC_LCTL, KC_LALT, KC_LGUI,     KC_SPC,  KC_SPC,  KC_SPC,       KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+  )
 };
diff --git a/keyboards/nightly_boards/n40_o/keymaps/ortho_4x13_encoders/keymap.c b/keyboards/nightly_boards/n40_o/keymaps/ortho_4x13_encoders/keymap.c
deleted file mode 100644
index f6e0dc23ee26..000000000000
--- a/keyboards/nightly_boards/n40_o/keymaps/ortho_4x13_encoders/keymap.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along 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_4x13_encoders(
-	    KC_SPC, KC_SPC, 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_BSPC,
-		KC_SPC, KC_SPC, KC_SPC, 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_SPC, KC_SPC, 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_ENT,
-						KC_SPC, KC_SPC,  KC_LCTL, KC_LALT, KC_LGUI, MO(1),   KC_SPC,  KC_SPC,  MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-};
diff --git a/keyboards/nightly_boards/n40_o/keymaps/via/config.h b/keyboards/nightly_boards/n40_o/keymaps/via/config.h
deleted file mode 100644
index 1208e2769f04..000000000000
--- a/keyboards/nightly_boards/n40_o/keymaps/via/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define LAYER_STATE_8BIT 
\ No newline at end of file
diff --git a/keyboards/nightly_boards/n40_o/keymaps/via/keymap.c b/keyboards/nightly_boards/n40_o/keymaps/via/keymap.c
index 830d8d87826b..e9ddb7140176 100644
--- a/keyboards/nightly_boards/n40_o/keymaps/via/keymap.c
+++ b/keyboards/nightly_boards/n40_o/keymaps/via/keymap.c
@@ -15,34 +15,24 @@
  */
 #include QMK_KEYBOARD_H
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_ortho_4x13_encoders(
-	    KC_SPC, KC_SPC, 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_BSPC,
-		KC_SPC, KC_SPC, KC_SPC, 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_SPC, KC_SPC, 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_ENT,
-						KC_SPC, KC_SPC,  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_4x13_encoders(
-	    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-						  KC_TRNS, 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_4x13_encoders(
-	    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-						  KC_TRNS, 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_4x13_encoders(
-	    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-						  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-		
-    ),
+	[0] = LAYOUT_ortho_4x13(
+	  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_BSPC,
+		KC_SPC, 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_SPC, 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_SPC, KC_SPC,  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_4x13(
+	  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, 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_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
+    [1] =  { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
 };
+#endif
diff --git a/keyboards/nightly_boards/n40_o/keymaps/via/rules.mk b/keyboards/nightly_boards/n40_o/keymaps/via/rules.mk
index 43061db1dd46..f1adcab005e8 100644
--- a/keyboards/nightly_boards/n40_o/keymaps/via/rules.mk
+++ b/keyboards/nightly_boards/n40_o/keymaps/via/rules.mk
@@ -1,2 +1,2 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nightly_boards/n40_o/n40_o.c b/keyboards/nightly_boards/n40_o/n40_o.c
deleted file mode 100644
index 643803f90340..000000000000
--- a/keyboards/nightly_boards/n40_o/n40_o.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You 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 "encoder_action.h"
-
-void matrix_scan_kb(void) {
-    encoder_action_unregister();
-    matrix_scan_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-//    if (!encoder_update_user(index, clockwise)) return false;
-    encoder_action_register(index, clockwise);
-    return true;
-};
diff --git a/keyboards/nightly_boards/n40_o/rules.mk b/keyboards/nightly_boards/n40_o/rules.mk
index f1189a87d2dd..6e7633bfe015 100644
--- a/keyboards/nightly_boards/n40_o/rules.mk
+++ b/keyboards/nightly_boards/n40_o/rules.mk
@@ -1,17 +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 = yes            # Audio output
-ENCODER_ENABLE = yes          # Enable Rotary Encoders
-LTO_ENABLE = yes
-
-# Added encoder Action
-SRC += encoder_action.c
\ No newline at end of file
+# This file intentionally left blank
diff --git a/keyboards/nightly_boards/n60_s/config.h b/keyboards/nightly_boards/n60_s/config.h
index 75f803f54879..519ac7b82a9d 100644
--- a/keyboards/nightly_boards/n60_s/config.h
+++ b/keyboards/nightly_boards/n60_s/config.h
@@ -17,32 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Encoders */
-#define ENCODERS_CW_KEY  { { 1, 5 } }
-#define ENCODERS_CCW_KEY { { 0, 5 } }
-
 /* Audio */
 
 #define B7_AUDIO
 #define AUDIO_CLICKY
 
-/* Underglow */
-
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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_ALTERNATING
-
 /* 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/nightly_boards/n60_s/encoder_action.c b/keyboards/nightly_boards/n60_s/encoder_action.c
deleted file mode 100644
index 522fb58d5a07..000000000000
--- a/keyboards/nightly_boards/n60_s/encoder_action.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can 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 "encoder_action.h"
-
-static uint8_t encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
diff --git a/keyboards/nightly_boards/n60_s/encoder_action.h b/keyboards/nightly_boards/n60_s/encoder_action.h
deleted file mode 100644
index fb226326324d..000000000000
--- a/keyboards/nightly_boards/n60_s/encoder_action.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can 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 "quantum.h"
-
-void encoder_action_unregister(void);
-
-void encoder_action_register(uint8_t index, bool clockwise);
\ No newline at end of file
diff --git a/keyboards/nightly_boards/n60_s/info.json b/keyboards/nightly_boards/n60_s/info.json
index 2e491343005b..46da18996b48 100644
--- a/keyboards/nightly_boards/n60_s/info.json
+++ b/keyboards/nightly_boards/n60_s/info.json
@@ -10,7 +10,7 @@
     },
     "matrix_pins": {
         "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "B5", "B6", "C6", "C7"],
-        "rows": ["B4", "D7", "D6", "D0", "E6", null]
+        "rows": ["B4", "D7", "D6", "D0", "E6"]
     },
     "diode_direction": "COL2ROW",
     "encoder": {
@@ -18,6 +18,22 @@
             {"pin_a": "D3", "pin_b": "D5"}
         ]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true
+        }
+    },
     "ws2812": {
         "pin": "D1"
     },
@@ -95,80 +111,6 @@
                 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
-        "LAYOUT_60_ansi_split_bs_rshift_encoder": {
-            "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, 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, 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": [5, 0], "x": 15.25, "y": 3},
-                {"matrix": [5, 1], "x": 16.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "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": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
         "LAYOUT_60_ansi_split_bs_rshift_tsangan": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
@@ -230,79 +172,6 @@
                 {"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": 1.5, "y": 4},
-                {"matrix": [4, 3], "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": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift_tsangan_encoder": {
-            "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, 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, 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": [5, 0], "x": 15.25, "y": 3},
-                {"matrix": [5, 1], "x": 16.25, "y": 3},
-
                 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
                 {"matrix": [4, 2], "x": 1.5, "y": 4},
                 {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
diff --git a/keyboards/nightly_boards/n60_s/keymaps/ansi_encoder/keymap.c b/keyboards/nightly_boards/n60_s/keymaps/ansi_encoder/keymap.c
deleted file mode 100644
index 9316b20c75f3..000000000000
--- a/keyboards/nightly_boards/n60_s/keymaps/ansi_encoder/keymap.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [0] = LAYOUT_60_ansi_split_bs_rshift_encoder(
-        KC_ESC,  KC_1,    KC_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_VOLD, KC_VOLU,
-        KC_LCTL, MO(1),   KC_LALT,                   KC_SPC,                                      KC_RALT, KC_APP,  KC_RGUI, KC_RCTL
-    ),
-    [1] = LAYOUT_60_ansi_split_bs_rshift_encoder(
-        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_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_PGUP,          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,KC_TRNS, KC_TRNS, KC_TRNS
-	)
-};
diff --git a/keyboards/nightly_boards/n60_s/keymaps/tsangan_encoder/keymap.c b/keyboards/nightly_boards/n60_s/keymaps/tsangan_encoder/keymap.c
deleted file mode 100644
index cc25ac42e73f..000000000000
--- a/keyboards/nightly_boards/n60_s/keymaps/tsangan_encoder/keymap.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [0] = LAYOUT_60_ansi_split_bs_rshift_tsangan_encoder(
-        KC_ESC,  KC_1,    KC_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_VOLD, KC_VOLU,
-        KC_LCTL, MO(1),   KC_LALT,                   KC_SPC,                                               KC_RALT,  KC_RGUI, KC_RCTL
-    ),
-    [1] = LAYOUT_60_ansi_split_bs_rshift_tsangan_encoder(
-        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_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_PGUP,          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, KC_TRNS, KC_TRNS
-	)
-};
diff --git a/keyboards/nightly_boards/n60_s/keymaps/via/keymap.c b/keyboards/nightly_boards/n60_s/keymaps/via/keymap.c
index d76c7347826e..04078c784efa 100644
--- a/keyboards/nightly_boards/n60_s/keymaps/via/keymap.c
+++ b/keyboards/nightly_boards/n60_s/keymaps/via/keymap.c
@@ -17,32 +17,41 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [0] = LAYOUT_60_ansi_split_bs_rshift_encoder(
+    [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_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_LSFT, KC_LSFT, KC_VOLD, 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_LSFT, KC_LSFT,
         KC_LCTL, MO(1),   KC_LALT,                   KC_SPC,                                      KC_LALT, KC_APP,  KC_RGUI, KC_LCTL
     ),
-    [1] = LAYOUT_60_ansi_split_bs_rshift_encoder(
+    [1] = LAYOUT_60_ansi_split_bs_rshift(
         QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,  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, 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_PGUP,          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, 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, KC_TRNS
-	), 
-    [2] = LAYOUT_60_ansi_split_bs_rshift_encoder(
+	),
+    [2] = LAYOUT_60_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,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                      KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS
 	),
-    [3] = LAYOUT_60_ansi_split_bs_rshift_encoder(
+    [3] = LAYOUT_60_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,
         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(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/nightly_boards/n60_s/keymaps/via/rules.mk b/keyboards/nightly_boards/n60_s/keymaps/via/rules.mk
index 36b7ba9cbc98..1189f4ad1927 100644
--- a/keyboards/nightly_boards/n60_s/keymaps/via/rules.mk
+++ b/keyboards/nightly_boards/n60_s/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nightly_boards/n60_s/n60_s.c b/keyboards/nightly_boards/n60_s/n60_s.c
deleted file mode 100644
index dd0d23425bfc..000000000000
--- a/keyboards/nightly_boards/n60_s/n60_s.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "n60_s.h"
-
-void matrix_scan_kb(void) {
-    encoder_action_unregister();
-    matrix_scan_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-//    if (!encoder_update_user(index, clockwise)) return false;
-    encoder_action_register(index, clockwise);
-    return true;
-};
diff --git a/keyboards/nightly_boards/n60_s/n60_s.h b/keyboards/nightly_boards/n60_s/n60_s.h
deleted file mode 100644
index 33cf8e0b6893..000000000000
--- a/keyboards/nightly_boards/n60_s/n60_s.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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"
-#include "encoder_action.h"
diff --git a/keyboards/nightly_boards/n60_s/rules.mk b/keyboards/nightly_boards/n60_s/rules.mk
index a37378959e01..f404ad01632c 100644
--- a/keyboards/nightly_boards/n60_s/rules.mk
+++ b/keyboards/nightly_boards/n60_s/rules.mk
@@ -12,6 +12,3 @@ RGBLIGHT_ENABLE = yes         # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes            # Audio output
 ENCODER_ENABLE = yes          # Enable Rotary Encoders
 LTO_ENABLE = yes
-
-# Added encoder Action
-SRC += encoder_action.c
\ No newline at end of file
diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h
index 3ba7c40ea643..04056f787166 100644
--- a/keyboards/nightly_boards/n87/config.h
+++ b/keyboards/nightly_boards/n87/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
-
 #define AUDIO_PIN B7
 
 #define AUDIO_CLICKY
diff --git a/keyboards/nightly_boards/n87/info.json b/keyboards/nightly_boards/n87/info.json
index 1be9d83f1c9c..71f78c1f3ac4 100644
--- a/keyboards/nightly_boards/n87/info.json
+++ b/keyboards/nightly_boards/n87/info.json
@@ -13,6 +13,24 @@
         "rows": ["B0", "B1", "B2", "B3", "F1", "F0", "D7", "B4", "D1", "D2", "D3", "D5"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "D0"
     },
diff --git a/keyboards/nightly_boards/n9/config.h b/keyboards/nightly_boards/n9/config.h
index 30f781e6008b..3223a5a19be1 100644
--- a/keyboards/nightly_boards/n9/config.h
+++ b/keyboards/nightly_boards/n9/config.h
@@ -14,22 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 8
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
-
 /* 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/nightly_boards/n9/info.json b/keyboards/nightly_boards/n9/info.json
index 1dfd4f6fda9b..e3fd75c9609e 100644
--- a/keyboards/nightly_boards/n9/info.json
+++ b/keyboards/nightly_boards/n9/info.json
@@ -13,6 +13,24 @@
         "rows": ["F4", "B1", "B3"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "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": "F5"
     },
diff --git a/keyboards/nightly_boards/octopad/config.h b/keyboards/nightly_boards/octopad/config.h
index 27c3d4bd0240..a0ee1a92af87 100644
--- a/keyboards/nightly_boards/octopad/config.h
+++ b/keyboards/nightly_boards/octopad/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#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
-
-/* Encoders */
-#define ENCODERS_CW_KEY  { { 3, 2 },{ 1, 2 } }
-#define ENCODERS_CCW_KEY { { 2, 2 },{ 0, 2 } }
-
 /* Audio */
 
 #define AUDIO_PIN B5
diff --git a/keyboards/nightly_boards/octopad/encoder_action.c b/keyboards/nightly_boards/octopad/encoder_action.c
deleted file mode 100644
index 522fb58d5a07..000000000000
--- a/keyboards/nightly_boards/octopad/encoder_action.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can 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 "encoder_action.h"
-
-static uint8_t encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
diff --git a/keyboards/nightly_boards/octopad/encoder_action.h b/keyboards/nightly_boards/octopad/encoder_action.h
deleted file mode 100644
index fb226326324d..000000000000
--- a/keyboards/nightly_boards/octopad/encoder_action.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can 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 "quantum.h"
-
-void encoder_action_unregister(void);
-
-void encoder_action_register(uint8_t index, bool clockwise);
\ No newline at end of file
diff --git a/keyboards/nightly_boards/octopad/info.json b/keyboards/nightly_boards/octopad/info.json
index c78a58937d8e..4e7affe4dd41 100644
--- a/keyboards/nightly_boards/octopad/info.json
+++ b/keyboards/nightly_boards/octopad/info.json
@@ -10,7 +10,7 @@
     },
     "matrix_pins": {
         "cols": ["F1", "F0", "D0", "D1", "B1"],
-        "rows": ["B2", "B3", null]
+        "rows": ["B2", "B3"]
     },
     "diode_direction": "COL2ROW",
     "encoder": {
@@ -19,6 +19,21 @@
             {"pin_a": "F4", "pin_b": "F5"}
         ]
     },
+    "rgblight": {
+        "led_count": 8,
+        "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": "F7"
     },
@@ -27,23 +42,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [2, 0], "x": 0, "y": 0},
-                {"matrix": [0, 4], "x": 1, "y": 0},
-                {"matrix": [2, 1], "x": 2, "y": 0},
+                {"matrix": [0, 4], "x": 0, "y": 0},
 
-                {"matrix": [2, 2], "x": 3.5, "y": 0},
-                {"matrix": [1, 4], "x": 4.5, "y": 0},
-                {"matrix": [2, 3], "x": 5.5, "y": 0},
+                {"matrix": [1, 4], "x": 3.5, "y": 0},
 
-                {"matrix": [0, 0], "x": 1.25, "y": 1.25},
-                {"matrix": [0, 1], "x": 2.25, "y": 1.25},
-                {"matrix": [0, 2], "x": 3.25, "y": 1.25},
-                {"matrix": [0, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 0], "x": 0.25, "y": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
 
-                {"matrix": [1, 0], "x": 1.25, "y": 2.25},
-                {"matrix": [1, 1], "x": 2.25, "y": 2.25},
-                {"matrix": [1, 2], "x": 3.25, "y": 2.25},
-                {"matrix": [1, 3], "x": 4.25, "y": 2.25}
+                {"matrix": [1, 0], "x": 0.25, "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}
             ]
         }
     }
diff --git a/keyboards/nightly_boards/octopad/keymaps/default/keymap.c b/keyboards/nightly_boards/octopad/keymaps/default/keymap.c
index 7025c8937566..94d8dc34f439 100644
--- a/keyboards/nightly_boards/octopad/keymaps/default/keymap.c
+++ b/keyboards/nightly_boards/octopad/keymaps/default/keymap.c
@@ -17,16 +17,15 @@
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    /* ENC1_CCW, ENC1_P,  ENC1_CW,   ENC2_CCW, ENC2_P, ENC2_CW,
-		         MACRO1,  MACRO2,    MACRO3,   MACRO4,
-			     MACRO5,  MACRO6,    MACRO7,   MACRO8
-	*/
 	[0] = LAYOUT(
-		KC_VOLD, KC_ESC,   KC_VOLU,  KC_BRID, QK_BOOT,  KC_BRIU,
+                           KC_ESC, QK_BOOT,
 		         KC_Q,     KC_W,     KC_E,     KC_R,
 			     KC_A,     KC_S,     KC_D,     KC_F
-		
-    ),
+    )
 };
 
+#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_BRID, KC_BRIU)  }
+};
+#endif
diff --git a/keyboards/nightly_boards/octopad/keymaps/default/rules.mk b/keyboards/nightly_boards/octopad/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/nightly_boards/octopad/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nightly_boards/octopad/keymaps/via/keymap.c b/keyboards/nightly_boards/octopad/keymaps/via/keymap.c
index 44c2d63cc75d..2f831466fcd1 100644
--- a/keyboards/nightly_boards/octopad/keymaps/via/keymap.c
+++ b/keyboards/nightly_boards/octopad/keymaps/via/keymap.c
@@ -17,57 +17,21 @@
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    /* ENC1_CCW, ENC1_P,  ENC1_CW,   ENC2_CCW, ENC2_P, ENC2_CW,
-		         MACRO1,  MACRO2,    MACRO3,   MACRO4,
-			     MACRO5,  MACRO6,    MACRO7,   MACRO8
-	*/
 	[0] = LAYOUT(
-		KC_VOLD, KC_ESC,   KC_VOLU,  KC_BRID, QK_BOOT,  KC_BRIU,
+                           KC_ESC, QK_BOOT,
 		         KC_Q,     KC_W,     KC_E,     KC_R,
 			     KC_A,     KC_S,     KC_D,     KC_F
-		
-    ),
-	[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
-		
-    ),
-	[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
-		
-    ),
-	[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
-		
-    ),
-	[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
-		
-    ),
-	[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
-		
-    ),
-	[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,  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,  KC_TRNS, KC_TRNS
-		
     ),
+	[1 ... 7] = 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(KC_BRID, KC_BRIU)  },
+    [1 ... 7] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  }
 };
+#endif
diff --git a/keyboards/nightly_boards/octopad/keymaps/via/rules.mk b/keyboards/nightly_boards/octopad/keymaps/via/rules.mk
index 43061db1dd46..1189f4ad1927 100644
--- a/keyboards/nightly_boards/octopad/keymaps/via/rules.mk
+++ b/keyboards/nightly_boards/octopad/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
+LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nightly_boards/octopad/octopad.c b/keyboards/nightly_boards/octopad/octopad.c
deleted file mode 100644
index e05782677e6c..000000000000
--- a/keyboards/nightly_boards/octopad/octopad.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "octopad.h"
-
-void matrix_scan_kb(void) {
-    encoder_action_unregister();
-    matrix_scan_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-//    if (!encoder_update_user(index, clockwise)) return false;
-    encoder_action_register(index, clockwise);
-    return true;
-};
diff --git a/keyboards/nightly_boards/octopad/octopad.h b/keyboards/nightly_boards/octopad/octopad.h
deleted file mode 100644
index 33cf8e0b6893..000000000000
--- a/keyboards/nightly_boards/octopad/octopad.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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"
-#include "encoder_action.h"
diff --git a/keyboards/nightly_boards/octopad/rules.mk b/keyboards/nightly_boards/octopad/rules.mk
index d36fbdc86005..660f93449977 100644
--- a/keyboards/nightly_boards/octopad/rules.mk
+++ b/keyboards/nightly_boards/octopad/rules.mk
@@ -12,6 +12,3 @@ BACKLIGHT_ENABLE = no         # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes         # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes             # Audio output
 ENCODER_ENABLE = yes          # Enable Rotary Encoders
-
-# Added encoder Action
-SRC +=  encoder_action.c
diff --git a/keyboards/nightly_boards/octopadplus/config.h b/keyboards/nightly_boards/octopadplus/config.h
index 7547d5a97bb3..3d0b7f438c86 100644
--- a/keyboards/nightly_boards/octopadplus/config.h
+++ b/keyboards/nightly_boards/octopadplus/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
 /* 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/nightly_boards/octopadplus/info.json b/keyboards/nightly_boards/octopadplus/info.json
index 533cefc3c1be..7a27cef0208f 100644
--- a/keyboards/nightly_boards/octopadplus/info.json
+++ b/keyboards/nightly_boards/octopadplus/info.json
@@ -19,6 +19,9 @@
             {"pin_a": "D1", "pin_b": "D0", "resolution": 5}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
         "rgblight": {
diff --git a/keyboards/ning/tiny_board/tb16_rgb/info.json b/keyboards/ning/tiny_board/tb16_rgb/info.json
index 3a6cfe3f77a2..337c61fabe9e 100644
--- a/keyboards/ning/tiny_board/tb16_rgb/info.json
+++ b/keyboards/ning/tiny_board/tb16_rgb/info.json
@@ -13,7 +13,7 @@
         "rgb_matrix": true
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B6", "B1", "B3", "B2"],
diff --git a/keyboards/nix_studio/lilith/info.json b/keyboards/nix_studio/lilith/info.json
index e648cf98fbed..7fe03ef80631 100644
--- a/keyboards/nix_studio/lilith/info.json
+++ b/keyboards/nix_studio/lilith/info.json
@@ -19,370 +19,702 @@
     "processor": "STM32F411",
     "url": "https://www.antipode.no/",
     "usb": {
-        "device_version": "1.0.0",
+        "vid": "0x6E78",
         "pid": "0x4C49",
-        "vid": "0x6E78"
+        "device_version": "1.0.0"
     },
-    "community_layouts": [ "65_ansi_blocker", "65_iso_blocker", "65_ansi_blocker_tsangan_split_bs", "65_iso_blocker_tsangan" ],
+    "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": [
-                { "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], "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, 15], "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], "x": 12.75, "y": 2 },
-                { "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2 },
-                { "matrix": [2, 15], "x": 15, "y": 2 },
-                { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-                { "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], "w": 1.75, "x": 12.25, "y": 3 },
-                { "matrix": [3, 13], "x": 14, "y": 3 },
-                { "matrix": [3, 15], "x": 15, "y": 3 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
-                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
-                { "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, 15], "x": 15, "y": 4 }
+                {"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, 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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 15], "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, 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, 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, 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], "w": 2, "x": 13, "y": 0 },
-                { "matrix": [0, 15], "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, 15], "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, 13], "w": 2.25, "x": 12.75, "y": 2 },
-                { "matrix": [2, 15], "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, 15], "x": 15, "y": 3 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
-                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
-                { "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, 15], "x": 15, "y": 4 }
+                {"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, 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, 13], "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, 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, 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, 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, 15], "x": 15, "y": 4}
             ]
-         },
-         "LAYOUT_65_iso_blocker": {
+        },
+        "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], "w": 2, "x": 13, "y": 0 },
-                { "matrix": [0, 15], "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, 15], "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], "x": 12.75, "y": 2 },
-                { "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
-                { "matrix": [2, 15], "x": 15, "y": 2 },
-                { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-                { "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], "w": 1.75, "x": 12.25, "y": 3 },
-                { "matrix": [3, 13], "x": 14, "y": 3 },
-                { "matrix": [3, 15], "x": 15, "y": 3 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
-                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
-                { "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, 15], "x": 15, "y": 4 }
+                {"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, 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, 13], "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, 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, 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, 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, 15], "x": 15, "y": 4}
             ]
-         },
-         "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+        },
+        "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 },
-                { "matrix": [0, 14], "x": 14, "y": 0 },
-                { "matrix": [0, 15], "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, 15], "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, 13], "w": 2.25, "x": 12.75, "y": 2 },
-                { "matrix": [2, 15], "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, 15], "x": 15, "y": 3 },
-                { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
-                { "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 },
-                { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
-                { "matrix": [4, 7], "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, 15], "x": 15, "y": 4 }
+                {"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, 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, 13], "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, 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, 15], "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, 15], "x": 15, "y": 4}
             ]
-         },
-         "LAYOUT_65_iso_blocker_tsangan": {
+        },
+        "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], "w": 2, "x": 13, "y": 0 },
-                { "matrix": [0, 15], "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, 15], "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], "x": 12.75, "y": 2 },
-                { "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1 },
-                { "matrix": [2, 15], "x": 15, "y": 2 },
-                { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-                { "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], "w": 1.75, "x": 12.25, "y": 3 },
-                { "matrix": [3, 13], "x": 14, "y": 3 },
-                { "matrix": [3, 15], "x": 15, "y": 3 },
-                { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
-                { "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 },
-                { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
-                { "matrix": [4, 7], "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, 15], "x": 15, "y": 4 }
+                {"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, 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, 13], "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, 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, 15], "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, 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, 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},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "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, 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, 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, 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, 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},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "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, 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, 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, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_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, 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, 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},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "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, 15], "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, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_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": [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, 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},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "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, 15], "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, 15], "x": 15, "y": 4}
+            ]
+        }
     }
 }
diff --git a/keyboards/nix_studio/lilith/matrix_diagram.md b/keyboards/nix_studio/lilith/matrix_diagram.md
new file mode 100644
index 000000000000..a37ebbad5677
--- /dev/null
+++ b/keyboards/nix_studio/lilith/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for Nix Studio Lilith
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│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   │1F │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2D  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2F │   │2C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3F │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+│40  │41  │42  │47                      │4A  │4B  │ │4C │4D │4F │
+└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+┌────────┐
+│30      │ 2.25u LShift
+└────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┐
+│40   │41 │42   │47                         │4B   │ Blocker Tsangan
+└─────┴───┴─────┴───────────────────────────┴─────┘
+```
diff --git a/keyboards/nix_studio/oxalys80/config.h b/keyboards/nix_studio/oxalys80/config.h
index 52b5d011d98b..0e5dd8a043c9 100644
--- a/keyboards/nix_studio/oxalys80/config.h
+++ b/keyboards/nix_studio/oxalys80/config.h
@@ -20,19 +20,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 24
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep
diff --git a/keyboards/nix_studio/oxalys80/info.json b/keyboards/nix_studio/oxalys80/info.json
index 5c804d7182bb..fdbabe4991ef 100644
--- a/keyboards/nix_studio/oxalys80/info.json
+++ b/keyboards/nix_studio/oxalys80/info.json
@@ -20,7 +20,23 @@
         "pin": "B3"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 24,
+        "max_brightness": 200,
+        "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
+        }
     },
     "indicators": {
         "caps_lock": "E6",
diff --git a/keyboards/nopunin10did/jabberwocky/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/info.json
index 71d6d94542b5..64848c055206 100644
--- a/keyboards/nopunin10did/jabberwocky/v2/info.json
+++ b/keyboards/nopunin10did/jabberwocky/v2/info.json
@@ -14,8 +14,8 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
-        "driver": "software",
-        "pins": ["D6"],
+        "driver": "timer",
+        "pin": "D6",
         "levels": 6
     },
     "indicators": {
diff --git a/keyboards/novelkeys/nk1/config.h b/keyboards/novelkeys/nk1/config.h
index c4cc79e62408..1bcd22e6e58f 100644
--- a/keyboards/novelkeys/nk1/config.h
+++ b/keyboards/novelkeys/nk1/config.h
@@ -17,21 +17,5 @@
 
 #pragma once
 
-    #define RGBLED_NUM 9
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-
 /* There is only 1 Button so limiting VIA to 1 layer */
 #define DYNAMIC_KEYMAP_LAYER_COUNT 1
diff --git a/keyboards/novelkeys/nk1/info.json b/keyboards/novelkeys/nk1/info.json
index b72492a6aa7a..480bc968c2f2 100755
--- a/keyboards/novelkeys/nk1/info.json
+++ b/keyboards/novelkeys/nk1/info.json
@@ -8,6 +8,24 @@
         "pid": "0x4E4D",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 9,
+        "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": "F0"
     },
diff --git a/keyboards/novelkeys/nk20/config.h b/keyboards/novelkeys/nk20/config.h
index 23b8d2915a16..55d8b53e83bd 100644
--- a/keyboards/novelkeys/nk20/config.h
+++ b/keyboards/novelkeys/nk20/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM3
 #define WS2812_DMA_CHANNEL 3
 
-#define RGBLED_NUM 20
 #define RGB_MATRIX_LED_COUNT 20
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 210
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/novelkeys/nk20/info.json b/keyboards/novelkeys/nk20/info.json
index 2befadb5d01b..3ad31f8a33e0 100644
--- a/keyboards/novelkeys/nk20/info.json
+++ b/keyboards/novelkeys/nk20/info.json
@@ -13,7 +13,7 @@
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B13", "B14", "B15", "A4"],
diff --git a/keyboards/novelkeys/nk20/rules.mk b/keyboards/novelkeys/nk20/rules.mk
index 131bc94a443b..9470fce1ba28 100644
--- a/keyboards/novelkeys/nk20/rules.mk
+++ b/keyboards/novelkeys/nk20/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/novelkeys/nk65/nk65.c b/keyboards/novelkeys/nk65/nk65.c
index 0e6fe08b5c40..2c325e453a46 100755
--- a/keyboards/novelkeys/nk65/nk65.c
+++ b/keyboards/novelkeys/nk65/nk65.c
@@ -27,9 +27,9 @@
  */
 void led_update_ports(led_t led_state) {
     if (led_state.caps_lock) {
-        IS31FL3733_set_color( 7+64-1, 0, 255, 0 );
+        is31fl3733_set_color( 7+64-1, 0, 255, 0 );
     } else {
-        IS31FL3733_set_color( 7+64-1, 0, 0, 0 );
+        is31fl3733_set_color( 7+64-1, 0, 0, 0 );
     }
 }
 
@@ -45,6 +45,6 @@ __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
         G = 255;
     }
 
-    IS31FL3733_set_color( 6+64-1, R, G, B );
+    is31fl3733_set_color( 6+64-1, R, G, B );
   return state;
 }
diff --git a/keyboards/novelkeys/nk65b/config.h b/keyboards/novelkeys/nk65b/config.h
index a22f9b168546..e236351344f1 100755
--- a/keyboards/novelkeys/nk65b/config.h
+++ b/keyboards/novelkeys/nk65b/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM3
 #define WS2812_DMA_CHANNEL 3
 
-#define RGBLED_NUM 68
 #define RGB_MATRIX_LED_COUNT 68
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/novelkeys/nk65b/info.json b/keyboards/novelkeys/nk65b/info.json
index 93700e6851bc..eb6565aea6d5 100755
--- a/keyboards/novelkeys/nk65b/info.json
+++ b/keyboards/novelkeys/nk65b/info.json
@@ -13,7 +13,7 @@
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "A8", "A9"],
diff --git a/keyboards/novelkeys/nk65b/rules.mk b/keyboards/novelkeys/nk65b/rules.mk
old mode 100755
new mode 100644
index 131bc94a443b..9470fce1ba28
--- a/keyboards/novelkeys/nk65b/rules.mk
+++ b/keyboards/novelkeys/nk65b/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/novelkeys/nk87/nk87.c b/keyboards/novelkeys/nk87/nk87.c
index c90ba02ea4fb..c75fff450b30 100755
--- a/keyboards/novelkeys/nk87/nk87.c
+++ b/keyboards/novelkeys/nk87/nk87.c
@@ -38,8 +38,8 @@ bool led_update_kb(led_t led_state) {
             CAPS = 0;
         }
     }
-    IS31FL3733_set_color( 63+64-1, FN1, FN1, CAPS );
-    IS31FL3733_set_color( 48+64-1, 0, 0, FN2 );
+    is31fl3733_set_color( 63+64-1, FN1, FN1, CAPS );
+    is31fl3733_set_color( 48+64-1, 0, 0, FN2 );
     return res;
 }
 
diff --git a/keyboards/novelkeys/nk87b/config.h b/keyboards/novelkeys/nk87b/config.h
index 49d3104c4546..a0bbb315d40d 100644
--- a/keyboards/novelkeys/nk87b/config.h
+++ b/keyboards/novelkeys/nk87b/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM3
 #define WS2812_DMA_CHANNEL 3
 
-#define RGBLED_NUM 87
 #define RGB_MATRIX_LED_COUNT 87
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 114
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/novelkeys/nk87b/info.json b/keyboards/novelkeys/nk87b/info.json
index 965c2f8b047d..269db89ed3bd 100755
--- a/keyboards/novelkeys/nk87b/info.json
+++ b/keyboards/novelkeys/nk87b/info.json
@@ -13,7 +13,7 @@
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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/nk87b/rules.mk b/keyboards/novelkeys/nk87b/rules.mk
index 131bc94a443b..9470fce1ba28 100644
--- a/keyboards/novelkeys/nk87b/rules.mk
+++ b/keyboards/novelkeys/nk87b/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/novelkeys/nk_plus/info.json b/keyboards/novelkeys/nk_plus/info.json
index 4fdbf80f5c0e..f6fad60b0105 100755
--- a/keyboards/novelkeys/nk_plus/info.json
+++ b/keyboards/novelkeys/nk_plus/info.json
@@ -27,7 +27,7 @@
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
             {"flags": 1, "matrix": [0, 1], "x": 13, "y": 0},
diff --git a/keyboards/novelkeys/nk_plus/rules.mk b/keyboards/novelkeys/nk_plus/rules.mk
index a68122281ad1..928a45cfaec7 100644
--- a/keyboards/novelkeys/nk_plus/rules.mk
+++ b/keyboards/novelkeys/nk_plus/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/novelkeys/novelpad/config.h b/keyboards/novelkeys/novelpad/config.h
index 413efb67b0b8..5c82c9a7ca33 100755
--- a/keyboards/novelkeys/novelpad/config.h
+++ b/keyboards/novelkeys/novelpad/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-     #define RGBLED_NUM 4
-//   #define RGBLIGHT_HUE_STEP 8
-//   #define RGBLIGHT_SAT_STEP 8
-//   #define RGBLIGHT_VAL_STEP 8
-//   #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
-
 /* 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/novelkeys/novelpad/info.json b/keyboards/novelkeys/novelpad/info.json
index e98746ab299f..1e5f6b4f73ce 100644
--- a/keyboards/novelkeys/novelpad/info.json
+++ b/keyboards/novelkeys/novelpad/info.json
@@ -17,6 +17,21 @@
         "pin": "B7",
         "levels": 10
     },
+    "rgblight": {
+        "led_count": 4,
+        "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": "D3"
     },
diff --git a/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c b/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
index 5380de9648d6..79a3e2fdbfb4 100755
--- a/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
+++ b/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
@@ -36,11 +36,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
+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/noxary/268/keymaps/ansi/keymap.c b/keyboards/noxary/268/keymaps/ansi/keymap.c
index dac8e6c0ddb8..860d17177c76 100644
--- a/keyboards/noxary/268/keymaps/ansi/keymap.c
+++ b/keyboards/noxary/268/keymaps/ansi/keymap.c
@@ -52,12 +52,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
     setPinOutput(B6);
     writePinHigh(B6);
   } else {
     setPinInput(B6);
     writePinLow(B6);
   }
+  return false;
 }
diff --git a/keyboards/noxary/268/keymaps/default/keymap.c b/keyboards/noxary/268/keymaps/default/keymap.c
index 571396f21d12..9023c6f81fd3 100644
--- a/keyboards/noxary/268/keymaps/default/keymap.c
+++ b/keyboards/noxary/268/keymaps/default/keymap.c
@@ -70,8 +70,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         setPinOutput(B6);
         writePinHigh(B6);
     }
@@ -79,4 +79,5 @@ void led_set_user(uint8_t usb_led) {
         setPinInput(B6);
         writePinLow(B6);
     }
+    return false;
 }
diff --git a/keyboards/noxary/268/keymaps/iso/keymap.c b/keyboards/noxary/268/keymaps/iso/keymap.c
index 410883dd54f9..76462bf7fe80 100644
--- a/keyboards/noxary/268/keymaps/iso/keymap.c
+++ b/keyboards/noxary/268/keymaps/iso/keymap.c
@@ -52,12 +52,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
     setPinOutput(B6);
     writePinHigh(B6);
   } else {
     setPinInput(B6);
     writePinLow(B6);
   }
+  return false;
 }
diff --git a/keyboards/noxary/268/keymaps/sixtyeight/keymap.c b/keyboards/noxary/268/keymaps/sixtyeight/keymap.c
index 2502667d3048..3527cf7ccca9 100644
--- a/keyboards/noxary/268/keymaps/sixtyeight/keymap.c
+++ b/keyboards/noxary/268/keymaps/sixtyeight/keymap.c
@@ -70,52 +70,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-    if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-
-    }
-    else {
-
-    }
-
-    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         DDRB |= (1 << 6); PORTB |= (1 << 6);
     }
     else {
         DDRB &= ~(1 << 6); PORTB &= ~(1 << 6);
     }
-
-    if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-
-    }
-    else {
-
-    }
-
-    if (usb_led & (1 << USB_LED_COMPOSE)) {
-
-    }
-    else {
-
-    }
-
-    if (usb_led & (1 << USB_LED_KANA)) {
-
-    }
-    else {
-
-    }
-
+    return false;
 }
diff --git a/keyboards/noxary/268_2/info.json b/keyboards/noxary/268_2/info.json
index b96500aa3126..a652276c6d1f 100644
--- a/keyboards/noxary/268_2/info.json
+++ b/keyboards/noxary/268_2/info.json
@@ -19,6 +19,9 @@
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "community_layouts": ["65_ansi_blocker"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_65_ansi_blocker"
+  },
   "layouts": {
     "LAYOUT_65_ansi_blocker": {
       "layout": [
diff --git a/keyboards/noxary/268_2_rgb/config.h b/keyboards/noxary/268_2_rgb/config.h
index 051782f14611..7d8bba5f4b7f 100644
--- a/keyboards/noxary/268_2_rgb/config.h
+++ b/keyboards/noxary/268_2_rgb/config.h
@@ -14,22 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* ws2812b options */
-#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 16
-#define RGBLIGHT_SAT_STEP 16
-#define RGBLIGHT_VAL_STEP 16
-
 /* 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/noxary/268_2_rgb/info.json b/keyboards/noxary/268_2_rgb/info.json
index d1f57bc5fc9b..f742581e0fb1 100644
--- a/keyboards/noxary/268_2_rgb/info.json
+++ b/keyboards/noxary/268_2_rgb/info.json
@@ -16,6 +16,24 @@
     "backlight": {
       "pin": "B7"
     },
+    "rgblight": {
+      "hue_steps": 16,
+      "saturation_steps": 16,
+      "brightness_steps": 16,
+      "led_count": 16,
+      "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": "B5"
     },
diff --git a/keyboards/noxary/378/rules.mk b/keyboards/noxary/378/rules.mk
index 3c9c278b519b..93e50cd795bd 100644
--- a/keyboards/noxary/378/rules.mk
+++ b/keyboards/noxary/378/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/noxary/valhalla/rules.mk b/keyboards/noxary/valhalla/rules.mk
index 3c9c278b519b..93e50cd795bd 100644
--- a/keyboards/noxary/valhalla/rules.mk
+++ b/keyboards/noxary/valhalla/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/noxary/x268/config.h b/keyboards/noxary/x268/config.h
index 0f7486408c4c..98d8ea885ec5 100644
--- a/keyboards/noxary/x268/config.h
+++ b/keyboards/noxary/x268/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* ws2812b options */
-#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 16
-#define RGBLIGHT_SAT_STEP 16
-#define RGBLIGHT_VAL_STEP 16
-
 /* 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/noxary/x268/info.json b/keyboards/noxary/x268/info.json
index 1bfcf109f442..cd94a8cdd5a0 100644
--- a/keyboards/noxary/x268/info.json
+++ b/keyboards/noxary/x268/info.json
@@ -16,6 +16,24 @@
   "backlight": {
     "pin": "B7"
   },
+  "rgblight": {
+    "hue_steps": 16,
+    "saturation_steps": 16,
+    "brightness_steps": 16,
+    "led_count": 16,
+    "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": "B5"
   },
diff --git a/keyboards/nullbitsco/nibble/config.h b/keyboards/nullbitsco/nibble/config.h
index 5ef3783b87d5..d521e647cdfa 100644
--- a/keyboards/nullbitsco/nibble/config.h
+++ b/keyboards/nullbitsco/nibble/config.h
@@ -37,17 +37,3 @@
 #define MATRIX_ROW_PINS { B1, B3, B2, B6, D4 }
 #define MATRIX_COL_MUX_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { }
-
-/* Optional SMT LED pins */
-#define RGBLED_NUM 10
-#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/nullbitsco/nibble/info.json b/keyboards/nullbitsco/nibble/info.json
index 7f24d3681323..159e50121851 100644
--- a/keyboards/nullbitsco/nibble/info.json
+++ b/keyboards/nullbitsco/nibble/info.json
@@ -12,6 +12,22 @@
             {"pin_a": "B5", "pin_b": "B4"}
         ]
     },
+    "rgblight": {
+        "led_count": 10,
+        "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": "E6"
     },
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled/rules.mk b/keyboards/nullbitsco/nibble/keymaps/oled/rules.mk
index d34d066ded93..dd68e9d3b090 100644
--- a/keyboards/nullbitsco/nibble/keymaps/oled/rules.mk
+++ b/keyboards/nullbitsco/nibble/keymaps/oled/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/rules.mk b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/rules.mk
index db6a98385a25..1909c7ef9a3a 100644
--- a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/rules.mk
+++ b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 VIA_ENABLE = yes
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_status/rules.mk b/keyboards/nullbitsco/nibble/keymaps/oled_status/rules.mk
index 0e39ada47b53..d665c5ec5a40 100644
--- a/keyboards/nullbitsco/nibble/keymaps/oled_status/rules.mk
+++ b/keyboards/nullbitsco/nibble/keymaps/oled_status/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 VIA_ENABLE = yes
 
diff --git a/keyboards/nullbitsco/scramble/keymaps/oled/rules.mk b/keyboards/nullbitsco/scramble/keymaps/oled/rules.mk
index d34d066ded93..dd68e9d3b090 100644
--- a/keyboards/nullbitsco/scramble/keymaps/oled/rules.mk
+++ b/keyboards/nullbitsco/scramble/keymaps/oled/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/nullbitsco/scramble/v1/config.h b/keyboards/nullbitsco/scramble/v1/config.h
deleted file mode 100644
index bb0ee7d7854b..000000000000
--- a/keyboards/nullbitsco/scramble/v1/config.h
+++ /dev/null
@@ -1,22 +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/>.
-*/
-
-/* NOTE: This config file is specific to AVR builds. */
-
-#pragma once
-
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/nullbitsco/scramble/v1/info.json b/keyboards/nullbitsco/scramble/v1/info.json
index 77a00d91f4bf..5a9aeef64be7 100644
--- a/keyboards/nullbitsco/scramble/v1/info.json
+++ b/keyboards/nullbitsco/scramble/v1/info.json
@@ -4,6 +4,9 @@
             {"pin_a": "D6", "pin_b": "D7"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega328p",
     "bootloader": "usbasploader",
     "matrix_pins": {
diff --git a/keyboards/nullbitsco/scramble/v2/config.h b/keyboards/nullbitsco/scramble/v2/config.h
index 945a4da9deca..419a028c9f7b 100644
--- a/keyboards/nullbitsco/scramble/v2/config.h
+++ b/keyboards/nullbitsco/scramble/v2/config.h
@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
 /* RP2040-specific defines*/
 #define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
 #define RP2040_FLASH_GENERIC_03H
diff --git a/keyboards/nullbitsco/scramble/v2/info.json b/keyboards/nullbitsco/scramble/v2/info.json
index 5255c32205e7..2a89a1063b2e 100644
--- a/keyboards/nullbitsco/scramble/v2/info.json
+++ b/keyboards/nullbitsco/scramble/v2/info.json
@@ -4,6 +4,9 @@
             {"pin_a": "GP24", "pin_b": "GP25"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "RP2040",
     "bootloader": "rp2040",
     "matrix_pins": {
diff --git a/keyboards/nullbitsco/snap/config.h b/keyboards/nullbitsco/snap/config.h
index 24e9340c0e3a..d9fe16e2858e 100644
--- a/keyboards/nullbitsco/snap/config.h
+++ b/keyboards/nullbitsco/snap/config.h
@@ -57,28 +57,6 @@
 #define MATRIX_COL_MUX_PINS_RIGHT { D7, C6, D4 }
 #define MATRIX_EXT_PIN_RIGHT B6
 
-/* Optional SMT LED pins */
-#define RGBLED_NUM 10
-#define RGBLED_SPLIT { 5, 5 }
-#define RGBLIGHT_LED_MAP { 8, 9, 0, 1, 2, 6, 7, 3, 4, 5 }  
-#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
-
-/* Optional encoder pins */
-#define ENCODERS_PAD_A { B3 }
-#define ENCODERS_PAD_B { B1 }
-#define ENCODERS_PAD_A_RIGHT { B4 }
-#define ENCODERS_PAD_B_RIGHT { B5 }
-
 /* Optional speaker pin */
 #define AUDIO_PIN B6
 
diff --git a/keyboards/nullbitsco/snap/info.json b/keyboards/nullbitsco/snap/info.json
index 560389a11fda..f235fce51177 100644
--- a/keyboards/nullbitsco/snap/info.json
+++ b/keyboards/nullbitsco/snap/info.json
@@ -7,6 +7,38 @@
         "pid": "0x6063",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B3", "pin_b": "B1"}
+        ]
+    },
+    "rgblight": {
+        "led_count": 10,
+        "sleep": true,
+        "led_map": [8, 9, 0, 1, 2, 6, 7, 3, 4, 5],
+        "split_count": [5, 5],
+        "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
+        }
+    },
+    "split": {
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "B4", "pin_b": "B5"}
+                ]
+            }
+        }
+    },
     "ws2812": {
         "pin": "B2"
     },
diff --git a/keyboards/nullbitsco/snap/keymaps/bongo_reactive/keymap.c b/keyboards/nullbitsco/snap/keymaps/bongo_reactive/keymap.c
index 31e58c24a6f3..447449702312 100644
--- a/keyboards/nullbitsco/snap/keymaps/bongo_reactive/keymap.c
+++ b/keyboards/nullbitsco/snap/keymaps/bongo_reactive/keymap.c
@@ -87,27 +87,27 @@ static void render_status(void) {
 
     // Host Keyboard LED Status
     oled_set_cursor(0, 1);
-    static uint8_t persistent_led_state = 0;
-    uint8_t led_usb_state = host_keyboard_leds();
+    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 != led_usb_state) {
-        persistent_led_state = led_usb_state;
+    if (persistent_led_state.raw != led_state.raw) {
+        persistent_led_state = led_state;
         
         oled_write_ln_P(PSTR(""), false);
 
-        if (IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK)) {
+        if (led_state.caps_lock) {
             oled_set_cursor(0, 1);
             oled_write_P(PSTR("CAPS"), false);
         }
 
-        if (IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK)) {
+        if (led_state.num_lock) {
             oled_set_cursor(5, 1);
             oled_write_P(PSTR("NUM"), true);
         }
 
-        if (IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK)) {
+        if (led_state.scroll_lock) {
             oled_set_cursor(9, 1);
             oled_write_P(PSTR("SCR"), false);
         }
diff --git a/keyboards/nullbitsco/snap/keymaps/bongo_reactive/rules.mk b/keyboards/nullbitsco/snap/keymaps/bongo_reactive/rules.mk
index 7e580bfd7490..5706b9bf2a0d 100644
--- a/keyboards/nullbitsco/snap/keymaps/bongo_reactive/rules.mk
+++ b/keyboards/nullbitsco/snap/keymaps/bongo_reactive/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 VIA_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/snap/keymaps/bongo_reactive_single_oled/rules.mk b/keyboards/nullbitsco/snap/keymaps/bongo_reactive_single_oled/rules.mk
index d0a184e961f1..506f77c16d69 100644
--- a/keyboards/nullbitsco/snap/keymaps/bongo_reactive_single_oled/rules.mk
+++ b/keyboards/nullbitsco/snap/keymaps/bongo_reactive_single_oled/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 VIA_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/snap/keymaps/oled/keymap.c b/keyboards/nullbitsco/snap/keymaps/oled/keymap.c
index 3a48e90134ba..07145ed6def9 100644
--- a/keyboards/nullbitsco/snap/keymaps/oled/keymap.c
+++ b/keyboards/nullbitsco/snap/keymaps/oled/keymap.c
@@ -114,27 +114,27 @@ static void render_status(void) {
 
     // Host Keyboard LED Status
     oled_set_cursor(0, 1);
-    static uint8_t persistent_led_state = 0;
-    uint8_t led_usb_state = host_keyboard_leds();
+    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 != led_usb_state) {
-        persistent_led_state = led_usb_state;
+    if (persistent_led_state.raw != led_state.raw) {
+        persistent_led_state = led_state;
         
         oled_write_ln_P(PSTR(""), false);
 
-        if (IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK)) {
+        if (led_state.caps_lock) {
             oled_set_cursor(0, 1);
             oled_write_P(PSTR("CAPS"), false);
         }
 
-        if (IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK)) {
+        if (led_state.num_lock) {
             oled_set_cursor(5, 1);
             oled_write_P(PSTR("NUM"), true);
         }
 
-        if (IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK)) {
+        if (led_state.scroll_lock) {
             oled_set_cursor(9, 1);
             oled_write_P(PSTR("SCR"), false);
         }
diff --git a/keyboards/nullbitsco/snap/keymaps/oled/rules.mk b/keyboards/nullbitsco/snap/keymaps/oled/rules.mk
index d0a184e961f1..506f77c16d69 100644
--- a/keyboards/nullbitsco/snap/keymaps/oled/rules.mk
+++ b/keyboards/nullbitsco/snap/keymaps/oled/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 VIA_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/snap/keymaps/typehud/keymap.c b/keyboards/nullbitsco/snap/keymaps/typehud/keymap.c
index 50e164f4086a..231c9d85452b 100644
--- a/keyboards/nullbitsco/snap/keymaps/typehud/keymap.c
+++ b/keyboards/nullbitsco/snap/keymaps/typehud/keymap.c
@@ -94,27 +94,27 @@ static void render_status(void) {
 
     // Host Keyboard LED Status
     oled_set_cursor(0, 1);
-    static uint8_t persistent_led_state = 0;
-    uint8_t        led_usb_state        = host_keyboard_leds();
+    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 != led_usb_state) {
-        persistent_led_state = led_usb_state;
+    if (persistent_led_state.raw != led_state.raw) {
+        persistent_led_state = led_state;
 
         oled_write_ln_P(PSTR("            "), false);
 
-        if (IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK)) {
+        if (led_state.caps_lock) {
             oled_set_cursor(0, 1);
             oled_write_P(PSTR("CAPS"), false);
         }
 
-        if (IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK)) {
+        if (led_state.num_lock) {
             oled_set_cursor(5, 1);
             oled_write_P(PSTR("NUM"), true);
         }
 
-        if (IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK)) {
+        if (led_state.scroll_lock) {
             oled_set_cursor(9, 1);
             oled_write_P(PSTR("SCR"), false);
         }
diff --git a/keyboards/nullbitsco/snap/keymaps/typehud/rules.mk b/keyboards/nullbitsco/snap/keymaps/typehud/rules.mk
index 151e44f4aac8..16bd6085c059 100644
--- a/keyboards/nullbitsco/snap/keymaps/typehud/rules.mk
+++ b/keyboards/nullbitsco/snap/keymaps/typehud/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 VIA_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/tidbit/config.h b/keyboards/nullbitsco/tidbit/config.h
index 346a8fb8a850..48eecde3f60f 100644
--- a/keyboards/nullbitsco/tidbit/config.h
+++ b/keyboards/nullbitsco/tidbit/config.h
@@ -21,16 +21,3 @@
 
 // Workaround for freezing after MacOS sleep
 #define USB_SUSPEND_WAKEUP_DELAY 200
-
-/* Optional SMT LED pins */
-#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
diff --git a/keyboards/nullbitsco/tidbit/info.json b/keyboards/nullbitsco/tidbit/info.json
index 0ed0a5e7b856..b8eaf60d89e8 100644
--- a/keyboards/nullbitsco/tidbit/info.json
+++ b/keyboards/nullbitsco/tidbit/info.json
@@ -7,6 +7,21 @@
         "pid": "0x6064",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 8,
+        "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": "B6"
     },
@@ -28,41 +43,29 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"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": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "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": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "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": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
 
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [1, 2], "x": 0, "y": 1},
+                {"matrix": [1, 3], "x": 1, "y": 1},
+                {"matrix": [1, 4], "x": 2, "y": 1},
+                {"matrix": [1, 5], "x": 3, "y": 1},
 
-                {"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": [2, 2], "x": 0, "y": 2},
+                {"matrix": [2, 3], "x": 1, "y": 2},
+                {"matrix": [2, 4], "x": 2, "y": 2},
+                {"matrix": [2, 5], "x": 3, "y": 2},
 
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 0, "y": 3},
+                {"matrix": [3, 3], "x": 1, "y": 3},
+                {"matrix": [3, 4], "x": 2, "y": 3},
+                {"matrix": [3, 5], "x": 3, "y": 3},
 
-                {"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, 2], "x": 0, "y": 4},
+                {"matrix": [4, 3], "x": 1, "y": 4},
+                {"matrix": [4, 4], "x": 2, "y": 4},
+                {"matrix": [4, 5], "x": 3, "y": 4}
             ]
         }
     }
diff --git a/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c
index 6cd9f48c94df..8f552d30c191 100644
--- a/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c
+++ b/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c
@@ -22,19 +22,26 @@ enum layers {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
-                            KC_PSLS, KC_PAST, KC_PMNS, 
-    KC_VOLD, KC_VOLU, KC_P7, KC_P8,   KC_P9,   KC_PPLS, 
-    KC_MPRV, KC_MNXT, KC_P4, KC_P5,   KC_P6,   KC_PPLS, 
-    KC_LEFT, KC_RGHT, KC_P1, KC_P2,   KC_P3,   KC_PENT, 
-    KC_TRNS, KC_TRNS, KC_P0, KC_P0,   KC_PDOT, KC_PENT  
-    ),
+  [_BASE] = 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
+  ),
 
     [_FUNC] = 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(_______, _______), },
+};
+#endif
diff --git a/keyboards/nullbitsco/tidbit/keymaps/default/rules.mk b/keyboards/nullbitsco/tidbit/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/nullbitsco/tidbit/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/tidbit/keymaps/oled/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/oled/keymap.c
index 255502653419..642870640e5c 100644
--- a/keyboards/nullbitsco/tidbit/keymaps/oled/keymap.c
+++ b/keyboards/nullbitsco/tidbit/keymaps/oled/keymap.c
@@ -25,34 +25,40 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
-                            KC_PSLS, KC_PAST, KC_PMNS, 
-    KC_VOLD, KC_VOLU, KC_P7, KC_P8,   KC_P9,   KC_PPLS, 
-    KC_TRNS, KC_TRNS, KC_P4, KC_P5,   KC_P6,   KC_PPLS, 
-    KC_TRNS, KC_TRNS, KC_P1, KC_P2,   KC_P3,   KC_PENT, 
-    KC_TRNS, KC_TRNS, KC_P0, KC_P0,   KC_PDOT, KC_PENT  
+        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
     ),
-
     [_VIA1] = LAYOUT(
-                      _______, _______, _______, 
-    _______, _______, _______, _______, _______, _______, 
-    _______, _______, _______, _______, _______, _______, 
-    _______, _______, _______, _______, _______, _______, 
-    _______, _______, _______, _______, _______, _______  
+        _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______
     ),
-
     [_VIA2] = LAYOUT(
-                      _______, _______, _______, 
-    _______, _______, _______, _______, _______, _______, 
-    _______, _______, _______, _______, _______, _______, 
-    _______, _______, _______, _______, _______, _______, 
-    _______, _______, _______, _______, _______, _______
+        _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______
     ),
-
     [_VIA3] = 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
diff --git a/keyboards/nullbitsco/tidbit/keymaps/oled/rules.mk b/keyboards/nullbitsco/tidbit/keymaps/oled/rules.mk
index ef531564fcdb..ba3a7b1701f7 100644
--- a/keyboards/nullbitsco/tidbit/keymaps/oled/rules.mk
+++ b/keyboards/nullbitsco/tidbit/keymaps/oled/rules.mk
@@ -1,3 +1,3 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c
index 32306ef9d6cf..d14723df0348 100644
--- a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c
+++ b/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c
@@ -25,38 +25,44 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LAY0] = LAYOUT(
-                            KC_PSLS, KC_PAST, KC_PMNS, 
-    KC_VOLD, KC_VOLU, KC_P7, KC_P8,   KC_P9,   KC_PPLS, 
-    KC_TRNS, KC_TRNS, KC_P4, KC_P5,   KC_P6,   KC_PPLS, 
-    KC_TRNS, KC_TRNS, KC_P1, KC_P2,   KC_P3,   KC_PENT, 
-    KC_TRNS, KC_TRNS, KC_P0, KC_P0,   KC_PDOT, KC_PENT  
+        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)
@@ -112,18 +118,18 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
 // 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, 
+        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));
 }
@@ -173,13 +179,13 @@ static void render_wpm_counters(uint8_t current_wpm) {
 
 static void render_led_status(void) {
     // Host Keyboard LED Status
-    uint8_t led_usb_state = host_keyboard_leds();
+    led_t led_state = host_keyboard_led_state();
     oled_set_cursor(0, 8);
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK) ? PSTR(CAPLCK_STR) : PSTR(EMPTY_STR), false);
+    oled_write_P(led_state.caps_lock ? PSTR(CAPLCK_STR) : PSTR(EMPTY_STR), false);
     oled_set_cursor(0, 9);
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK) ? PSTR(NUMLCK_STR) : PSTR(EMPTY_STR), false);
+    oled_write_P(led_state.num_lock ? PSTR(NUMLCK_STR) : PSTR(EMPTY_STR), false);
     oled_set_cursor(0, 10);
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR(SCRLK_STR) : PSTR(EMPTY_STR), false);
+    oled_write_P(led_state.scroll_lock ? PSTR(SCRLK_STR) : PSTR(EMPTY_STR), false);
 }
 
 // Update WPM snail icon
diff --git a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/rules.mk b/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/rules.mk
index 1b72fd006a25..605f034e1df8 100644
--- a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/rules.mk
+++ b/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/rules.mk
@@ -4,3 +4,4 @@ VIA_ENABLE = yes
 SPACE_CADET_ENABLE = no
 GRAVE_ESC_ENABLE = no
 MAGIC_ENABLE = no
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/tidbit/keymaps/via/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/via/keymap.c
index 895b02c2925c..642870640e5c 100644
--- a/keyboards/nullbitsco/tidbit/keymaps/via/keymap.c
+++ b/keyboards/nullbitsco/tidbit/keymaps/via/keymap.c
@@ -24,36 +24,41 @@ enum layers {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
-                            KC_PSLS, KC_PAST, KC_PMNS, 
-  KC_VOLD, KC_VOLU, KC_P7, KC_P8,   KC_P9,   KC_PPLS, 
-  KC_TRNS, KC_TRNS, KC_P4, KC_P5,   KC_P6,   KC_PPLS, 
-  KC_TRNS, KC_TRNS, KC_P1, KC_P2,   KC_P3,   KC_PENT, 
-  KC_TRNS, KC_TRNS, KC_P0, KC_P0,   KC_PDOT, KC_PENT  
-  ),
-
-  [_VIA1] = LAYOUT(
-                    _______, _______, _______, 
-  _______, _______, _______, _______, _______, _______, 
-  _______, _______, _______, _______, _______, _______, 
-  _______, _______, _______, _______, _______, _______, 
-  _______, _______, _______, _______, _______, _______  
-  ),
-
-  [_VIA2] = LAYOUT(
-                    _______, _______, _______, 
-  _______, _______, _______, _______, _______, _______, 
-  _______, _______, _______, _______, _______, _______, 
-  _______, _______, _______, _______, _______, _______, 
-  _______, _______, _______, _______, _______, _______
-  ),
-
-  [_VIA3] = LAYOUT(
-                    _______, _______, _______, 
-  _______, _______, _______, _______, _______, _______, 
-  _______, _______, _______, _______, _______, _______, 
-  _______, _______, _______, _______, _______, _______, 
-  _______, _______, _______, _______, _______, _______
-  ),
+    [_BASE] = 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
+    ),
+    [_VIA1] = LAYOUT(
+        _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______
+    ),
+    [_VIA2] = LAYOUT(
+        _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______
+    ),
+    [_VIA3] = 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
diff --git a/keyboards/nullbitsco/tidbit/keymaps/via/rules.mk b/keyboards/nullbitsco/tidbit/keymaps/via/rules.mk
index 036bd6d1c3ec..f1adcab005e8 100644
--- a/keyboards/nullbitsco/tidbit/keymaps/via/rules.mk
+++ b/keyboards/nullbitsco/tidbit/keymaps/via/rules.mk
@@ -1 +1,2 @@
-VIA_ENABLE = yes
\ No newline at end of file
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/tidbit/tidbit.c b/keyboards/nullbitsco/tidbit/tidbit.c
index eea5a5d54c0a..15bc0f6a7ac2 100644
--- a/keyboards/nullbitsco/tidbit/tidbit.c
+++ b/keyboards/nullbitsco/tidbit/tidbit.c
@@ -18,20 +18,6 @@
 #include "common/remote_kb.h"
 #include "common/bitc_led.h"
 
-typedef struct PACKED {
-    uint8_t r;
-    uint8_t c;
-} encodermap_t;
-
-// Map encoders to their respective virtual matrix entry
-// Allows for encoder control using VIA
-const encodermap_t encoder_map[4][2] = {
-    {{1, 0}, {1, 1}},  // Encoder 1 matrix location
-    {{2, 0}, {2, 1}},  // Encoder 2 matrix location
-    {{3, 0}, {3, 1}},  // Encoder 3 matrix location
-    {{4, 0}, {4, 1}},  // Encoder 4 matrix location
-};
-
 bool numlock_set = false;
 
 #ifdef OLED_ENABLE
@@ -41,40 +27,40 @@ oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
 
 static void render_logo(void) {
     static const char PROGMEM tidbit_oled[] = {
-        0x00, 0x0e, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-        0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x0e, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 
-        0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 
-        0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3e, 0x3e, 0x7e, 0xfc, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x00, 0x00, 
-        0x00, 0x00, 0x00, 0x00, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 
-        0x1f, 0x1f, 0x3f, 0x7e, 0xfe, 0xfe, 0xfc, 0xf8, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-        0xfe, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x0e, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 
-        0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1e, 0x00, 
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 
-        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xc0, 
-        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 
-        0xe0, 0xf0, 0xf0, 0xf8, 0xff, 0xff, 0xbf, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-        0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-        0x00, 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, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 
-        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x03, 
-        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
-        0x03, 0x03, 0x03, 0x07, 0x07, 0xbf, 0xff, 0xff, 0xff, 0xfe, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 
-        0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-        0x00, 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, 0x3f, 0x7f, 0xff, 0xff, 0x7f, 0x3f, 
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 
-        0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 
-        0xf8, 0xf8, 0xf8, 0x7c, 0x7c, 0x7c, 0x7e, 0x3e, 0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x01, 0x00, 0x00, 
-        0x00, 0x00, 0x00, 0x00, 0x1f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 
-        0xf8, 0x7c, 0x7c, 0x7c, 0x7e, 0x3f, 0x3f, 0x1f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-        0x7f, 0xff, 0xff, 0x7f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x0e, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x0e, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff,
+        0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f,
+        0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3e, 0x3e, 0x7e, 0xfc, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f,
+        0x1f, 0x1f, 0x3f, 0x7e, 0xfe, 0xfe, 0xfc, 0xf8, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xfe, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x0e, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f,
+        0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1e, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xc0,
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+        0xe0, 0xf0, 0xf0, 0xf8, 0xff, 0xff, 0xbf, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 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, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x03,
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+        0x03, 0x03, 0x03, 0x07, 0x07, 0xbf, 0xff, 0xff, 0xff, 0xfe, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 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, 0x3f, 0x7f, 0xff, 0xff, 0x7f, 0x3f,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff,
+        0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xf8, 0xf8, 0xf8,
+        0xf8, 0xf8, 0xf8, 0x7c, 0x7c, 0x7c, 0x7e, 0x3e, 0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x01, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x1f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8,
+        0xf8, 0x7c, 0x7c, 0x7c, 0x7e, 0x3f, 0x3f, 0x1f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x7f, 0xff, 0xff, 0x7f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x3f, 0x7f, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     };
-    
+
     oled_write_raw_P(tidbit_oled, sizeof(tidbit_oled));
 };
 
@@ -86,20 +72,6 @@ bool oled_task_kb(void) {
 
 #endif
 
-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;
-    process_encoder_matrix(encoder_map[index][clockwise ? 0 : 1]);
-    return false;
-}
-
 // Use Bit-C LED to show NUM LOCK status
 void led_update_ports(led_t led_state) {
     set_bitc_LED(led_state.num_lock ? LED_DIM : LED_OFF);
diff --git a/keyboards/numatreus/config.h b/keyboards/numatreus/config.h
index 774687565a14..46a94d10c09c 100644
--- a/keyboards/numatreus/config.h
+++ b/keyboards/numatreus/config.h
@@ -19,15 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-// keyboard RGB LED support
-//    see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
-#define RGBLED_NUM 6
-
-#define RGBLIGHT_VAL_STEP 17
-
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-
 #if defined(RGBLIGHT_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for stonehenge30 keyboard
 //  120  RGBoff, OLEDoff
diff --git a/keyboards/numatreus/info.json b/keyboards/numatreus/info.json
index 54f5bde1bd92..bdf4a574c688 100644
--- a/keyboards/numatreus/info.json
+++ b/keyboards/numatreus/info.json
@@ -17,6 +17,8 @@
     "pin": "D3"
   },
   "rgblight": {
+    "hue_steps": 10,
+    "led_count": 6,
     "max_brightness": 200
   },
   "processor": "atmega32u4",
diff --git a/keyboards/obosob/arch_36/config.h b/keyboards/obosob/arch_36/config.h
index 068a231f434e..1b6189b42e09 100644
--- a/keyboards/obosob/arch_36/config.h
+++ b/keyboards/obosob/arch_36/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_SPLIT { 6, 6 }
-#define RGBLED_NUM 12
-#define RGBLIGHT_LED_MAP {  0,  1,  2,  3,  4,  5, \
-                           11, 10,  9,  8,  7,  6 }
-#endif
-
 #define OLED_DISPLAY_128X64
 
 #define EE_HANDS
diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json
index d978080a2f73..464cd01be8f3 100644
--- a/keyboards/obosob/arch_36/info.json
+++ b/keyboards/obosob/arch_36/info.json
@@ -16,6 +16,11 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "led_count": 12,
+        "led_map": [0, 1, 2, 3, 4, 5, 11, 10, 9, 8, 7, 6],
+        "split_count": [6, 6]
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/obosob/arch_36/rules.mk b/keyboards/obosob/arch_36/rules.mk
index e2392b129305..7d311cd40586 100644
--- a/keyboards/obosob/arch_36/rules.mk
+++ b/keyboards/obosob/arch_36/rules.mk
@@ -10,6 +10,5 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enables the use of OLED displays
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes       # Split common
diff --git a/keyboards/oddforge/vea/config.h b/keyboards/oddforge/vea/config.h
index c2e9c2b6bb50..963f3ea31344 100644
--- a/keyboards/oddforge/vea/config.h
+++ b/keyboards/oddforge/vea/config.h
@@ -26,16 +26,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 
-#define RGBLED_NUM 18
-#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_EFFECT_KNIGHT_OFFSET 9
diff --git a/keyboards/oddforge/vea/info.json b/keyboards/oddforge/vea/info.json
index d6586a09e8d0..b5299b1f3e02 100644
--- a/keyboards/oddforge/vea/info.json
+++ b/keyboards/oddforge/vea/info.json
@@ -11,6 +11,22 @@
     "backlight": {
         "pin": "D4"
     },
+    "rgblight": {
+        "led_count": 18,
+        "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": {
         "driver": "custom"
     },
diff --git a/keyboards/ogre/ergo_single/config.h b/keyboards/ogre/ergo_single/config.h
deleted file mode 100644
index c6739d7f6657..000000000000
--- a/keyboards/ogre/ergo_single/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2020 ctrlshiftba
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGBLED_NUM 14
-#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 13, 12,11, 10, 9, 8, 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/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/info.json
index 4a5b96b8add4..6c3feea0e051 100644
--- a/keyboards/ogre/ergo_single/info.json
+++ b/keyboards/ogre/ergo_single/info.json
@@ -13,6 +13,22 @@
         "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 14,
+        "led_map": [0, 1, 2, 3, 4, 5, 6, 13, 12, 11, 10, 9, 8, 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": "B6"
     },
diff --git a/keyboards/ogre/ergo_split/config.h b/keyboards/ogre/ergo_split/config.h
index 92535947de1b..9c0eb3b7a96e 100644
--- a/keyboards/ogre/ergo_split/config.h
+++ b/keyboards/ogre/ergo_split/config.h
@@ -18,17 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define SPLIT_HAND_PIN D1
-
-#define RGBLED_SPLIT { 7, 7 }
-#define RGBLED_NUM 14
-#define RGBLIGHT_LED_MAP { 6, 5, 4, 3, 2, 1, 0, 13, 12,11, 10, 9, 8, 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/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json
index 2a1bbbdcd650..7da3bb487a65 100644
--- a/keyboards/ogre/ergo_split/info.json
+++ b/keyboards/ogre/ergo_split/info.json
@@ -16,6 +16,23 @@
     "split": {
         "soft_serial_pin": "D3"
     },
+    "rgblight": {
+        "led_count": 14,
+        "led_map": [6, 5, 4, 3, 2, 1, 0, 13, 12, 11, 10, 9, 8, 7],
+        "split_count": [7, 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": "B6"
     },
diff --git a/keyboards/ok60/config.h b/keyboards/ok60/config.h
index f11b35919e9f..74f7ff51815d 100644
--- a/keyboards/ok60/config.h
+++ b/keyboards/ok60/config.h
@@ -22,18 +22,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 10
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ok60/info.json b/keyboards/ok60/info.json
index a99963973991..a8a345824cef 100644
--- a/keyboards/ok60/info.json
+++ b/keyboards/ok60/info.json
@@ -17,6 +17,23 @@
     "pin": "B7",
     "levels": 5
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 10,
+    "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": "F6"
   },
diff --git a/keyboards/om60/config.h b/keyboards/om60/config.h
index 16957f9a0a1f..e5c8d9426ab2 100644
--- a/keyboards/om60/config.h
+++ b/keyboards/om60/config.h
@@ -34,39 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#ifndef RGBLED_NUM
-  #define RGBLED_NUM 69
-  #define RGBLIGHT_LED_MAP { \
-       0,    1, 2, 3, \
-       8, 7, 6, 5, 4, \
-       9,10,11,12,13, \
-      18,17,16,15,14, \
-      19,20,21,22,23, \
-      28,27,26,25,24, \
-      29,30,31,32,33, \
-      38,37,36,35,34, \
-      39,40,41,42,43, \
-      48,47,46,45,44, \
-      49,50,51,52,53, \
-      58,57,56,55,54, \
-      59,60,61,62,63, \
-      68,67,66,65,64  \
-  }
-
-  #define RGBLIGHT_SLEEP
-#endif
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 90
   #define RGBLIGHT_VAL_STEP 17
@@ -74,8 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LIMIT_VAL 30
   #define RGBLIGHT_VAL_STEP 4
 #endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for naked48 keyboard
@@ -90,5 +55,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   // iOS device need lessthan 100
   #define USB_MAX_POWER_CONSUMPTION 100
 #endif
-
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/om60/info.json b/keyboards/om60/info.json
index 7efa8097d602..df718e7fa026 100644
--- a/keyboards/om60/info.json
+++ b/keyboards/om60/info.json
@@ -13,6 +13,27 @@
       {"pin_a": "B4", "pin_b": "B5"}
     ]
   },
+  "qmk": {
+    "tap_keycode_delay": 10
+  },
+  "rgblight": {
+    "hue_steps": 10,
+    "led_count": 69,
+    "sleep": true,
+    "led_map": [0, 1, 2, 3, 8, 7, 6, 5, 4, 9, 10, 11, 12, 13, 18, 17, 16, 15, 14, 19, 20, 21, 22, 23, 28, 27, 26, 25, 24, 29, 30, 31, 32, 33, 38, 37, 36, 35, 34, 39, 40, 41, 42, 43, 48, 47, 46, 45, 44, 49, 50, 51, 52, 53, 58, 57, 56, 55, 54, 59, 60, 61, 62, 63, 68, 67, 66, 65, 64],
+    "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": "D3"
   },
diff --git a/keyboards/omkbd/ergodash/mini/config.h b/keyboards/omkbd/ergodash/mini/config.h
index c66f9ef044b7..26543ebb9df1 100644
--- a/keyboards/omkbd/ergodash/mini/config.h
+++ b/keyboards/omkbd/ergodash/mini/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 #define AUDIO_PIN C6
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -28,21 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#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_SPLIT
-#define RGBLED_SPLIT { 10, 10 }    // Number of LEDs
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 /*Sets the protocol speed when using serial communication*/
 //Speeds:
diff --git a/keyboards/omkbd/ergodash/mini/info.json b/keyboards/omkbd/ergodash/mini/info.json
index 0c62ef58fdf8..4e4a13e93a46 100644
--- a/keyboards/omkbd/ergodash/mini/info.json
+++ b/keyboards/omkbd/ergodash/mini/info.json
@@ -20,6 +20,25 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "tapping": {
+        "term": 120
+    },
+    "rgblight": {
+        "led_count": 20,
+        "split_count": [10, 10],
+        "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": "D3"
     },
diff --git a/keyboards/omkbd/ergodash/rev1/config.h b/keyboards/omkbd/ergodash/rev1/config.h
index 03eea39fd6ec..26543ebb9df1 100644
--- a/keyboards/omkbd/ergodash/rev1/config.h
+++ b/keyboards/omkbd/ergodash/rev1/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 #define AUDIO_PIN C6
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -28,25 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#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 24
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 12, 12 }    // Number of LEDs
-
-// The LEDs on the slave half go in reverse order
-#define RGBLIGHT_LED_MAP { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, \
-                          23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12}
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 /*Sets the protocol speed when using serial communication*/
 //Speeds:
diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/info.json
index 1ec059bd82bf..b3ebe4648e07 100644
--- a/keyboards/omkbd/ergodash/rev1/info.json
+++ b/keyboards/omkbd/ergodash/rev1/info.json
@@ -20,6 +20,26 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "tapping": {
+        "term": 120
+    },
+    "rgblight": {
+        "led_count": 24,
+        "led_map": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12],
+        "split_count": [12, 12],
+        "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": "D3"
     },
diff --git a/keyboards/omkbd/runner3680/3x6/config.h b/keyboards/omkbd/runner3680/3x6/config.h
index d2cd91cbc547..c0a755e251b5 100644
--- a/keyboards/omkbd/runner3680/3x6/config.h
+++ b/keyboards/omkbd/runner3680/3x6/config.h
@@ -16,29 +16,11 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define 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 36
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 18, 18 }    // Number of LEDs
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 /*Sets the protocol speed when using serial communication*/
 //Speeds:
diff --git a/keyboards/omkbd/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/info.json
index c197f04207c8..f2a169d22887 100644
--- a/keyboards/omkbd/runner3680/3x6/info.json
+++ b/keyboards/omkbd/runner3680/3x6/info.json
@@ -16,11 +16,28 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 100
+        "led_count": 36,
+        "max_brightness": 100,
+        "split_count": [18, 18],
+        "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": {
diff --git a/keyboards/omkbd/runner3680/3x7/config.h b/keyboards/omkbd/runner3680/3x7/config.h
index b8c601b56426..c0a755e251b5 100644
--- a/keyboards/omkbd/runner3680/3x7/config.h
+++ b/keyboards/omkbd/runner3680/3x7/config.h
@@ -16,29 +16,11 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define 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_SPLIT
-#define RGBLED_SPLIT { 21, 21 }    // Number of LEDs
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 /*Sets the protocol speed when using serial communication*/
 //Speeds:
diff --git a/keyboards/omkbd/runner3680/3x7/info.json b/keyboards/omkbd/runner3680/3x7/info.json
index 458fab653c02..e4b36983e731 100644
--- a/keyboards/omkbd/runner3680/3x7/info.json
+++ b/keyboards/omkbd/runner3680/3x7/info.json
@@ -16,11 +16,28 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 100
+        "led_count": 42,
+        "max_brightness": 100,
+        "split_count": [21, 21],
+        "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": {
diff --git a/keyboards/omkbd/runner3680/3x8/config.h b/keyboards/omkbd/runner3680/3x8/config.h
index 3a273e8bb958..c0a755e251b5 100644
--- a/keyboards/omkbd/runner3680/3x8/config.h
+++ b/keyboards/omkbd/runner3680/3x8/config.h
@@ -16,29 +16,11 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define 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 48
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 24, 24 }    // Number of LEDs
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 /*Sets the protocol speed when using serial communication*/
 //Speeds:
diff --git a/keyboards/omkbd/runner3680/3x8/info.json b/keyboards/omkbd/runner3680/3x8/info.json
index 33fcc3228f9a..e001332796c9 100644
--- a/keyboards/omkbd/runner3680/3x8/info.json
+++ b/keyboards/omkbd/runner3680/3x8/info.json
@@ -16,11 +16,28 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 100
+        "led_count": 48,
+        "max_brightness": 100,
+        "split_count": [24, 24],
+        "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": {
diff --git a/keyboards/omkbd/runner3680/4x6/config.h b/keyboards/omkbd/runner3680/4x6/config.h
index 3a273e8bb958..c0a755e251b5 100644
--- a/keyboards/omkbd/runner3680/4x6/config.h
+++ b/keyboards/omkbd/runner3680/4x6/config.h
@@ -16,29 +16,11 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define 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 48
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 24, 24 }    // Number of LEDs
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 /*Sets the protocol speed when using serial communication*/
 //Speeds:
diff --git a/keyboards/omkbd/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/info.json
index 2e6eda2a2eee..6568a9e845e9 100644
--- a/keyboards/omkbd/runner3680/4x6/info.json
+++ b/keyboards/omkbd/runner3680/4x6/info.json
@@ -16,11 +16,28 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 100
+        "led_count": 48,
+        "max_brightness": 100,
+        "split_count": [24, 24],
+        "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": {
diff --git a/keyboards/omkbd/runner3680/4x7/config.h b/keyboards/omkbd/runner3680/4x7/config.h
index f6b5dcf1450f..c0a755e251b5 100644
--- a/keyboards/omkbd/runner3680/4x7/config.h
+++ b/keyboards/omkbd/runner3680/4x7/config.h
@@ -16,29 +16,11 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define 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 56
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 28, 28 }    // Number of LEDs
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 /*Sets the protocol speed when using serial communication*/
 //Speeds:
diff --git a/keyboards/omkbd/runner3680/4x7/info.json b/keyboards/omkbd/runner3680/4x7/info.json
index af1a4375d635..88f3bdd18de4 100644
--- a/keyboards/omkbd/runner3680/4x7/info.json
+++ b/keyboards/omkbd/runner3680/4x7/info.json
@@ -16,11 +16,28 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 100
+        "led_count": 56,
+        "max_brightness": 100,
+        "split_count": [28, 28],
+        "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": {
diff --git a/keyboards/omkbd/runner3680/4x8/config.h b/keyboards/omkbd/runner3680/4x8/config.h
index 9a53d1968852..c0a755e251b5 100644
--- a/keyboards/omkbd/runner3680/4x8/config.h
+++ b/keyboards/omkbd/runner3680/4x8/config.h
@@ -16,29 +16,11 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define 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 64
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 32, 32 }    // Number of LEDs
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 /*Sets the protocol speed when using serial communication*/
 //Speeds:
diff --git a/keyboards/omkbd/runner3680/4x8/info.json b/keyboards/omkbd/runner3680/4x8/info.json
index 88dc1455ce26..1ee1d482c92b 100644
--- a/keyboards/omkbd/runner3680/4x8/info.json
+++ b/keyboards/omkbd/runner3680/4x8/info.json
@@ -16,11 +16,28 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 100
+        "led_count": 64,
+        "max_brightness": 100,
+        "split_count": [32, 32],
+        "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": {
diff --git a/keyboards/omkbd/runner3680/5x6/config.h b/keyboards/omkbd/runner3680/5x6/config.h
index 52626f1de345..c0a755e251b5 100644
--- a/keyboards/omkbd/runner3680/5x6/config.h
+++ b/keyboards/omkbd/runner3680/5x6/config.h
@@ -16,29 +16,11 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define 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 60
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 30, 30 }    // Number of LEDs
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 /*Sets the protocol speed when using serial communication*/
 //Speeds:
diff --git a/keyboards/omkbd/runner3680/5x6/info.json b/keyboards/omkbd/runner3680/5x6/info.json
index 08c4950b807b..28fddf187383 100644
--- a/keyboards/omkbd/runner3680/5x6/info.json
+++ b/keyboards/omkbd/runner3680/5x6/info.json
@@ -16,11 +16,28 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 100
+        "led_count": 60,
+        "max_brightness": 100,
+        "split_count": [30, 30],
+        "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": {
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/config.h b/keyboards/omkbd/runner3680/5x6_5x8/config.h
index 33f41e5289ca..99e7de0d87dc 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/config.h
+++ b/keyboards/omkbd/runner3680/5x6_5x8/config.h
@@ -16,30 +16,11 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#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 RGBLED_NUM 70
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 30, 40 }    // Number of LEDs
-#endif
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_MATRIX_LED_COUNT 70
 #define RGB_MATRIX_SPLIT { 30, 40 }    // Number of LEDs
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json
index 8b1b7054a5ea..ed687ddb3d73 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/info.json
+++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.5"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
@@ -19,11 +19,28 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 100
+        "led_count": 70,
+        "max_brightness": 100,
+        "split_count": [30, 40],
+        "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": {
diff --git a/keyboards/omkbd/runner3680/5x7/config.h b/keyboards/omkbd/runner3680/5x7/config.h
index 7b60494fcbc3..c0a755e251b5 100644
--- a/keyboards/omkbd/runner3680/5x7/config.h
+++ b/keyboards/omkbd/runner3680/5x7/config.h
@@ -16,29 +16,11 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define 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 70
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 35, 35 }    // Number of LEDs
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 /*Sets the protocol speed when using serial communication*/
 //Speeds:
diff --git a/keyboards/omkbd/runner3680/5x7/info.json b/keyboards/omkbd/runner3680/5x7/info.json
index 0c0c8670f2b1..10a833a839e9 100644
--- a/keyboards/omkbd/runner3680/5x7/info.json
+++ b/keyboards/omkbd/runner3680/5x7/info.json
@@ -16,11 +16,28 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 100
+        "led_count": 70,
+        "max_brightness": 100,
+        "split_count": [35, 35],
+        "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": {
diff --git a/keyboards/omkbd/runner3680/5x8/config.h b/keyboards/omkbd/runner3680/5x8/config.h
index 55d8ae5c97fb..c0a755e251b5 100644
--- a/keyboards/omkbd/runner3680/5x8/config.h
+++ b/keyboards/omkbd/runner3680/5x8/config.h
@@ -16,29 +16,11 @@
 
 #pragma once
 
-/* define tapping term */
-#define TAPPING_TERM 120
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define 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 80
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 40, 40 }    // Number of LEDs
-
 #define SELECT_SOFT_SERIAL_SPEED 1
 /*Sets the protocol speed when using serial communication*/
 //Speeds:
diff --git a/keyboards/omkbd/runner3680/5x8/info.json b/keyboards/omkbd/runner3680/5x8/info.json
index 41e95e583a94..8b2ca0142ce4 100644
--- a/keyboards/omkbd/runner3680/5x8/info.json
+++ b/keyboards/omkbd/runner3680/5x8/info.json
@@ -16,11 +16,28 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "tapping": {
+        "term": 120
+    },
     "ws2812": {
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 100
+        "led_count": 80,
+        "max_brightness": 100,
+        "split_count": [40, 40],
+        "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": {
diff --git a/keyboards/opendeck/32/rev1/info.json b/keyboards/opendeck/32/rev1/info.json
index e2491c8ef14c..2d72d9d0b40d 100644
--- a/keyboards/opendeck/32/rev1/info.json
+++ b/keyboards/opendeck/32/rev1/info.json
@@ -4,7 +4,7 @@
         "rows": ["C7", "C6", "B6", "B5"]
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
diff --git a/keyboards/orange75/keymaps/default/keymap.c b/keyboards/orange75/keymaps/default/keymap.c
index c79fc918d0ff..d6b585145db4 100644
--- a/keyboards/orange75/keymaps/default/keymap.c
+++ b/keyboards/orange75/keymaps/default/keymap.c
@@ -52,9 +52,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         )
 };
 
-void led_set_user(uint8_t usb_led) {
+bool led_update_user(led_t led_state) {
 
-    if (usb_led & (1 << USB_LED_NUM_LOCK)) {
+    if (led_state.num_lock) {
         setPinOutput(B0);
         writePinLow(B0);
     } else {
@@ -62,7 +62,7 @@ void led_set_user(uint8_t usb_led) {
         writePinLow(B0);
     }
 
-    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+    if (led_state.caps_lock) {
         setPinOutput(B1);
         writePinLow(B1);
     } else {
@@ -70,11 +70,12 @@ void led_set_user(uint8_t usb_led) {
         writePinLow(B1);
     }
 
-    if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
+    if (led_state.scroll_lock) {
         setPinOutput(B2);
         writePinLow(B2);
     } else {
         setPinInput(B2);
         writePinLow(B2);
     }
+    return false;
 }
diff --git a/keyboards/org60/config.h b/keyboards/org60/config.h
index e2b275251dd5..4e5969481849 100644
--- a/keyboards/org60/config.h
+++ b/keyboards/org60/config.h
@@ -17,26 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB Underglow
- */
-#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     			// Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
 /* 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 TAPPING_TERM 200
diff --git a/keyboards/org60/info.json b/keyboards/org60/info.json
index 7ceeef831240..2e4599752492 100644
--- a/keyboards/org60/info.json
+++ b/keyboards/org60/info.json
@@ -14,9 +14,26 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "F5",
         "levels": 6
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 20,
+        "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": "F6"
     },
diff --git a/keyboards/orthocode/config.h b/keyboards/orthocode/config.h
index 38098991fedf..3cc80db37646 100644
--- a/keyboards/orthocode/config.h
+++ b/keyboards/orthocode/config.h
@@ -16,23 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAP_CODE_DELAY 10
-
-  #define RGBLED_NUM 10  /*Change for the number of leds on the strip you attach*/
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/orthocode/info.json b/keyboards/orthocode/info.json
index 6b283da6cf17..b7fe9dab4721 100644
--- a/keyboards/orthocode/info.json
+++ b/keyboards/orthocode/info.json
@@ -19,6 +19,20 @@
             {"pin_a": "D1", "pin_b": "D0", "resolution": 1}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true
+        }
+    },
     "ws2812": {
         "pin": "D5"
     },
diff --git a/keyboards/owlab/jelly_epoch/hotswap/config.h b/keyboards/owlab/jelly_epoch/hotswap/config.h
deleted file mode 100644
index b40244be73d8..000000000000
--- a/keyboards/owlab/jelly_epoch/hotswap/config.h
+++ /dev/null
@@ -1,33 +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
-
-/* RGB Strip*/
-#    define RGBLIGHT_EFFECT_ALTERNATING
-#    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_SNAKE
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#    define RGBLIGHT_EFFECT_TWINKLE
-#    define RGBLED_NUM 24
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/owlab/jelly_epoch/hotswap/info.json b/keyboards/owlab/jelly_epoch/hotswap/info.json
index c30c06fb6707..0cf09660cab6 100644
--- a/keyboards/owlab/jelly_epoch/hotswap/info.json
+++ b/keyboards/owlab/jelly_epoch/hotswap/info.json
@@ -14,6 +14,22 @@
         "rows": ["B0", "B1", "B2", "B3", "A15", "B10"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 10,
+        "led_count": 24,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
         "pin": "B15"
     },
diff --git a/keyboards/owlab/jelly_epoch/soldered/config.h b/keyboards/owlab/jelly_epoch/soldered/config.h
deleted file mode 100644
index b40244be73d8..000000000000
--- a/keyboards/owlab/jelly_epoch/soldered/config.h
+++ /dev/null
@@ -1,33 +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
-
-/* RGB Strip*/
-#    define RGBLIGHT_EFFECT_ALTERNATING
-#    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_SNAKE
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#    define RGBLIGHT_EFFECT_TWINKLE
-#    define RGBLED_NUM 24
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 10
diff --git a/keyboards/owlab/jelly_epoch/soldered/info.json b/keyboards/owlab/jelly_epoch/soldered/info.json
index 4c66855d6b73..4337922ee05d 100644
--- a/keyboards/owlab/jelly_epoch/soldered/info.json
+++ b/keyboards/owlab/jelly_epoch/soldered/info.json
@@ -14,6 +14,22 @@
         "rows": ["B0", "B1", "B2", "B3", "A15", "B10"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 10,
+        "led_count": 24,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
         "pin": "B15"
     },
diff --git a/keyboards/owlab/jelly_evolv/solder/info.json b/keyboards/owlab/jelly_evolv/solder/info.json
index 1c31904ecf51..b02be86f3e8e 100644
--- a/keyboards/owlab/jelly_evolv/solder/info.json
+++ b/keyboards/owlab/jelly_evolv/solder/info.json
@@ -4,91 +4,815 @@
         "pid": "0x4A56",
         "device_version": "0.0.1"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
+            "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, 14], "x": 15, "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": [2, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 13], "x": 14, "y": 1.5},
+                {"matrix": [1, 14], "x": 15, "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, "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, 14], "x": 15, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 1.25, "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], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "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, 5], "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, 12], "x": 13, "y": 5.5},
+                {"matrix": [5, 13], "x": 14, "y": 5.5},
+                {"matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi_blocker": {
+            "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, 14], "x": 15, "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, "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, "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, 14], "x": 15, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"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], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "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, 5], "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, 12], "x": 13, "y": 5.5},
+                {"matrix": [5, 13], "x": 14, "y": 5.5},
+                {"matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi_blocker_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": 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, 14], "x": 15, "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": [2, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 13], "x": 14, "y": 1.5},
+                {"matrix": [1, 14], "x": 15, "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, "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, 14], "x": 15, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"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], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "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, 5], "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, 12], "x": 13, "y": 5.5},
+                {"matrix": [5, 13], "x": 14, "y": 5.5},
+                {"matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan": {
+            "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, 14], "x": 15, "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, "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, "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, 14], "x": 15, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"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], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "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, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 13, "y": 5.5},
+                {"matrix": [5, 13], "x": 14, "y": 5.5},
+                {"matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan_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": 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, 14], "x": 15, "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": [2, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 13], "x": 14, "y": 1.5},
+                {"matrix": [1, 14], "x": 15, "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, "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, 14], "x": 15, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"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], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "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, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 13, "y": 5.5},
+                {"matrix": [5, 13], "x": 14, "y": 5.5},
+                {"matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso_blocker": {
+            "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, 14], "x": 15, "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, "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, 14], "x": 15, "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": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 1.25, "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], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "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, 5], "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, 12], "x": 13, "y": 5.5},
+                {"matrix": [5, 13], "x": 14, "y": 5.5},
+                {"matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso_blocker_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": 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, 14], "x": 15, "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": [2, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 13], "x": 14, "y": 1.5},
+                {"matrix": [1, 14], "x": 15, "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, 14], "x": 15, "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": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 1.25, "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], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "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, 5], "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, 12], "x": 13, "y": 5.5},
+                {"matrix": [5, 13], "x": 14, "y": 5.5},
+                {"matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan": {
+            "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, 14], "x": 15, "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, "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, 14], "x": 15, "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": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 1.25, "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], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "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, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 13, "y": 5.5},
+                {"matrix": [5, 13], "x": 14, "y": 5.5},
+                {"matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan_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":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, 14], "x":15, "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": [2, 13], "x":13, "y":1.5},
-                {"matrix": [1, 13], "x":14, "y":1.5},
-                {"matrix": [1, 14], "x":15, "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, "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, 14], "x":15, "y":3.5},
-                {"matrix": [4, 0], "x":0, "y":4.5, "w":1.25},
-                {"matrix": [5, 3], "x":1.25, "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], "x":12.25, "y":4.5, "w":1.75},
-                {"matrix": [4, 13], "x":14, "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, 5], "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, 12], "x":13, "y":5.5},
-                {"matrix": [5, 13], "x":14, "y":5.5},
-                {"matrix": [5, 14], "x":15, "y":5.5}
+                {"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, 14], "x": 15, "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": [2, 13], "x": 13, "y": 1.5},
+                {"matrix": [1, 13], "x": 14, "y": 1.5},
+                {"matrix": [1, 14], "x": 15, "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, 14], "x": 15, "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": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 1.25, "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], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "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, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 13, "y": 5.5},
+                {"matrix": [5, 13], "x": 14, "y": 5.5},
+                {"matrix": [5, 14], "x": 15, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/owlab/jelly_evolv/solder/keymaps/default/keymap.c b/keyboards/owlab/jelly_evolv/solder/keymaps/default/keymap.c
index b45d40340a66..a10c76f97f5a 100644
--- a/keyboards/owlab/jelly_evolv/solder/keymaps/default/keymap.c
+++ b/keyboards/owlab/jelly_evolv/solder/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(
+	[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_GRV,  KC_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_PGUP,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
 		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
 	),
-	[1] = LAYOUT(
+	[1] = LAYOUT_all(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, 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_TRNS, KC_TRNS,
diff --git a/keyboards/owlab/jelly_evolv/solder/keymaps/via/keymap.c b/keyboards/owlab/jelly_evolv/solder/keymaps/via/keymap.c
index b45d40340a66..a10c76f97f5a 100644
--- a/keyboards/owlab/jelly_evolv/solder/keymaps/via/keymap.c
+++ b/keyboards/owlab/jelly_evolv/solder/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(
+	[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_GRV,  KC_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_PGUP,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
 		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
 	),
-	[1] = LAYOUT(
+	[1] = LAYOUT_all(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, 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_TRNS, KC_TRNS,
diff --git a/keyboards/owlab/jelly_evolv/solder/matrix_diagram.md b/keyboards/owlab/jelly_evolv/solder/matrix_diagram.md
new file mode 100644
index 000000000000..2b0be0a5b8b5
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/solder/matrix_diagram.md
@@ -0,0 +1,27 @@
+# Matrix Diagram for OwLab Jelly Evolv Solder
+
+```
+┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┐
+│00 │ │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │0A │0B │0C │ │0E │
+└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2D │1D │1E │    │1D     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │3C   │2E │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐3D  │ ISO Enter
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │3E │   │3C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┘   └───┴────┘
+│40  │53 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B    │4D │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┐
+│50  │51  │52  │55                      │59  │5A  │ │5C │5D │5E │
+└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+┌────────┐
+│40      │ 2.25u LShift
+└────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┐
+│50   │51 │52   │55                         │5A   │ Blocker Tsangan
+└─────┴───┴─────┴───────────────────────────┴─────┘
+┌─────┬─────┬─┬───┬───────────────────────────┬───┐
+│50   │51   │ │52 │55                         │5A │
+└─────┴─────┘ └───┴───────────────────────────┴───┘
+```
diff --git a/keyboards/owlab/spring/config.h b/keyboards/owlab/spring/config.h
index 15d1e18d0b30..461903ea2ee0 100644
--- a/keyboards/owlab/spring/config.h
+++ b/keyboards/owlab/spring/config.h
@@ -17,20 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB 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
-#    define RGBLED_NUM 8
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 10
 #    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 cdf51430618d..d5813e78c882 100644
--- a/keyboards/owlab/spring/info.json
+++ b/keyboards/owlab/spring/info.json
@@ -14,6 +14,23 @@
         "rows": ["B0", "B7", "D0", "D1", "D2"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 10,
+        "led_count": 8,
+        "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": "D3"
     },
diff --git a/keyboards/owlab/spring/spring.c b/keyboards/owlab/spring/spring.c
index 8088fb03c247..13280ff9b39c 100644
--- a/keyboards/owlab/spring/spring.c
+++ b/keyboards/owlab/spring/spring.c
@@ -108,7 +108,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 
 
         case KC_CAPS:
-            if(IS_LED_ON(host_keyboard_leds(), USB_LED_CAPS_LOCK)){ 
+            if(host_keyboard_led_state().caps_lock){ 
                 caps_mode_index = CAPS_MODE_LOWER;
             } else{
                 caps_mode_index = CAPS_MODE_UPPER;
diff --git a/keyboards/owlab/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h
index 17222658f319..04bd741d771b 100644
--- a/keyboards/owlab/voice65/hotswap/config.h
+++ b/keyboards/owlab/voice65/hotswap/config.h
@@ -17,20 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB stripe */
-#    define RGBLIGHT_EFFECT_ALTERNATING
-#    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_SNAKE
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#    define RGBLIGHT_EFFECT_TWINKLE
-#    define RGBLED_NUM 20
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 10
 #    define OWL_VOLUME_RANGE 50
 
 /* RGB matrix */
@@ -95,5 +81,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #endif
-
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/owlab/voice65/hotswap/hotswap.c b/keyboards/owlab/voice65/hotswap/hotswap.c
index 57a216f30a9a..65c0ee7eed22 100644
--- a/keyboards/owlab/voice65/hotswap/hotswap.c
+++ b/keyboards/owlab/voice65/hotswap/hotswap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hotswap.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
@@ -122,329 +122,3 @@ bool rgb_matrix_indicators_kb(void) {
     }
     return true;
 }
-
-enum encoder_modes{
-    ENCODER_MODE_ONE,
-    ENCODER_MODE_TWO,
-    ENCODER_MODE_THREE
-};
-
-keyboard_config_t keyboard_config;
-rgblight_config_t rgblight_config;
-
-uint8_t pre_hue, pre_sat, pre_val;
-uint8_t previous_rgb_mode = 0;
-uint8_t dir_hue, dir_sat;
-
-bool encoder_in = false;
-uint32_t encoder_timer;
-
-bool encoder_ani_start= false;
-uint32_t encoder_ani_timer = 0;
-
-bool encoder_direction_start = false;
-uint32_t encoder_direction_timer = 0;
-
-
-bool lizm_restart_snake = false;
-void rgblight_snake_restart(uint8_t hue, uint8_t sat, uint8_t val){
-    lizm_restart_snake = true;  // restart signal to local each effect
-    rgblight_config.hue = hue;
-    rgblight_config.sat = sat;
-    rgblight_config.val = val;
-}
-
-
-void keyboard_post_init_kb(void){
-    keyboard_config.raw = eeconfig_read_kb();
-    if( keyboard_config.encoder_mode_index > ENCODER_MODE_THREE ){
-        keyboard_config.encoder_mode_index = ENCODER_MODE_ONE;
-        eeconfig_update_kb(keyboard_config.raw);
-    }
-}
-
-void switch_encoder_mode(uint8_t mode){
-       switch(mode){
-            case ENCODER_MODE_ONE:
-            dir_hue = 88;
-            dir_sat = 255;
-            break;
-
-            case ENCODER_MODE_TWO:
-            dir_hue = 0;
-            dir_sat = 240;
-            break;
-
-            case ENCODER_MODE_THREE:
-            dir_hue = 176;
-            dir_sat = 255;
-            break;
-        }
-        rgblight_sethsv_noeeprom(dir_hue,dir_sat,pre_val);
-}
-
-
-void init_encoder_mode(uint8_t mode){
-    previous_rgb_mode = rgblight_get_mode();
-    pre_hue = rgblight_get_hue();
-    pre_sat = rgblight_get_sat();
-    pre_val = rgblight_get_val();
-    encoder_in = true;
-
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-
-    switch_encoder_mode(mode);
-}
-
-
-void set_encoder_mode(uint8_t mode){
-    if(encoder_in == false){
-       init_encoder_mode(mode);
-    }else{
-        switch_encoder_mode(mode);
-    }
-    eeconfig_update_kb(keyboard_config.raw);
-    encoder_timer = timer_read32();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    switch(keycode) {
-        case RGB_MOD:
-        case RGB_RMOD:
-        case RGB_HUI:
-        case RGB_HUD:
-        case RGB_SAI:
-        case RGB_SAD:
-        case RGB_VAI:
-        case RGB_VAD:
-
-        if(encoder_in){
-                return false;
-            }
-        break;
-
-        case KC_F13:
-        rgb_matrix_toggle();
-        break;
-
-        case KC_F14:
-        rgb_matrix_step();
-        break;
-
-        case KC_F15:
-        rgb_matrix_step_reverse();
-        break;
-
-        case KC_F16:
-        rgb_matrix_increase_hue();  //Increase the hue for effect range LEDs
-        break;
-
-        case KC_F17:
-        rgb_matrix_decrease_hue(); //Decrease the hue for effect range LEDs
-        break;
-
-        case KC_F18:
-        rgb_matrix_increase_sat(); //Increase the saturation for effect range LEDs
-        break;
-
-        case KC_F19:
-        rgb_matrix_decrease_sat(); //Decrease the saturation for effect range LEDs
-        break;
-
-        case KC_F20:
-        rgb_matrix_increase_val(); //Increase the value for effect range LEDs
-        break;
-
-        case KC_F21:
-        rgb_matrix_decrease_val();//Decrease the value for effect range LEDs
-        break;
-
-        case KC_F22:  //change encoder mode upward
-        if(!encoder_direction_start){
-            if(keyboard_config.encoder_mode_index < ENCODER_MODE_THREE){
-                keyboard_config.encoder_mode_index++;
-            }
-            else{
-                keyboard_config.encoder_mode_index = ENCODER_MODE_ONE;
-            }
-            set_encoder_mode(keyboard_config.encoder_mode_index);
-        }
-        return false;
-        case KC_F23:
-        if(!encoder_direction_start){
-            if(keyboard_config.encoder_mode_index > ENCODER_MODE_ONE){
-                keyboard_config.encoder_mode_index--;
-            }
-            else{
-                keyboard_config.encoder_mode_index = ENCODER_MODE_THREE;
-            }
-            set_encoder_mode(keyboard_config.encoder_mode_index);
-        }
-        return false;
-
-        default:
-        break;
-    }
-  }
-  return process_record_user(keycode, record);
-}
-
-
-void matrix_scan_kb(void) {
-    if(encoder_in){
-        if(timer_elapsed32(encoder_timer) > 5000){
-            rgblight_mode(previous_rgb_mode);
-            rgblight_sethsv(pre_hue, pre_sat, pre_val);
-            encoder_in = false;
-        }
-    }
-
-    if(encoder_ani_start){
-        if(timer_elapsed32(encoder_ani_timer) > VOLUME_ANIMATION_TIMER){
-            encoder_ani_start = false;
-            rgblight_sethsv_noeeprom(0,0,0);
-        }
-    }
-
-    if(encoder_direction_start){
-        if(timer_elapsed32(encoder_direction_timer) > (VOLUME_ANIMATION_TIMER+1500)){
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-            rgblight_sethsv_noeeprom(dir_hue, dir_sat, pre_val);
-            encoder_direction_start = false;
-        }
-    }
-    matrix_scan_user();
-}
-
-
-void set_volume_animation(bool increase){
-    if(!encoder_ani_start){
-        rgblight_snake_restart(dir_hue, dir_sat, pre_val);
-    }
-
-    if(increase){
-        rgblight_mode_noeeprom(17);
-    } else {
-        rgblight_mode_noeeprom(18);
-    }
-
-    encoder_ani_timer = timer_read32();
-    encoder_direction_timer = encoder_ani_timer;
-    encoder_ani_start = true;
-    encoder_direction_start = true;
-}
-
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    uint8_t layer_now = keyboard_config.encoder_mode_index +1;
-    uint16_t encoder_cw_keycode = keymap_key_to_keycode(layer_now, (keypos_t){.row=2, .col=1 });
-    uint16_t encoder_ccw_keycode = keymap_key_to_keycode(layer_now, (keypos_t){.row=2, .col=2 });
-    if (index == 0) { /* First encoder */
-        if(encoder_in == false){
-            init_encoder_mode(keyboard_config.encoder_mode_index);
-        }
-
-        if (!clockwise) {
-             switch(encoder_cw_keycode) {
-
-                case KC_F13:
-                rgb_matrix_toggle();
-                break;
-
-                case KC_F14:
-                rgb_matrix_step();
-                break;
-
-                case KC_F15:
-                rgb_matrix_step_reverse();
-                break;
-
-                case KC_F16:
-                rgb_matrix_increase_hue();  //Increase the hue for effect range LEDs
-                break;
-
-                case KC_F17:
-                rgb_matrix_decrease_hue(); //Decrease the hue for effect range LEDs
-                break;
-
-                case KC_F18:
-                rgb_matrix_increase_sat(); //Increase the saturation for effect range LEDs
-                break;
-
-                case KC_F19:
-                rgb_matrix_decrease_sat(); //Decrease the saturation for effect range LEDs
-                break;
-
-                case KC_F20:
-                rgb_matrix_increase_val(); //Increase the value for effect range LEDs
-                break;
-
-                case KC_F21:
-                rgb_matrix_decrease_val();//Decrease the value for effect range LEDs
-                break;
-
-                case KC_VOLU:
-                case KC_VOLD:
-                tap_code(encoder_cw_keycode);
-                break;
-
-                default:
-                tap_code(encoder_cw_keycode);
-                break;
-            }
-            set_volume_animation(true);
-        } else {
-             switch(encoder_ccw_keycode) {
-
-                case KC_F13:
-                rgb_matrix_toggle();
-                break;
-
-                case KC_F14:
-                rgb_matrix_step();
-                break;
-
-                case KC_F15:
-                rgb_matrix_step_reverse();
-                break;
-
-                case KC_F16:
-                rgb_matrix_increase_hue();  //Increase the hue for effect range LEDs
-                break;
-
-                case KC_F17:
-                rgb_matrix_decrease_hue(); //Decrease the hue for effect range LEDs
-                break;
-
-                case KC_F18:
-                rgb_matrix_increase_sat(); //Increase the saturation for effect range LEDs
-                break;
-
-                case KC_F19:
-                rgb_matrix_decrease_sat(); //Decrease the saturation for effect range LEDs
-                break;
-
-                case KC_F20:
-                rgb_matrix_increase_val(); //Increase the value for effect range LEDs
-                break;
-
-                case KC_F21:
-                rgb_matrix_decrease_val();//Decrease the value for effect range LEDs
-                break;
-
-                case KC_VOLU:
-                case KC_VOLD:
-                tap_code(encoder_ccw_keycode);
-                break;
-
-                default:
-                tap_code(encoder_ccw_keycode);
-                break;
-            }
-            set_volume_animation(false);
-        }
-        encoder_timer = timer_read32();
-    }
-    return true;
-}
diff --git a/keyboards/owlab/voice65/hotswap/hotswap.h b/keyboards/owlab/voice65/hotswap/hotswap.h
deleted file mode 100644
index 6536af4c49ec..000000000000
--- a/keyboards/owlab/voice65/hotswap/hotswap.h
+++ /dev/null
@@ -1,30 +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"
-
-typedef union {
-    uint32_t raw;
-    struct {
-        uint8_t encoder_mode_index :8;
-    };
-} keyboard_config_t;
-
-extern keyboard_config_t keyboard_config;
-
-#define VOLUME_ANIMATION_TIMER 580
diff --git a/keyboards/owlab/voice65/hotswap/info.json b/keyboards/owlab/voice65/hotswap/info.json
index 6b6474ab68fc..7b1ff47794a1 100644
--- a/keyboards/owlab/voice65/hotswap/info.json
+++ b/keyboards/owlab/voice65/hotswap/info.json
@@ -10,7 +10,7 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A15", "B8", "B9", "B12", "B13"],
@@ -22,11 +22,28 @@
             {"pin_a": "B4", "pin_b": "B5"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "ws2812": {
         "pin": "B15"
     },
     "rgblight": {
-        "max_brightness": 180
+        "saturation_steps": 8,
+        "brightness_steps": 10,
+        "led_count": 20,
+        "max_brightness": 180,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true,
+            "twinkle": true
+        }
     },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/owlab/voice65/hotswap/keymaps/default/keymap.c b/keyboards/owlab/voice65/hotswap/keymaps/default/keymap.c
index 055f93e1880d..5d640c162b22 100644
--- a/keyboards/owlab/voice65/hotswap/keymaps/default/keymap.c
+++ b/keyboards/owlab/voice65/hotswap/keymaps/default/keymap.c
@@ -16,35 +16,44 @@
 #include QMK_KEYBOARD_H
 
 // How long (in ms) to wait between animation steps for the snake mode
-const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 35, 20}; 
+const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 35, 20};
 
 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_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_ESC,  KC_1,    KC_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_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_TRNS, QK_BOOT,
         KC_TRNS, 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_HOME, KC_HOME,
-        KC_TRNS, KC_VOLU, KC_VOLD, 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_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_TRNS, KC_TRNS, KC_F22,  KC_TRNS, 
+        KC_TRNS, KC_VOLU, KC_VOLD, 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_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_TRNS, KC_TRNS, KC_F22,  KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_F23,  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_PGUP, 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
     ),
     [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_WH_U, 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_TRNS, KC_TRNS, 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
+};
+
+#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_PGUP, KC_PGDN) },
+    [2] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/owlab/voice65/hotswap/keymaps/default/rules.mk b/keyboards/owlab/voice65/hotswap/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/owlab/voice65/hotswap/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/owlab/voice65/hotswap/keymaps/via/keymap.c b/keyboards/owlab/voice65/hotswap/keymaps/via/keymap.c
index 68801ff2f8b4..5d640c162b22 100644
--- a/keyboards/owlab/voice65/hotswap/keymaps/via/keymap.c
+++ b/keyboards/owlab/voice65/hotswap/keymaps/via/keymap.c
@@ -16,36 +16,44 @@
 #include QMK_KEYBOARD_H
 
 // How long (in ms) to wait between animation steps for the snake mode
-const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 35, 20}; 
+const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 35, 20};
 
 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_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_ESC,  KC_1,    KC_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_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_TRNS, QK_BOOT,
         KC_TRNS, 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_HOME, KC_HOME,
-        KC_TRNS, KC_VOLU, KC_VOLD, 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_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_TRNS, KC_TRNS, KC_F22,  KC_TRNS, 
+        KC_TRNS, KC_VOLU, KC_VOLD, 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_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_TRNS, KC_TRNS, KC_F22,  KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_F23,  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_PGUP, 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
     ),
     [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_WH_U, 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_TRNS, KC_TRNS, 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_PGUP, KC_PGDN) },
+    [2] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/owlab/voice65/hotswap/keymaps/via/rules.mk b/keyboards/owlab/voice65/hotswap/keymaps/via/rules.mk
index 36b7ba9cbc98..1189f4ad1927 100644
--- a/keyboards/owlab/voice65/hotswap/keymaps/via/rules.mk
+++ b/keyboards/owlab/voice65/hotswap/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h
index 6f41edccd06d..66e412effb65 100644
--- a/keyboards/owlab/voice65/soldered/config.h
+++ b/keyboards/owlab/voice65/soldered/config.h
@@ -17,20 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB stripe */
-#    define RGBLIGHT_EFFECT_ALTERNATING
-#    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_SNAKE
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#    define RGBLIGHT_EFFECT_TWINKLE
-#    define RGBLED_NUM 20
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 10
 #    define OWL_VOLUME_RANGE 50
 
 /* RGB matrix*/
@@ -96,5 +82,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #endif
-
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/owlab/voice65/soldered/info.json b/keyboards/owlab/voice65/soldered/info.json
index 3b38b45da4c1..8e96d689283b 100644
--- a/keyboards/owlab/voice65/soldered/info.json
+++ b/keyboards/owlab/voice65/soldered/info.json
@@ -10,7 +10,7 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "A15", "B8", "B9", "B12", "B13"],
@@ -22,11 +22,28 @@
             {"pin_a": "B4", "pin_b": "B5"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "ws2812": {
         "pin": "B15"
     },
     "rgblight": {
-        "max_brightness": 180
+        "saturation_steps": 8,
+        "brightness_steps": 10,
+        "led_count": 20,
+        "max_brightness": 180,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true,
+            "twinkle": true
+        }
     },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/owlab/voice65/soldered/keymaps/default/keymap.c b/keyboards/owlab/voice65/soldered/keymaps/default/keymap.c
index 055f93e1880d..5d640c162b22 100644
--- a/keyboards/owlab/voice65/soldered/keymaps/default/keymap.c
+++ b/keyboards/owlab/voice65/soldered/keymaps/default/keymap.c
@@ -16,35 +16,44 @@
 #include QMK_KEYBOARD_H
 
 // How long (in ms) to wait between animation steps for the snake mode
-const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 35, 20}; 
+const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 35, 20};
 
 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_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_ESC,  KC_1,    KC_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_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_TRNS, QK_BOOT,
         KC_TRNS, 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_HOME, KC_HOME,
-        KC_TRNS, KC_VOLU, KC_VOLD, 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_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_TRNS, KC_TRNS, KC_F22,  KC_TRNS, 
+        KC_TRNS, KC_VOLU, KC_VOLD, 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_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_TRNS, KC_TRNS, KC_F22,  KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_F23,  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_PGUP, 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
     ),
     [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_WH_U, 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_TRNS, KC_TRNS, 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
+};
+
+#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_PGUP, KC_PGDN) },
+    [2] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/owlab/voice65/soldered/keymaps/default/rules.mk b/keyboards/owlab/voice65/soldered/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/owlab/voice65/soldered/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/owlab/voice65/soldered/keymaps/via/keymap.c b/keyboards/owlab/voice65/soldered/keymaps/via/keymap.c
index 055f93e1880d..5d640c162b22 100644
--- a/keyboards/owlab/voice65/soldered/keymaps/via/keymap.c
+++ b/keyboards/owlab/voice65/soldered/keymaps/via/keymap.c
@@ -16,35 +16,44 @@
 #include QMK_KEYBOARD_H
 
 // How long (in ms) to wait between animation steps for the snake mode
-const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 35, 20}; 
+const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 35, 20};
 
 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_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_ESC,  KC_1,    KC_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_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_TRNS, QK_BOOT,
         KC_TRNS, 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_HOME, KC_HOME,
-        KC_TRNS, KC_VOLU, KC_VOLD, 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_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_TRNS, KC_TRNS, KC_F22,  KC_TRNS, 
+        KC_TRNS, KC_VOLU, KC_VOLD, 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_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_TRNS, KC_TRNS, KC_F22,  KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_F23,  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_PGUP, 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
     ),
     [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_WH_U, 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_TRNS, KC_TRNS, 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
+};
+
+#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_PGUP, KC_PGDN) },
+    [2] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/owlab/voice65/soldered/keymaps/via/rules.mk b/keyboards/owlab/voice65/soldered/keymaps/via/rules.mk
index 36b7ba9cbc98..1189f4ad1927 100644
--- a/keyboards/owlab/voice65/soldered/keymaps/via/rules.mk
+++ b/keyboards/owlab/voice65/soldered/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/owlab/voice65/soldered/soldered.c b/keyboards/owlab/voice65/soldered/soldered.c
index cfdaaad4ae21..1444b058640e 100644
--- a/keyboards/owlab/voice65/soldered/soldered.c
+++ b/keyboards/owlab/voice65/soldered/soldered.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "soldered.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
@@ -126,330 +126,3 @@ bool rgb_matrix_indicators_kb(void) {
     }
     return true;
 }
-
-enum encoder_modes{
-    ENCODER_MODE_ONE,
-    ENCODER_MODE_TWO,
-    ENCODER_MODE_THREE
-};
-
-keyboard_config_t keyboard_config;
-rgblight_config_t rgblight_config;
-
-uint8_t pre_hue, pre_sat, pre_val;
-uint8_t previous_rgb_mode = 0;
-uint8_t dir_hue, dir_sat;
-
-bool encoder_in = false;
-uint32_t encoder_timer;
-
-bool encoder_ani_start= false;
-uint32_t encoder_ani_timer = 0;
-
-bool encoder_direction_start = false;
-uint32_t encoder_direction_timer = 0;
-
-
-bool lizm_restart_snake = false;
-void rgblight_snake_restart(uint8_t hue, uint8_t sat, uint8_t val){
-    lizm_restart_snake = true;  // restart signal to local each effect
-    rgblight_config.hue = hue;
-    rgblight_config.sat = sat;
-    rgblight_config.val = val;
-}
-
-
-void keyboard_post_init_kb(void){
-    keyboard_config.raw = eeconfig_read_kb();
-    if( keyboard_config.encoder_mode_index > ENCODER_MODE_THREE ){
-        keyboard_config.encoder_mode_index = ENCODER_MODE_ONE;
-        eeconfig_update_kb(keyboard_config.raw);
-    }
-}
-
-void switch_encoder_mode(uint8_t mode){
-       switch(mode){
-            case ENCODER_MODE_ONE:
-            dir_hue = 88;
-            dir_sat = 255;
-            break;
-
-            case ENCODER_MODE_TWO:
-            dir_hue = 0;
-            dir_sat = 240;
-            break;
-
-            case ENCODER_MODE_THREE:
-            dir_hue = 176;
-            dir_sat = 255;
-            break;
-        }
-        rgblight_sethsv_noeeprom(dir_hue,dir_sat,pre_val);
-}
-
-
-void init_encoder_mode(uint8_t mode){
-    previous_rgb_mode = rgblight_get_mode();
-    pre_hue = rgblight_get_hue();
-    pre_sat = rgblight_get_sat();
-    pre_val = rgblight_get_val();
-    encoder_in = true;
-
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-
-    switch_encoder_mode(mode);
-}
-
-
-void set_encoder_mode(uint8_t mode){
-    if(encoder_in == false){
-       init_encoder_mode(mode);
-    }else{
-        switch_encoder_mode(mode);
-    }
-    eeconfig_update_kb(keyboard_config.raw);
-    encoder_timer = timer_read32();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    switch(keycode) {
-        case RGB_MOD:
-        case RGB_RMOD:
-        case RGB_HUI:
-        case RGB_HUD:
-        case RGB_SAI:
-        case RGB_SAD:
-        case RGB_VAI:
-        case RGB_VAD:
-
-        if(encoder_in){
-                return false;
-            }
-        break;
-
-        case KC_F13:
-        rgb_matrix_toggle();
-        break;
-
-        case KC_F14:
-        rgb_matrix_step();
-        break;
-
-        case KC_F15:
-        rgb_matrix_step_reverse();
-        break;
-
-        case KC_F16:
-        rgb_matrix_increase_hue();  //Increase the hue for effect range LEDs
-        break;
-
-        case KC_F17:
-        rgb_matrix_decrease_hue(); //Decrease the hue for effect range LEDs
-        break;
-
-        case KC_F18:
-        rgb_matrix_increase_sat(); //Increase the saturation for effect range LEDs
-        break;
-
-        case KC_F19:
-        rgb_matrix_decrease_sat(); //Decrease the saturation for effect range LEDs
-        break;
-
-        case KC_F20:
-        rgb_matrix_increase_val(); //Increase the value for effect range LEDs
-        break;
-
-        case KC_F21:
-        rgb_matrix_decrease_val();//Decrease the value for effect range LEDs
-        break;
-
-        case KC_F22:  //change encoder mode upward
-        if(!encoder_direction_start){
-            if(keyboard_config.encoder_mode_index < ENCODER_MODE_THREE){
-                keyboard_config.encoder_mode_index++;
-            }
-            else{
-                keyboard_config.encoder_mode_index = ENCODER_MODE_ONE;
-            }
-            set_encoder_mode(keyboard_config.encoder_mode_index);
-        }
-        return false;
-
-        case KC_F23:
-        if(!encoder_direction_start){
-            if(keyboard_config.encoder_mode_index > ENCODER_MODE_ONE){
-                keyboard_config.encoder_mode_index--;
-            }
-            else{
-                keyboard_config.encoder_mode_index = ENCODER_MODE_THREE;
-            }
-            set_encoder_mode(keyboard_config.encoder_mode_index);
-        }
-        return false;
-
-        default:
-        break;
-    }
-  }
-  return process_record_user(keycode, record);
-}
-
-
-void matrix_scan_kb(void) {
-    if(encoder_in){
-        if(timer_elapsed32(encoder_timer) > 5000){
-            rgblight_mode(previous_rgb_mode);
-            rgblight_sethsv(pre_hue, pre_sat, pre_val);
-            encoder_in = false;
-        }
-    }
-
-    if(encoder_ani_start){
-        if(timer_elapsed32(encoder_ani_timer) > VOLUME_ANIMATION_TIMER){
-            encoder_ani_start = false;
-            rgblight_sethsv_noeeprom(0,0,0);
-        }
-    }
-
-    if(encoder_direction_start){
-        if(timer_elapsed32(encoder_direction_timer) > (VOLUME_ANIMATION_TIMER+1500)){
-            rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-            rgblight_sethsv_noeeprom(dir_hue, dir_sat, pre_val);
-            encoder_direction_start = false;
-        }
-    }
-    matrix_scan_user();
-}
-
-
-void set_volume_animation(bool increase){
-    if(!encoder_ani_start){
-        rgblight_snake_restart(dir_hue, dir_sat, pre_val);
-    }
-
-    if(increase){
-        rgblight_mode_noeeprom(17);
-    } else {
-        rgblight_mode_noeeprom(18);
-    }
-
-    encoder_ani_timer = timer_read32();
-    encoder_direction_timer = encoder_ani_timer;
-    encoder_ani_start = true;
-    encoder_direction_start = true;
-}
-
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    uint8_t layer_now = keyboard_config.encoder_mode_index +1;
-    uint16_t encoder_cw_keycode = keymap_key_to_keycode(layer_now, (keypos_t){.row=2, .col=1 });
-    uint16_t encoder_ccw_keycode = keymap_key_to_keycode(layer_now, (keypos_t){.row=2, .col=2 });
-    if (index == 0) { /* First encoder */
-        if(encoder_in == false){
-            init_encoder_mode(keyboard_config.encoder_mode_index);
-        }
-
-        if (!clockwise) {
-             switch(encoder_cw_keycode) {
-
-                case KC_F13:
-                rgb_matrix_toggle();
-                break;
-
-                case KC_F14:
-                rgb_matrix_step();
-                break;
-
-                case KC_F15:
-                rgb_matrix_step_reverse();
-                break;
-
-                case KC_F16:
-                rgb_matrix_increase_hue();  //Increase the hue for effect range LEDs
-                break;
-
-                case KC_F17:
-                rgb_matrix_decrease_hue(); //Decrease the hue for effect range LEDs
-                break;
-
-                case KC_F18:
-                rgb_matrix_increase_sat(); //Increase the saturation for effect range LEDs
-                break;
-
-                case KC_F19:
-                rgb_matrix_decrease_sat(); //Decrease the saturation for effect range LEDs
-                break;
-
-                case KC_F20:
-                rgb_matrix_increase_val(); //Increase the value for effect range LEDs
-                break;
-
-                case KC_F21:
-                rgb_matrix_decrease_val();//Decrease the value for effect range LEDs
-                break;
-
-                case KC_VOLU:
-                case KC_VOLD:
-                tap_code(encoder_cw_keycode);
-                break;
-
-                default:
-                tap_code(encoder_cw_keycode);
-                break;
-            }
-            set_volume_animation(true);
-        } else {
-             switch(encoder_ccw_keycode) {
-
-                case KC_F13:
-                rgb_matrix_toggle();
-                break;
-
-                case KC_F14:
-                rgb_matrix_step();
-                break;
-
-                case KC_F15:
-                rgb_matrix_step_reverse();
-                break;
-
-                case KC_F16:
-                rgb_matrix_increase_hue();  //Increase the hue for effect range LEDs
-                break;
-
-                case KC_F17:
-                rgb_matrix_decrease_hue(); //Decrease the hue for effect range LEDs
-                break;
-
-                case KC_F18:
-                rgb_matrix_increase_sat(); //Increase the saturation for effect range LEDs
-                break;
-
-                case KC_F19:
-                rgb_matrix_decrease_sat(); //Decrease the saturation for effect range LEDs
-                break;
-
-                case KC_F20:
-                rgb_matrix_increase_val(); //Increase the value for effect range LEDs
-                break;
-
-                case KC_F21:
-                rgb_matrix_decrease_val();//Decrease the value for effect range LEDs
-                break;
-
-                case KC_VOLU:
-                case KC_VOLD:
-                tap_code(encoder_ccw_keycode);
-                break;
-
-                default:
-                tap_code(encoder_ccw_keycode);
-                break;
-            }
-            set_volume_animation(false);
-        }
-        encoder_timer = timer_read32();
-    }
-    return true;
-}
diff --git a/keyboards/owlab/voice65/soldered/soldered.h b/keyboards/owlab/voice65/soldered/soldered.h
deleted file mode 100644
index 2c10428cec2f..000000000000
--- a/keyboards/owlab/voice65/soldered/soldered.h
+++ /dev/null
@@ -1,30 +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"
-
-typedef union {
-  uint32_t raw;
-  struct {
-    uint8_t encoder_mode_index :8;
-  };
-} keyboard_config_t;
-
-extern keyboard_config_t keyboard_config;
-
-#define VOLUME_ANIMATION_TIMER 580
diff --git a/keyboards/p3d/glitch/config.h b/keyboards/p3d/glitch/config.h
index a7548280532c..0fc3805ff7fb 100644
--- a/keyboards/p3d/glitch/config.h
+++ b/keyboards/p3d/glitch/config.h
@@ -17,18 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 25
-#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
-
 /* 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/p3d/glitch/info.json b/keyboards/p3d/glitch/info.json
index 4f323df44771..e7858124e2fe 100644
--- a/keyboards/p3d/glitch/info.json
+++ b/keyboards/p3d/glitch/info.json
@@ -19,6 +19,21 @@
             {"pin_a": "F6", "pin_b": "F7", "resolution": 2}
         ]
     },
+    "rgblight": {
+        "led_count": 25,
+        "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": "B1"
     },
diff --git a/keyboards/palette1202/rules.mk b/keyboards/palette1202/rules.mk
index 1c07ca71f286..8876586f4bae 100644
--- a/keyboards/palette1202/rules.mk
+++ b/keyboards/palette1202/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE    = no     # Enable keyboard RGB underglow
 AUDIO_ENABLE       = no     # Audio output
 ENCODER_ENABLE     = yes    # Enable support for rotary encoders
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable support for OLED display
 
 # Additional code
 SRC += lib/oled_helper.c  # Adding OLED
diff --git a/keyboards/panc40/config.h b/keyboards/panc40/config.h
index edc623d08fa5..5f360813239b 100644
--- a/keyboards/panc40/config.h
+++ b/keyboards/panc40/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 8
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/panc40/info.json b/keyboards/panc40/info.json
index 89c96391395f..c5f50057b69f 100644
--- a/keyboards/panc40/info.json
+++ b/keyboards/panc40/info.json
@@ -8,6 +8,23 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "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": "D2"
     },
diff --git a/keyboards/panc60/config.h b/keyboards/panc60/config.h
deleted file mode 100644
index d324ea3f8139..000000000000
--- a/keyboards/panc60/config.h
+++ /dev/null
@@ -1,32 +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
-
-
-#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
diff --git a/keyboards/panc60/info.json b/keyboards/panc60/info.json
index 077949cd0950..1a967727cef2 100644
--- a/keyboards/panc60/info.json
+++ b/keyboards/panc60/info.json
@@ -16,6 +16,21 @@
   "backlight": {
     "pin": "D4"
   },
+  "rgblight": {
+    "led_count": 12,
+    "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": {
     "driver": "i2c"
   },
diff --git a/keyboards/pangorin/tan67/info.json b/keyboards/pangorin/tan67/info.json
index 4aab01aa8d3c..5b36fd7a4003 100644
--- a/keyboards/pangorin/tan67/info.json
+++ b/keyboards/pangorin/tan67/info.json
@@ -27,7 +27,7 @@
         "pin": "B15"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "max_brightness": 200,
         "animations": {
             "alphas_mods": true,
diff --git a/keyboards/paprikman/albacore/info.json b/keyboards/paprikman/albacore/info.json
index 8d62d0a2472d..5fad6237face 100644
--- a/keyboards/paprikman/albacore/info.json
+++ b/keyboards/paprikman/albacore/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["C6", "B6", "B5", "B4"],
diff --git a/keyboards/pearl/config.h b/keyboards/pearl/config.h
deleted file mode 100644
index 2a51abdab271..000000000000
--- a/keyboards/pearl/config.h
+++ /dev/null
@@ -1,30 +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
-
-#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/pearl/info.json b/keyboards/pearl/info.json
index 8ac8ef0a7e46..cf090b958720 100644
--- a/keyboards/pearl/info.json
+++ b/keyboards/pearl/info.json
@@ -15,6 +15,21 @@
   "backlight": {
     "pin": "D4"
   },
+  "rgblight": {
+    "led_count": 12,
+    "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": {
     "driver": "i2c"
   },
diff --git a/keyboards/pearl/keymaps/cijanzen/rules.mk b/keyboards/pearl/keymaps/cijanzen/rules.mk
index c800dc98f8e9..900468e149c1 100644
--- a/keyboards/pearl/keymaps/cijanzen/rules.mk
+++ b/keyboards/pearl/keymaps/cijanzen/rules.mk
@@ -6,6 +6,5 @@ CONSOLE_ENABLE = no
 COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-RGBLIGHT_CUSTOM_DRIVER = yes
 # TAP_DANCE_ENABLE = yes
 AUTO_SHIFT_ENABLE = yes
diff --git a/keyboards/pearlboards/atlas/config.h b/keyboards/pearlboards/atlas/config.h
index 009f810b0cc4..6fbdda292b54 100644
--- a/keyboards/pearlboards/atlas/config.h
+++ b/keyboards/pearlboards/atlas/config.h
@@ -22,29 +22,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define AUDIO_PIN C6
 
 /* Haptic feedback */
-#define FB_ERM_LRA 0
-#define FB_BRAKEFACTOR 3 // For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7
-#define FB_LOOPGAIN 3 // For  Low:0, Medium:1, High:2, Very High:3
+#define DRV2605L_FB_ERM_LRA 0
+#define DRV2605L_FB_BRAKEFACTOR 3 // For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7
+#define DRV2605L_FB_LOOPGAIN 3 // For  Low:0, Medium:1, High:2, Very High:3
 /* Motor settings */
-#define RATED_VOLTAGE 3
-#define V_PEAK 5
-
-/*== all animations enabled ==*/
-/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGBLIGHT_EFFECT_ALTERNATING
-#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_SNAKE
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 8
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
+#define DRV2605L_RATED_VOLTAGE 3
+#define DRV2605L_V_PEAK 5
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/atlas/info.json b/keyboards/pearlboards/atlas/info.json
index 6c944ff32939..5433eb3c75f0 100644
--- a/keyboards/pearlboards/atlas/info.json
+++ b/keyboards/pearlboards/atlas/info.json
@@ -24,6 +24,23 @@
         "scroll_lock": "F6",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
         "pin": "B6"
     },
diff --git a/keyboards/pearlboards/atlas/rules.mk b/keyboards/pearlboards/atlas/rules.mk
index 15d4f79cde65..1dd174f43667 100644
--- a/keyboards/pearlboards/atlas/rules.mk
+++ b/keyboards/pearlboards/atlas/rules.mk
@@ -12,6 +12,6 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
 ENCODER_ENABLE = yes
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = DRV2605L
+HAPTIC_DRIVER = drv2605l
 
 LTO_ENABLE = yes
diff --git a/keyboards/pearlboards/pandora/config.h b/keyboards/pearlboards/pandora/config.h
index 02fc30db9775..beaeec353d50 100644
--- a/keyboards/pearlboards/pandora/config.h
+++ b/keyboards/pearlboards/pandora/config.h
@@ -19,23 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DIP_SWITCH_PINS { B2, B5 }
 
-/*== all animations enabled ==*/
-/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGBLIGHT_EFFECT_ALTERNATING
-#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_SNAKE
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/pearlboards/pandora/info.json b/keyboards/pearlboards/pandora/info.json
index 39f271d1b525..e0a28788ebf8 100644
--- a/keyboards/pearlboards/pandora/info.json
+++ b/keyboards/pearlboards/pandora/info.json
@@ -22,6 +22,23 @@
         "caps_lock": "E6",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
         "pin": "B1"
     },
diff --git a/keyboards/pearlboards/pearl/config.h b/keyboards/pearlboards/pearl/config.h
index 361c3159291c..e0ed66359a6e 100644
--- a/keyboards/pearlboards/pearl/config.h
+++ b/keyboards/pearlboards/pearl/config.h
@@ -22,30 +22,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define AUDIO_PIN C6
 
 /* Haptic feedback */
-#define FB_ERM_LRA 0
-#define FB_BRAKEFACTOR 3 // For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7
-#define FB_LOOPGAIN 1 // For  Low:0, Medium:1, High:2, Very High:3
+#define DRV2605L_FB_ERM_LRA 0
+#define DRV2605L_FB_BRAKEFACTOR 3 // For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7
+#define DRV2605L_FB_LOOPGAIN 1 // For  Low:0, Medium:1, High:2, Very High:3
 /* Motor settings */
-#define RATED_VOLTAGE 3
-#define V_PEAK 5
-
-/*== all animations enabled ==*/
-/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGBLIGHT_EFFECT_ALTERNATING
-#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
-#    define RGBLED_NUM 10
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP
+#define DRV2605L_RATED_VOLTAGE 3
+#define DRV2605L_V_PEAK 5
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/pearl/info.json b/keyboards/pearlboards/pearl/info.json
index c14c6685b36f..43dd3ad871d2 100644
--- a/keyboards/pearlboards/pearl/info.json
+++ b/keyboards/pearlboards/pearl/info.json
@@ -19,6 +19,24 @@
         "scroll_lock": "B2",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "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": "B3"
     },
diff --git a/keyboards/pearlboards/pearl/rules.mk b/keyboards/pearlboards/pearl/rules.mk
index 707e9c931264..83d6c3a33f5b 100644
--- a/keyboards/pearlboards/pearl/rules.mk
+++ b/keyboards/pearlboards/pearl/rules.mk
@@ -11,6 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = DRV2605L
+HAPTIC_DRIVER = drv2605l
 
 LTO_ENABLE = yes
diff --git a/keyboards/pearlboards/zeus/config.h b/keyboards/pearlboards/zeus/config.h
index 102c43e16809..ae2ca44ab555 100644
--- a/keyboards/pearlboards/zeus/config.h
+++ b/keyboards/pearlboards/zeus/config.h
@@ -26,29 +26,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 /* Haptic feedback */
-#define FB_ERM_LRA 0
-#define FB_BRAKEFACTOR 1 // For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7
-#define FB_LOOPGAIN 3 // For  Low:0, Medium:1, High:2, Very High:3
+#define DRV2605L_FB_ERM_LRA 0
+#define DRV2605L_FB_BRAKEFACTOR 1 // For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7
+#define DRV2605L_FB_LOOPGAIN 3 // For  Low:0, Medium:1, High:2, Very High:3
 /* Motor settings */
-#define RATED_VOLTAGE 2
-#define V_PEAK 5
-
-/*== all animations enabled ==*/
-/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGBLIGHT_EFFECT_ALTERNATING
-#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_SNAKE
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 2
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
+#define DRV2605L_RATED_VOLTAGE 2
+#define DRV2605L_V_PEAK 5
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/zeus/info.json b/keyboards/pearlboards/zeus/info.json
index 0fbfc75c2174..3128b8c1d85e 100644
--- a/keyboards/pearlboards/zeus/info.json
+++ b/keyboards/pearlboards/zeus/info.json
@@ -24,6 +24,23 @@
         "scroll_lock": "C3",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 2,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
         "pin": "D5"
     },
diff --git a/keyboards/pearlboards/zeus/rules.mk b/keyboards/pearlboards/zeus/rules.mk
index eeb36fee4ee4..5cb2d9b64939 100644
--- a/keyboards/pearlboards/zeus/rules.mk
+++ b/keyboards/pearlboards/zeus/rules.mk
@@ -12,6 +12,6 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
 ENCODER_ENABLE = yes        # Rotary encoder
 HAPTIC_ENABLE = yes         # Rumble feefback
-HAPTIC_DRIVER = DRV2605L    # Rumble motor
+HAPTIC_DRIVER = drv2605l    # Rumble motor
 
 LTO_ENABLE = yes            # Link time optimization
diff --git a/keyboards/pearlboards/zeuspad/config.h b/keyboards/pearlboards/zeuspad/config.h
index 205cad6e32af..c012875d68c8 100644
--- a/keyboards/pearlboards/zeuspad/config.h
+++ b/keyboards/pearlboards/zeuspad/config.h
@@ -24,23 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define AUDIO_CLICKY
 #define AUDIO_PIN C6
 
-/*== all animations enabled ==*/
-/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGBLIGHT_EFFECT_ALTERNATING
-#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_SNAKE
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 2
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/pearlboards/zeuspad/info.json b/keyboards/pearlboards/zeuspad/info.json
index 9bd5a1a99ad7..9d43e932bf76 100644
--- a/keyboards/pearlboards/zeuspad/info.json
+++ b/keyboards/pearlboards/zeuspad/info.json
@@ -18,6 +18,23 @@
             {"pin_a": "D6", "pin_b": "D4", "resolution": 1}
         ]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 2,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
         "pin": "B7"
     },
diff --git a/keyboards/pearlboards/zeuspad/rules.mk b/keyboards/pearlboards/zeuspad/rules.mk
index c6e9db406aba..a560cb2ea2cf 100644
--- a/keyboards/pearlboards/zeuspad/rules.mk
+++ b/keyboards/pearlboards/zeuspad/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Rotary encoder
 OLED_ENABLE = yes           # Enable oled
-OLED_DRIVER = SSD1306       # Oled type
 
 LTO_ENABLE = yes            # Link time optimization
diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h
index c97fab915a3b..bbe3b73627f9 100644
--- a/keyboards/peranekofactory/tone/rev1/config.h
+++ b/keyboards/peranekofactory/tone/rev1/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAP_CODE_DELAY 100
-
 /* 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/peranekofactory/tone/rev1/info.json b/keyboards/peranekofactory/tone/rev1/info.json
index 5a19b72ffeb2..67e08be6885e 100644
--- a/keyboards/peranekofactory/tone/rev1/info.json
+++ b/keyboards/peranekofactory/tone/rev1/info.json
@@ -13,6 +13,9 @@
             {"pin_a": "B5", "pin_b": "B4"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 100
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "matrix_pins": {
diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h
index c97fab915a3b..bbe3b73627f9 100644
--- a/keyboards/peranekofactory/tone/rev2/config.h
+++ b/keyboards/peranekofactory/tone/rev2/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAP_CODE_DELAY 100
-
 /* 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/peranekofactory/tone/rev2/info.json b/keyboards/peranekofactory/tone/rev2/info.json
index 5a19b72ffeb2..67e08be6885e 100644
--- a/keyboards/peranekofactory/tone/rev2/info.json
+++ b/keyboards/peranekofactory/tone/rev2/info.json
@@ -13,6 +13,9 @@
             {"pin_a": "B5", "pin_b": "B4"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 100
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "matrix_pins": {
diff --git a/keyboards/percent/booster/config.h b/keyboards/percent/booster/config.h
deleted file mode 100644
index d0537fd5d79f..000000000000
--- a/keyboards/percent/booster/config.h
+++ /dev/null
@@ -1,34 +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
-
-    #define RGBLED_NUM 10
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/percent/booster/info.json b/keyboards/percent/booster/info.json
index ba8be4a60375..5718cb81c4f3 100644
--- a/keyboards/percent/booster/info.json
+++ b/keyboards/percent/booster/info.json
@@ -16,6 +16,24 @@
     "backlight": {
         "pin": "B7"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "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": "E2"
     },
diff --git a/keyboards/percent/canoe/config.h b/keyboards/percent/canoe/config.h
deleted file mode 100644
index b7aa6ca2e9c8..000000000000
--- a/keyboards/percent/canoe/config.h
+++ /dev/null
@@ -1,32 +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
-
-
-#define RGBLED_NUM 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
diff --git a/keyboards/percent/canoe/info.json b/keyboards/percent/canoe/info.json
index fcbdf6bac88f..a1fc705561c0 100644
--- a/keyboards/percent/canoe/info.json
+++ b/keyboards/percent/canoe/info.json
@@ -16,6 +16,21 @@
   "backlight": {
     "pin": "D4"
   },
+  "rgblight": {
+    "led_count": 2,
+    "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": {
     "driver": "i2c"
   },
diff --git a/keyboards/percent/canoe/keymaps/boy_314/keymap.c b/keyboards/percent/canoe/keymaps/boy_314/keymap.c
index e9c56ed1b10e..cccfd448a0c2 100644
--- a/keyboards/percent/canoe/keymaps/boy_314/keymap.c
+++ b/keyboards/percent/canoe/keymaps/boy_314/keymap.c
@@ -47,10 +47,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+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_gen2/config.h b/keyboards/percent/canoe_gen2/config.h
index fe374cd7945f..d34e923ac57c 100644
--- a/keyboards/percent/canoe_gen2/config.h
+++ b/keyboards/percent/canoe_gen2/config.h
@@ -66,18 +66,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
+// #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 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 df0c3092662a..0cdb8f98193d 100644
--- a/keyboards/percent/canoe_gen2/info.json
+++ b/keyboards/percent/canoe_gen2/info.json
@@ -12,7 +12,7 @@
         "pin": "B7"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B0", "D0", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "F6", "F7"],
diff --git a/keyboards/percent/skog/config.h b/keyboards/percent/skog/config.h
deleted file mode 100644
index 6907429c391b..000000000000
--- a/keyboards/percent/skog/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2018 Jumail Mundekkat / MxBlue
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGBLED_NUM 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
diff --git a/keyboards/percent/skog/info.json b/keyboards/percent/skog/info.json
index 19e7f816036c..4ba43d6c04c6 100644
--- a/keyboards/percent/skog/info.json
+++ b/keyboards/percent/skog/info.json
@@ -17,6 +17,21 @@
       "pin": "D4",
       "levels": 5
     },
+    "rgblight": {
+      "led_count": 2,
+      "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": {
       "driver": "i2c"
     },
diff --git a/keyboards/percent/skog_lite/config.h b/keyboards/percent/skog_lite/config.h
deleted file mode 100644
index 75b78de22de1..000000000000
--- a/keyboards/percent/skog_lite/config.h
+++ /dev/null
@@ -1,32 +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
-
-
-#define RGBLED_NUM 18
-
-#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/percent/skog_lite/info.json b/keyboards/percent/skog_lite/info.json
index 4133d5c81b8c..ed75e8ae2b83 100644
--- a/keyboards/percent/skog_lite/info.json
+++ b/keyboards/percent/skog_lite/info.json
@@ -16,6 +16,21 @@
     "backlight": {
         "pin": "D4"
     },
+    "rgblight": {
+        "led_count": 18,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/phage_studio/pila87/info.json b/keyboards/phage_studio/pila87/info.json
index 522cd9c54832..c7157bc57387 100644
--- a/keyboards/phage_studio/pila87/info.json
+++ b/keyboards/phage_studio/pila87/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "processor": "STM32F103",
     "bootloader": "stm32duino",
diff --git a/keyboards/phage_studio/pila87/rules.mk b/keyboards/phage_studio/pila87/rules.mk
index 05f967d7a879..cd96ec2c2cdd 100644
--- a/keyboards/phage_studio/pila87/rules.mk
+++ b/keyboards/phage_studio/pila87/rules.mk
@@ -14,9 +14,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
 
diff --git a/keyboards/phantom/config.h b/keyboards/phantom/config.h
index 5a4961d3bb56..b9449c4714bf 100644
--- a/keyboards/phantom/config.h
+++ b/keyboards/phantom/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 20
-#    define RGBLIGHT_HUE_STEP 10
-#    define RGBLIGHT_SAT_STEP 17
-#    define RGBLIGHT_VAL_STEP 17
-//#    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
-
 /* 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/phantom/info.json b/keyboards/phantom/info.json
index bf858eaf06ba..0d52fb38d06d 100644
--- a/keyboards/phantom/info.json
+++ b/keyboards/phantom/info.json
@@ -17,6 +17,22 @@
         "caps_lock": "B6",
         "scroll_lock": "B7"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 20,
+        "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": "E2"
     },
diff --git a/keyboards/phase_studio/titan65/hotswap/info.json b/keyboards/phase_studio/titan65/hotswap/info.json
index 380c0c271a6d..a45523516847 100644
--- a/keyboards/phase_studio/titan65/hotswap/info.json
+++ b/keyboards/phase_studio/titan65/hotswap/info.json
@@ -12,7 +12,7 @@
         "pin": "E6"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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
new file mode 100644
index 000000000000..05391a21ed79
--- /dev/null
+++ b/keyboards/phentech/rpk_001/config.h
@@ -0,0 +1,26 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* RGB Config */
+#define DRIVER_1_CS B6
+#define DRIVER_1_EN B7
+#define DRIVER_COUNT 1
+#define RGB_MATRIX_LED_COUNT 67
+
+/* SPI Config */
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+
+/* SPI Flash */
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
+#define WEAR_LEVELING_BACKING_SIZE (4 * 1024)
+
+/* 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/halconf.h b/keyboards/phentech/rpk_001/halconf.h
new file mode 100644
index 000000000000..8760386e815f
--- /dev/null
+++ b/keyboards/phentech/rpk_001/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/phentech/rpk_001/info.json b/keyboards/phentech/rpk_001/info.json
new file mode 100644
index 000000000000..3d89d012ee28
--- /dev/null
+++ b/keyboards/phentech/rpk_001/info.json
@@ -0,0 +1,233 @@
+{
+    "manufacturer": "HENGCANG ELECTRONIC",
+    "keyboard_name": "RPK-001",
+    "maintainer": "JoyLee",
+    "url": "",
+    "processor": "WB32FQ95",
+    "bootloader": "wb32-dfu",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0xAC12",
+        "pid": "0x2236",
+        "force_nkro": true,
+        "suspend_wakeup_delay": 1000
+    },
+    "diode_direction": "ROW2COL",
+    "features": {
+        "nkro": true,
+        "encoder": true,
+        "extrakey": true,
+        "bootmagic": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "C4", "C5", "B0", "B1", "B10", "B11", "B13", "B14", "B15", "C6", "C7", "C8", "C9"],
+        "rows": ["C3", "A0", "A3", "A4", "A5"]
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A2", "pin_b": "A1"}
+        ]
+    },
+    "indicators": {
+        "caps_lock": "C15",
+        "scroll_lock": "C0",
+        "on_state": 0
+    },
+    "rgb_matrix": {
+        "driver": "aw20216",
+        "animations": {
+            "solid_color": true,
+            "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":  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":  96, "y": 0 },
+            { "flags": 4, "matrix": [0, 7],  "x": 112, "y": 0 },
+            { "flags": 4, "matrix": [0, 8],  "x": 128, "y": 0 },
+            { "flags": 4, "matrix": [0, 9],  "x": 144, "y": 0 },
+            { "flags": 4, "matrix": [0, 10], "x": 160, "y": 0 },
+            { "flags": 4, "matrix": [0, 11], "x": 176, "y": 0 },
+            { "flags": 4, "matrix": [0, 12], "x": 192, "y": 0 },
+            { "flags": 4, "matrix": [0, 13], "x": 208, "y": 0 },
+
+            { "flags": 4, "matrix": [1, 0],  "x":   0, "y": 16},
+            { "flags": 4, "matrix": [1, 1],  "x":  16, "y": 16},
+            { "flags": 4, "matrix": [1, 2],  "x":  32, "y": 16},
+            { "flags": 4, "matrix": [1, 3],  "x":  48, "y": 16},
+            { "flags": 4, "matrix": [1, 4],  "x":  64, "y": 16},
+            { "flags": 4, "matrix": [1, 5],  "x":  80, "y": 16},
+            { "flags": 4, "matrix": [1, 6],  "x":  96, "y": 16},
+            { "flags": 4, "matrix": [1, 7],  "x": 112, "y": 16},
+            { "flags": 4, "matrix": [1, 8],  "x": 128, "y": 16},
+            { "flags": 4, "matrix": [1, 9],  "x": 144, "y": 16},
+            { "flags": 4, "matrix": [1, 10], "x": 160, "y": 16},
+            { "flags": 4, "matrix": [1, 11], "x": 176, "y": 16},
+            { "flags": 4, "matrix": [1, 12], "x": 192, "y": 16},
+            { "flags": 4, "matrix": [1, 13], "x": 208, "y": 16},
+            { "flags": 4, "matrix": [1, 14], "x": 224, "y": 16},
+
+            { "flags": 1, "matrix": [2, 0],  "x":   0, "y": 32},
+            { "flags": 4, "matrix": [2, 1],  "x":  16, "y": 32},
+            { "flags": 4, "matrix": [2, 2],  "x":  32, "y": 32},
+            { "flags": 4, "matrix": [2, 3],  "x":  48, "y": 32},
+            { "flags": 4, "matrix": [2, 4],  "x":  64, "y": 32},
+            { "flags": 4, "matrix": [2, 5],  "x":  80, "y": 32},
+            { "flags": 4, "matrix": [2, 6],  "x":  96, "y": 32},
+            { "flags": 4, "matrix": [2, 7],  "x": 112, "y": 32},
+            { "flags": 4, "matrix": [2, 8],  "x": 128, "y": 32},
+            { "flags": 4, "matrix": [2, 9],  "x": 144, "y": 32},
+            { "flags": 4, "matrix": [2, 10], "x": 160, "y": 32},
+            { "flags": 4, "matrix": [2, 11], "x": 176, "y": 32},
+            { "flags": 1, "matrix": [2, 12], "x": 192, "y": 32},
+            { "flags": 4, "matrix": [2, 14], "x": 224, "y": 32},
+
+            { "flags": 1, "matrix": [3, 0],  "x":   0, "y": 48},
+            { "flags": 4, "matrix": [3, 2],  "x":  32, "y": 48},
+            { "flags": 4, "matrix": [3, 3],  "x":  48, "y": 48},
+            { "flags": 4, "matrix": [3, 4],  "x":  64, "y": 48},
+            { "flags": 4, "matrix": [3, 5],  "x":  80, "y": 48},
+            { "flags": 4, "matrix": [3, 6],  "x":  96, "y": 48},
+            { "flags": 4, "matrix": [3, 7],  "x": 112, "y": 48},
+            { "flags": 4, "matrix": [3, 8],  "x": 128, "y": 48},
+            { "flags": 4, "matrix": [3, 9],  "x": 144, "y": 48},
+            { "flags": 4, "matrix": [3, 10], "x": 160, "y": 48},
+            { "flags": 4, "matrix": [3, 11], "x": 176, "y": 48},
+            { "flags": 1, "matrix": [4, 12], "x": 192, "y": 48},
+            { "flags": 1, "matrix": [3, 13], "x": 208, "y": 48},
+            { "flags": 4, "matrix": [3, 14], "x": 224, "y": 48},
+
+            { "flags": 1, "matrix": [4, 0],  "x":   0, "y": 64},
+            { "flags": 1, "matrix": [4, 1],  "x":  16, "y": 64},
+            { "flags": 1, "matrix": [4, 2],  "x":  32, "y": 64},
+            { "flags": 4, "matrix": [4, 5],  "x":  80, "y": 64},
+            { "flags": 1, "matrix": [4, 8],  "x": 144, "y": 64},
+            { "flags": 1, "matrix": [4, 9],  "x": 160, "y": 64},
+            { "flags": 4, "matrix": [4, 10], "x": 176, "y": 64},
+            { "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}
+        ]
+    },
+    "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], "w": 2, "x": 13, "y": 0 },
+                { "matrix": [0, 14], "x": 15.5, "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.5, "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.5, "y": 1 },
+                { "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": [4, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "matrix": [3, 13], "x": 14.25, "y": 3 },
+                { "matrix": [3, 14], "x": 15.5, "y": 3 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4 },
+                { "matrix": [4, 8], "w": 1, "x": 10, "y": 4 },
+                { "matrix": [4, 9], "w": 1, "x": 11, "y": 4 },
+                { "matrix": [4, 10], "w": 1.25, "x": 12, "y": 4 },
+                { "matrix": [4, 11], "x": 13.5, "y": 4 },
+                { "matrix": [4, 13], "x": 14.5, "y": 4 },
+                { "matrix": [4, 14], "x": 15.5, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/phentech/rpk_001/keymaps/default/keymap.c b/keyboards/phentech/rpk_001/keymaps/default/keymap.c
new file mode 100644
index 000000000000..b07a7f64c05a
--- /dev/null
+++ b/keyboards/phentech/rpk_001/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+// 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] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐    ┌────┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│    │Mute│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤    ├────┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │    │Del │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤    ├────┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │    │Home│
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─────┬──┘    ├────┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift │ ┌───┐ │End │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴───┬───┘ │ ↑ │ └────┘
+     * │Ctrl│GUI │Alt │                        │Alt│Ctl│ FN │ ┌───┼───┼───┐
+     * └────┴────┴────┴────────────────────────┴───┴───┴────┘ │ ← │ ↓ │ → │
+     *                                                        └───┴───┴───┘
+     */
+    [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_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_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_RCTL,   MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        QK_BOOT, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______,          _______,          _______,
+        _______,          RGB_TOG, RGB_MOD, RGB_RMOD, RGB_SPI, _______, _______,  _______,  _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                             _______,                              _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/phentech/rpk_001/keymaps/via/keymap.c b/keyboards/phentech/rpk_001/keymaps/via/keymap.c
new file mode 100644
index 000000000000..99bfd5ad1509
--- /dev/null
+++ b/keyboards/phentech/rpk_001/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+// 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] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐    ┌────┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│    │Mute│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤    ├────┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │    │Del │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤    ├────┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │    │Home│
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─────┬──┘    ├────┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift │ ┌───┐ │End │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴───┬───┘ │ ↑ │ └────┘
+     * │Ctrl│GUI │Alt │                        │Alt│Ctl│ FN │ ┌───┼───┼───┐
+     * └────┴────┴────┴────────────────────────┴───┴───┴────┘ │ ← │ ↓ │ → │
+     *                                                        └───┴───┴───┘
+     */
+    [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_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_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, KC_RCTL,   MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        QK_BOOT, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, NK_TOGG,          _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______,          _______,          _______,
+        _______,          RGB_TOG, RGB_MOD, RGB_RMOD, RGB_SPI, _______, _______,  _______,  _______, _______, _______,          _______, _______, _______,
+        _______, GU_TOGG, _______,                             _______,                              _______, _______, _______, _______, _______, _______
+    )
+};
+
+/* 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) }
+};
+#endif
diff --git a/keyboards/phentech/rpk_001/keymaps/via/rules.mk b/keyboards/phentech/rpk_001/keymaps/via/rules.mk
new file mode 100644
index 000000000000..715838ecc5d9
--- /dev/null
+++ b/keyboards/phentech/rpk_001/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/phentech/rpk_001/mcuconf.h b/keyboards/phentech/rpk_001/mcuconf.h
new file mode 100644
index 000000000000..ca0e017ebdf9
--- /dev/null
+++ b/keyboards/phentech/rpk_001/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/phentech/rpk_001/readme.md b/keyboards/phentech/rpk_001/readme.md
new file mode 100644
index 000000000000..f543f7f1a6f3
--- /dev/null
+++ b/keyboards/phentech/rpk_001/readme.md
@@ -0,0 +1,25 @@
+
+# RPK-001
+
+[![p9HNfPg.png](https://s1.ax1x.com/2023/05/25/p9HNfPg.png)](https://imgse.com/i/p9HNfPg)
+
+* Keyboard Maintainer: [JoyLee](https://github.com/itarze)
+* Hardware Supported: RPK-001 PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make phentech/rpk_001:default
+
+Flashing example for this keyboard:
+
+    make phentech/rpk_001: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/phentech/rpk_001/rpk_001.c b/keyboards/phentech/rpk_001/rpk_001.c
new file mode 100644
index 000000000000..9f1a11875969
--- /dev/null
+++ b/keyboards/phentech/rpk_001/rpk_001.c
@@ -0,0 +1,92 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+// clang-format off
+
+const aw_led g_aw_leds[RGB_MATRIX_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, 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, 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, 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, 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
+};
+
+// clang-format on
+
+#endif  // #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/phentech/rpk_001/rules.mk b/keyboards/phentech/rpk_001/rules.mk
new file mode 100644
index 000000000000..002458405eed
--- /dev/null
+++ b/keyboards/phentech/rpk_001/rules.mk
@@ -0,0 +1 @@
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/phrygian/ph100/rules.mk b/keyboards/phrygian/ph100/rules.mk
index 707adf67c4ec..5fb302d01f14 100644
--- a/keyboards/phrygian/ph100/rules.mk
+++ b/keyboards/phrygian/ph100/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/pica40/rev1/rules.mk b/keyboards/pica40/rev1/rules.mk
index 2e3ef9fb844d..e69de29bb2d1 100644
--- a/keyboards/pica40/rev1/rules.mk
+++ b/keyboards/pica40/rev1/rules.mk
@@ -1 +0,0 @@
-OLED_DRIVER = SSD1306
diff --git a/keyboards/pico/65keys/config.h b/keyboards/pico/65keys/config.h
index 7506090b1edc..04bc8cb2d211 100644
--- a/keyboards/pico/65keys/config.h
+++ b/keyboards/pico/65keys/config.h
@@ -21,22 +21,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#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_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/pico/65keys/info.json b/keyboards/pico/65keys/info.json
index c9d61fc43428..260b2db1e900 100644
--- a/keyboards/pico/65keys/info.json
+++ b/keyboards/pico/65keys/info.json
@@ -16,6 +16,23 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "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": "D3"
     },
diff --git a/keyboards/pico/70keys/config.h b/keyboards/pico/70keys/config.h
index 7506090b1edc..04bc8cb2d211 100644
--- a/keyboards/pico/70keys/config.h
+++ b/keyboards/pico/70keys/config.h
@@ -21,22 +21,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#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_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/pico/70keys/info.json b/keyboards/pico/70keys/info.json
index 09c1cfa5b38e..ed3c8163d134 100644
--- a/keyboards/pico/70keys/info.json
+++ b/keyboards/pico/70keys/info.json
@@ -16,6 +16,23 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "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": "D3"
     },
diff --git a/keyboards/picolab/frusta_fundamental/config.h b/keyboards/picolab/frusta_fundamental/config.h
index 1bd318c9ade4..916ca10b4600 100644
--- a/keyboards/picolab/frusta_fundamental/config.h
+++ b/keyboards/picolab/frusta_fundamental/config.h
@@ -21,18 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 67
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/picolab/frusta_fundamental/info.json b/keyboards/picolab/frusta_fundamental/info.json
index 91aadda6ff4f..bd73d2b77fe5 100644
--- a/keyboards/picolab/frusta_fundamental/info.json
+++ b/keyboards/picolab/frusta_fundamental/info.json
@@ -8,6 +8,23 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 67,
+        "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": "B0"
     },
diff --git a/keyboards/pimentoso/touhoupad/config.h b/keyboards/pimentoso/touhoupad/config.h
deleted file mode 100644
index c4b29301c374..000000000000
--- a/keyboards/pimentoso/touhoupad/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 Michele Ferri <zomgsako@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 RGBLED_NUM 12
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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_STATIC_GRADIENT
diff --git a/keyboards/pimentoso/touhoupad/info.json b/keyboards/pimentoso/touhoupad/info.json
index 4e351917614b..8baff8f78ed7 100644
--- a/keyboards/pimentoso/touhoupad/info.json
+++ b/keyboards/pimentoso/touhoupad/info.json
@@ -8,6 +8,18 @@
         "pid": "0x0031",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "F4"
     },
diff --git a/keyboards/pixelspace/capsule65i/config.h b/keyboards/pixelspace/capsule65i/config.h
deleted file mode 100644
index c6dd26a46a9b..000000000000
--- a/keyboards/pixelspace/capsule65i/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2022 PixelSpace 295033045@qq.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have 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 RGBLED_NUM 6
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/pixelspace/capsule65i/info.json b/keyboards/pixelspace/capsule65i/info.json
index b2ac8f852870..d38155349be6 100644
--- a/keyboards/pixelspace/capsule65i/info.json
+++ b/keyboards/pixelspace/capsule65i/info.json
@@ -16,6 +16,23 @@
     "indicators": {
         "caps_lock": "F6"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "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": "F7"
     },
diff --git a/keyboards/pkb65/readme.md b/keyboards/pkb65/readme.md
index b47552da0f57..a7dce94a4f5e 100644
--- a/keyboards/pkb65/readme.md
+++ b/keyboards/pkb65/readme.md
@@ -6,7 +6,7 @@ A regular 65% layout keyboard. This will be the default layout flashed for all p
 Made and sold by MCKeebs. [More info on MCKeebDeisgn](https://www.mckeebdesign.com)
 
 * Keyboard Maintainer: [MCKeebs](https://github.com/chrisquocmai)
-* Hardware Supported: [PKB65 PCB](https://https://mckeebdesign.com/PKB65/)
+* Hardware Supported: [PKB65 PCB](https://mckeebdesign.com/PKB65/)
 * Hardware Availability: [PKB65](https://mckeebdesign.com/PKB65/)
 
 Make example for this keyboard (after setting up your build environment:
diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h
index 3b10a2b753b1..7cfc65d50943 100644
--- a/keyboards/planck/ez/config.h
+++ b/keyboards/planck/ez/config.h
@@ -42,7 +42,6 @@
 //#define NO_ACTION_ONESHOT
 
 // #define WS2812_LED_N 2
-// #define RGBLED_NUM WS2812_LED_N
 // #define WS2812_TIM_N 2
 // #define WS2812_TIM_CH 2
 // #define PORT_WS2812     GPIOA
@@ -111,8 +110,6 @@
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#define TAPPING_TOGGLE  1
-
 #define MOUSEKEY_INTERVAL           20
 #define MOUSEKEY_DELAY              0
 #define MOUSEKEY_TIME_TO_MAX        60
diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json
index 370a19357f04..6848239279fb 100644
--- a/keyboards/planck/ez/info.json
+++ b/keyboards/planck/ez/info.json
@@ -7,7 +7,7 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "IS31FL3737"
+    "driver": "is31fl3737"
   },
   "matrix_pins": {
     "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
@@ -21,6 +21,9 @@
   },
   "processor": "STM32F303",
   "bootloader": "stm32-dfu",
+  "tapping": {
+    "toggle": 1
+  },
   "community_layouts": ["ortho_4x12", "planck_mit"],
   "layout_aliases": {
     "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
diff --git a/keyboards/planck/keymaps/altgr/common/init.h b/keyboards/planck/keymaps/altgr/common/init.h
index 6366a19f65eb..6d0b4392fb86 100644
--- a/keyboards/planck/keymaps/altgr/common/init.h
+++ b/keyboards/planck/keymaps/altgr/common/init.h
@@ -13,21 +13,22 @@ void matrix_init_user(void)
 
 #ifdef AUDIO_ENABLE
 #ifdef BACKLIGHT_ENABLE
-void led_set_user(uint8_t usb_led)
+bool led_update_user(led_t led_state)
 {
-  static uint8_t old_usb_led = 0;
+  static led_t old_led_state = {0};
   _delay_ms(10);                            // gets rid of tick
   if (!is_playing_notes()) {
-    if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK))) {
+    if (led_state.caps_lock && !old_led_state.caps_lock) {
       // if capslock LED is turning on
       PLAY_SONG(song_caps_on);
     }
-    else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK))) {
+    else if (!led_state.caps_lock && old_led_state.caps_lock) {
       // if capslock LED is turning off
       PLAY_SONG(song_caps_off);
     }
   }
-  old_usb_led = usb_led;
+  old_led_state = led_state;
+  return false;
 }
 #endif
 
diff --git a/keyboards/planck/keymaps/badger/keymap.c b/keyboards/planck/keymaps/badger/keymap.c
index 5235ac90f7b5..1703f937296d 100644
--- a/keyboards/planck/keymaps/badger/keymap.c
+++ b/keyboards/planck/keymaps/badger/keymap.c
@@ -12,49 +12,44 @@ GNU General Public License for more details.
 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 AUDIO_ENABLE
 
 #include "ortho.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY_MAC_ORTHO] = 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_BSLS,
-      MOMAC,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_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,  RAISE,    P_ADJ,    KC_SPC,   LOWER,    KC_NO,    KC_MINS,  KC_EQL,   KC_LBRC,  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_BSPC, \
+      MOMAC,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_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,  \
+      J_FUN,    KC_LCTL,  KC_LALT,  KC_LGUI,  RAISE,    KC_SPC,   KC_SPC,   LOWER,    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RIGHT),
 
   [_MOVE_MAC_ORTHO]   = LAYOUT_ortho_4x12(
-      KC_BACK,  IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_RUN,   IJ_STOP,  _______,  WD_BACK,  KC_HOME,  KC_END,   WD_FRWD,  KC_NEXT,
-      _______,  MM_LH,    MM_MAX,   MM_RH,    IJ_FIND,  IJ_IMPS,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CM_RIGHT, CM_DOWN,
-      _______,  MM_UH,    MM_BH,    MAC_CPY,  MAC_PST,  IJ_IMPH,  _______,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______),
-  
-  [_QWERTY_LINUX_ORTHO] = 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_BSLS,
-      MOLNX,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_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,  RAISE,    P_ADJ,    KC_SPC,   LOWER,    KC_NO,    KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC),
-
-  [_MOVE_LINUX_ORTHO]   = LAYOUT_ortho_4x12(
-      _______,  WM_VD1,   WM_UH,    WM_VD2,   KC_MAC1,  KC_MSTP,  KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  KC_INS,
-      _______,  WM_LH,    WM_MAX,   WM_RH,    KC_MAC2,  KC_PSCR,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CS_RIGHT, CS_DOWN,
-      _______,  WM_VD3,   WM_BH,    OS_COPY,  OS_PAST,  KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______),
-
+      KC_BACK,  IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_RUN,   IJ_STOP,  IJ_TOP,   WD_BACK,  KC_HOME,  KC_END,   WD_FRWD,  WD_DELE, \
+      _______,  MM_LH,    MM_MAX,   MM_RH,    IJ_FIND,  IJ_LINE,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CM_RIGHT, _______, \
+      _______,  MM_UH,    MM_BH,    MAC_CPY,  MAC_SPS,  SHEBANG,  IJ_BOTT,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,  _______, \
+      _______,  _______,  _______,  _______,  _______,  KC_BSPC,  _______,  _______,  _______,  _______,  _______,  _______),
+    
   [_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_PIPE,
-      _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_DQUO,
-      _______,  KC_UNDO,  KC_CUT,   OS_COPY,  OS_PAST,  KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_LT,    KC_GT,    KC_QUES,  _______,
+      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_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_DQUO, \
+      _______,  KC_F7,    KC_F8,    KC_9,     KC_F10,   KC_F11,   KC_F12,   KC_MUTE,  KC_LT,    KC_GT,    KC_QUES,  _______, \
       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______),
 
   [_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_BSLS,
-      _______,  KC_4,     KC_5,     KC_6,     KC_PMNS,  KC_PSCR,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_SCLN,  KC_QUOT,
-      _______,  KC_1,     KC_2,     KC_3,     KC_PPLS,  KC_NO,    KC_NO,    KC_WHOM,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,
+      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_4,     KC_5,     KC_6,     KC_PMNS,  KC_PSCR,  KC_BSLS,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_QUOT, \
+      _______,  KC_1,     KC_2,     KC_3,     KC_PPLS,  KC_NO,    KC_NO,    KC_WHOM,  KC_WBAK,  KC_WFWD,  KC_WSCH,  KC_RSFT, \
       _______,  KC_0,     KC_DOT,   KC_ENT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______),
 
-  [_ADJUST]   = LAYOUT_ortho_4x12(
-      _______,  NK_ON,    NK_OFF,   EE_CLR,   QK_BOOT,  KC_MSTP,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN2,  KC_INS,
-      _______,  GE_SWAP,  GE_NORM,  DB_TOGG,  AG_SWAP,  AG_NORM,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_BTN1,  _______,
-      _______,  KC_LYRC,  KC_FIRST, KC_CAPS,  KC_NO,    KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_ACL0,  KC_ACL1,  KC_ACL2,  _______,
+  [_FUNCTION_ORTHO]   = LAYOUT_ortho_4x12(
+      _______,  KC_7,     KC_8,     KC_9,     IJ_RFMT,  KC_MSTP,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN2,  KC_INS,  \
+      _______,  KC_4,     KC_5,     KC_6,     KC_PMNS,  AG_NORM,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_BTN1,  _______, \
+      KC_0,     KC_1,     KC_2,     KC_3,     KC_PPLS,  KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_ACL0,  KC_ACL1,  KC_ACL2,  _______, \
+      _______,  KC_PDOT,  KC_PEQL,  KC_PSLS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  J_ADJ),
+
+  [_ADJUST_ORTHO]   = LAYOUT_ortho_4x12(
+      _______,  NK_ON,    NK_OFF,   EE_CLR,   QK_BOOT,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  \
+      _______,  GE_SWAP,  GE_NORM,  DB_TOGG,  AG_SWAP,  AG_NORM,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_BTN1,  _______, \
+      _______,  KC_LYRC,  KC_FIRST, KC_CAPS,  KC_NO,    KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_ACL0,  KC_ACL1,  KC_ACL2,  _______, \
       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______)
 };
diff --git a/keyboards/planck/keymaps/hiea/common/init.h b/keyboards/planck/keymaps/hiea/common/init.h
index 6366a19f65eb..6d0b4392fb86 100644
--- a/keyboards/planck/keymaps/hiea/common/init.h
+++ b/keyboards/planck/keymaps/hiea/common/init.h
@@ -13,21 +13,22 @@ void matrix_init_user(void)
 
 #ifdef AUDIO_ENABLE
 #ifdef BACKLIGHT_ENABLE
-void led_set_user(uint8_t usb_led)
+bool led_update_user(led_t led_state)
 {
-  static uint8_t old_usb_led = 0;
+  static led_t old_led_state = {0};
   _delay_ms(10);                            // gets rid of tick
   if (!is_playing_notes()) {
-    if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK))) {
+    if (led_state.caps_lock && !old_led_state.caps_lock) {
       // if capslock LED is turning on
       PLAY_SONG(song_caps_on);
     }
-    else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK))) {
+    else if (!led_state.caps_lock && old_led_state.caps_lock) {
       // if capslock LED is turning off
       PLAY_SONG(song_caps_off);
     }
   }
-  old_usb_led = usb_led;
+  old_led_state = led_state;
+  return false;
 }
 #endif
 
diff --git a/keyboards/planck/keymaps/hieax/common/init.h b/keyboards/planck/keymaps/hieax/common/init.h
index 6366a19f65eb..6d0b4392fb86 100644
--- a/keyboards/planck/keymaps/hieax/common/init.h
+++ b/keyboards/planck/keymaps/hieax/common/init.h
@@ -13,21 +13,22 @@ void matrix_init_user(void)
 
 #ifdef AUDIO_ENABLE
 #ifdef BACKLIGHT_ENABLE
-void led_set_user(uint8_t usb_led)
+bool led_update_user(led_t led_state)
 {
-  static uint8_t old_usb_led = 0;
+  static led_t old_led_state = {0};
   _delay_ms(10);                            // gets rid of tick
   if (!is_playing_notes()) {
-    if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK))) {
+    if (led_state.caps_lock && !old_led_state.caps_lock) {
       // if capslock LED is turning on
       PLAY_SONG(song_caps_on);
     }
-    else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK))) {
+    else if (!led_state.caps_lock && old_led_state.caps_lock) {
       // if capslock LED is turning off
       PLAY_SONG(song_caps_off);
     }
   }
-  old_usb_led = usb_led;
+  old_led_state = led_state;
+  return false;
 }
 #endif
 
diff --git a/keyboards/planck/keymaps/mwpeterson/keymap.c b/keyboards/planck/keymaps/mwpeterson/keymap.c
index 5871fe4bfe35..065750434f4c 100644
--- a/keyboards/planck/keymaps/mwpeterson/keymap.c
+++ b/keyboards/planck/keymaps/mwpeterson/keymap.c
@@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [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, X(IBANG), KC_COMM, KC_DOT,  KC_BSLS, _______,
+    _______,  KC_MINS, KC_PLUS,  KC_GRV,  SFT_INS, KC_COLN, KC_PIPE, UM(IBANG), KC_COMM, KC_DOT,  KC_BSLS, _______,
     _______,  _______, _______, _______, _______,  KC_BSPC, KC_BSPC, _______, _______, _______, _______, _______
   ),
 
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
index 7e3b8af36762..a8ff2dd8d920 100644
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ b/keyboards/planck/keymaps/rootiest/keymap.c
@@ -1328,33 +1328,25 @@ void send_degree_symbol(tap_dance_state_t* state, void* user_data) {
     switch (state->count) {
         case 4:
             // ℃
-            unicode_input_start();
-            register_hex(0x2103);
-            unicode_input_finish();
+            register_unicode(0x2103);
             print("You pressed the Degrees key 4 times!\n");
             reset_tap_dance(state);
             break;
         case 3:
             //℉
-            unicode_input_start();
-            register_hex(0x2109);
-            unicode_input_finish();
+            register_unicode(0x2109);
             print("You pressed the Degrees key 3 times!\n");
             reset_tap_dance(state);
             break;
         case 2:
             // €
-            unicode_input_start();
-            register_hex(0x20AC);
-            unicode_input_finish();
+            register_unicode(0x20AC);
             print("You pressed the Degrees key 2 times!\n");
             reset_tap_dance(state);
             break;
         case 1:
             // °
-            unicode_input_start();
-            register_hex(0x00B0);
-            unicode_input_finish();
+            register_unicode(0x00B0);
             print("You pressed the Degrees key 1 time!\n");
             reset_tap_dance(state);
             break;
@@ -1527,7 +1519,7 @@ void scap_finished(tap_dance_state_t* state, void* user_data) {
             register_code(KC_LSFT);
             break;
         default:
-            if (host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK)) {
+            if (host_keyboard_led_state().caps_lock) {
                 tap_code(KC_CAPS);
                 reset_tap_dance(state);
                 break;
diff --git a/keyboards/planck/keymaps/rootiest/rules.mk b/keyboards/planck/keymaps/rootiest/rules.mk
index ca0f90b6e9a8..d6f42b33ad55 100644
--- a/keyboards/planck/keymaps/rootiest/rules.mk
+++ b/keyboards/planck/keymaps/rootiest/rules.mk
@@ -1,7 +1,6 @@
 SRC += muse.c
 ENCODER_ENABLE = yes # Enables basic encoder support
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306 # Enables support for OLED displays
 # 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
diff --git a/keyboards/planck/keymaps/sdothum/common/init.h b/keyboards/planck/keymaps/sdothum/common/init.h
index 6366a19f65eb..6d0b4392fb86 100644
--- a/keyboards/planck/keymaps/sdothum/common/init.h
+++ b/keyboards/planck/keymaps/sdothum/common/init.h
@@ -13,21 +13,22 @@ void matrix_init_user(void)
 
 #ifdef AUDIO_ENABLE
 #ifdef BACKLIGHT_ENABLE
-void led_set_user(uint8_t usb_led)
+bool led_update_user(led_t led_state)
 {
-  static uint8_t old_usb_led = 0;
+  static led_t old_led_state = {0};
   _delay_ms(10);                            // gets rid of tick
   if (!is_playing_notes()) {
-    if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK))) {
+    if (led_state.caps_lock && !old_led_state.caps_lock) {
       // if capslock LED is turning on
       PLAY_SONG(song_caps_on);
     }
-    else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK))) {
+    else if (!led_state.caps_lock && old_led_state.caps_lock) {
       // if capslock LED is turning off
       PLAY_SONG(song_caps_off);
     }
   }
-  old_usb_led = usb_led;
+  old_led_state = led_state;
+  return false;
 }
 #endif
 
diff --git a/keyboards/planck/keymaps/vaire/keymap.c b/keyboards/planck/keymaps/vaire/keymap.c
index 05f7f4a5201e..f58486cda8d5 100644
--- a/keyboards/planck/keymaps/vaire/keymap.c
+++ b/keyboards/planck/keymaps/vaire/keymap.c
@@ -80,47 +80,48 @@ void matrix_init_user(void)
     println("Matrix Init");
 }
 
-void led_set_user(uint8_t usb_led)
+bool led_update_user(led_t led_state)
 {
-    static uint8_t old_usb_led = 0;
+    static led_t old_led_state = {0};
 
     _delay_ms(10); // gets rid of tick
 
     if (!is_playing_notes())
     {
-        if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
+        if (led_state.caps_lock && !old_led_state.caps_lock)
         {
                 // If CAPS LK LED is turning on...
                 PLAY_SONG(tone_caps_on);
         }
-        else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
+        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 ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
+        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 (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
+        else if (!led_state.num_lock && old_led_state.num_lock)
         {
                 // If NUM LED is turning off...
                 PLAY_SONG(tone_numlk_off);
         }
-        else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
+        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 (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
+        else if (!led_state.scroll_lock && old_led_state.scroll_lock)
         {
                 // If SCROLL LED is turning off...
                 PLAY_SONG(tone_scroll_off);
         }
     }
 
-    old_usb_led = usb_led;
+    old_led_state = led_state;
+    return false;
 }
 
 
diff --git a/keyboards/planck/keymaps/zach/zach_common_functions.c b/keyboards/planck/keymaps/zach/zach_common_functions.c
index 6ad1c7bed337..ae5f44e71363 100644
--- a/keyboards/planck/keymaps/zach/zach_common_functions.c
+++ b/keyboards/planck/keymaps/zach/zach_common_functions.c
@@ -141,31 +141,31 @@ tap_dance_action_t tap_dance_actions[] = {
 
 //#ifdef UNICODE_ENABLE
 // Unicode shortcuts
-#define IBANG   X(0x203D)
-#define RAROW   X(0x2192)
-#define LAROW   X(0x2190)
-#define DEGREE  X(0x00B0)
-#define OMEGA   X(0x03A9)
-#define WOMEGA  X(0x03C9)
-#define MICRO   X(0x00B5)
-#define PLUMIN  X(0x00B1)
-#define SUPA2   X(0x00B2)
-#define ROMAN1  X(0x2160)
-#define ROMAN2  X(0x2161)
-#define ROMAN3  X(0x2162)
-#define ROMAN4  X(0x2163)
-#define ROMAN5  X(0x2164)
-#define ROMAN6  X(0x2165)
-#define ROMAN7  X(0x2166)
-#define roman1  X(0x2170)
-#define roman2  X(0x2171)
-#define roman3  X(0x2172)
-#define roman4  X(0x2173)
-#define roman5  X(0x2174)
-#define roman6  X(0x2175)
-#define roman7  X(0x2176)
+#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        // For Unicode characters larger than 0x8000. Send with X(<unicode>)
+#ifdef UNICODEMAP_ENABLE
 enum Ext_Unicode{
     PENGUIN = 0,
     BOAR,
@@ -182,12 +182,12 @@ const uint32_t unicode_map[] PROGMEM = {
     [CHICK]     = 0x1F425,
     [TUMBLER]   = 0x1F943
 };
-#define PENGY   X(PENGUIN)
-#define BOARY   X(BOAR)
-#define MNKY    X(MONKEY)
-#define DRGN    X(DRAGON)
-#define DUCK    X(CHICK)
-#define TMBL    X(TUMBLER)
+#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
diff --git a/keyboards/planck/light/info.json b/keyboards/planck/light/info.json
index 64d9fdcd8512..b6f3df8fe64f 100644
--- a/keyboards/planck/light/info.json
+++ b/keyboards/planck/light/info.json
@@ -9,7 +9,7 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "IS31FL3731"
+    "driver": "is31fl3731"
   },
   "matrix_pins": {
     "cols": ["E6", "E3", "E4", "D3", "D4", "D5", "C0", "A7", "A6", "E1", "E0", "D7"],
diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h
index 1d029dae697b..c0c8dc2c55e2 100644
--- a/keyboards/planck/rev6/config.h
+++ b/keyboards/planck/rev6/config.h
@@ -45,8 +45,7 @@
 /*
  * WS2812 Underglow Matrix options
  */
-#define RGBLED_NUM 9
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 9
 
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
diff --git a/keyboards/planck/rev6/info.json b/keyboards/planck/rev6/info.json
index c1e4e527cee4..59e7ba6635d4 100644
--- a/keyboards/planck/rev6/info.json
+++ b/keyboards/planck/rev6/info.json
@@ -8,12 +8,15 @@
     "pid": "0xA4F9",
     "device_version": "0.0.6"
   },
+  "rgblight": {
+    "led_count": 9
+  },
   "ws2812": {
     "pin": "A1",
     "driver": "pwm"
   },
   "rgb_matrix": {
-    "driver": "WS2812"
+    "driver": "ws2812"
   },
   "matrix_pins": {
     "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h
index ff15e9628d2c..7050fa009c29 100644
--- a/keyboards/planck/rev6_drop/config.h
+++ b/keyboards/planck/rev6_drop/config.h
@@ -46,8 +46,7 @@
 /*
  * WS2812 Underglow Matrix options
  */
-#define RGBLED_NUM 9
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 9
 
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
diff --git a/keyboards/planck/rev6_drop/info.json b/keyboards/planck/rev6_drop/info.json
index 00f1fab14eea..d04bb0d6aaca 100644
--- a/keyboards/planck/rev6_drop/info.json
+++ b/keyboards/planck/rev6_drop/info.json
@@ -8,12 +8,15 @@
     "pid": "0xA4F9",
     "device_version": "0.0.6"
   },
+  "rgblight": {
+    "led_count": 9
+  },
   "ws2812": {
     "pin": "A1",
     "driver": "pwm"
   },
   "rgb_matrix": {
-    "driver": "WS2812"
+    "driver": "ws2812"
   },
   "matrix_pins": {
     "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
diff --git a/keyboards/planck/rev7/info.json b/keyboards/planck/rev7/info.json
index e4d743342366..1d57732b4f6b 100644
--- a/keyboards/planck/rev7/info.json
+++ b/keyboards/planck/rev7/info.json
@@ -13,7 +13,7 @@
     "driver": "pwm"
   },
   "rgb_matrix": {
-    "driver": "WS2812"
+    "driver": "ws2812"
   },
   "matrix_pins": {
     "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
diff --git a/keyboards/planck/thk/config.h b/keyboards/planck/thk/config.h
index 832fb0789cca..cfb88aa0eb13 100644
--- a/keyboards/planck/thk/config.h
+++ b/keyboards/planck/thk/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAPPING_TOGGLE 3
-
 #define DIP_SWITCH_PINS { D0, D1, D4, D6 }
 
 // THK uses D5 for audio
diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/info.json
index e7321ba69720..f62e074e6828 100644
--- a/keyboards/planck/thk/info.json
+++ b/keyboards/planck/thk/info.json
@@ -21,6 +21,9 @@
   },
   "processor": "atmega32a",
   "bootloader": "usbasploader",
+  "tapping": {
+    "toggle": 3
+  },
   "layout_aliases": {
     "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
     "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
diff --git a/keyboards/playkbtw/ca66/config.h b/keyboards/playkbtw/ca66/config.h
index 9bcb20ae881e..5f360813239b 100644
--- a/keyboards/playkbtw/ca66/config.h
+++ b/keyboards/playkbtw/ca66/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 6
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/playkbtw/ca66/info.json b/keyboards/playkbtw/ca66/info.json
index 828d5337b2ae..5711f0e742b3 100644
--- a/keyboards/playkbtw/ca66/info.json
+++ b/keyboards/playkbtw/ca66/info.json
@@ -14,8 +14,26 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "F0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "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": "B1"
     },
diff --git a/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c b/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
index 9b441a889224..8ef6c0499db6 100644
--- a/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
+++ b/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
@@ -17,20 +17,11 @@ 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),
 };
 
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+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/helen80/config.h b/keyboards/playkbtw/helen80/config.h
deleted file mode 100644
index 57840935b6bc..000000000000
--- a/keyboards/playkbtw/helen80/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 Play Keyboard
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 87
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/playkbtw/helen80/info.json b/keyboards/playkbtw/helen80/info.json
index 7e568e6ed8e4..95cbde601067 100644
--- a/keyboards/playkbtw/helen80/info.json
+++ b/keyboards/playkbtw/helen80/info.json
@@ -22,7 +22,23 @@
     "pin": "E2"
   },
   "rgblight": {
-    "max_brightness": 180
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 87,
+    "max_brightness": 180,
+    "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
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
diff --git a/keyboards/playkbtw/pk60/config.h b/keyboards/playkbtw/pk60/config.h
index 8471167fcd95..5f360813239b 100644
--- a/keyboards/playkbtw/pk60/config.h
+++ b/keyboards/playkbtw/pk60/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/playkbtw/pk60/info.json b/keyboards/playkbtw/pk60/info.json
index 89b414d08f64..e42854308e67 100644
--- a/keyboards/playkbtw/pk60/info.json
+++ b/keyboards/playkbtw/pk60/info.json
@@ -17,6 +17,23 @@
     "pin": "B7",
     "levels": 5
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 12,
+    "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": "E2"
   },
diff --git a/keyboards/playkbtw/pk60/keymaps/default/keymap.c b/keyboards/playkbtw/pk60/keymaps/default/keymap.c
index 65d3996a85e8..cc0276673a39 100644
--- a/keyboards/playkbtw/pk60/keymaps/default/keymap.c
+++ b/keyboards/playkbtw/pk60/keymaps/default/keymap.c
@@ -20,12 +20,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
     setPinOutput(F4);
     writePinLow(F4);
   } else {
     setPinInput(F4);
     writePinLow(F4);
   }
+  return false;
 }
diff --git a/keyboards/playkbtw/pk64rgb/config.h b/keyboards/playkbtw/pk64rgb/config.h
index 3b2087c5b833..bb28749d9436 100644
--- a/keyboards/playkbtw/pk64rgb/config.h
+++ b/keyboards/playkbtw/pk64rgb/config.h
@@ -40,21 +40,6 @@
 #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL
 #endif
 
-#    define RGBLIGHT_EFFECT_BREATHING
-#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#    define RGBLIGHT_EFFECT_SNAKE
-#    define RGBLIGHT_EFFECT_KNIGHT
-#    define RGBLIGHT_EFFECT_CHRISTMAS
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-// #    define RGBLIGHT_EFFECT_ALTERNATING
-#    define RGBLIGHT_EFFECT_TWINKLE
-#    define RGBLED_NUM 18
-#    define RGBLIGHT_HUE_STEP 5
-#    define RGBLIGHT_SAT_STEP 5
-#    define RGBLIGHT_VAL_STEP 5
-#    define RGBLIGHT_SLEEP
-
 /* 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/playkbtw/pk64rgb/info.json b/keyboards/playkbtw/pk64rgb/info.json
index 522cd248b3ad..727b9c0a5cb2 100644
--- a/keyboards/playkbtw/pk64rgb/info.json
+++ b/keyboards/playkbtw/pk64rgb/info.json
@@ -9,13 +9,30 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "matrix_pins": {
         "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"],
         "rows": ["D7", "D6", "D5", "D3", "D2"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "hue_steps": 5,
+        "saturation_steps": 5,
+        "brightness_steps": 5,
+        "led_count": 18,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
         "pin": "B0"
     },
diff --git a/keyboards/ploopyco/madromys/config.h b/keyboards/ploopyco/madromys/config.h
new file mode 100644
index 000000000000..19fa1fada400
--- /dev/null
+++ b/keyboards/ploopyco/madromys/config.h
@@ -0,0 +1,29 @@
+/* Copyright 2023 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// #define ROTATIONAL_TRANSFORM_ANGLE 0
+#define POINTING_DEVICE_INVERT_Y
+
+/* PMW3360 Settings */
+#define PMW33XX_LIFTOFF_DISTANCE 0x00
+#define PMW33XX_CS_PIN GP5
+#define SPI_SCK_PIN GP2
+#define SPI_MISO_PIN GP0
+#define SPI_MOSI_PIN GP7
\ No newline at end of file
diff --git a/keyboards/ploopyco/madromys/info.json b/keyboards/ploopyco/madromys/info.json
new file mode 100644
index 000000000000..e39f593df9fe
--- /dev/null
+++ b/keyboards/ploopyco/madromys/info.json
@@ -0,0 +1,35 @@
+{
+    "keyboard_name": "Ploopy Adept Trackball",
+    "url": "www.ploopy.co",
+    "maintainer": "ploopyco",
+    "manufacturer": "Ploopy Corporation",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "usb": {
+        "vid": "0x5043",
+        "pid": "0x5C47",
+        "max_power": 100
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "pointing_device": true,
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 1], "label":"Top Left Left", "x":0, "y":0, "h":2},
+                {"matrix": [0, 2], "label":"Top Left", "x":1.25, "y":0, "h":1.25},
+                {"matrix": [0, 3], "label":"Top Right", "x":2.5, "y":0, "h":1.25},
+                {"matrix": [0, 4], "label":"Top Right Right", "x":3.75, "y":0, "h":2},
+                {"matrix": [0, 0], "label":"Bottom Left", "x":0, "y":2.25, "w":1.75, "h":2},
+                {"matrix": [0, 5], "label":"Bottom Right", "x":3, "y":2.25, "w":1.75, "h":2}
+            ]
+        }
+    },
+    "dynamic_keymap": {
+        "layer_count": 8
+    },
+}
diff --git a/keyboards/ploopyco/madromys/keymaps/default/keymap.c b/keyboards/ploopyco/madromys/keymaps/default/keymap.c
new file mode 100644
index 000000000000..bc8265b39d03
--- /dev/null
+++ b/keyboards/ploopyco/madromys/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+/* Copyright 2023 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along 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_BTN4, KC_BTN5, DRAG_SCROLL, KC_BTN2, KC_BTN1, KC_BTN3 )
+};
diff --git a/keyboards/ploopyco/madromys/keymaps/via/keymap.c b/keyboards/ploopyco/madromys/keymaps/via/keymap.c
new file mode 100644
index 000000000000..bc8265b39d03
--- /dev/null
+++ b/keyboards/ploopyco/madromys/keymaps/via/keymap.c
@@ -0,0 +1,22 @@
+/* Copyright 2023 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along 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_BTN4, KC_BTN5, DRAG_SCROLL, KC_BTN2, KC_BTN1, KC_BTN3 )
+};
diff --git a/keyboards/ploopyco/madromys/keymaps/via/readme.md b/keyboards/ploopyco/madromys/keymaps/via/readme.md
new file mode 100644
index 000000000000..c8717fe1f74a
--- /dev/null
+++ b/keyboards/ploopyco/madromys/keymaps/via/readme.md
@@ -0,0 +1 @@
+This is the VIA keymap for Ploopyco Madromys Trackball, which can be used to customise the key layout. See [the VIA online app](https://usevia.app/) for how to do this.
diff --git a/keyboards/ploopyco/madromys/keymaps/via/rules.mk b/keyboards/ploopyco/madromys/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/ploopyco/madromys/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/ploopyco/madromys/madromys.c b/keyboards/ploopyco/madromys/madromys.c
new file mode 100644
index 000000000000..8ea1bcdbd784
--- /dev/null
+++ b/keyboards/ploopyco/madromys/madromys.c
@@ -0,0 +1,176 @@
+/* Copyright 2023 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "madromys.h"
+
+#ifndef PLOOPY_DPI_OPTIONS
+#    define PLOOPY_DPI_OPTIONS \
+        { 600, 900, 1200, 1600 }
+#    ifndef PLOOPY_DPI_DEFAULT
+#        define PLOOPY_DPI_DEFAULT 1
+#    endif
+#endif
+#ifndef PLOOPY_DPI_DEFAULT
+#    define PLOOPY_DPI_DEFAULT 0
+#endif
+#ifndef PLOOPY_DRAGSCROLL_DPI
+#    define PLOOPY_DRAGSCROLL_DPI 100  // Fixed-DPI Drag Scroll
+#endif
+#ifndef PLOOPY_DRAGSCROLL_FIXED
+#    define PLOOPY_DRAGSCROLL_FIXED 1
+#endif
+#ifndef PLOOPY_DRAGSCROLL_MULTIPLIER
+#    define PLOOPY_DRAGSCROLL_MULTIPLIER 0.75  // Variable-DPI Drag Scroll
+#endif
+#ifndef PLOOPY_DRAGSCROLL_SEMAPHORE
+#    define PLOOPY_DRAGSCROLL_SEMAPHORE 4
+#endif
+#ifndef PLOOPY_DRAGSCROLL_MOMENTARY
+#    define PLOOPY_DRAGSCROLL_MOMENTARY 1
+#endif
+#ifndef PLOOPY_DRAGSCROLL_INVERT
+#    define PLOOPY_DRAGSCROLL_INVERT 1
+#endif
+
+keyboard_config_t keyboard_config;
+uint16_t          dpi_array[] = PLOOPY_DPI_OPTIONS;
+#define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t))
+
+// TODO: Implement libinput profiles
+// https://wayland.freedesktop.org/libinput/doc/latest/pointer-acceleration.html
+// Compile time accel selection
+// Valid options are ACC_NONE, ACC_LINEAR, ACC_CUSTOM, ACC_QUADRATIC
+
+// Trackball State
+bool     is_drag_scroll    = false;
+
+// drag scroll divisor state
+int8_t drag_scroll_x_semaphore = 0;
+int8_t drag_scroll_y_semaphore = 0;
+
+report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
+    if (is_drag_scroll) {
+        int16_t mouse_report_x_temp = mouse_report.x;
+        int16_t mouse_report_y_temp = mouse_report.y;
+        int16_t mouse_report_x_calc = 0;
+        int16_t mouse_report_y_calc = 0;
+        int16_t valx = (mouse_report_x_temp > 0) ? -1 : 1;
+        int16_t valy = (mouse_report_y_temp > 0) ? -1 : 1;
+
+        while (mouse_report_x_temp != 0) {
+            mouse_report_x_temp += valx;
+            drag_scroll_x_semaphore -= valx;
+
+            if (abs(drag_scroll_x_semaphore) >= PLOOPY_DRAGSCROLL_SEMAPHORE) {
+                mouse_report_x_calc -= valx;
+                drag_scroll_x_semaphore = 0;
+            }
+        }
+
+        while (mouse_report_y_temp != 0) {
+            mouse_report_y_temp += valy;
+            drag_scroll_y_semaphore -= valy;
+
+            if (abs(drag_scroll_y_semaphore) >= PLOOPY_DRAGSCROLL_SEMAPHORE) {
+                mouse_report_y_calc -= valy;
+                drag_scroll_y_semaphore = 0;
+            }
+        }
+
+        mouse_report.h = mouse_report_x_calc;
+
+#ifdef PLOOPY_DRAGSCROLL_INVERT
+        // Invert vertical scroll direction
+        mouse_report.v = -mouse_report_y_calc;
+#else
+        mouse_report.v = mouse_report_y_calc;
+#endif
+        mouse_report.x = 0;
+        mouse_report.y = 0;
+    }
+
+    return pointing_device_task_user(mouse_report);
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+
+    if (keycode == DPI_CONFIG && record->event.pressed) {
+        keyboard_config.dpi_config = (keyboard_config.dpi_config + 1) % DPI_OPTION_SIZE;
+        eeconfig_update_kb(keyboard_config.raw);
+        pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]);
+    }
+
+    if (keycode == DRAG_SCROLL) {
+#ifndef PLOOPY_DRAGSCROLL_MOMENTARY
+        if (record->event.pressed)
+#endif
+        {
+            is_drag_scroll ^= 1;
+        }
+#ifdef PLOOPY_DRAGSCROLL_FIXED
+        pointing_device_set_cpi(is_drag_scroll ? PLOOPY_DRAGSCROLL_DPI : dpi_array[keyboard_config.dpi_config]);
+#else
+        pointing_device_set_cpi(is_drag_scroll ? (dpi_array[keyboard_config.dpi_config] * PLOOPY_DRAGSCROLL_MULTIPLIER) : dpi_array[keyboard_config.dpi_config]);
+#endif
+    }
+
+    return true;
+}
+
+// Hardware Setup
+void keyboard_pre_init_kb(void) {
+    // debug_enable  = true;
+    // debug_matrix  = true;
+    // debug_mouse   = true;
+    // debug_encoder = true;
+
+    /* 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.
+     */
+    const pin_t unused_pins[] = { GP1, GP3, GP4, GP6, GP8, GP10, GP14, GP16,
+        GP18, GP20, GP22, GP24, GP25, GP26, GP27, GP28, GP29 };
+
+    for (uint8_t i = 0; i < (sizeof(unused_pins) / sizeof(pin_t)); i++) {
+        setPinOutput(unused_pins[i]);
+        writePinLow(unused_pins[i]);
+    }
+
+    keyboard_pre_init_user();
+}
+
+void pointing_device_init_kb(void) { pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]); }
+
+void eeconfig_init_kb(void) {
+    keyboard_config.dpi_config = PLOOPY_DPI_DEFAULT;
+    eeconfig_update_kb(keyboard_config.raw);
+    eeconfig_init_user();
+}
+
+void matrix_init_kb(void) {
+    // is safe to just read DPI setting since matrix init
+    // comes before pointing device init.
+    keyboard_config.raw = eeconfig_read_kb();
+    if (keyboard_config.dpi_config > DPI_OPTION_SIZE) {
+        eeconfig_init_kb();
+    }
+    matrix_init_user();
+}
diff --git a/keyboards/ploopyco/madromys/madromys.h b/keyboards/ploopyco/madromys/madromys.h
new file mode 100644
index 000000000000..944cce937b47
--- /dev/null
+++ b/keyboards/ploopyco/madromys/madromys.h
@@ -0,0 +1,37 @@
+/* Copyright 2023 Colin Lam (Ploopy Corporation)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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"
+
+typedef union {
+    uint32_t raw;
+    struct {
+        uint8_t dpi_config;
+    };
+} keyboard_config_t;
+_Static_assert(sizeof(keyboard_config_t) == sizeof(uint32_t), "keyboard_config_t size mismatch compared to EEPROM area");
+
+extern keyboard_config_t keyboard_config;
+extern uint16_t          dpi_array[];
+
+enum ploopy_keycodes {
+    DPI_CONFIG = QK_KB_0,
+    DRAG_SCROLL,
+};
diff --git a/keyboards/ploopyco/madromys/readme.md b/keyboards/ploopyco/madromys/readme.md
new file mode 100644
index 000000000000..456a3c7db20c
--- /dev/null
+++ b/keyboards/ploopyco/madromys/readme.md
@@ -0,0 +1,43 @@
+
+# Ploopyco Madromys Trackball
+
+It's a DIY, QMK-powered trackball!
+
+* Keyboard Maintainer: [PloopyCo](https://github.com/ploopyco)
+* Hardware Supported: RP2040
+* Hardware Availability: [Store](https://ploopy.co), [GitHub](https://github.com/ploopyco)
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb ploopyco/madromys -km default
+
+# Building Firmware
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+# Triggering the Bootloader
+
+[Do you see those two golden holes in the board](https://ploopy.co/wp-content/uploads/2023/11/boot.jpg)? Those are called **vias**. They act exactly like a switch does. Right now, that switch is OFF. However, if you take a paperclip or a pair of metal tweezers and touch those two vias, the two vias will form an electrical connection. Effectively, that switch turns ON.
+
+Go ahead and connect the two vias, and then (while the vias are connected) plug in the Madromys board into your computer.
+
+The computer should recognise that a mass storage device was just plugged in. Once this is done, you should be able to drag and drop files onto the Madromys board, as if the board was a USB drive. Feel free to remove the tweezers or paperclip at this point.
+
+If you want to upload a new firmware file (a ".uf2" file, like "madromys_awesome_version.uf2" or something), just drag it into the folder, and it'll automatically install on the Madromys board and restart itself, in normal operating mode. You're done!
+
+**TIP**: If your firmware is in some kind of strange state and uploading new firmware isn't fixing it, try uploading [a flash nuke](https://learn.adafruit.com/getting-started-with-raspberry-pi-pico-circuitpython/circuitpython#flash-resetting-uf2-3083182) to the Madromys board before flashing the new firmware. It wipes the memory of the Madromys board completely clean, which can help clear a few types of errors.
+
+# Drag Scroll
+
+Drag Scroll is a custom keycode for Ploopy devices that allows you to hold or tap a button and have the mouse movement translate into scrolling instead. 
+
+Nothing needs to be enabled to use this functionality; it's enabled on Madromys by default.
+
+### Drag Scroll Configuration
+
+* `#define PLOOPY_DRAGSCROLL_MOMENTARY` - Makes the key into a momentary key, rather than a toggle.
+* `#define PLOOPY_DRAGSCROLL_MULTIPLIER 0.75` - Sets the DPI multiplier to use when drag scroll is enabled. 
+* `#define PLOOPY_DRAGSCROLL_FIXED` - Normally, when activating Drag Scroll, it uses a fraction of the current DPI. You can define this to use a specific, set DPI rather than a fraction of the current DPI. 
+  * `#define PLOOPY_DRAGSCROLL_DPI 100` - When the fixed DPI option is enabled, this sets the DPI to be used for Drag Scroll.
+* `#define PLOOPY_DRAGSCROLL_INVERT` - This reverses the direction that the scroll is performed. 
+* `#define PLOOPY_DRAGSCROLL_SEMAPHORE` - This is a divisor on the drag scroll sensitivity. The default is 0, which means that the drag scroll is at maximum sensitivity. A value of 4 would mean that the drag scroll is 4 times less sensitive.
\ No newline at end of file
diff --git a/keyboards/ploopyco/madromys/rev1_001/info.json b/keyboards/ploopyco/madromys/rev1_001/info.json
new file mode 100644
index 000000000000..5cb4ee393811
--- /dev/null
+++ b/keyboards/ploopyco/madromys/rev1_001/info.json
@@ -0,0 +1,23 @@
+{
+    "usb": {
+        "device_version": "1.0.0"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "direct": [
+            ["GP15", "GP17", "GP19", "GP21", "GP23", "GP11"]
+        ]
+    },
+    "rgblight": {
+        "led_count": 3,
+        "max_brightness": 40,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true
+        }
+    },
+    "ws2812": {
+        "pin": "GP12"
+    }
+}
diff --git a/keyboards/ploopyco/madromys/rev1_001/readme.md b/keyboards/ploopyco/madromys/rev1_001/readme.md
new file mode 100644
index 000000000000..b9a2e106dbd5
--- /dev/null
+++ b/keyboards/ploopyco/madromys/rev1_001/readme.md
@@ -0,0 +1,3 @@
+This is the R1.001+ version of Madromys. Future versions may have other features.
+
+See the [main readme](../readme.md) for more details. 
diff --git a/keyboards/ploopyco/madromys/rev1_001/rules.mk b/keyboards/ploopyco/madromys/rev1_001/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/ploopyco/madromys/rules.mk b/keyboards/ploopyco/madromys/rules.mk
new file mode 100644
index 000000000000..b7e33d92f92c
--- /dev/null
+++ b/keyboards/ploopyco/madromys/rules.mk
@@ -0,0 +1,3 @@
+POINTING_DEVICE_DRIVER = pmw3360
+
+DEFAULT_FOLDER = ploopyco/madromys/rev1_001
diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h
index 62ed32840bc3..94bd6ef6af68 100644
--- a/keyboards/ploopyco/mouse/config.h
+++ b/keyboards/ploopyco/mouse/config.h
@@ -28,11 +28,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define RGBLED_NUM 4
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-
 // #define DEBUG_LED_PIN F7
 
 /* PMW33XX Settings */
diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json
index b89f82a363d1..5dc53392ff24 100644
--- a/keyboards/ploopyco/mouse/info.json
+++ b/keyboards/ploopyco/mouse/info.json
@@ -16,7 +16,13 @@
         "pin": "B5"
     },
     "rgblight": {
-        "max_brightness": 40
+        "led_count": 4,
+        "max_brightness": 40,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/ploopyco/trackball/rev1_005/config.h b/keyboards/ploopyco/trackball/rev1_005/config.h
index e59c0a3e853c..014d67f9c1f3 100644
--- a/keyboards/ploopyco/trackball/rev1_005/config.h
+++ b/keyboards/ploopyco/trackball/rev1_005/config.h
@@ -22,8 +22,3 @@
 // They are set as output and pulled high, by default
 #define UNUSABLE_PINS \
     { D1, D3, B4, B7, D6, C7, F6, F5, F3, F7 }
-
-#define RGBLED_NUM 3
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/ploopyco/trackball/rev1_005/info.json b/keyboards/ploopyco/trackball/rev1_005/info.json
index c7506f2d84df..4ec61dc7eb1d 100644
--- a/keyboards/ploopyco/trackball/rev1_005/info.json
+++ b/keyboards/ploopyco/trackball/rev1_005/info.json
@@ -10,6 +10,12 @@
         "pin": "B5"
     },
     "rgblight": {
-        "max_brightness": 40
+        "led_count": 3,
+        "max_brightness": 40,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true
+        }
     }
 }
diff --git a/keyboards/plume/plume65/config.h b/keyboards/plume/plume65/config.h
index ba11813e4ea8..4183c7db05e7 100644
--- a/keyboards/plume/plume65/config.h
+++ b/keyboards/plume/plume65/config.h
@@ -16,22 +16,6 @@
 
 #pragma once
 
-   #define RGBLED_NUM 10
-//   #define RGBLIGHT_HUE_STEP 8
-//   #define RGBLIGHT_SAT_STEP 8
-//   #define RGBLIGHT_VAL_STEP 8
-//   #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
-
 /* 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/plume/plume65/info.json b/keyboards/plume/plume65/info.json
index 3f38c555e194..a149784fd7f9 100644
--- a/keyboards/plume/plume65/info.json
+++ b/keyboards/plume/plume65/info.json
@@ -8,6 +8,21 @@
         "pid": "0x22CF",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 10,
+        "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": "B0"
     },
diff --git a/keyboards/plut0nium/0x3e/config.h b/keyboards/plut0nium/0x3e/config.h
deleted file mode 100644
index 67d2105ef73f..000000000000
--- a/keyboards/plut0nium/0x3e/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-Copyright 2020 plut0nium
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should 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 RGBLED_NUM 6
-  #define RGBLIGHT_HUE_STEP 12
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
-/*
- * 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/plut0nium/0x3e/info.json b/keyboards/plut0nium/0x3e/info.json
index 9ae1bcca07ed..97c448f3a734 100644
--- a/keyboards/plut0nium/0x3e/info.json
+++ b/keyboards/plut0nium/0x3e/info.json
@@ -22,7 +22,17 @@
         "pin": "C7"
     },
     "rgblight": {
-        "max_brightness": 150
+        "hue_steps": 12,
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "max_brightness": 150,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "static_gradient": true
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/plut0nium/0x3e/keymaps/default/keymap.c b/keyboards/plut0nium/0x3e/keymaps/default/keymap.c
index 0b4c26369dad..a906ebd24e9c 100644
--- a/keyboards/plut0nium/0x3e/keymaps/default/keymap.c
+++ b/keyboards/plut0nium/0x3e/keymaps/default/keymap.c
@@ -136,14 +136,6 @@ bool oled_task_user(void) {
             oled_write_ln_P(PSTR("Undf"), false);
     }
 
-    // Host Keyboard LED Status
-    // uint8_t led_usb_state = host_keyboard_leds();
-    // oled_write_P(PSTR("-----"), false);
-    // oled_write_P(PSTR("Stats"), false);
-    // oled_write_P(led_usb_state & (1<<USB_LED_NUM_LOCK) ? PSTR("num:*") : PSTR("num:."), false);
-    // oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK) ? PSTR("cap:*") : PSTR("cap:."), false);
-    // oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("scr:*") : PSTR("scr:."), false);
-
     oled_write_P(PSTR("-----"), false);
     render_backlight_status();
 
diff --git a/keyboards/plywrks/lune/config.h b/keyboards/plywrks/lune/config.h
index 50f82aeac934..06b97ae4ab8c 100644
--- a/keyboards/plywrks/lune/config.h
+++ b/keyboards/plywrks/lune/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 8
-//#    define RGBLIGHT_HUE_STEP 8
-//#    define RGBLIGHT_SAT_STEP 8
-//#    define RGBLIGHT_VAL_STEP 8
-//#    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
-
 /* 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/plywrks/lune/info.json b/keyboards/plywrks/lune/info.json
index 0804c27c1c7d..46c789054d19 100644
--- a/keyboards/plywrks/lune/info.json
+++ b/keyboards/plywrks/lune/info.json
@@ -8,6 +8,21 @@
         "pid": "0x7901",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 8,
+        "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": "E2"
     },
diff --git a/keyboards/plywrks/ply8x/info.json b/keyboards/plywrks/ply8x/info.json
index 8c5766e2c1c8..7c0717ade002 100644
--- a/keyboards/plywrks/ply8x/info.json
+++ b/keyboards/plywrks/ply8x/info.json
@@ -74,7 +74,7 @@
             "solid_splash": true,
             "solid_multisplash": true
         },
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 8, "matrix": [3, 0], "x":2, "y":27},
             {"flags": 8, "matrix": [0,15], "x":211, "y":0},
diff --git a/keyboards/pohjolaworks/louhi/config.h b/keyboards/pohjolaworks/louhi/config.h
index ee3792928a0f..9dbdc0105033 100644
--- a/keyboards/pohjolaworks/louhi/config.h
+++ b/keyboards/pohjolaworks/louhi/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 14
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
 /* 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/pohjolaworks/louhi/info.json b/keyboards/pohjolaworks/louhi/info.json
index 39674dc1ba0e..618d46b9c863 100644
--- a/keyboards/pohjolaworks/louhi/info.json
+++ b/keyboards/pohjolaworks/louhi/info.json
@@ -22,6 +22,9 @@
         "pin": "B5"
     },
     "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
         "max_brightness": 230
     },
     "processor": "atmega32u4",
diff --git a/keyboards/poker87c/config.h b/keyboards/poker87c/config.h
deleted file mode 100644
index b91aa11bd73b..000000000000
--- a/keyboards/poker87c/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 water <mfkiiyd@163.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 95
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/poker87c/info.json b/keyboards/poker87c/info.json
index f987bb5b0508..b0c8befc23ef 100644
--- a/keyboards/poker87c/info.json
+++ b/keyboards/poker87c/info.json
@@ -20,7 +20,23 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 180
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 95,
+        "max_brightness": 180,
+        "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
+        }
     },
     "indicators": {
         "caps_lock": "B3",
diff --git a/keyboards/poker87d/config.h b/keyboards/poker87d/config.h
deleted file mode 100644
index 35d54817f7d8..000000000000
--- a/keyboards/poker87d/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 water <mfkiiyd@163.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 125
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/poker87d/info.json b/keyboards/poker87d/info.json
index 3e0ea91fdc78..8eec7890895d 100644
--- a/keyboards/poker87d/info.json
+++ b/keyboards/poker87d/info.json
@@ -25,7 +25,23 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 180
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 125,
+        "max_brightness": 180,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/polycarbdiet/s20/config.h b/keyboards/polycarbdiet/s20/config.h
index 61969b945f31..fcff1b29cfc1 100644
--- a/keyboards/polycarbdiet/s20/config.h
+++ b/keyboards/polycarbdiet/s20/config.h
@@ -16,23 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 4
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
-
 /* 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/polycarbdiet/s20/info.json b/keyboards/polycarbdiet/s20/info.json
index aeb542758989..0905f9240ac0 100644
--- a/keyboards/polycarbdiet/s20/info.json
+++ b/keyboards/polycarbdiet/s20/info.json
@@ -18,6 +18,24 @@
         "pin": "B6",
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "B3"
     },
diff --git a/keyboards/pom_keyboards/tnln95/config.h b/keyboards/pom_keyboards/tnln95/config.h
index 4c85d73c7a73..14f8d92d5dbe 100644
--- a/keyboards/pom_keyboards/tnln95/config.h
+++ b/keyboards/pom_keyboards/tnln95/config.h
@@ -21,23 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* RGB Configs */
-    #define RGBLED_NUM 14
-#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 // RGB will turn off when PC is put to sleep
 //    #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
diff --git a/keyboards/pom_keyboards/tnln95/info.json b/keyboards/pom_keyboards/tnln95/info.json
index 02f8ac7927f1..7e055181bd8c 100644
--- a/keyboards/pom_keyboards/tnln95/info.json
+++ b/keyboards/pom_keyboards/tnln95/info.json
@@ -18,6 +18,24 @@
         "levels": 10,
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "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": "C7"
     },
diff --git a/keyboards/preonic/keymaps/badger/keymap.c b/keyboards/preonic/keymaps/badger/keymap.c
index 553b84ad341a..abaf611b0f6a 100644
--- a/keyboards/preonic/keymaps/badger/keymap.c
+++ b/keyboards/preonic/keymaps/badger/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 Dan White <opensource@bluetufa.com>
+Copyright 2023 Dan White <opensource@bluetufa.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -13,62 +13,48 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// if not REV3, just compile the default keymaps
-#ifndef KEYBOARD_preonic_rev3
-#include "../default/keymap.c"
-#else
-
 #include "ortho.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY_MAC_ORTHO]   = LAYOUT_preonic_2x2u(
-      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,
-      MOMAC,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_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,  RAISE,    P_ADJ,              KC_SPC,             LOWER,    KC_RGUI,  KC_RALT,  MAC_POP),
+      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, \
+      MOMAC,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_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,  \
+      J_FUN,    KC_LCTL,  KC_LALT,  KC_LGUI,  RAISE,              LOWER,              J_FUN,    KC_LEFT,  KC_DOWN,  KC_RIGHT),
 
   [_MOVE_MAC_ORTHO]    = LAYOUT_preonic_2x2u(
-      MAC_FRC,  MM_LEFT,  MM_RGHT,  IJ_TOP,   IJ_BOTT,  _______,  _______,  IJ_UP,    IJ_DOWN,  IJ_BACK,  IJ_FWD,   KC_BSPC,
-      KC_BACK,  IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_RUN,   IJ_STOP,  _______,  WD_BACK,  KC_HOME,  KC_END,   WD_FRWD,  KC_NEXT,
-      _______,  MM_LH,    MM_MAX,   MM_RH,    IJ_FIND,  IJ_IMPS,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CM_RIGHT, CM_DOWN,
-      _______,  MM_UH,    MM_BH,    MAC_CPY,  MAC_PST,  IJ_IMPH,  _______,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,  _______,
-      _______,  _______,  _______,  _______,  _______,            _______,            _______,  _______,  _______,  _______),
- 
-  [_QWERTY_LINUX_ORTHO]   = LAYOUT_preonic_2x2u(
-      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,
-      MOLNX,    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,  RAISE,    P_ADJ,              KC_SPC,             LOWER,    KC_RALT,  KC_RGUI,  OS_POP),
-
-  [_MOVE_LINUX_ORTHO]    = LAYOUT_preonic_2x2u(
-      KC_ESC,   VD_1,     VD_2,     VD_3,     KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_DEL,
-      _______,  WM_VD1,   WM_UH,    WM_VD2,   KC_MAC1,  KC_MSTP,  KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  KC_INS,
-      _______,  WM_LH,    WM_MAX,   WM_RH,    KC_MAC2,  KC_PSCR,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CS_RIGHT, CS_DOWN,
-      _______,  WM_VD3,   WM_BH,    OS_COPY,  OS_PAST,  KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,
-      _______,  KC_LCTL,  KC_LALT,  KC_LGUI,  _______,            _______,            _______,  _______,  _______,  _______),
+      MAC_FRC,  MM_LEFT,  MM_RGHT,  IJ_TOP,   IJ_BOTT,  _______,  _______,  IJ_UP,    IJ_DOWN,  IJ_BACK,  IJ_FWD,   WD_DELE, \
+      KC_BACK,  IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_RUN,   IJ_STOP,  _______,  WD_BACK,  KC_HOME,  KC_END,   WD_FRWD,  KC_NEXT, \
+      _______,  MM_LH,    MM_MAX,   MM_RH,    IJ_FIND,  IJ_IMPS,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CM_RIGHT, CM_DOWN, \
+      _______,  MM_UH,    MM_BH,    MAC_CPY,  MAC_PST,  IJ_IMPH,  _______,  IJ_REN,   IJ_IMPL,  IJ_DECL,  KC_UP,    _______, \
+      _______,  _______,  _______,  _______,  KC_SPC,             KC_SPC,             _______,  _______,  _______,  _______),
 
   [_RAISE]    = LAYOUT_preonic_2x2u(
-      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_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_PIPE,
-      _______,  KC_AGIN,  KC_STOP,  KC_MENU,  KC_FIND,  KC_MPLY,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_COLN,  KC_DQUO,
-      _______,  KC_UNDO,  KC_CUT,   OS_COPY,  OS_PAST,  KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_LT,    KC_GT,    KC_QUES,  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_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_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_COLN,  KC_DQUO, \
+      _______,  KC_UNDO,  KC_CUT,   OS_COPY,  OS_PAST,  KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_LT,    KC_GT,    KC_QUES,  _______, \
       _______,  _______,  _______,  _______,  _______,            _______,            _______,  _______,  _______,  _______),
 
   [_LOWER]    = LAYOUT_preonic_2x2u(
-      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_7,     KC_8,     KC_9,     KC_PMNS,  KC_VOLD,  KC_VOLU,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_BSLS,
-      _______,  KC_4,     KC_5,     KC_6,     KC_PPLS,  KC_PSCR,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_SCLN,  KC_QUOT,
-      _______,  KC_1,     KC_2,     KC_3,     KC_PAST,  KC_NO,    KC_NO,    KC_WHOM,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,
+      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_7,     KC_8,     KC_9,     KC_PMNS,  KC_VOLD,  KC_VOLU,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_BSLS, \
+      _______,  KC_4,     KC_5,     KC_6,     KC_PPLS,  KC_PSCR,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_SCLN,  KC_QUOT, \
+      _______,  KC_1,     KC_2,     KC_3,     KC_PAST,  KC_NO,    KC_NO,    KC_WHOM,  KC_WBAK,  KC_WFWD,  KC_WSCH,  KC_RSFT, \
       _______,  KC_0,     KC_DOT,   KC_ENT,   _______,            _______,            _______,  _______,  _______,  _______),
 
+  [_FUNCTION_ORTHO]   = LAYOUT_preonic_2x2u(
+      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_7,     KC_8,     KC_9,     _______,  KC_MSTP,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN2,  KC_INS,  \
+      KC_CAPS,  KC_4,     KC_5,     KC_6,     _______,  _______,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_BTN1,  _______, \
+      KC_0,     KC_1,     KC_2,     KC_3,     _______,  KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_ACL2,  KC_RSFT, \
+      _______,  KC_LCTL,  KC_LALT,  KC_LGUI,  _______,            _______,            _______,  _______,  _______,  J_ADJ),
+
   [_ADJUST_ORTHO]   = LAYOUT_preonic_2x2u(
-      KC_ESC,   AU_ON,    AU_OFF,   CK_TOGG,  CK_UP,    CK_DOWN,  CK_RST,   MU_ON,    MU_OFF,   MU_TOGG,  MU_NEXT,  KC_DEL,
-      _______,  NK_ON,    NK_OFF,   EE_CLR,   QK_BOOT,  KC_MSTP,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN2,  KC_INS,
-      _______,  GE_SWAP,  GE_NORM,  DB_TOGG,  AG_SWAP,  AG_NORM,  KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R,  KC_BTN1,  _______,
-      _______,  KC_LYRC,  KC_FIRST, KC_CAPS,  KC_NO,    KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_ACL0,  KC_ACL1,  KC_ACL2,  _______,
+      _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_DEL,  \
+      _______,  NK_ON,    NK_OFF,   EE_CLR,   QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  KC_INS,  \
+      _______,  GE_SWAP,  GE_NORM,  DB_TOGG,  AG_SWAP,  AG_NORM,  _______,  _______,  _______,  _______,  _______,  _______, \
+      _______,  _______,  _______,  KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, \
       _______,  _______,  _______,  _______,  _______,            _______,            _______,  _______,  _______,  _______)
 };
-
-#endif
diff --git a/keyboards/preonic/keymaps/zach/zach_common_functions.c b/keyboards/preonic/keymaps/zach/zach_common_functions.c
index 6ad1c7bed337..ae5f44e71363 100644
--- a/keyboards/preonic/keymaps/zach/zach_common_functions.c
+++ b/keyboards/preonic/keymaps/zach/zach_common_functions.c
@@ -141,31 +141,31 @@ tap_dance_action_t tap_dance_actions[] = {
 
 //#ifdef UNICODE_ENABLE
 // Unicode shortcuts
-#define IBANG   X(0x203D)
-#define RAROW   X(0x2192)
-#define LAROW   X(0x2190)
-#define DEGREE  X(0x00B0)
-#define OMEGA   X(0x03A9)
-#define WOMEGA  X(0x03C9)
-#define MICRO   X(0x00B5)
-#define PLUMIN  X(0x00B1)
-#define SUPA2   X(0x00B2)
-#define ROMAN1  X(0x2160)
-#define ROMAN2  X(0x2161)
-#define ROMAN3  X(0x2162)
-#define ROMAN4  X(0x2163)
-#define ROMAN5  X(0x2164)
-#define ROMAN6  X(0x2165)
-#define ROMAN7  X(0x2166)
-#define roman1  X(0x2170)
-#define roman2  X(0x2171)
-#define roman3  X(0x2172)
-#define roman4  X(0x2173)
-#define roman5  X(0x2174)
-#define roman6  X(0x2175)
-#define roman7  X(0x2176)
+#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        // For Unicode characters larger than 0x8000. Send with X(<unicode>)
+#ifdef UNICODEMAP_ENABLE
 enum Ext_Unicode{
     PENGUIN = 0,
     BOAR,
@@ -182,12 +182,12 @@ const uint32_t unicode_map[] PROGMEM = {
     [CHICK]     = 0x1F425,
     [TUMBLER]   = 0x1F943
 };
-#define PENGY   X(PENGUIN)
-#define BOARY   X(BOAR)
-#define MNKY    X(MONKEY)
-#define DRGN    X(DRAGON)
-#define DUCK    X(CHICK)
-#define TMBL    X(TUMBLER)
+#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
diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h
index 2f55894ae652..3d64a4a34ad1 100644
--- a/keyboards/preonic/rev3/config.h
+++ b/keyboards/preonic/rev3/config.h
@@ -42,22 +42,8 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/*
- * WS2812 Underglow Matrix options
- */
-#define RGBLED_NUM 9
-#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
 // RGB Matrix support
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 9
 
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
diff --git a/keyboards/preonic/rev3/info.json b/keyboards/preonic/rev3/info.json
index e69aacf144e9..75688a33b22e 100644
--- a/keyboards/preonic/rev3/info.json
+++ b/keyboards/preonic/rev3/info.json
@@ -6,12 +6,27 @@
         "pid": "0xA649",
         "device_version": "0.0.3"
     },
+    "rgblight": {
+        "led_count": 9,
+        "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": "A1",
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h
index ac584dfbfe47..3d64a4a34ad1 100644
--- a/keyboards/preonic/rev3_drop/config.h
+++ b/keyboards/preonic/rev3_drop/config.h
@@ -42,23 +42,8 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/*
- * WS2812 Underglow Matrix options
- */
-#define RGBLED_NUM 9
-#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
-
 // RGB Matrix support
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 9
 
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
diff --git a/keyboards/preonic/rev3_drop/info.json b/keyboards/preonic/rev3_drop/info.json
index 7e5eace3d5cd..fed4acb01f5b 100644
--- a/keyboards/preonic/rev3_drop/info.json
+++ b/keyboards/preonic/rev3_drop/info.json
@@ -6,12 +6,27 @@
         "pid": "0xA649",
         "device_version": "0.0.3"
     },
+    "rgblight": {
+        "led_count": 9,
+        "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": "A1",
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
diff --git a/keyboards/primekb/meridian/config.h b/keyboards/primekb/meridian/config.h
index 0633f8948ef8..3bb4f22006dd 100644
--- a/keyboards/primekb/meridian/config.h
+++ b/keyboards/primekb/meridian/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 3
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/primekb/meridian/ktr1010/config.h b/keyboards/primekb/meridian/ktr1010/config.h
index e28306587db9..3da9ff72c421 100644
--- a/keyboards/primekb/meridian/ktr1010/config.h
+++ b/keyboards/primekb/meridian/ktr1010/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 3
 // Special timing definitions for KTR101
 #define WS2812_TIMING 1325
 #define WS2812_T0H 350
diff --git a/keyboards/primekb/meridian/ktr1010/info.json b/keyboards/primekb/meridian/ktr1010/info.json
index 3a330b7306e6..a9a9362ec98d 100644
--- a/keyboards/primekb/meridian/ktr1010/info.json
+++ b/keyboards/primekb/meridian/ktr1010/info.json
@@ -1,4 +1,7 @@
 {
+    "rgblight": {
+        "led_count": 3
+    },
     "ws2812": {
         "pin": "B15"
     }
diff --git a/keyboards/primekb/meridian/rules.mk b/keyboards/primekb/meridian/rules.mk
index 8b14acaf197b..6d34cadbf7d6 100644
--- a/keyboards/primekb/meridian/rules.mk
+++ b/keyboards/primekb/meridian/rules.mk
@@ -11,7 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 DEFAULT_FOLDER = primekb/meridian/ktr1010
diff --git a/keyboards/primekb/meridian/ws2812/config.h b/keyboards/primekb/meridian/ws2812/config.h
index 0633f8948ef8..3bb4f22006dd 100644
--- a/keyboards/primekb/meridian/ws2812/config.h
+++ b/keyboards/primekb/meridian/ws2812/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 3
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/primekb/meridian/ws2812/info.json b/keyboards/primekb/meridian/ws2812/info.json
index 98702321171d..4299d367c203 100644
--- a/keyboards/primekb/meridian/ws2812/info.json
+++ b/keyboards/primekb/meridian/ws2812/info.json
@@ -1,4 +1,7 @@
 {
+    "rgblight": {
+        "led_count": 3
+    },
     "ws2812": {
         "pin": "B15",
         "driver": "spi"
diff --git a/keyboards/primekb/meridian_rgb/config.h b/keyboards/primekb/meridian_rgb/config.h
index 6e481d7778ef..66857199142b 100644
--- a/keyboards/primekb/meridian_rgb/config.h
+++ b/keyboards/primekb/meridian_rgb/config.h
@@ -17,18 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 64
-#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
-
 /* 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/primekb/meridian_rgb/info.json b/keyboards/primekb/meridian_rgb/info.json
index c967c15811f6..767a70b6f345 100644
--- a/keyboards/primekb/meridian_rgb/info.json
+++ b/keyboards/primekb/meridian_rgb/info.json
@@ -22,7 +22,20 @@
         "pin": "F1"
     },
     "rgblight": {
-        "max_brightness": 200
+        "led_count": 64,
+        "max_brightness": 200,
+        "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",
diff --git a/keyboards/primekb/prime_e/keymaps/default/keymap.c b/keyboards/primekb/prime_e/keymaps/default/keymap.c
index 08067b3132bb..e5e47cffc2c5 100644
--- a/keyboards/primekb/prime_e/keymaps/default/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/default/keymap.c
@@ -57,24 +57,18 @@ void matrix_init_user(void) {
   writePinLow(B3);
 }
 
-void led_set_user(uint8_t usb_led) {
-  if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.num_lock) {
     writePinHigh(B2);
   } else {
     writePinLow(B2);
   }
-  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+  if (led_state.caps_lock) {
     writePinHigh(B1);
   } else {
     writePinLow(B1);
   }
-/*
-  if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-    writePinHigh(B3);
-  } else {
-    writePinLow(B3);
-  }*/
-
+  return false;
 }
 
 //function for layer indicator LED
diff --git a/keyboards/primekb/prime_e/keymaps/jetpacktuxedo/keymap.c b/keyboards/primekb/prime_e/keymaps/jetpacktuxedo/keymap.c
index cdd1b56430da..a45a841285f0 100644
--- a/keyboards/primekb/prime_e/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/jetpacktuxedo/keymap.c
@@ -100,13 +100,14 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     return state;
 }
 
-void led_set_user(uint8_t usb_led) {
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+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) {
diff --git a/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c b/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
index f3228ec0d59f..998046c6d7c6 100644
--- a/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
@@ -91,8 +91,9 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     return state;
 }
 
-void led_set_user(uint8_t usb_led) {
-    CAPS = IS_LED_ON(usb_led, USB_LED_CAPS_LOCK);
+bool led_update_user(led_t led_state) {
+    CAPS = led_state.caps_lock;
+    return false;
 }
 
 void togg_indicator(uint8_t *state, uint8_t pin) {
diff --git a/keyboards/primekb/prime_e/keymaps/via/keymap.c b/keyboards/primekb/prime_e/keymaps/via/keymap.c
index 2d1d003d51a5..09a42b0d1657 100644
--- a/keyboards/primekb/prime_e/keymaps/via/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/via/keymap.c
@@ -85,24 +85,18 @@ void matrix_init_user(void) {
   writePinLow(B3);
 }
 
-void led_set_user(uint8_t usb_led) {
-  if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.num_lock) {
     writePinHigh(B2);
   } else {
     writePinLow(B2);
   }
-  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+  if (led_state.caps_lock) {
     writePinHigh(B1);
   } else {
     writePinLow(B1);
   }
-/*
-  if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-    writePinHigh(B3);
-  } else {
-    writePinLow(B3);
-  }*/
-
+  return false;
 }
 
 //function for layer indicator LED
diff --git a/keyboards/primekb/prime_e/rgb/config.h b/keyboards/primekb/prime_e/rgb/config.h
deleted file mode 100644
index 6610d03f0460..000000000000
--- a/keyboards/primekb/prime_e/rgb/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2019 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/>.
-*/
-
-#pragma once
-
-#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
diff --git a/keyboards/primekb/prime_e/rgb/info.json b/keyboards/primekb/prime_e/rgb/info.json
index 189e448ed935..998331ad8978 100644
--- a/keyboards/primekb/prime_e/rgb/info.json
+++ b/keyboards/primekb/prime_e/rgb/info.json
@@ -4,6 +4,21 @@
         "pid": "0x0052",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 8,
+        "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"
     }
diff --git a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
index 20f34ce60be3..2f0290dc0334 100644
--- a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
+++ b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
@@ -172,15 +172,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
   return true;
 }
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/printedpad/config.h b/keyboards/printedpad/config.h
new file mode 100644
index 000000000000..58bf9c6ffe1c
--- /dev/null
+++ b/keyboards/printedpad/config.h
@@ -0,0 +1,15 @@
+// Copyright 2023 Noah Beidelman (@noahbei)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define I2C_DRIVER I2CD1
+#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
+
+#define OLED_TIMEOUT 300000
diff --git a/keyboards/printedpad/halconf.h b/keyboards/printedpad/halconf.h
new file mode 100644
index 000000000000..0534f72da252
--- /dev/null
+++ b/keyboards/printedpad/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Noah Beidelman (@noahbei)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/printedpad/info.json b/keyboards/printedpad/info.json
new file mode 100644
index 000000000000..90a42c73137a
--- /dev/null
+++ b/keyboards/printedpad/info.json
@@ -0,0 +1,46 @@
+{
+    "manufacturer": "Prota Designs",
+    "keyboard_name": "Printed Pad",
+    "maintainer": "noahbei",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B1", "B0"],
+        "rows": ["A10", "C9", "A8", "A9"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x5064"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "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 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/printedpad/keymaps/default/keymap.c b/keyboards/printedpad/keymaps/default/keymap.c
new file mode 100644
index 000000000000..2126dc593fdd
--- /dev/null
+++ b/keyboards/printedpad/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2023 Noah Beidelman (@noahbei)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐
+     * │Tog│ 
+     * ├───┼───┬───┐ 
+     * │ 7 │ 8 │ 9 │
+     * ├───┼───┼───┤
+     * │ 4 │ 5 │ 6 │
+     * ├───┼───┼───┤
+     * │ 1 │ 2 │ 3 │ 
+     * └───┴───┴───┘
+     */
+    [0] = LAYOUT(
+        LT(0, KC_NO),
+        KC_7,   KC_8,   KC_9,
+        KC_4,   KC_5,   KC_6,
+        KC_1,   KC_2,   KC_3
+    ),
+
+    [1] = LAYOUT(
+        LT(0, KC_NO),
+        KC_A,   KC_B,   KC_C,
+        KC_D,   KC_E,   KC_F,
+        KC_G,   KC_H,   KC_I
+    ),
+
+    [2] = LAYOUT(
+        LT(0, KC_NO),
+        KC_J,   KC_K,   KC_L,
+        KC_M,   KC_N,   KC_O,
+        KC_P,   KC_Q,   KC_R
+    ),
+
+    [3] = LAYOUT(
+        LT(0, KC_NO),
+        KC_S,   KC_T,   KC_U,
+        KC_V,   KC_W,   KC_X,
+        KC_Y,   KC_Z,   KC_ENT
+    )
+};
\ No newline at end of file
diff --git a/keyboards/printedpad/keymaps/via/keymap.c b/keyboards/printedpad/keymaps/via/keymap.c
new file mode 100644
index 000000000000..2126dc593fdd
--- /dev/null
+++ b/keyboards/printedpad/keymaps/via/keymap.c
@@ -0,0 +1,45 @@
+// Copyright 2023 Noah Beidelman (@noahbei)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┐
+     * │Tog│ 
+     * ├───┼───┬───┐ 
+     * │ 7 │ 8 │ 9 │
+     * ├───┼───┼───┤
+     * │ 4 │ 5 │ 6 │
+     * ├───┼───┼───┤
+     * │ 1 │ 2 │ 3 │ 
+     * └───┴───┴───┘
+     */
+    [0] = LAYOUT(
+        LT(0, KC_NO),
+        KC_7,   KC_8,   KC_9,
+        KC_4,   KC_5,   KC_6,
+        KC_1,   KC_2,   KC_3
+    ),
+
+    [1] = LAYOUT(
+        LT(0, KC_NO),
+        KC_A,   KC_B,   KC_C,
+        KC_D,   KC_E,   KC_F,
+        KC_G,   KC_H,   KC_I
+    ),
+
+    [2] = LAYOUT(
+        LT(0, KC_NO),
+        KC_J,   KC_K,   KC_L,
+        KC_M,   KC_N,   KC_O,
+        KC_P,   KC_Q,   KC_R
+    ),
+
+    [3] = LAYOUT(
+        LT(0, KC_NO),
+        KC_S,   KC_T,   KC_U,
+        KC_V,   KC_W,   KC_X,
+        KC_Y,   KC_Z,   KC_ENT
+    )
+};
\ No newline at end of file
diff --git a/keyboards/printedpad/keymaps/via/rules.mk b/keyboards/printedpad/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/printedpad/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/printedpad/mcuconf.h b/keyboards/printedpad/mcuconf.h
new file mode 100644
index 000000000000..af97c1c992a3
--- /dev/null
+++ b/keyboards/printedpad/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Noah Beidelman (@noahbei)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/printedpad/oled.c b/keyboards/printedpad/oled.c
new file mode 100644
index 000000000000..a41fad77673e
--- /dev/null
+++ b/keyboards/printedpad/oled.c
@@ -0,0 +1,1420 @@
+// Copyright 2023 Noah Beidelman (@noahbei)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "printedpad.h"
+
+#ifdef OLED_ENABLE
+static void flash_current_layer(void);
+
+#define FRAME_DURATION 200
+
+uint32_t animation_timer = 0;
+uint8_t current_frame = 0;
+
+static void render_animation(void) {
+    // 'monkeylong26', 128x32px
+    static const char epd_bitmap_monkeylong26[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 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, 0xc0, 0x20, 0x10, 
+        0x90, 0x90, 0x63, 0xc4, 0x3f, 0x1f, 0x3b, 0xf0, 0xe0, 0xc8, 0xd3, 0x50, 0x50, 0xc3, 0xa0, 0xa1, 
+        0x72, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x02, 
+        0x02, 0x04, 0x74, 0xf4, 0xe5, 0xaf, 0xcf, 0x1f, 0x11, 0x10, 0x10, 0x10, 0x70, 0xe8, 0xef, 0xd0, 
+        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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong25', 128x32px
+    static const char epd_bitmap_monkeylong25[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 
+        0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 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, 0x80, 0x40, 0x20, 0x20, 0x20, 0xc3, 0xc4, 
+        0x3f, 0x1f, 0x3b, 0xf0, 0xe0, 0xc8, 0xd3, 0x50, 0x50, 0xc3, 0xa0, 0xa1, 0x72, 0x0c, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 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, 0x02, 0x04, 0x05, 0x05, 0x74, 0xf4, 
+        0xe5, 0xaf, 0xcf, 0x1f, 0x11, 0x10, 0x10, 0xf0, 0xf0, 0xe8, 0xaf, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong24', 128x32px
+    static const char epd_bitmap_monkeylong24[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 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, 0xb0, 0xf8, 0xf8, 0x7c, 
+        0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 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, 0x80, 0x40, 0x40, 0x40, 0x83, 0x04, 0x9f, 0x7f, 0x3b, 0x70, 
+        0xe0, 0xc8, 0xd3, 0x50, 0x50, 0xc3, 0xe0, 0x21, 0x32, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x04, 0x08, 0x0a, 0x0a, 0x09, 0x74, 0xf5, 0xee, 0xae, 0xde, 
+        0x11, 0x10, 0xf0, 0xf0, 0xf0, 0xa8, 0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong23', 128x32px
+    static const char epd_bitmap_monkeylong23[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 
+        0x38, 0x18, 0x10, 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, 0x80, 0x80, 0x80, 0x03, 0x04, 0x1f, 0x3f, 0xfb, 0xf0, 0x60, 0x28, 0x53, 0xd0, 
+        0x50, 0xc3, 0x20, 0x21, 0x32, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x09, 0x10, 0x14, 0x14, 0x13, 0x08, 0x04, 0xef, 0xef, 0xff, 0xf2, 0xf2, 0xf2, 0xb1, 
+        0xd0, 0x08, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong22', 128x32px
+    static const char epd_bitmap_monkeylong22[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 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, 0x80, 0x40, 
+        0x40, 0x40, 0x83, 0x04, 0x1f, 0xff, 0xfb, 0xf0, 0xe0, 0xc8, 0xd3, 0x50, 0x30, 0x43, 0xe0, 0x21, 
+        0x32, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x04, 0x08, 
+        0x0a, 0x0a, 0x09, 0x04, 0xe4, 0xef, 0xef, 0xbf, 0xd1, 0x10, 0xf1, 0xf2, 0xf2, 0xaa, 0xcf, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong21', 128x32px
+    static const char epd_bitmap_monkeylong21[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 
+        0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 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, 0x80, 0x40, 0x20, 0x20, 0x20, 0xc3, 0x04, 
+        0xdf, 0x3f, 0xfb, 0xf0, 0xe0, 0xc8, 0xd3, 0x50, 0xd0, 0x43, 0x20, 0x61, 0xf2, 0x0c, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 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, 0x02, 0x04, 0x05, 0x05, 0x04, 0x74, 
+        0xf4, 0xef, 0xaf, 0xdf, 0x11, 0x10, 0x10, 0xf0, 0xf1, 0xea, 0xae, 0xc2, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong20', 128x32px
+    static const char epd_bitmap_monkeylong20[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 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, 0xb0, 0xf8, 0xf8, 0x7c, 
+        0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 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, 0xc0, 0x20, 0x10, 0x90, 0x90, 0x63, 0x64, 0x9f, 0xbf, 0xfb, 0xf0, 
+        0xe0, 0xca, 0xd2, 0x50, 0x52, 0xc2, 0x20, 0x11, 0x32, 0xec, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x02, 0x02, 0x04, 0x74, 0xf4, 0xe4, 0xaf, 0xcf, 0x1f, 
+        0x11, 0x10, 0x10, 0xf0, 0xf0, 0xe8, 0xaf, 0xc1, 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, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong19', 128x32px
+    static const char epd_bitmap_monkeylong19[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 
+        0x38, 0x18, 0x10, 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, 0xc0, 0x20, 0x10, 0x90, 0x90, 0x63, 0x64, 0x9f, 0xbf, 0xfb, 0xf0, 0xe0, 0xc8, 0xd3, 0x50, 
+        0x50, 0xc3, 0x20, 0x11, 0x32, 0xec, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x02, 0x02, 0x04, 0x74, 0xf4, 0xe4, 0xaf, 0xcf, 0x1f, 0x11, 0x10, 0x10, 0x10, 
+        0x70, 0xe8, 0xef, 0xd1, 0x71, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong18', 128x32px
+    static const char epd_bitmap_monkeylong18[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 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, 0x80, 0x40, 0x20, 
+        0x20, 0x20, 0xc3, 0x64, 0x9f, 0xbf, 0xfb, 0xf0, 0xe0, 0xc8, 0xd3, 0x50, 0x50, 0xc3, 0x20, 0x11, 
+        0x32, 0xec, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x02, 0x04, 
+        0x05, 0x05, 0x74, 0xf4, 0xe4, 0xaf, 0xcf, 0x1f, 0x11, 0x10, 0x10, 0x10, 0x70, 0xe8, 0xef, 0xd1, 
+        0x71, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong17', 128x32px
+    static const char epd_bitmap_monkeylong17[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 
+        0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 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, 0x80, 0x40, 0x40, 0x40, 0x83, 0x04, 
+        0xdf, 0x3f, 0xfb, 0xf0, 0xe0, 0xc8, 0xd3, 0x50, 0xd0, 0x43, 0x20, 0x61, 0xf2, 0x0c, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 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, 0x04, 0x08, 0x0a, 0x0a, 0x09, 0x74, 
+        0xf4, 0xef, 0xaf, 0xdf, 0x11, 0x10, 0x10, 0xf0, 0xf1, 0xea, 0xae, 0xc2, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong16', 128x32px
+    static const char epd_bitmap_monkeylong16[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 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, 0xb0, 0xf8, 0xf8, 0x7c, 
+        0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 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, 0x80, 0x80, 0x80, 0x03, 0x04, 0x1f, 0xff, 0xfb, 0xf0, 
+        0xe0, 0xc8, 0xd3, 0x50, 0x30, 0x43, 0xe0, 0x21, 0x32, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x09, 0x10, 0x14, 0x14, 0x13, 0x08, 0x04, 0xef, 0xef, 0xff, 
+        0xb1, 0xd0, 0xf1, 0xf2, 0xf2, 0xaa, 0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong15', 128x32px
+    static const char epd_bitmap_monkeylong15[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 
+        0x38, 0x18, 0x10, 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, 0x80, 0x40, 0x40, 0x40, 0x83, 0x04, 0x1f, 0x3f, 0xfb, 0xf0, 0x60, 0x28, 0x53, 0xd0, 
+        0x50, 0xc3, 0x20, 0x21, 0x32, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x04, 0x08, 0x0a, 0x0a, 0x09, 0x04, 0x04, 0x0f, 0x0f, 0xff, 0xf2, 0xf2, 0xb2, 0xf1, 
+        0xb0, 0xc8, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong14', 128x32px
+    static const char epd_bitmap_monkeylong14[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xb0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x38, 0x18, 0x10, 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, 0x80, 0x40, 0x20, 
+        0x20, 0x20, 0xc3, 0x04, 0x9f, 0x7f, 0x3b, 0x70, 0xe0, 0xc8, 0xd3, 0x50, 0x50, 0xc3, 0xe0, 0x21, 
+        0x32, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x02, 0x04, 
+        0x05, 0x05, 0x04, 0x04, 0xe5, 0xee, 0xee, 0xbe, 0xd1, 0x10, 0xf0, 0xf0, 0xf0, 0xa8, 0xcf, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+
+    // 'monkeylong13', 128x32px
+    static const char epd_bitmap_monkeylong13[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x72, 
+        0xa1, 0xa0, 0xc3, 0x50, 0x50, 0xd3, 0xc8, 0xe0, 0xf0, 0x3b, 0x1f, 0x3f, 0xc4, 0x63, 0x90, 0x90, 
+        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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 
+        0xd0, 0xef, 0xe8, 0x70, 0x10, 0x10, 0x10, 0x11, 0x1f, 0xcf, 0xaf, 0xe5, 0xf4, 0x74, 0x04, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong12', 128x32px
+    static const char epd_bitmap_monkeylong12[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 
+        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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x72, 0xa1, 0xa0, 0xc3, 0x50, 0x50, 0xd3, 0xc8, 0xe0, 0xf0, 0x3b, 0x1f, 0x3f, 
+        0xc4, 0xc3, 0x20, 0x20, 0x20, 0x40, 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, 0xc0, 0xaf, 0xe8, 0xf0, 0xf0, 0x10, 0x10, 0x11, 0x1f, 0xcf, 0xaf, 0xe5, 
+        0xf4, 0x74, 0x05, 0x05, 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, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong11', 128x32px
+    static const char epd_bitmap_monkeylong11[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        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, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 
+        0x7c, 0xf8, 0xf8, 0xb0, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x32, 0x21, 0xe0, 0xc3, 0x50, 0x50, 0xd3, 0xc8, 0xe0, 
+        0x70, 0x3b, 0x7f, 0x9f, 0x04, 0x83, 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, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcf, 0xa8, 0xf0, 0xf0, 0xf0, 0x10, 0x11, 
+        0xde, 0xae, 0xee, 0xf5, 0x74, 0x09, 0x0a, 0x0a, 0x08, 0x04, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong9', 128x32px
+    static const char epd_bitmap_monkeylong9[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x32, 
+        0x21, 0xe0, 0x43, 0x30, 0x50, 0xd3, 0xc8, 0xe0, 0xf0, 0xfb, 0xff, 0x1f, 0x04, 0x83, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0xcf, 0xaa, 0xf2, 0xf2, 0xf1, 0x10, 0xd1, 0xbf, 0xef, 0xef, 0xe4, 0x04, 0x09, 0x0a, 0x0a, 
+        0x08, 0x04, 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, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong10', 128x32px
+    static const char epd_bitmap_monkeylong10[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 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, 0x18, 0x38, 
+        0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 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, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 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, 0x32, 0x21, 0x20, 0xc3, 0x50, 
+        0xd0, 0x53, 0x28, 0x60, 0xf0, 0xfb, 0x3f, 0x1f, 0x04, 0x03, 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, 0x0f, 0x08, 0xd0, 
+        0xb1, 0xf2, 0xf2, 0xf2, 0xff, 0xef, 0xef, 0x04, 0x08, 0x13, 0x14, 0x14, 0x10, 0x09, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong8', 128x32px
+    static const char epd_bitmap_monkeylong8[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 
+        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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xf2, 0x61, 0x20, 0x43, 0xd0, 0x50, 0xd3, 0xc8, 0xe0, 0xf0, 0xfb, 0x3f, 0xdf, 
+        0x04, 0xc3, 0x20, 0x20, 0x20, 0x40, 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, 0x01, 0xc2, 0xae, 0xea, 0xf1, 0xf0, 0x10, 0x10, 0x11, 0xdf, 0xaf, 0xef, 0xf4, 
+        0x74, 0x04, 0x05, 0x05, 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, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong7', 128x32px
+    static const char epd_bitmap_monkeylong7[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        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, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 
+        0x7c, 0xf8, 0xf8, 0xb0, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0x32, 0x11, 0x20, 0xc2, 0x52, 0x50, 0xd2, 0xca, 0xe0, 
+        0xf0, 0xfb, 0xbf, 0x9f, 0x64, 0x63, 0x90, 0x90, 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, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xc1, 0xaf, 0xe8, 0xf0, 0xf0, 0x10, 0x10, 0x11, 
+        0x1f, 0xcf, 0xaf, 0xe4, 0xf4, 0x74, 0x04, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong6', 128x32px
+    static const char epd_bitmap_monkeylong6[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 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, 0x18, 0x38, 
+        0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 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, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0x32, 0x11, 0x20, 0xc3, 0x50, 
+        0x50, 0xd3, 0xc8, 0xe0, 0xf0, 0xfb, 0xbf, 0x9f, 0x64, 0x63, 0x90, 0x90, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 0xd1, 0xef, 0xe8, 0x70, 
+        0x10, 0x10, 0x10, 0x11, 0x1f, 0xcf, 0xaf, 0xe4, 0xf4, 0x74, 0x04, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong5', 128x32px
+    static const char epd_bitmap_monkeylong5[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0x32, 
+        0x11, 0x20, 0xc3, 0x50, 0x50, 0xd3, 0xc8, 0xe0, 0xf0, 0xfb, 0xbf, 0x9f, 0x64, 0xc3, 0x20, 0x20, 
+        0x20, 0x40, 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, 0x71, 
+        0xd1, 0xef, 0xe8, 0x70, 0x10, 0x10, 0x10, 0x11, 0x1f, 0xcf, 0xaf, 0xe4, 0xf4, 0x74, 0x05, 0x05, 
+        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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong4', 128x32px
+    static const char epd_bitmap_monkeylong4[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 
+        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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xf2, 0x61, 0x20, 0x43, 0xd0, 0x50, 0xd3, 0xc8, 0xe0, 0xf0, 0xfb, 0x3f, 0xdf, 
+        0x04, 0x83, 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, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xc2, 0xae, 0xea, 0xf1, 0xf0, 0x10, 0x10, 0x11, 0xdf, 0xaf, 0xef, 0xf4, 
+        0x74, 0x09, 0x0a, 0x0a, 0x08, 0x04, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong3', 128x32px
+    static const char epd_bitmap_monkeylong3[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        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, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 
+        0x7c, 0xf8, 0xf8, 0xb0, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x32, 0x21, 0xe0, 0x43, 0x30, 0x50, 0xd3, 0xc8, 0xe0, 
+        0xf0, 0xfb, 0xff, 0x1f, 0x04, 0x03, 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, 0xcf, 0xaa, 0xf2, 0xf2, 0xf1, 0xd0, 0xb1, 
+        0xff, 0xef, 0xef, 0x04, 0x08, 0x13, 0x14, 0x14, 0x10, 0x09, 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, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong2', 128x32px
+    static const char epd_bitmap_monkeylong2[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 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, 0x18, 0x38, 
+        0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 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, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 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, 0x32, 0x21, 0x20, 0xc3, 0x50, 
+        0xd0, 0x53, 0x28, 0x60, 0xf0, 0xfb, 0x3f, 0x1f, 0x04, 0x83, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xc8, 0xb0, 
+        0xf1, 0xb2, 0xf2, 0xf2, 0xff, 0x0f, 0x0f, 0x04, 0x04, 0x09, 0x0a, 0x0a, 0x08, 0x04, 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, 0x00, 0x00, 0x00, 0x00
+    };
+    // 'monkeylong1', 128x32px
+    static const char epd_bitmap_monkeylong1[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x18, 0x38, 0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0xf8, 0xf8, 0xb0, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x32, 
+        0x21, 0xe0, 0xc3, 0x50, 0x50, 0xd3, 0xc8, 0xe0, 0x70, 0x3b, 0x7f, 0x9f, 0x04, 0xc3, 0x20, 0x20, 
+        0x20, 0x40, 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, 0xcf, 0xa8, 0xf0, 0xf0, 0xf0, 0x10, 0xd1, 0xbe, 0xee, 0xee, 0xe5, 0x04, 0x04, 0x05, 0x05, 
+        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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+
+    // Array of all bitmaps for convenience. (Total bytes used to store images = 13728)
+    static const char* const epd_bitmap_allArray[26] = {
+        epd_bitmap_monkeylong1,
+        epd_bitmap_monkeylong2,
+        epd_bitmap_monkeylong3,
+        epd_bitmap_monkeylong4,
+        epd_bitmap_monkeylong5,
+        epd_bitmap_monkeylong6,
+        epd_bitmap_monkeylong7,
+        epd_bitmap_monkeylong8,
+        epd_bitmap_monkeylong9,
+        epd_bitmap_monkeylong10,
+        epd_bitmap_monkeylong11,
+        epd_bitmap_monkeylong12,
+        epd_bitmap_monkeylong13,
+        epd_bitmap_monkeylong14,
+        epd_bitmap_monkeylong15,
+        epd_bitmap_monkeylong16,
+        epd_bitmap_monkeylong17,
+        epd_bitmap_monkeylong18,
+        epd_bitmap_monkeylong19,
+        epd_bitmap_monkeylong20,
+        epd_bitmap_monkeylong21,
+        epd_bitmap_monkeylong22,
+        epd_bitmap_monkeylong23,
+        epd_bitmap_monkeylong24,
+        epd_bitmap_monkeylong25,
+        epd_bitmap_monkeylong26
+    };
+
+    uint16_t frame_size = sizeof(epd_bitmap_monkeylong1);
+    
+    if (layer_changed) // flash_current_layer will change layer_changed to flase after a short time, resuming the animation
+        flash_current_layer();
+
+    else if (timer_elapsed(animation_timer) > FRAME_DURATION) {
+        // Set animation_timer to updated time
+        animation_timer = timer_read();
+        
+        // Increment frame
+        current_frame = (current_frame + 1) % (sizeof(epd_bitmap_allArray) / sizeof(epd_bitmap_allArray[0]));
+
+        // Draw frame to OLED
+        oled_write_raw_P(epd_bitmap_allArray[current_frame], frame_size); 
+    }
+}
+
+static void render_layers(void) {
+    static const char pop[][525] = {
+        {
+        // 'Pop1', 128x32px
+        0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 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, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x07, 0x03, 0x01, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 
+        0x01, 0x03, 0x07, 0xff, 0xff, 0xc7, 0xc3, 0xe1, 0xf0, 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, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xe0, 0xc0, 0x80, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 
+        0x80, 0xc0, 0xe0, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 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, 0x03, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x03, 
+        0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 
+        0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 
+        0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00
+        },
+        {
+        // 'Pop2', 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, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 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, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x07, 0x03, 0x01, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0x01, 
+        0x03, 0x07, 0xff, 0xff, 0xe3, 0xe1, 0xf0, 0xf8, 0xf8, 0x78, 0x30, 0x01, 0x03, 0x87, 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, 0xff, 0xff, 0xe0, 0xc0, 0x80, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x80, 
+        0xc0, 0xe0, 0xff, 0x1f, 0x0f, 0x07, 0x03, 0x21, 0x30, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 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, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 
+        0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x03, 0x00, 
+        0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 
+        0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00
+        },
+        {
+        // 'Pop3', 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, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 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, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x07, 0x03, 0x01, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0x01, 0x03, 0x07, 
+        0xff, 0xff, 0xf3, 0xf1, 0xf0, 0x78, 0x78, 0x78, 0x38, 0x00, 0x01, 0x83, 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, 0xff, 0xff, 0xe0, 0xc0, 0x80, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x80, 0xc0, 0xe0, 
+        0xff, 0xff, 0xcf, 0x8f, 0x0f, 0x1e, 0x3e, 0x3e, 0x3e, 0x1c, 0x00, 0x80, 0xc3, 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, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 
+        0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 
+        0x00, 0x00, 0x03, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 
+        0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00
+        },
+        {
+        // 'Pop4', 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, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 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, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x07, 0x03, 0x01, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0x01, 0x03, 0x07, 0xff, 
+        0xff, 0xff, 0x3f, 0x1f, 0x0f, 0x83, 0xc1, 0xe0, 0x00, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xe0, 0xc0, 0x80, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x80, 0xc0, 0xe0, 0xff, 
+        0xe3, 0xe0, 0xe0, 0xe0, 0xe2, 0xe3, 0xe3, 0xe3, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 
+        0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 
+        0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 
+        0x00, 0x03, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00
+        }
+    };
+    
+    oled_write_raw_P(pop[get_highest_layer(layer_state)], sizeof(pop[0]));
+}
+
+static void render_button_pressed(void) {
+    static const char pressed[] = {
+        // 'pressed', 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, 0xf0, 0x08, 0x08, 0x08, 0x90, 0x00, 0xf8, 
+        0x00, 0x00, 0x00, 0x00, 0x08, 0xf8, 0x08, 0x00, 0xf0, 0x08, 0x08, 0x08, 0x90, 0x00, 0xf8, 0x20, 
+        0xd0, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x38, 0x08, 0x0c, 0x0c, 0x1e, 0x1e, 
+        0x1e, 0x1e, 0x0e, 0x0e, 0x0e, 0x0e, 0x1e, 0x3c, 0xf8, 0xf8, 0xd8, 0x10, 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, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        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, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 
+        0x01, 0x01, 0xc1, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0xc0, 0x01, 0x00, 
+        0x00, 0x01, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x3c, 0x42, 0x81, 0x00, 0x02, 0x01, 0x21, 0x41, 0x42, 
+        0x40, 0x42, 0x41, 0x21, 0x01, 0x02, 0x00, 0x00, 0x01, 0x8f, 0xff, 0x3e, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        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, 0x41, 0x22, 0x10, 0x10, 0x10, 0x10, 0x10, 
+        0x10, 0x10, 0x11, 0x12, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x12, 0x11, 0x10, 0x10, 
+        0x10, 0x18, 0x2a, 0x45, 0xc4, 0x42, 0x42, 0x22, 0x21, 0x11, 0x12, 0xfe, 0x02, 0x02, 0x02, 0x02, 
+        0x7a, 0x84, 0x84, 0x4c, 0x3c, 0xfc, 0xfe, 0x87, 0x83, 0x99, 0xa4, 0xa2, 0x92, 0x44, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        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, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 
+        0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 
+        0x42, 0x42, 0x42, 0x42, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x42, 0x43, 0x42, 0x44, 0x3c, 0x04, 
+        0x0c, 0x08, 0x08, 0x08, 0x3c, 0x46, 0x43, 0x43, 0x42, 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
+    };
+
+    static const char not_pressed[] = {
+        // 'not_pressed', 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, 0xf0, 0x38, 0x08, 0x0c, 0x0c, 0x1e, 0x1e, 
+        0x1e, 0x1e, 0x0e, 0x0e, 0x0e, 0x0e, 0x1e, 0x3c, 0xf8, 0xf8, 0xd8, 0x10, 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, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x10, 0x10, 0x3c, 0x42, 0x81, 0x00, 0x02, 0x01, 0x21, 0x41, 0x42, 
+        0x40, 0x42, 0x41, 0x21, 0x01, 0x02, 0x00, 0x00, 0x01, 0x8f, 0xff, 0x3e, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        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, 0x48, 0xc4, 0x42, 0x42, 0x42, 0x42, 0x42, 
+        0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 
+        0x42, 0x42, 0xc4, 0x48, 0x71, 0x02, 0x04, 0x04, 0x08, 0x09, 0x12, 0xfe, 0x02, 0x02, 0x02, 0x02, 
+        0x7a, 0x84, 0x84, 0x4c, 0x3c, 0xfc, 0xfe, 0x87, 0x83, 0x99, 0xa4, 0xa2, 0x92, 0x44, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        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, 0x42, 0x43, 0x42, 0x42, 0x42, 0x42, 0x42, 
+        0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 
+        0x42, 0x42, 0x43, 0x42, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x42, 0x43, 0x42, 0x44, 0x3c, 0x04, 
+        0x0c, 0x08, 0x08, 0x08, 0x3c, 0x46, 0x43, 0x43, 0x42, 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
+    };
+
+    if (layer_changed)
+        flash_current_layer();
+    
+    else if (key_pressed)
+        oled_write_raw_P(pressed, sizeof(pressed));
+    else
+        oled_write_raw_P(not_pressed, sizeof(not_pressed));
+}
+
+static void flash_current_layer(void) {
+    // will flash for 500 ms
+    if (timer_elapsed(flash_timer) > 500)
+        layer_changed = false;
+    
+    static const char flash[][525] = {
+        {
+        // 'flash1', 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, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 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, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x07, 0x03, 0x01, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0x01, 0x03, 
+        0x07, 0xff, 0xff, 0xc7, 0xc3, 0xe1, 0xf0, 0x00, 0x00, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xe0, 0xc0, 0x80, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x80, 0xc0, 
+        0xe0, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 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, 0x03, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 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
+        },
+        {
+        // 'flash2', 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, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 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, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x07, 0x03, 0x01, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0x01, 0x03, 
+        0x07, 0xff, 0xff, 0xe3, 0xe1, 0xf0, 0xf8, 0xf8, 0x78, 0x30, 0x01, 0x03, 0x87, 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, 0xff, 0xff, 0xe0, 0xc0, 0x80, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x80, 0xc0, 
+        0xe0, 0xff, 0x1f, 0x0f, 0x07, 0x03, 0x21, 0x30, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 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, 0x03, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 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
+        },
+        {
+        // 'flash3', 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, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 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, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x07, 0x03, 0x01, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0x01, 0x03, 
+        0x07, 0xff, 0xff, 0xf3, 0xf1, 0xf0, 0x78, 0x78, 0x78, 0x38, 0x00, 0x01, 0x83, 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, 0xff, 0xff, 0xe0, 0xc0, 0x80, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x80, 0xc0, 
+        0xe0, 0xff, 0xff, 0xcf, 0x8f, 0x0f, 0x1e, 0x3e, 0x3e, 0x3e, 0x1c, 0x00, 0x80, 0xc3, 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, 0x03, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 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
+        },
+        {
+        // 'flash4', 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, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 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, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x07, 0x03, 0x01, 0xe0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0x01, 0x03, 
+        0x07, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x0f, 0x83, 0xe1, 0xf0, 0x00, 0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xe0, 0xc0, 0x80, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x80, 0xc0, 
+        0xe0, 0xff, 0xe3, 0xe0, 0xe0, 0xe0, 0xe2, 0xe3, 0xe3, 0xe3, 0x00, 0x00, 0x00, 0xe3, 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, 0x03, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 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
+        }
+    };
+
+    oled_write_raw_P(flash[get_highest_layer(layer_state)], sizeof(flash[0]));
+}
+
+static void render_logo(void) {
+    static const char prota[] = {
+        // 'Prota_flash', 128x32px
+        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, 0x80, 0x00, 0x00, 
+        0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 
+        0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 
+        0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 
+        0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xe0, 0xe0, 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, 0x00, 0x00, 0xff, 
+        0xff, 0xff, 0xff, 0xff, 0x80, 0x80, 0x80, 0x80, 0x80, 0x81, 0xc3, 0xff, 0xff, 0xff, 0x7f, 0x3e, 
+        0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x81, 0xc3, 0xff, 
+        0xff, 0xff, 0x7f, 0x3f, 0x00, 0x00, 0xf8, 0xfe, 0xff, 0xff, 0x1f, 0x07, 0x03, 0x01, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x1f, 0xff, 0xff, 0xfe, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0xe0, 0xf8, 0xfe, 0xff, 0x3f, 0x07, 0x07, 0x3f, 0xff, 0xfe, 0xf8, 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, 0xff, 
+        0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x07, 0xff, 
+        0xff, 0xfe, 0xfc, 0xf8, 0x00, 0x00, 0x1f, 0x7f, 0xff, 0xff, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xff, 0xff, 0x7f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 
+        0xff, 0xff, 0xff, 0x3f, 0x1d, 0x1c, 0x1c, 0x1c, 0x1c, 0x1d, 0x3f, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 
+        0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 
+        0x07, 0x07, 0x07, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x07, 0x07, 0x07, 0x06, 
+        0x06, 0x06, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x07, 0x07, 
+        0x07, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x07, 0x07, 0x07, 
+        0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+
+    oled_write_raw_P(prota, sizeof(prota));
+}
+
+bool logo_rendered = false;
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    if (!logo_rendered) {
+        render_logo();
+        if (timer_read() > 2500)
+            logo_rendered = true;
+    }
+    else {
+        switch(current_display_mode) {
+            case 0:
+                render_layers();
+                break;
+            case 1:
+                render_animation();
+                break;
+            case 2:
+                render_button_pressed();
+                break;
+        }
+    }
+    return false;
+}
+#endif
diff --git a/keyboards/printedpad/printedpad.c b/keyboards/printedpad/printedpad.c
new file mode 100644
index 000000000000..4e3354c0284b
--- /dev/null
+++ b/keyboards/printedpad/printedpad.c
@@ -0,0 +1,57 @@
+// Copyright 2023 Noah Beidelman (@noahbei)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+#include "printedpad.h"
+
+void board_init(void) {
+  SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
+}
+
+const uint8_t max_layer = 3;
+uint8_t current_display_mode = 0;
+
+bool key_pressed = false;
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+#ifdef OLED_ENABLE
+    key_pressed = record->event.pressed;
+#endif
+    switch(keycode) {
+        case LT(0, KC_NO):
+            if (record->event.pressed) {
+                // on tap
+                if (record->tap.count) {
+                    if (get_highest_layer(layer_state) >= max_layer) {
+                        layer_clear(); 
+                    } else { 
+                        layer_move(get_highest_layer(layer_state) + 1);
+                    }
+                }
+#ifdef OLED_ENABLE
+                // on hold
+                else {
+                    current_display_mode = (current_display_mode + 1) % 3;
+                }
+#endif
+            }
+            return false;
+    }
+    return true;
+}
+
+#ifdef OLED_ENABLE
+uint32_t flash_timer = 0;
+bool layer_changed = false;
+
+// when the layer is changed, flash the layer number on the screen
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    flash_timer = timer_read();
+    layer_changed = true;
+    
+    return layer_state_set_user(state);
+}
+#endif
\ No newline at end of file
diff --git a/keyboards/printedpad/printedpad.h b/keyboards/printedpad/printedpad.h
new file mode 100644
index 000000000000..17c23be69bcf
--- /dev/null
+++ b/keyboards/printedpad/printedpad.h
@@ -0,0 +1,16 @@
+// Copyright 2023 Noah Beidelman (@noahbei)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+//for oled key press
+extern bool key_pressed;
+
+// for changing oled display mode
+extern uint8_t current_display_mode;
+
+//for determining when the layer is changed and having a timer for how long we flash the layer
+extern uint32_t flash_timer;
+extern bool layer_changed;
diff --git a/keyboards/printedpad/readme.md b/keyboards/printedpad/readme.md
new file mode 100644
index 000000000000..bbddd29116f1
--- /dev/null
+++ b/keyboards/printedpad/readme.md
@@ -0,0 +1,25 @@
+# Printed Pad
+
+![magtray4x3](https://i.imgur.com/TBpZzIoh.jpeg)
+
+* Keyboard Maintainer: [noahbei](https://github.com/noahbei)
+* Hardware Supported: STM32F072RBT6
+* Hardware Availability: https://protadesigns.com/products/printed-pad
+
+Make example for this keyboard (after setting up your build environment):
+
+    make printedpad:default
+
+Flashing example for this keyboard:
+
+    make printedpad: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/printedpad/rules.mk b/keyboards/printedpad/rules.mk
new file mode 100644
index 000000000000..5ab52a55a0f8
--- /dev/null
+++ b/keyboards/printedpad/rules.mk
@@ -0,0 +1 @@
+SRC += oled.c
\ No newline at end of file
diff --git a/keyboards/program_yoink/config.h b/keyboards/program_yoink/config.h
index dfb6f078aef6..dcf558fdf781 100644
--- a/keyboards/program_yoink/config.h
+++ b/keyboards/program_yoink/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/*RGB*/
-   #define RGBLED_NUM 5
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #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
-
 /* 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/program_yoink/ortho/info.json b/keyboards/program_yoink/ortho/info.json
index ef5492bd5276..e9d5fd3e8004 100644
--- a/keyboards/program_yoink/ortho/info.json
+++ b/keyboards/program_yoink/ortho/info.json
@@ -8,6 +8,18 @@
         "pid": "0xF10C",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 5,
+        "sleep": true,
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "knight": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "D4"
     },
diff --git a/keyboards/program_yoink/staggered/info.json b/keyboards/program_yoink/staggered/info.json
index 1b028593e33a..c20e2c9fc7f1 100644
--- a/keyboards/program_yoink/staggered/info.json
+++ b/keyboards/program_yoink/staggered/info.json
@@ -8,6 +8,18 @@
         "pid": "0xF10B",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 5,
+        "sleep": true,
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "knight": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "D4"
     },
diff --git a/keyboards/projectd/65/projectd_65_ansi/info.json b/keyboards/projectd/65/projectd_65_ansi/info.json
index 41ac577c8d16..0c8b9585bbf6 100644
--- a/keyboards/projectd/65/projectd_65_ansi/info.json
+++ b/keyboards/projectd/65/projectd_65_ansi/info.json
@@ -74,7 +74,7 @@
             "solid_multisplash": true
         },
         "center_point": [76, 25],
-        "driver": "AW20216",
+        "driver": "aw20216",
         "layout": [
             { "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 },
             { "flags": 4, "matrix": [1, 7], "x": 10, "y": 0 },
diff --git a/keyboards/projectd/75/ansi/ansi.c b/keyboards/projectd/75/ansi/ansi.c
new file mode 100644
index 000000000000..1df76250022d
--- /dev/null
+++ b/keyboards/projectd/75/ansi/ansi.c
@@ -0,0 +1,205 @@
+/* Copyright 2023 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ansi.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const aw_led g_aw_leds[RGB_MATRIX_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
+};
+
+#endif
+
+#ifdef EEPROM_ENABLE
+
+#include "spi_master.h"
+
+void spi_init(void) {
+    static bool is_initialised = false;
+    if (!is_initialised) {
+        is_initialised = true;
+
+        // Try releasing special pins for a short time
+        setPinInput(SPI_SCK_PIN);
+        setPinInput(SPI_MOSI_PIN);
+        setPinInput(SPI_MISO_PIN);
+
+        chThdSleepMilliseconds(10);
+
+        palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_ALTERNATE(SPI_SCK_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST | PAL_WB32_CURRENT_LEVEL3);
+        palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_ALTERNATE(SPI_MOSI_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+        palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_ALTERNATE(SPI_MISO_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+    }
+}
+
+#endif
+
+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) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(45, 255, 255, 255);
+    }
+
+    return false;
+
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+
+    switch (keycode) {
+
+        case RGB_R:
+            if (record->event.pressed) {
+                rgb_matrix_sethsv(0, 255, 255);
+                rgb_matrix_mode(1);
+            }
+            return false; /* Skip all further processing of this key */
+
+        case RGB_G:
+            if (record->event.pressed) {
+                rgb_matrix_sethsv(85, 255, 255);
+                rgb_matrix_mode(1);
+            }
+            return false; /* Skip all further processing of this key */
+
+        case RGB_B:
+            if (record->event.pressed) {
+                rgb_matrix_sethsv(170, 255, 255);
+                rgb_matrix_mode(1);
+            }
+            return false; /* Skip all further processing of this key */
+
+        case RGB_W:
+            if (record->event.pressed) {
+                rgb_matrix_sethsv(0, 0, 255);
+                rgb_matrix_mode(1);
+            }
+            return false; /* Skip all further processing of this key */
+
+        case SW_cy:
+            rgb_matrix_sethsv(0, 255, 255);
+            rgb_matrix_mode(13);
+            return false; /* Skip all further processing of this key */
+
+        
+        default:
+            return true; /* Process all other keycodes normally */
+    }
+};
diff --git a/keyboards/projectd/75/ansi/ansi.h b/keyboards/projectd/75/ansi/ansi.h
new file mode 100644
index 000000000000..4e65d84ba74c
--- /dev/null
+++ b/keyboards/projectd/75/ansi/ansi.h
@@ -0,0 +1,27 @@
+/* Copyright 2023 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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"
+
+enum my_keycodes {
+    RGB_R = QK_KB,
+    RGB_G,
+    RGB_B,
+    RGB_W,
+    SW_cy,
+};
diff --git a/keyboards/projectd/75/ansi/config.h b/keyboards/projectd/75/ansi/config.h
new file mode 100644
index 000000000000..5fcad72e7111
--- /dev/null
+++ b/keyboards/projectd/75/ansi/config.h
@@ -0,0 +1,44 @@
+/* Copyright 2023 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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 RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* External spi flash */
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
+#define WEAR_LEVELING_BACKING_SIZE (4 * 1024)
+
+/* SPI Config for LED Driver */
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN A5
+#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 70
+#define DRIVER_2_LED_TOTAL 17
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/projectd/75/ansi/halconf.h b/keyboards/projectd/75/ansi/halconf.h
new file mode 100644
index 000000000000..64a184eb924e
--- /dev/null
+++ b/keyboards/projectd/75/ansi/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 2023 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#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/projectd/75/ansi/info.json b/keyboards/projectd/75/ansi/info.json
new file mode 100644
index 000000000000..daf94202e06b
--- /dev/null
+++ b/keyboards/projectd/75/ansi/info.json
@@ -0,0 +1,276 @@
+{
+    "manufacturer": "ProjectD",
+    "keyboard_name": "ProjectD 75% ANSI",
+    "maintainer": "Gsky",
+    "bootloader": "wb32-dfu",
+    "bootmagic": {
+        "matrix": [1, 3]
+    },
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 10
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
+    },
+    "processor": "WB32FQ95",
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "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
+        },
+        "center_point": [78, 20],
+        "driver": "aw20216",
+        "layout": [
+            { "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 },
+            { "flags": 4, "matrix": [2, 6], "x": 12.5, "y": 0 },
+            { "flags": 4, "matrix": [3, 6], "x": 22.5, "y": 0 },
+            { "flags": 4, "matrix": [3, 1], "x": 32.5, "y": 0 },
+            { "flags": 4, "matrix": [3, 3], "x": 42.5, "y": 0 },
+            { "flags": 4, "matrix": [0, 7], "x": 55, "y": 0 },
+            { "flags": 4, "matrix": [6, 3], "x": 65, "y": 0 },
+            { "flags": 4, "matrix": [7, 1], "x": 75, "y": 0 },
+            { "flags": 4, "matrix": [7, 6], "x": 85, "y": 0 },
+            { "flags": 4, "matrix": [10, 6], "x": 97.5, "y": 0 },
+            { "flags": 4, "matrix": [10, 7], "x": 107.5, "y": 0 },
+            { "flags": 4, "matrix": [10, 3], "x": 117.5, "y": 0 },
+            { "flags": 4, "matrix": [10, 5], "x": 127.5, "y": 0 },
+            { "flags": 4, "matrix": [9, 7], "x": 140, "y": 0 },
+            { "flags": 4, "matrix": [6, 5], "x": 155, "y": 0 },
+
+            { "flags": 4, "matrix": [1, 6], "x": 0, "y": 12.5 },
+            { "flags": 4, "matrix": [1, 7], "x": 10, "y": 12.5 },
+            { "flags": 4, "matrix": [2, 7], "x": 20, "y": 12.5 },
+            { "flags": 4, "matrix": [3, 7], "x": 30, "y": 12.5 },
+            { "flags": 4, "matrix": [4, 7], "x": 40, "y": 12.5 },
+            { "flags": 4, "matrix": [4, 6], "x": 50, "y": 12.5 },
+            { "flags": 4, "matrix": [5, 6], "x": 60, "y": 12.5 },
+            { "flags": 4, "matrix": [5, 7], "x": 70, "y": 12.5 },
+            { "flags": 4, "matrix": [6, 7], "x": 80, "y": 12.5 },
+            { "flags": 4, "matrix": [7, 7], "x": 90, "y": 12.5 },
+            { "flags": 4, "matrix": [8, 7], "x": 100, "y": 12.5 },
+            { "flags": 4, "matrix": [8, 6], "x": 110, "y": 12.5 },
+            { "flags": 4, "matrix": [6, 6], "x": 120, "y": 12.5 },
+            { "flags": 4, "matrix": [10, 1], "x": 130, "y": 12.5 },
+            { "flags": 4, "matrix": [0, 2], "x": 155, "y": 12.5 },
+
+            { "flags": 4, "matrix": [1, 1], "x": 0, "y": 22.5 },
+            { "flags": 4, "matrix": [1, 0], "x": 15, "y": 22.5 },
+            { "flags": 4, "matrix": [2, 0], "x": 25, "y": 22.5 },
+            { "flags": 4, "matrix": [3, 0], "x": 35, "y": 22.5 },
+            { "flags": 4, "matrix": [4, 0], "x": 45, "y": 22.5 },
+            { "flags": 4, "matrix": [4, 1], "x": 55, "y": 22.5 },
+            { "flags": 4, "matrix": [5, 1], "x": 65, "y": 22.5 },
+            { "flags": 4, "matrix": [5, 0], "x": 75, "y": 22.5 },
+            { "flags": 4, "matrix": [6, 0], "x": 85, "y": 22.5 },
+            { "flags": 4, "matrix": [7, 0], "x": 95, "y": 22.5 },
+            { "flags": 4, "matrix": [8, 0], "x": 105, "y": 22.5 },
+            { "flags": 4, "matrix": [8, 1], "x": 115, "y": 22.5 },
+            { "flags": 4, "matrix": [6, 1], "x": 125, "y": 22.5 },
+            { "flags": 4, "matrix": [10, 2], "x": 135, "y": 22.5 },
+            { "flags": 4, "matrix": [1, 5], "x": 155, "y": 22.5 },
+
+            { "flags": 8, "matrix": [2, 1], "x": 0, "y": 32.5 },
+            { "flags": 4, "matrix": [1, 2], "x": 17.5, "y": 32.5 },
+            { "flags": 4, "matrix": [2, 2], "x": 27.5, "y": 32.5 },
+            { "flags": 4, "matrix": [3, 2], "x": 37.5, "y": 32.5 },
+            { "flags": 4, "matrix": [4, 2], "x": 47.5, "y": 32.5 },
+            { "flags": 4, "matrix": [4, 3], "x": 57.5, "y": 32.5 },
+            { "flags": 4, "matrix": [5, 3], "x": 67.5, "y": 32.5 },
+            { "flags": 4, "matrix": [5, 2], "x": 77.5, "y": 32.5 },
+            { "flags": 4, "matrix": [6, 2], "x": 87.5, "y": 32.5 },
+            { "flags": 4, "matrix": [7, 2], "x": 97.5, "y": 32.5 },
+            { "flags": 4, "matrix": [8, 2], "x": 107.5, "y": 32.5 },
+            { "flags": 4, "matrix": [8, 3], "x": 117.5, "y": 32.5 },
+            { "flags": 4, "matrix": [10, 4], "x": 127.5, "y": 32.5 },
+            { "flags": 4, "matrix": [2, 5], "x": 155, "y": 32.5 },
+
+            { "flags": 4, "matrix": [0, 0], "x": 0, "y": 42.5 },
+            { "flags": 4, "matrix": [1, 4], "x": 22.5, "y": 42.5 },
+            { "flags": 4, "matrix": [2, 4], "x": 32.5, "y": 42.5 },
+            { "flags": 4, "matrix": [3, 4], "x": 42.5, "y": 42.5 },
+            { "flags": 4, "matrix": [4, 4], "x": 52.5, "y": 42.5 },
+            { "flags": 4, "matrix": [4, 5], "x": 62.5, "y": 42.5 },
+            { "flags": 4, "matrix": [5, 5], "x": 72.5, "y": 42.5 },
+            { "flags": 4, "matrix": [5, 4], "x": 82.5, "y": 42.5 },
+            { "flags": 4, "matrix": [6, 4], "x": 92.5, "y": 42.5 },
+            { "flags": 4, "matrix": [7, 4], "x": 102.5, "y": 42.5 },
+            { "flags": 4, "matrix": [8, 5], "x": 112.5, "y": 42.5 },
+            { "flags": 4, "matrix": [9, 1], "x": 122.5, "y": 42.5 },
+            { "flags": 4, "matrix": [3, 5], "x": 142.5, "y": 45 },
+            { "flags": 4, "matrix": [7, 5], "x": 155, "y": 42.5 },
+
+            { "flags": 4, "matrix": [0, 6], "x": 0, "y": 52.5 },
+            { "flags": 4, "matrix": [9, 0], "x": 12.5, "y": 52.5 },
+            { "flags": 4, "matrix": [9, 3], "x": 25, "y": 52.5 },
+            { "flags": 4, "x": 61.5, "y": 52.5 },
+            { "flags": 4, "x": 62.5, "y": 52.5 },
+            { "flags": 4, "matrix": [9, 4], "x": 65, "y": 52.5 },
+            { "flags": 4, "x": 67.5, "y": 52.5 },
+            { "flags": 4, "x": 68.5, "y": 52.5 },
+            { "flags": 4, "matrix": [9, 5], "x": 100, "y": 52.5 },
+            { "flags": 4, "matrix": [9, 2], "x": 110, "y": 52.5 },
+            { "flags": 4, "matrix": [0, 4], "x": 120, "y": 52.5 },
+            { "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 }
+        ]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "0.0.2",
+        "pid": "0x000F",
+        "vid": "0x3233"
+    },
+    "eeprom": {
+        "driver": "wear_leveling"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "Esc", "matrix": [1, 3], "x": 0, "y": 0 },
+                { "label": "F1", "matrix": [2, 6], "x": 1.25, "y": 0 },
+                { "label": "F2", "matrix": [3, 6], "x": 2.25, "y": 0 },
+                { "label": "F3", "matrix": [3, 1], "x": 3.25, "y": 0 },
+                { "label": "F4", "matrix": [3, 3], "x": 4.25, "y": 0 },
+                { "label": "F5", "matrix": [0, 7], "x": 5.5, "y": 0 },
+                { "label": "F6", "matrix": [6, 3], "x": 6.5, "y": 0 },
+                { "label": "F7", "matrix": [7, 1], "x": 7.5, "y": 0 },
+                { "label": "F8", "matrix": [7, 6], "x": 8.5, "y": 0 },
+                { "label": "F9", "matrix": [10, 6], "x": 9.75, "y": 0 },
+                { "label": "F10", "matrix": [10, 7], "x": 10.75, "y": 0 },
+                { "label": "F11", "matrix": [10, 3], "x": 11.75, "y": 0 },
+                { "label": "F12", "matrix": [10, 5], "x": 12.75, "y": 0 },
+                { "label": "PrintScreen", "matrix": [9, 7], "x": 14, "y": 0 },
+                { "label": "Delete", "matrix": [6, 5], "x": 15.5, "y": 0 },
+
+                { "label": "`", "matrix": [1, 6], "x": 0, "y": 1.25 },
+                { "label": "1", "matrix": [1, 7], "x": 1, "y": 1.25 },
+                { "label": "2", "matrix": [2, 7], "x": 2, "y": 1.25 },
+                { "label": "3", "matrix": [3, 7], "x": 3, "y": 1.25 },
+                { "label": "4", "matrix": [4, 7], "x": 4, "y": 1.25 },
+                { "label": "5", "matrix": [4, 6], "x": 5, "y": 1.25 },
+                { "label": "6", "matrix": [5, 6], "x": 6, "y": 1.25 },
+                { "label": "7", "matrix": [5, 7], "x": 7, "y": 1.25 },
+                { "label": "8", "matrix": [6, 7], "x": 8, "y": 1.25 },
+                { "label": "9", "matrix": [7, 7], "x": 9, "y": 1.25 },
+                { "label": "0", "matrix": [8, 7], "x": 10, "y": 1.25 },
+                { "label": "-", "matrix": [8, 6], "x": 11, "y": 1.25 },
+                { "label": "=", "matrix": [6, 6], "x": 12, "y": 1.25 },
+                { "label": "Backspace", "matrix": [10, 1], "w": 2, "x": 13, "y": 1.25 },
+                { "label": "Home", "matrix": [0, 2], "x": 15.5, "y": 1.25 },
+
+                { "label": "Tab", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 2.25 },
+                { "label": "Q", "matrix": [1, 0], "x": 1.5, "y": 2.25 },
+                { "label": "W", "matrix": [2, 0], "x": 2.5, "y": 2.25 },
+                { "label": "E", "matrix": [3, 0], "x": 3.5, "y": 2.25 },
+                { "label": "R", "matrix": [4, 0], "x": 4.5, "y": 2.25 },
+                { "label": "T", "matrix": [4, 1], "x": 5.5, "y": 2.25 },
+                { "label": "Y", "matrix": [5, 1], "x": 6.5, "y": 2.25 },
+                { "label": "U", "matrix": [5, 0], "x": 7.5, "y": 2.25 },
+                { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 2.25 },
+                { "label": "O", "matrix": [7, 0], "x": 9.5, "y": 2.25 },
+                { "label": "P", "matrix": [8, 0], "x": 10.5, "y": 2.25 },
+                { "label": "[", "matrix": [8, 1], "x": 11.5, "y": 2.25 },
+                { "label": "]", "matrix": [6, 1], "x": 12.5, "y": 2.25 },
+                { "label": "\\", "matrix": [10, 2], "w": 1.5, "x": 13.5, "y": 2.25 },
+                { "label": "PGUP", "matrix": [1, 5], "x": 15.5, "y": 2.25 },
+
+                { "label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 3.25 },
+                { "label": "A", "matrix": [1, 2], "x": 1.75, "y": 3.25 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 3.25 },
+                { "label": "D", "matrix": [3, 2], "x": 3.75, "y": 3.25 },
+                { "label": "F", "matrix": [4, 2], "x": 4.75, "y": 3.25 },
+                { "label": "G", "matrix": [4, 3], "x": 5.75, "y": 3.25 },
+                { "label": "H", "matrix": [5, 3], "x": 6.75, "y": 3.25 },
+                { "label": "J", "matrix": [5, 2], "x": 7.75, "y": 3.25 },
+                { "label": "K", "matrix": [6, 2], "x": 8.75, "y": 3.25 },
+                { "label": "L", "matrix": [7, 2], "x": 9.75, "y": 3.25 },
+                { "label": ";", "matrix": [8, 2], "x": 10.75, "y": 3.25 },
+                { "label": "'", "matrix": [8, 3], "x": 11.75, "y": 3.25 },
+                { "label": "Enter", "matrix": [10, 4], "w": 2.25, "x": 12.75, "y": 3.25 },
+                { "label": "PGDN", "matrix": [2, 5], "x": 15.5, "y": 3.25 },
+
+                { "label": "L Shift", "matrix": [0, 0], "w": 2.25, "x": 0, "y": 4.25 },
+                { "label": "Z", "matrix": [1, 4], "x": 2.25, "y": 4.25 },
+                { "label": "X", "matrix": [2, 4], "x": 3.25, "y": 4.25 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 4.25 },
+                { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25 },
+                { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25 },
+                { "label": "N", "matrix": [5, 5], "x": 7.25, "y": 4.25 },
+                { "label": "M", "matrix": [5, 4], "x": 8.25, "y": 4.25 },
+                { "label": ",", "matrix": [6, 4], "x": 9.25, "y": 4.25 },
+                { "label": ".", "matrix": [7, 4], "x": 10.25, "y": 4.25 },
+                { "label": "/", "matrix": [8, 5], "x": 11.25, "y": 4.25 },
+                { "label": "R Shift", "matrix": [9, 1], "w": 1.75, "x": 12.25, "y": 4.25 },
+                { "label": "Up", "matrix": [3, 5], "x": 14.25, "y": 4.5 },
+                { "label": "End", "matrix": [7, 5], "x": 15.5, "y": 4.25 },
+
+                { "label": "L Ctrl", "matrix": [0, 6], "w": 1.25, "x": 0, "y": 5.25 },
+                { "label": "L Win", "matrix": [9, 0], "w": 1.25, "x": 1.25, "y": 5.25 },
+                { "label": "L Alt", "matrix": [9, 3], "w": 1.25, "x": 2.5, "y": 5.25 },
+                { "label": "Space", "matrix": [9, 4], "w": 6.25, "x": 3.75, "y": 5.25 },
+                { "label": "R Alt", "matrix": [9, 5], "x": 10, "y": 5.25 },
+                { "label": "FN", "matrix": [9, 2], "x": 11, "y": 5.25 },
+                { "label": "R Ctrl", "matrix": [0, 4], "x": 12, "y": 5.25 },
+                { "label": "Left", "matrix": [0, 3], "x": 13.25, "y": 5.5 },
+                { "label": "Down", "matrix": [7, 3], "x": 14.25, "y": 5.5 },
+                { "label": "Right", "matrix": [0, 5], "x": 15.25, "y": 5.5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/projectd/75/ansi/keymaps/default/config.h b/keyboards/projectd/75/ansi/keymaps/default/config.h
new file mode 100644
index 000000000000..43e27f6356c3
--- /dev/null
+++ b/keyboards/projectd/75/ansi/keymaps/default/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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/projectd/75/ansi/keymaps/default/keymap.c b/keyboards/projectd/75/ansi/keymaps/default/keymap.c
new file mode 100644
index 000000000000..36e493748194
--- /dev/null
+++ b/keyboards/projectd/75/ansi/keymaps/default/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2023 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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.
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[0] = 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_PSCR,  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_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+[1] = LAYOUT(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  RGB_TOG,  RGB_MOD,  RGB_RMOD, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            RGB_VAI,  _______,
+        _______,  _______,  _______,                      _______,                                MO(2),    _______,  _______,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+[2] = LAYOUT(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,  RGB_R,    RGB_G,    RGB_B,    RGB_W,    SW_cy,    _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,  _______,  _______,                      _______,                                _______,  _______,  _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/projectd/75/ansi/keymaps/via/keymap.c b/keyboards/projectd/75/ansi/keymaps/via/keymap.c
new file mode 100644
index 000000000000..36e493748194
--- /dev/null
+++ b/keyboards/projectd/75/ansi/keymaps/via/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2023 GSKY <gskyGit@gsky.com.tw>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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.
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[0] = 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_PSCR,  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_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+[1] = LAYOUT(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  RGB_TOG,  RGB_MOD,  RGB_RMOD, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            RGB_VAI,  _______,
+        _______,  _______,  _______,                      _______,                                MO(2),    _______,  _______,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+[2] = LAYOUT(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,  RGB_R,    RGB_G,    RGB_B,    RGB_W,    SW_cy,    _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,  _______,  _______,                      _______,                                _______,  _______,  _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/projectd/75/ansi/keymaps/via/rules.mk b/keyboards/projectd/75/ansi/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/projectd/75/ansi/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/projectd/75/ansi/mcuconf.h b/keyboards/projectd/75/ansi/mcuconf.h
new file mode 100644
index 000000000000..e4b8d1f97328
--- /dev/null
+++ b/keyboards/projectd/75/ansi/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright (C) 2023 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
+
+#undef WB32_SPI_USE_SPIM2
+#define WB32_SPI_USE_SPIM2 TRUE
diff --git a/keyboards/projectd/75/ansi/readme.md b/keyboards/projectd/75/ansi/readme.md
new file mode 100644
index 000000000000..97b13a953bee
--- /dev/null
+++ b/keyboards/projectd/75/ansi/readme.md
@@ -0,0 +1,25 @@
+# ProjectD 75% ANSI 
+![ProjectD 75 ANSI](https://imgur.com/dtNDC8zh.png)
+
+A 75% keyboard, Equipped with the WestBerry Q95 microcontroller.
+
+* Keyboard Maintainer: [GSKY](https://github.com/gksygithub)
+* Hardware Supported: projectd_75_ansi
+* Hardware Availability: [GSKY](https://github.com/gskygithub/projectd_75_ansi)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make projectd/75/ansi:default
+
+Flashing example for this keyboard:
+
+    make projectd/75/ansi:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Hold the Reset switch mounted under the space key after the USB cable is connected
+* Hold the Esc key while connecting the USB cable (also erases persistent settings)
+* Fn+Alt+Tab will reset the board to 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).
+
diff --git a/keyboards/projectd/75/ansi/rules.mk b/keyboards/projectd/75/ansi/rules.mk
new file mode 100644
index 000000000000..002458405eed
--- /dev/null
+++ b/keyboards/projectd/75/ansi/rules.mk
@@ -0,0 +1 @@
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/projectkb/alice/rev1/config.h b/keyboards/projectkb/alice/rev1/config.h
index bcb9ffbb09d8..2692965fbfda 100644
--- a/keyboards/projectkb/alice/rev1/config.h
+++ b/keyboards/projectkb/alice/rev1/config.h
@@ -26,17 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 14
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/projectkb/alice/rev1/info.json b/keyboards/projectkb/alice/rev1/info.json
index 4ed9926907ef..1157fb13ae25 100644
--- a/keyboards/projectkb/alice/rev1/info.json
+++ b/keyboards/projectkb/alice/rev1/info.json
@@ -1,4 +1,19 @@
 {
+    "rgblight": {
+        "led_count": 14,
+        "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"
diff --git a/keyboards/projectkb/alice/rev1/rules.mk b/keyboards/projectkb/alice/rev1/rules.mk
index ab88066b0aaa..f689205b3882 100644
--- a/keyboards/projectkb/alice/rev1/rules.mk
+++ b/keyboards/projectkb/alice/rev1/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/projectkb/alice/rev2/config.h b/keyboards/projectkb/alice/rev2/config.h
index 95f845c9313f..8bb661f90bd4 100644
--- a/keyboards/projectkb/alice/rev2/config.h
+++ b/keyboards/projectkb/alice/rev2/config.h
@@ -26,17 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 14
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/projectkb/alice/rev2/info.json b/keyboards/projectkb/alice/rev2/info.json
index 57113b1e3cd9..be97136ccd20 100644
--- a/keyboards/projectkb/alice/rev2/info.json
+++ b/keyboards/projectkb/alice/rev2/info.json
@@ -1,4 +1,19 @@
 {
+    "rgblight": {
+        "led_count": 14,
+        "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"
diff --git a/keyboards/projectkb/alice/rev2/rules.mk b/keyboards/projectkb/alice/rev2/rules.mk
index ab88066b0aaa..f689205b3882 100644
--- a/keyboards/projectkb/alice/rev2/rules.mk
+++ b/keyboards/projectkb/alice/rev2/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/projectkb/signature65/rules.mk b/keyboards/projectkb/signature65/rules.mk
index 707adf67c4ec..5fb302d01f14 100644
--- a/keyboards/projectkb/signature65/rules.mk
+++ b/keyboards/projectkb/signature65/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/projectkb/signature87/rules.mk b/keyboards/projectkb/signature87/rules.mk
index 06b7b460e38c..a09b9d3bdf28 100644
--- a/keyboards/projectkb/signature87/rules.mk
+++ b/keyboards/projectkb/signature87/rules.mk
@@ -9,5 +9,3 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/prototypist/oceanographer/rules.mk b/keyboards/prototypist/oceanographer/rules.mk
index 07ce0fe6c515..e18a6cecee5c 100644
--- a/keyboards/prototypist/oceanographer/rules.mk
+++ b/keyboards/prototypist/oceanographer/rules.mk
@@ -1,7 +1,5 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 AUDIO_ENABLE = yes
 LTO_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-RGBLIGHT_DRIVER = WS2812
 ENCODER_ENABLE = yes
diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/info.json
index f57d28aa8427..8018350e6f5e 100644
--- a/keyboards/prototypist/pt60/info.json
+++ b/keyboards/prototypist/pt60/info.json
@@ -42,7 +42,8 @@
                 {"matrix": [0, 12], "label": "+", "x": 12, "y": 0},
                 {"matrix": [0, 13], "label": "Back", "x": 13, "y": 0},
                 {"matrix": [2, 13], "label": "Delete", "x": 14, "y": 0},
-                {"matrix": [1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1},
+
+                {"matrix": [1, 0], "label": "Tab", "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "label": "Q", "x": 1.5, "y": 1},
                 {"matrix": [1, 2], "label": "W", "x": 2.5, "y": 1},
                 {"matrix": [1, 3], "label": "E", "x": 3.5, "y": 1},
@@ -55,8 +56,8 @@
                 {"matrix": [1, 10], "label": "P", "x": 10.5, "y": 1},
                 {"matrix": [1, 11], "label": "{", "x": 11.5, "y": 1},
                 {"matrix": [1, 12], "label": "}", "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 1},
-                {"matrix": [2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "label": "A", "x": 1.75, "y": 2},
                 {"matrix": [2, 2], "label": "S", "x": 2.75, "y": 2},
                 {"matrix": [2, 3], "label": "D", "x": 3.75, "y": 2},
@@ -69,8 +70,9 @@
                 {"matrix": [2, 10], "label": ":", "x": 10.75, "y": 2},
                 {"matrix": [2, 11], "label": "@", "x": 11.75, "y": 2},
                 {"matrix": [2, 12], "label": "~", "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "label": "Enter", "x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
-                {"matrix": [3, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 3},
+                {"matrix": [3, 0], "label": "Shift", "x": 0, "y": 3, "w": 1.25},
                 {"matrix": [3, 1], "label": "|", "x": 1.25, "y": 3},
                 {"matrix": [3, 2], "label": "Z", "x": 2.25, "y": 3},
                 {"matrix": [3, 3], "label": "X", "x": 3.25, "y": 3},
@@ -82,16 +84,17 @@
                 {"matrix": [3, 9], "label": "<", "x": 9.25, "y": 3},
                 {"matrix": [3, 10], "label": ">", "x": 10.25, "y": 3},
                 {"matrix": [3, 11], "label": "?", "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 3},
+                {"matrix": [3, 12], "label": "Shift", "x": 12.25, "y": 3, "w": 1.75},
                 {"matrix": [3, 13], "label": "Fn", "x": 14, "y": 3},
-                {"matrix": [4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4},
-                {"matrix": [4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4},
-                {"matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4},
-                {"matrix": [4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4},
-                {"matrix": [4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4},
-                {"matrix": [4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4}
+
+                {"matrix": [4, 0], "label": "Ctrl", "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "label": "Win", "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "label": "Alt", "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "label": "AltGr", "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "label": "Win", "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "label": "Fn", "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_iso": {
@@ -109,9 +112,9 @@
                 {"matrix": [0, 10], "label": ")", "x": 10, "y": 0},
                 {"matrix": [0, 11], "label": "_", "x": 11, "y": 0},
                 {"matrix": [0, 12], "label": "+", "x": 12, "y": 0},
-                {"matrix": [0, 13], "label": "Back", "w": 2, "x": 13, "y": 0},
+                {"matrix": [0, 13], "label": "Back", "x": 13, "y": 0, "w": 2},
 
-                {"matrix": [1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1},
+                {"matrix": [1, 0], "label": "Tab", "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "label": "Q", "x": 1.5, "y": 1},
                 {"matrix": [1, 2], "label": "W", "x": 2.5, "y": 1},
                 {"matrix": [1, 3], "label": "E", "x": 3.5, "y": 1},
@@ -124,8 +127,8 @@
                 {"matrix": [1, 10], "label": "P", "x": 10.5, "y": 1},
                 {"matrix": [1, 11], "label": "{", "x": 11.5, "y": 1},
                 {"matrix": [1, 12], "label": "}", "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "label": "Enter", "h": 2, "w": 1.25, "x": 13.75, "y": 1},
-                {"matrix": [2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "label": "A", "x": 1.75, "y": 2},
                 {"matrix": [2, 2], "label": "S", "x": 2.75, "y": 2},
                 {"matrix": [2, 3], "label": "D", "x": 3.75, "y": 2},
@@ -138,8 +141,9 @@
                 {"matrix": [2, 10], "label": ":", "x": 10.75, "y": 2},
                 {"matrix": [2, 11], "label": "@", "x": 11.75, "y": 2},
                 {"matrix": [2, 12], "label": "~", "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "label": "Enter", "x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
-                {"matrix": [3, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 3},
+                {"matrix": [3, 0], "label": "Shift", "x": 0, "y": 3, "w": 1.25},
                 {"matrix": [3, 1], "label": "|", "x": 1.25, "y": 3},
                 {"matrix": [3, 2], "label": "Z", "x": 2.25, "y": 3},
                 {"matrix": [3, 3], "label": "X", "x": 3.25, "y": 3},
@@ -151,16 +155,16 @@
                 {"matrix": [3, 9], "label": "<", "x": 9.25, "y": 3},
                 {"matrix": [3, 10], "label": ">", "x": 10.25, "y": 3},
                 {"matrix": [3, 11], "label": "?", "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 3},
+                {"matrix": [3, 12], "label": "Shift", "x": 12.25, "y": 3, "w": 2.75},
 
-                {"matrix": [4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4},
-                {"matrix": [4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4},
-                {"matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4},
-                {"matrix": [4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4},
-                {"matrix": [4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4},
-                {"matrix": [4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4}
+                {"matrix": [4, 0], "label": "Ctrl", "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "label": "Win", "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "label": "Alt", "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "label": "AltGr", "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "label": "Win", "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "label": "Fn", "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_ansi": {
@@ -178,9 +182,9 @@
                 {"matrix": [0, 10], "label": ")", "x": 10, "y": 0},
                 {"matrix": [0, 11], "label": "_", "x": 11, "y": 0},
                 {"matrix": [0, 12], "label": "+", "x": 12, "y": 0},
-                {"matrix": [0, 13], "label": "Back", "w": 2, "x": 13, "y": 0},
+                {"matrix": [0, 13], "label": "Back", "x": 13, "y": 0, "w": 2},
 
-                {"matrix": [1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1},
+                {"matrix": [1, 0], "label": "Tab", "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "label": "Q", "x": 1.5, "y": 1},
                 {"matrix": [1, 2], "label": "W", "x": 2.5, "y": 1},
                 {"matrix": [1, 3], "label": "E", "x": 3.5, "y": 1},
@@ -193,8 +197,9 @@
                 {"matrix": [1, 10], "label": "P", "x": 10.5, "y": 1},
                 {"matrix": [1, 11], "label": "{", "x": 11.5, "y": 1},
                 {"matrix": [1, 12], "label": "}", "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "label": "|", "w": 1.5, "x": 13.5, "y": 1},
-                {"matrix": [2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [1, 13], "label": "|", "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "label": "A", "x": 1.75, "y": 2},
                 {"matrix": [2, 2], "label": "S", "x": 2.75, "y": 2},
                 {"matrix": [2, 3], "label": "D", "x": 3.75, "y": 2},
@@ -206,10 +211,9 @@
                 {"matrix": [2, 9], "label": "L", "x": 9.75, "y": 2},
                 {"matrix": [2, 10], "label": ":", "x": 10.75, "y": 2},
                 {"matrix": [2, 11], "label": "'", "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "label": "Enter", "w": 2.25, "x": 12.75, "y": 2},
-
-                {"matrix": [3, 0], "label": "Shift", "w": 2.25, "x": 0, "y": 3},
+                {"matrix": [2, 12], "label": "Enter", "x": 12.75, "y": 2, "w": 2.25},
 
+                {"matrix": [3, 0], "label": "Shift", "x": 0, "y": 3, "w": 2.25},
                 {"matrix": [3, 2], "label": "Z", "x": 2.25, "y": 3},
                 {"matrix": [3, 3], "label": "X", "x": 3.25, "y": 3},
                 {"matrix": [3, 4], "label": "C", "x": 4.25, "y": 3},
@@ -220,16 +224,16 @@
                 {"matrix": [3, 9], "label": "<", "x": 9.25, "y": 3},
                 {"matrix": [3, 10], "label": ">", "x": 10.25, "y": 3},
                 {"matrix": [3, 11], "label": "?", "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 3},
+                {"matrix": [3, 12], "label": "Shift", "x": 12.25, "y": 3, "w": 2.75},
 
-                {"matrix": [4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4},
-                {"matrix": [4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4},
-                {"matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4},
-                {"matrix": [4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4},
-                {"matrix": [4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4},
-                {"matrix": [4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4}
+                {"matrix": [4, 0], "label": "Ctrl", "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "label": "Win", "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "label": "Alt", "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "label": "AltGr", "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "label": "Win", "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "label": "Fn", "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/prototypist/pt60/keymaps/default/keymap.c b/keyboards/prototypist/pt60/keymaps/default/keymap.c
index 24616964751e..9a2688e4c1b6 100644
--- a/keyboards/prototypist/pt60/keymaps/default/keymap.c
+++ b/keyboards/prototypist/pt60/keymaps/default/keymap.c
@@ -6,33 +6,33 @@
 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_ENT,
-        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_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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        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_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
     ),
 
     [1] = LAYOUT_60_iso(
         EE_CLR,  KC_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_UP,   _______, _______, KC_MUTE,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2),   
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, _______,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_MUTE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          MO(2),
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
     ),
 
     [2] = LAYOUT_60_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_MPRV,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, MO(3)
     ),
 
     [3] = LAYOUT_60_iso(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
     )
-};                                                                          
+};
diff --git a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c
index a25cd2fae90f..b1e8987b650f 100644
--- a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c
+++ b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c
@@ -7,32 +7,32 @@ 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_LGUI, KC_A,    KC_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_LGUI, KC_A,    KC_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(
         EE_CLR,  KC_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_UP,   _______, _______, KC_MUTE,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, 
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2),   
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          MO(2),
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
     ),
 
     [2] = LAYOUT_60_ansi(
         _______, 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_MPRV,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, MO(3)
     ),
 
     [3] = LAYOUT_60_ansi(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
     )
 };
diff --git a/keyboards/prototypist/pt60/keymaps/via/keymap.c b/keyboards/prototypist/pt60/keymaps/via/keymap.c
index d710399a811e..53e82bcd45f8 100644
--- a/keyboards/prototypist/pt60/keymaps/via/keymap.c
+++ b/keyboards/prototypist/pt60/keymaps/via/keymap.c
@@ -5,33 +5,33 @@
 
 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_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_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, 
+        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_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_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, KC_RGUI, KC_APP,  KC_RCTL
     ),
 
     [1] = LAYOUT_all(
         EE_CLR,  KC_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_UP,   _______, _______, KC_MUTE,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, _______,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_MUTE,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2),   _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
     ),
 
     [2] = 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_MPRV, KC_MNXT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
-        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_MPRV, KC_MNXT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, MO(3)
     ),
 
     [3] = LAYOUT_all(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, _______
     )
diff --git a/keyboards/prototypist/pt60/matrix_diagram.md b/keyboards/prototypist/pt60/matrix_diagram.md
new file mode 100644
index 000000000000..8401f90158f0
--- /dev/null
+++ b/keyboards/prototypist/pt60/matrix_diagram.md
@@ -0,0 +1,27 @@
+# Matrix Diagram for Proto[Typist] PT-60
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      ┌─────┐
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤   ┌──┴┐1D  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │   │2C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+│40  │41  │42  │46                      │4A  │4B  │4C  │4D  │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+┌────────┐                                       ┌──────────┐
+│30      │ 2.25u LShift             2.75u RShift │3C        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40   │41 │42   │46                         │4B   │4C │4D   │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+┌─────┬───┬───────────────────────────────────────┬───┬─────┐
+│40   │41 │46                                     │4C │4D   │ Tsangan/WKL with 10u Spacebar
+└─────┴───┴───────────────────────────────────────┴───┴─────┘
+```
diff --git a/keyboards/prototypist/pt80/info.json b/keyboards/prototypist/pt80/info.json
index a9c47072a32d..cb58643e3f59 100644
--- a/keyboards/prototypist/pt80/info.json
+++ b/keyboards/prototypist/pt80/info.json
@@ -44,6 +44,7 @@
                 {"matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0},
                 {"matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0},
                 {"matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0},
+
                 {"matrix": [1, 0], "label": "\u00ac", "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "label": "!", "x": 1, "y": 1.25},
                 {"matrix": [1, 2], "label": "\"", "x": 2, "y": 1.25},
@@ -62,7 +63,8 @@
                 {"matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25},
                 {"matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25},
                 {"matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25},
-                {"matrix": [2, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 2.25},
+
+                {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
                 {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
                 {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
                 {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
@@ -75,11 +77,11 @@
                 {"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
                 {"matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25},
                 {"matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 2.25},
                 {"matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25},
                 {"matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25},
                 {"matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25},
-                {"matrix": [3, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25},
+
+                {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
                 {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
                 {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
                 {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
@@ -92,7 +94,9 @@
                 {"matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25},
                 {"matrix": [3, 11], "label": "@", "x": 11.75, "y": 3.25},
                 {"matrix": [3, 12], "label": "~", "x": 12.75, "y": 3.25},
-                {"matrix": [4, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 4.25},
+                {"matrix": [2, 13], "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "label": "Shift", "x": 0, "y": 4.25, "w": 1.25},
                 {"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25},
                 {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
                 {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
@@ -104,17 +108,18 @@
                 {"matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25},
                 {"matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25},
                 {"matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 4.25},
+                {"matrix": [4, 12], "label": "Shift", "x": 12.25, "y": 4.25, "w": 1.75},
                 {"matrix": [4, 13], "label": "Fn", "x": 14, "y": 4.25},
                 {"matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25},
-                {"matrix": [5, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25},
-                {"matrix": [5, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 5.25},
-                {"matrix": [5, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25},
-                {"matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25},
-                {"matrix": [5, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 5.25},
-                {"matrix": [5, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 5.25},
-                {"matrix": [5, 12], "label": "Menu", "w": 1.25, "x": 12.5, "y": 5.25},
-                {"matrix": [5, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 5.25},
+
+                {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "label": "AltGr", "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25},
                 {"matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25},
                 {"matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25}
@@ -123,22 +128,22 @@
         "LAYOUT_tkl_iso": {
             "layout": [
                 {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
-                {"matrix": [0, 1], "label": "F1", "x": 2, "y": 0},
-                {"matrix": [0, 2], "label": "F2", "x": 3, "y": 0},
-                {"matrix": [0, 3], "label": "F3", "x": 4, "y": 0},
-                {"matrix": [0, 4], "label": "F4", "x": 5, "y": 0},
-                {"matrix": [0, 5], "label": "F5", "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "label": "F6", "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "label": "F7", "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "label": "F8", "x": 9.5, "y": 0},
-                {"matrix": [0, 9], "label": "F9", "x": 11, "y": 0},
-                {"matrix": [0, 10], "label": "F10", "x": 12, "y": 0},
-                {"matrix": [0, 11], "label": "F11", "x": 13, "y": 0},
-                {"matrix": [0, 12], "label": "F12", "x": 14, "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.5, "y": 0},
+                {"matrix": [0, 7], "label": "F6", "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "label": "F7", "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "label": "F8", "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "label": "F9", "x": 11, "y": 0},
+                {"matrix": [0, 11], "label": "F10", "x": 12, "y": 0},
+                {"matrix": [0, 12], "label": "F11", "x": 13, "y": 0},
+                {"matrix": [0, 13], "label": "F12", "x": 14, "y": 0},
                 {"matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0},
                 {"matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0},
                 {"matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0},
+
                 {"matrix": [1, 0], "label": "\u00ac", "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "label": "!", "x": 1, "y": 1.25},
                 {"matrix": [1, 2], "label": "\"", "x": 2, "y": 1.25},
@@ -152,12 +157,12 @@
                 {"matrix": [1, 10], "label": ")", "x": 10, "y": 1.25},
                 {"matrix": [1, 11], "label": "_", "x": 11, "y": 1.25},
                 {"matrix": [1, 12], "label": "+", "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "label": "Backspace", "w": 2, "x": 13, "y": 1.25},
-
+                {"matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25, "w": 2},
                 {"matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25},
                 {"matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25},
                 {"matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25},
-                {"matrix": [2, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 2.25},
+
+                {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
                 {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
                 {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
                 {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
@@ -170,11 +175,11 @@
                 {"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
                 {"matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25},
                 {"matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 2.25},
                 {"matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25},
                 {"matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25},
                 {"matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25},
-                {"matrix": [3, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25},
+
+                {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
                 {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
                 {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
                 {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
@@ -187,7 +192,9 @@
                 {"matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25},
                 {"matrix": [3, 11], "label": "@", "x": 11.75, "y": 3.25},
                 {"matrix": [3, 12], "label": "~", "x": 12.75, "y": 3.25},
-                {"matrix": [4, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 4.25},
+                {"matrix": [2, 13], "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "label": "Shift", "x": 0, "y": 4.25, "w": 1.25},
                 {"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25},
                 {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
                 {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
@@ -199,17 +206,17 @@
                 {"matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25},
                 {"matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25},
                 {"matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 4.25},
-
+                {"matrix": [4, 12], "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75},
                 {"matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25},
-                {"matrix": [5, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25},
-                {"matrix": [5, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 5.25},
-                {"matrix": [5, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25},
-                {"matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25},
-                {"matrix": [5, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 5.25},
-                {"matrix": [5, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 5.25},
-                {"matrix": [5, 12], "label": "Menu", "w": 1.25, "x": 12.5, "y": 5.25},
-                {"matrix": [5, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 5.25},
+
+                {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "label": "AltGr", "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25},
                 {"matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25},
                 {"matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25}
@@ -218,22 +225,22 @@
         "LAYOUT_tkl_ansi": {
             "layout": [
                 {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
-                {"matrix": [0, 1], "label": "F1", "x": 2, "y": 0},
-                {"matrix": [0, 2], "label": "F2", "x": 3, "y": 0},
-                {"matrix": [0, 3], "label": "F3", "x": 4, "y": 0},
-                {"matrix": [0, 4], "label": "F4", "x": 5, "y": 0},
-                {"matrix": [0, 5], "label": "F5", "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "label": "F6", "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "label": "F7", "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "label": "F8", "x": 9.5, "y": 0},
-                {"matrix": [0, 9], "label": "F9", "x": 11, "y": 0},
-                {"matrix": [0, 10], "label": "F10", "x": 12, "y": 0},
-                {"matrix": [0, 11], "label": "F11", "x": 13, "y": 0},
-                {"matrix": [0, 12], "label": "F12", "x": 14, "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.5, "y": 0},
+                {"matrix": [0, 7], "label": "F6", "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "label": "F7", "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "label": "F8", "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "label": "F9", "x": 11, "y": 0},
+                {"matrix": [0, 11], "label": "F10", "x": 12, "y": 0},
+                {"matrix": [0, 12], "label": "F11", "x": 13, "y": 0},
+                {"matrix": [0, 13], "label": "F12", "x": 14, "y": 0},
                 {"matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0},
                 {"matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0},
                 {"matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0},
+
                 {"matrix": [1, 0], "label": "\u00ac", "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "label": "!", "x": 1, "y": 1.25},
                 {"matrix": [1, 2], "label": "\"", "x": 2, "y": 1.25},
@@ -247,12 +254,12 @@
                 {"matrix": [1, 10], "label": ")", "x": 10, "y": 1.25},
                 {"matrix": [1, 11], "label": "_", "x": 11, "y": 1.25},
                 {"matrix": [1, 12], "label": "+", "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "label": "Backspace", "w": 2, "x": 13, "y": 1.25},
-
+                {"matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25, "w": 2},
                 {"matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25},
                 {"matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25},
                 {"matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25},
-                {"matrix": [2, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 2.25},
+
+                {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
                 {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
                 {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
                 {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
@@ -265,11 +272,12 @@
                 {"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
                 {"matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25},
                 {"matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "label": "|", "w": 1.5, "x": 13.5, "y": 2.25},
+                {"matrix": [2, 13], "label": "|", "x": 13.5, "y": 2.25, "w": 1.5},
                 {"matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25},
                 {"matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25},
                 {"matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25},
-                {"matrix": [3, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25},
+
+                {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
                 {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
                 {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
                 {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
@@ -281,9 +289,9 @@
                 {"matrix": [3, 9], "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", "w": 2.25, "x": 12.75, "y": 3.25},
-                {"matrix": [4, 0], "label": "Shift", "w": 2.25, "x": 0, "y": 4.25},
+                {"matrix": [3, 12], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25},
 
+                {"matrix": [4, 0], "label": "Shift", "x": 0, "y": 4.25, "w": 2.25},
                 {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
                 {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
                 {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25},
@@ -294,17 +302,17 @@
                 {"matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25},
                 {"matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25},
                 {"matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 4.25},
-
+                {"matrix": [4, 12], "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75},
                 {"matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25},
-                {"matrix": [5, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25},
-                {"matrix": [5, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 5.25},
-                {"matrix": [5, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25},
-                {"matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25},
-                {"matrix": [5, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 5.25},
-                {"matrix": [5, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 5.25},
-                {"matrix": [5, 12], "label": "Menu", "w": 1.25, "x": 12.5, "y": 5.25},
-                {"matrix": [5, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 5.25},
+
+                {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "label": "AltGr", "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25},
                 {"matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25},
                 {"matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25}
diff --git a/keyboards/prototypist/pt80/keymaps/default/keymap.c b/keyboards/prototypist/pt80/keymaps/default/keymap.c
index 5c5776b271db..5905a8d05fdf 100644
--- a/keyboards/prototypist/pt80/keymaps/default/keymap.c
+++ b/keyboards/prototypist/pt80/keymaps/default/keymap.c
@@ -5,43 +5,43 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_tkl_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_ESC,           KC_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_ENT,             KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, 
-        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                              KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,            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_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_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_RGUI, KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [1] = LAYOUT_tkl_iso(
-        QK_BOOT,          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, _______,
+        QK_BOOT,          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, _______,
 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2),                                KC_VOLU,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,            KC_MPRV, KC_VOLD, KC_MNXT
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          MO(2),               KC_VOLU,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    KC_MPRV, KC_VOLD, KC_MNXT
     ),
 
     [2] = LAYOUT_tkl_iso(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, MO(3),              _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, MO(3),      _______, _______, _______
     ),
 
     [3] = LAYOUT_tkl_iso(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,            _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
     )
-    
+
 };
diff --git a/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c
index d4d974464ae0..0f851bcd5c67 100644
--- a/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c
+++ b/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c
@@ -5,43 +5,43 @@
 
 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_ESC,           KC_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
+        KC_GRV,  KC_1,    KC_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
     ),
 
     [1] = LAYOUT_tkl_ansi(
-        QK_BOOT,          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, _______,
+        QK_BOOT,          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, _______,
 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2),                                KC_VOLU,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,            KC_MPRV, KC_VOLD, KC_MNXT
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          MO(2),               KC_VOLU,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    KC_MPRV, KC_VOLD, KC_MNXT
     ),
 
     [2] = LAYOUT_tkl_ansi(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, MO(3),              _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, MO(3),      _______, _______, _______
     ),
 
     [3] = LAYOUT_tkl_ansi(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,            _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
     )
-    
+
 };
diff --git a/keyboards/prototypist/pt80/keymaps/via/keymap.c b/keyboards/prototypist/pt80/keymaps/via/keymap.c
index 0529547ba712..c3fe205bc079 100644
--- a/keyboards/prototypist/pt80/keymaps/via/keymap.c
+++ b/keyboards/prototypist/pt80/keymaps/via/keymap.c
@@ -5,43 +5,43 @@
 
 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_ESC,  KC_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_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_ENT,             KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, 
-        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                       KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,            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_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_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, KC_APP,  KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [1] = LAYOUT_all(
-        QK_BOOT, 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, _______,
+        QK_BOOT, 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, _______,
 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2),   _______,                       KC_VOLU,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,            KC_MPRV, KC_VOLD, KC_MNXT
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2),   _______,                      KC_VOLU,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             KC_MPRV, KC_VOLD, KC_MNXT
     ),
 
     [2] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, MO(3),              _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, MO(3),               _______, _______, _______
     ),
 
     [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,              _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
     )
-    
+
 };
diff --git a/keyboards/prototypist/pt80/matrix_diagram.md b/keyboards/prototypist/pt80/matrix_diagram.md
new file mode 100644
index 000000000000..e4fa03655eba
--- /dev/null
+++ b/keyboards/prototypist/pt80/matrix_diagram.md
@@ -0,0 +1,30 @@
+# Matrix Diagram for Proto[Typist] PT-80
+
+```
+┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐
+│00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ Standard
+└───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
+│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 │3D ││1E │1F │1G │    │1D     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤    └─┬─────┤
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘   ┌──┴┐2D  │ ISO Enter
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C      │                │3C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐       └───┴────┘
+│40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │    │4F │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+│50  │51  │52  │56                      │5A  │5B  │5C  │5D  ││5E │5F │5G │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+┌────────┐                                       ┌──────────┐
+│40      │ 2.25u LShift             2.75u RShift │4C        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│50   │51 │52   │56                         │5B   │5C │5D   │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+┌─────┬───┬───────────────────────────────────────┬───┬─────┐
+│50   │51 │56                                     │5C │5D   │ Tsangan/WKL with 10u Spacebar
+└─────┴───┴───────────────────────────────────────┴───┴─────┘
+```
diff --git a/keyboards/protozoa/cassini/rules.mk b/keyboards/protozoa/cassini/rules.mk
index 7000bb65710c..7c0709f41e6c 100644
--- a/keyboards/protozoa/cassini/rules.mk
+++ b/keyboards/protozoa/cassini/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/protozoa/p01/config.h b/keyboards/protozoa/p01/config.h
index 46f96e7934c4..fd58bda9123f 100644
--- a/keyboards/protozoa/p01/config.h
+++ b/keyboards/protozoa/p01/config.h
@@ -23,18 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_PAL_MODE 2
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM5
 #define WS2812_DMA_CHANNEL 5  
-
-#define RGBLED_NUM 18
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/protozoa/p01/info.json b/keyboards/protozoa/p01/info.json
index 94089a3b78da..f414d6d71ad0 100644
--- a/keyboards/protozoa/p01/info.json
+++ b/keyboards/protozoa/p01/info.json
@@ -8,6 +8,23 @@
         "pid": "0x5031",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "A9",
         "driver": "pwm"
diff --git a/keyboards/protozoa/p01/rules.mk b/keyboards/protozoa/p01/rules.mk
index a9e8e0f92e71..adb0000e0162 100644
--- a/keyboards/protozoa/p01/rules.mk
+++ b/keyboards/protozoa/p01/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/pteron36/config.h b/keyboards/pteron36/config.h
index d661f794cc49..1148463200fa 100644
--- a/keyboards/pteron36/config.h
+++ b/keyboards/pteron36/config.h
@@ -40,6 +40,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // for via
 #define DYNAMIC_KEYMAP_LAYER_COUNT 7
-
-//RGB Underglow
-#define RGBLED_NUM 10
diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/info.json
index bb5a8ee1eb4a..418ca0f6b8ab 100644
--- a/keyboards/pteron36/info.json
+++ b/keyboards/pteron36/info.json
@@ -28,6 +28,9 @@
             }
         }
     },
+    "rgblight": {
+        "led_count": 10
+    },
     "ws2812": {
         "pin": "B6"
     },
diff --git a/keyboards/purin/info.json b/keyboards/purin/info.json
new file mode 100644
index 000000000000..08a8b06e3423
--- /dev/null
+++ b/keyboards/purin/info.json
@@ -0,0 +1,108 @@
+{
+    "manufacturer": "oRE-o",
+    "keyboard_name": "purin",
+    "maintainer": "oRE-o",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D0", "D1", "D2", "B7", "B3", "F4", "F1", "F0"],
+        "rows": ["F6", "F7", "D4", "D5", "D3"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0x6F52"
+    },
+    "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": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"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": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"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": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 3.5, "y": 3},
+                {"matrix": [3, 2], "x": 4.5, "y": 3},
+                {"matrix": [3, 3], "x": 5.5, "y": 3},
+                {"matrix": [3, 4], "x": 6.5, "y": 3},
+                {"matrix": [3, 5], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 6], "x": 9.5, "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, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/purin/keymaps/default/keymap.c b/keyboards/purin/keymaps/default/keymap.c
new file mode 100644
index 000000000000..f5c2cd7bbfe1
--- /dev/null
+++ b/keyboards/purin/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+// 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( // for windows
+        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_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_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_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(2),
+                    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  MO(2),            KC_SPC,           KC_RALT,                            KC_RCTL
+    ),
+
+    [1] = LAYOUT(   // for mac
+        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_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),
+                    KC_LCTL, KC_LALT, KC_LGUI,          KC_SPC,  MO(2),            KC_SPC,           KC_RGUI,                            KC_RALT
+    ),
+
+    [2] = LAYOUT(   // FN Layer 1
+        _______,    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,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   DF(0),   DF(1),
+        KC_PGDN,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT,          _______,
+                    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,
+                    _______, _______, _______,          _______, _______,          _______,          _______,                            _______
+    ),
+};
diff --git a/keyboards/purin/keymaps/via/keymap.c b/keyboards/purin/keymaps/via/keymap.c
new file mode 100644
index 000000000000..e13eea3c7485
--- /dev/null
+++ b/keyboards/purin/keymaps/via/keymap.c
@@ -0,0 +1,31 @@
+// 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( // for windows
+        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_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_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_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(2),
+                    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  MO(2),            KC_SPC,           KC_RALT,                            KC_RCTL
+    ),
+
+    [1] = LAYOUT(   // for mac
+        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_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),
+                    KC_LCTL, KC_LALT, KC_LGUI,          KC_SPC,  MO(2),            KC_SPC,           KC_RGUI,                            KC_RALT
+    ),
+
+    [2] = LAYOUT(   // FN Layer 1
+        _______,    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,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   DF(0),   DF(1),
+        KC_PGDN,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT,          _______,
+                    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,
+                    _______, _______, _______,          _______, _______,          _______,          _______,                            _______
+    ),
+};
diff --git a/keyboards/purin/keymaps/via/rules.mk b/keyboards/purin/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/purin/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/purin/readme.md b/keyboards/purin/readme.md
new file mode 100644
index 000000000000..4b4eb6a1b86d
--- /dev/null
+++ b/keyboards/purin/readme.md
@@ -0,0 +1,28 @@
+# purin
+
+![purin](https://i.imgur.com/ig8DWEFh.jpg)
+
+Keyboard developed by oREo!
+Project for learning about qmk, Atmega32u4.
+
+* Keyboard Maintainer: [oRE-o](https://github.com/oRE-o)
+* Hardware Supported: Purin PCB by oREo
+* Hardware Availability: Not yet
+
+Make example for this keyboard (after setting up your build environment):
+
+    make purin:default
+
+Flashing example for this keyboard:
+
+    make purin: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/purin/rules.mk b/keyboards/purin/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/purin/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/pw88/config.h b/keyboards/pw88/config.h
new file mode 100644
index 000000000000..f655b9252728
--- /dev/null
+++ b/keyboards/pw88/config.h
@@ -0,0 +1,21 @@
+/*
+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/pw88/info.json b/keyboards/pw88/info.json
new file mode 100644
index 000000000000..bd24071e70d6
--- /dev/null
+++ b/keyboards/pw88/info.json
@@ -0,0 +1,144 @@
+{
+    "keyboard_name": "PW88",
+    "manufacturer": "Smollchungus",
+    "url": "https://www.github.com/smollchungus",
+    "maintainer": "Smollchungus",
+    "usb": {
+        "vid": "0x5363",
+        "pid": "0x8888",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgblight": true,
+        "nkro": true
+    },
+    "ws2812": {
+        "pin": "GP0",
+        "driver": "vendor"
+    },
+    "rgblight": {
+        "led_count": 34,
+        "layers": {
+             "enabled": 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
+        }
+    },
+    "matrix_pins": {
+        "cols": ["GP4", "GP3", "GP2", "GP26", "GP25", "GP24", "GP23", "GP20", "GP19", "GP18", "GP29", "GP28", "GP27", "GP14", "GP1", "GP5", "GP6"],
+        "rows": ["GP8", "GP11", "GP10", "GP9", "GP13", "GP12"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "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": [1, 13], "x": 13, "y": 1.25 },
+                { "matrix": [3, 14], "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, 12], "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/pw88/keymaps/default/keymap.c b/keyboards/pw88/keymaps/default/keymap.c
new file mode 100644
index 000000000000..9e5ffd3f243d
--- /dev/null
+++ b/keyboards/pw88/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* 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/>.
+ */
+#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_NUBS,        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_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,  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,               RGB_TOG, RGB_MOD, 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,    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_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, 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_MPLY,                                        KC_TRNS,    _______, _______,      KC_TRNS,               KC_MPRV, KC_VOLD, KC_MNXT
+  )
+};
diff --git a/keyboards/pw88/keymaps/via/keymap.c b/keyboards/pw88/keymaps/via/keymap.c
new file mode 100644
index 000000000000..9e5ffd3f243d
--- /dev/null
+++ b/keyboards/pw88/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/* 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/>.
+ */
+#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_NUBS,        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_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,  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,               RGB_TOG, RGB_MOD, 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,    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_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, 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_MPLY,                                        KC_TRNS,    _______, _______,      KC_TRNS,               KC_MPRV, KC_VOLD, KC_MNXT
+  )
+};
diff --git a/keyboards/pw88/keymaps/via/rules.mk b/keyboards/pw88/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/pw88/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/pw88/readme.md b/keyboards/pw88/readme.md
new file mode 100644
index 000000000000..facee8bac818
--- /dev/null
+++ b/keyboards/pw88/readme.md
@@ -0,0 +1,26 @@
+# PW88
+
+![%PW88%](https://i.imgur.com/0uN5u2gh.jpg)
+
+
+* Keyboard Maintainer: [Matthijs Muller](https://github.com/smollchungus)
+* Hardware Supported: *Project W PCB*
+* Hardware Availability: *Trailblazer Keyboards*
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pw88:default
+
+Flashing example for this keyboard:
+
+    make pw88: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/pw88/rules.mk b/keyboards/pw88/rules.mk
new file mode 100644
index 000000000000..c628fc7d0fe7
--- /dev/null
+++ b/keyboards/pw88/rules.mk
@@ -0,0 +1 @@
+# This file intentionally blank
diff --git a/keyboards/qck75/v1/config.h b/keyboards/qck75/v1/config.h
new file mode 100644
index 000000000000..06d945ebf74c
--- /dev/null
+++ b/keyboards/qck75/v1/config.h
@@ -0,0 +1,18 @@
+// Copyright 2023 Andrian (@PoringH)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define I2C1_SCL_PIN B8
+#define I2C1_SDA_PIN B9
+
+#define I2C1_SCL_PAL_MODE 1
+#define I2C1_SDA_PAL_MODE 1
+
+#define OLED_DISPLAY_128X64
+
+#define OLED_IC OLED_IC_SH1106
+#define OLED_COLUMN_OFFSET 2
+
+#define OLED_TIMEOUT 120000
+#define OLED_BRIGHTNESS 120
diff --git a/keyboards/qck75/v1/halconf.h b/keyboards/qck75/v1/halconf.h
new file mode 100644
index 000000000000..bbf9322333db
--- /dev/null
+++ b/keyboards/qck75/v1/halconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Andrian (@PoringH)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
+
diff --git a/keyboards/qck75/v1/info.json b/keyboards/qck75/v1/info.json
new file mode 100644
index 000000000000..a8ae853ab36e
--- /dev/null
+++ b/keyboards/qck75/v1/info.json
@@ -0,0 +1,132 @@
+{
+    "manufacturer": "Andrian",
+    "keyboard_name": "QCK75-XT",
+    "maintainer": "PoringH",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C0", "pin_b": "C1", "resolution": 2}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "wpm": true
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "C4", "C5", "B0", "B1", "B2", "B11", "A9", "A8", "C9", "C8", "C7", "C6", "B15", "B14", "B13", "B12"],
+        "rows": ["C3", "A0", "A1", "A2", "B10", "A15"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x5047"
+    },
+    "layouts": {
+        "LAYOUT_75_ansi": {
+            "layout": [
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 18, "y": 0},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.5, "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.25},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 14.5, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25, "w": 2},
+                {"matrix": [1, 17], "x": 18, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 0, "y": 2.25, "w": 2.5},
+                {"matrix": [2, 3], "x": 4, "y": 2.25},
+                {"matrix": [2, 4], "x": 5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6, "y": 2.25},
+                {"matrix": [2, 6], "x": 7, "y": 2.25},
+                {"matrix": [2, 7], "x": 8, "y": 2.25},
+                {"matrix": [2, 8], "x": 9, "y": 2.25},
+                {"matrix": [2, 9], "x": 10, "y": 2.25},
+                {"matrix": [2, 10], "x": 11, "y": 2.25},
+                {"matrix": [2, 11], "x": 12, "y": 2.25},
+                {"matrix": [2, 12], "x": 13, "y": 2.25},
+                {"matrix": [2, 13], "x": 14, "y": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2.25},
+                {"matrix": [2, 15], "x": 16, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 17], "x": 18, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 15], "x": 15.25, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 17], "x": 18, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.75, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.75, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.75, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.75, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.75, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4.25},
+                {"matrix": [4, 14], "x": 14.75, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 16], "x": 16.75, "y": 4.25},
+                {"matrix": [4, 17], "x": 18, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 8], "x": 6.25, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25},
+                {"matrix": [5, 14], "x": 14.5, "y": 5.25},
+                {"matrix": [5, 15], "x": 15.75, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.75, "y": 5.5},
+                {"matrix": [5, 17], "x": 17.75, "y": 5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/qck75/v1/keymaps/default/keymap.c b/keyboards/qck75/v1/keymaps/default/keymap.c
new file mode 100644
index 000000000000..a9cc10f8a4a2
--- /dev/null
+++ b/keyboards/qck75/v1/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+// 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_75_ansi(
+                          KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5, KC_F6,  KC_F7,  KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_SCRL, 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_MPRV, KC_MNXT, KC_TAB,  KC_Q,    KC_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_F17,  KC_F18,  KC_CAPS, KC_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_F19,  KC_F20,  KC_LSFT, KC_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_F21,  KC_F22,  KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,                  KC_NUM, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_75_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, 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, NK_TOGG, KC_TRNS, GU_TOGG, KC_TRNS,                            KC_TRNS,                   MO(2),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
+
+
diff --git a/keyboards/qck75/v1/keymaps/via/keymap.c b/keyboards/qck75/v1/keymaps/via/keymap.c
new file mode 100644
index 000000000000..8281855ded7c
--- /dev/null
+++ b/keyboards/qck75/v1/keymaps/via/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] = {
+    [0] = LAYOUT_75_ansi(
+                          KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5, KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F13,  KC_SCRL, 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_MPRV, KC_MNXT, KC_TAB,  KC_Q,    KC_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_F17,  KC_F18,  KC_CAPS, KC_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_F19,  KC_F20,  KC_LSFT, KC_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_F21,  KC_F22,  KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,                  KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_75_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, 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, NK_TOGG, KC_TRNS, GU_TOGG, KC_TRNS,                            KC_TRNS,                   MO(2),   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_MPRV, KC_MNXT)}
+};
+
+#endif
diff --git a/keyboards/qck75/v1/keymaps/via/rules.mk b/keyboards/qck75/v1/keymaps/via/rules.mk
new file mode 100644
index 000000000000..4253f570f0bb
--- /dev/null
+++ b/keyboards/qck75/v1/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/qck75/v1/mcuconf.h b/keyboards/qck75/v1/mcuconf.h
new file mode 100644
index 000000000000..c465397d36c1
--- /dev/null
+++ b/keyboards/qck75/v1/mcuconf.h
@@ -0,0 +1,15 @@
+// Copyright 2023 Andrian (@PoringH)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+#undef STM32_I2C_I2C1_RX_DMA_STREAM
+#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 3)
+
+#undef STM32_I2C_I2C1_TX_DMA_STREAM
+#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2)
diff --git a/keyboards/qck75/v1/readme.md b/keyboards/qck75/v1/readme.md
new file mode 100644
index 000000000000..b51dca8e4061
--- /dev/null
+++ b/keyboards/qck75/v1/readme.md
@@ -0,0 +1,28 @@
+# qck75
+
+[qck75](https://i.imgur.com/exdD8Hgh.jpeg)
+
+This keyboard is a keyboard made for self use
+75% layout with extra keys for macro with led and knob
+
+* Keyboard Maintainer: [Andrian](https://github.com/PoringH)
+* Hardware Supported: This project uses STM32F072R8Tx for the mcu on the pcb
+* Hardware Availability: https://github.com/PoringH/QCK75-XT
+
+Make example for this keyboard (after setting up your build environment):
+
+    make qck75/v1:default
+
+Flashing example for this keyboard:
+
+    make qck75/v1:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## 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/qck75/v1/rules.mk b/keyboards/qck75/v1/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/qck75/v1/v1.c b/keyboards/qck75/v1/v1.c
new file mode 100644
index 000000000000..5e512b292c7a
--- /dev/null
+++ b/keyboards/qck75/v1/v1.c
@@ -0,0 +1,395 @@
+// Copyright 2023 Andrian (@PoringH)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum { MAIN = 0, SECOND = 1, THIRD = 2, FOURTH = 3 };
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
+    switch (get_highest_layer(layer_state)) {
+        default:
+            if (clockwise) {
+                tap_code(KC_VOLU);
+            } else {
+                tap_code(KC_VOLD);
+            }
+        case SECOND:
+            if (clockwise) {
+                tap_code(KC_MNXT);
+            } else {
+                tap_code(KC_MPRV);
+            }
+            break;
+        case THIRD:
+            if (clockwise) {
+                tap_code(KC_MS_R);
+            } else {
+                tap_code(KC_MS_L);
+            }
+            break;
+        case FOURTH:
+            if (clockwise) {
+                tap_code(KC_MS_U);
+            } else {
+                tap_code(KC_MS_D);
+            }
+            break;
+    }
+    return true;
+}
+#endif
+
+#ifdef OLED_ENABLE
+#    define KB_STAT_SIZE 18
+#    define WIN_STAT_SIZE 12
+#    define MIN_WALK_SPEED 10
+#    define MIN_RUN_SPEED 40
+#    define ANIM_FRAME_DURATION 200
+#    define ANIM_SIZE 96
+
+uint32_t anim_timer    = 0;
+uint8_t  current_frame = 0;
+int      current_wpm   = 0;
+led_t    led_usb_state;
+
+bool isguiDisabled = false;
+bool isSneaking    = false;
+bool isJumping     = false;
+bool showedJump    = true;
+
+#    ifdef OLED_ENABLE
+
+static void render_animation(int ANIM_X, int ANIM_Y) {
+    // sit animation 32 X 22
+    static const char PROGMEM sit[2][3][ANIM_SIZE] = {{
+                                                          {
+                                                              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,
+                                                          },
+                                                      },
+
+                                                      {{
+                                                           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 animation 32 X 22
+    static const char PROGMEM walk[2][3][ANIM_SIZE] = {{{
+                                                            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,
+                                                        }},
+
+                                                       {{
+                                                            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 animation 32 X 22
+    static const char PROGMEM run[2][3][ANIM_SIZE] = {{{
+                                                           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,
+                                                       }},
+
+                                                      {{
+                                                           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 animation 32 X 22
+    static const char PROGMEM bark[2][3][ANIM_SIZE] = {{
+                                                           {
+                                                               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,
+                                                           },
+                                                       },
+
+                                                       {{
+                                                            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 animation 32 X 22
+    static const char PROGMEM sneak[2][3][ANIM_SIZE] = {{
+                                                            {
+                                                                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,
+                                                            },
+                                                        },
+
+                                                        {{
+                                                             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,
+                                                         }
+
+                                                        }};
+
+    void animate_luna(void) {
+        int anim_x;
+        int anim_y;
+
+        if (isJumping || !showedJump) {
+            oled_set_cursor(ANIM_X, ANIM_Y + 2);
+            oled_write("     ", false);
+            anim_x     = ANIM_X;
+            anim_y     = ANIM_Y - 1;
+            showedJump = true;
+        } else {
+            oled_set_cursor(ANIM_X, ANIM_Y - 1);
+            oled_write("     ", false);
+
+            anim_x = ANIM_X;
+            anim_y = ANIM_Y;
+        }
+
+        if (led_usb_state.caps_lock) {
+            oled_set_cursor(anim_x, anim_y);
+            oled_write_raw_P(bark[current_frame][0], ANIM_SIZE);
+            oled_set_cursor(anim_x, anim_y + 1);
+            oled_write_raw_P(bark[current_frame][1], ANIM_SIZE);
+            oled_set_cursor(anim_x, anim_y + 2);
+            oled_write_raw_P(bark[current_frame][2], ANIM_SIZE);
+        } else if (get_mods() & MOD_MASK_CS) {
+            oled_set_cursor(anim_x, anim_y);
+            oled_write_raw_P(sneak[current_frame][0], ANIM_SIZE);
+            oled_set_cursor(anim_x, anim_y + 1);
+            oled_write_raw_P(sneak[current_frame][1], ANIM_SIZE);
+            oled_set_cursor(anim_x, anim_y + 2);
+            oled_write_raw_P(sneak[current_frame][2], ANIM_SIZE);
+        } else if (current_wpm <= MIN_WALK_SPEED) {
+            oled_set_cursor(anim_x, anim_y);
+            oled_write_raw_P(sit[current_frame][0], ANIM_SIZE);
+            oled_set_cursor(anim_x, anim_y + 1);
+            oled_write_raw_P(sit[current_frame][1], ANIM_SIZE);
+            oled_set_cursor(anim_x, anim_y + 2);
+            oled_write_raw_P(sit[current_frame][2], ANIM_SIZE);
+        } else if (current_wpm <= MIN_RUN_SPEED) {
+            oled_set_cursor(anim_x, anim_y);
+            oled_write_raw_P(walk[current_frame][0], ANIM_SIZE);
+            oled_set_cursor(anim_x, anim_y + 1);
+            oled_write_raw_P(walk[current_frame][1], ANIM_SIZE);
+            oled_set_cursor(anim_x, anim_y + 2);
+            oled_write_raw_P(walk[current_frame][2], ANIM_SIZE);
+        } else {
+            oled_set_cursor(anim_x, anim_y);
+            oled_write_raw_P(run[current_frame][0], ANIM_SIZE);
+            oled_set_cursor(anim_x, anim_y + 1);
+            oled_write_raw_P(run[current_frame][1], ANIM_SIZE);
+            oled_set_cursor(anim_x, anim_y + 2);
+            oled_write_raw_P(run[current_frame][2], ANIM_SIZE);
+        }
+    }
+
+#        if OLED_TIMEOUT > 0
+
+    if (last_input_activity_elapsed() > OLED_TIMEOUT && last_led_activity_elapsed() > OLED_TIMEOUT) {
+        oled_off();
+        return;
+    } else {
+        oled_on();
+    }
+#        endif
+
+    if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+        anim_timer    = timer_read32();
+        current_frame = (current_frame + 1) % 2;
+        animate_luna();
+    }
+};
+
+static void render_caps(int CAP_X, int CAP_Y) {
+    if (led_usb_state.caps_lock == true) {
+        static const char PROGMEM caps[KB_STAT_SIZE] = {
+            0x00, 0xfe, 0xff, 0x07, 0xfb, 0xfb, 0x3b, 0xdb, 0xeb, 0xdb, 0x3b, 0xfb, 0xfb, 0x07, 0xff, 0xfe, 0x00, 0x00,
+        };
+        static const char PROGMEM caps2[KB_STAT_SIZE] = {0x00, 0x3f, 0x7f, 0x70, 0x6f, 0x6f, 0x68, 0x6e, 0x6e, 0x6e, 0x68, 0x6f, 0x6f, 0x70, 0x7f, 0x3f, 0x00, 0x00};
+        oled_set_cursor(CAP_X, CAP_Y);
+        oled_write_raw_P(caps, KB_STAT_SIZE);
+        oled_set_cursor(CAP_X, CAP_Y + 1);
+        oled_write_raw_P(caps2, KB_STAT_SIZE);
+    } else {
+        static const char PROGMEM caps[KB_STAT_SIZE] = {
+            0x00, 0x00, 0x00, 0xf8, 0x04, 0x04, 0xc4, 0x24, 0x14, 0x24, 0xc4, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00,
+        };
+        static const char PROGMEM caps2[KB_STAT_SIZE] = {0x00, 0x00, 0x00, 0x0f, 0x10, 0x10, 0x17, 0x11, 0x11, 0x11, 0x17, 0x10, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00};
+        oled_set_cursor(CAP_X, CAP_Y);
+        oled_write_raw_P(caps, KB_STAT_SIZE);
+        oled_set_cursor(CAP_X, CAP_Y + 1);
+        oled_write_raw_P(caps2, KB_STAT_SIZE);
+    }
+}
+
+static void render_num(int NUM_X, int NUM_Y) {
+    if (led_usb_state.num_lock == true) {
+        static const char PROGMEM num[KB_STAT_SIZE] = {
+            0x00, 0xfe, 0xff, 0x07, 0xfb, 0xfb, 0xfb, 0xdb, 0x0b, 0xfb, 0xfb, 0xfb, 0xfb, 0x07, 0xff, 0xfe, 0x00, 0x00,
+        };
+        static const char PROGMEM num2[KB_STAT_SIZE] = {0x00, 0x3f, 0x7f, 0x70, 0x6f, 0x6f, 0x6f, 0x6b, 0x68, 0x6b, 0x6f, 0x6f, 0x6f, 0x70, 0x7f, 0x3f, 0x00, 0x00};
+        oled_set_cursor(NUM_X, NUM_Y);
+        oled_write_raw_P(num, KB_STAT_SIZE);
+        oled_set_cursor(NUM_X, NUM_Y + 1);
+        oled_write_raw_P(num2, KB_STAT_SIZE);
+    } else {
+        static const char PROGMEM num[KB_STAT_SIZE] = {
+            0x00, 0x00, 0x00, 0xf8, 0x04, 0x04, 0x04, 0x24, 0xf4, 0x04, 0x04, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00,
+        };
+        static const char PROGMEM num2[KB_STAT_SIZE] = {0x00, 0x00, 0x00, 0x0f, 0x10, 0x10, 0x10, 0x14, 0x17, 0x14, 0x10, 0x10, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00};
+        oled_set_cursor(NUM_X, NUM_Y);
+        oled_write_raw_P(num, KB_STAT_SIZE);
+        oled_set_cursor(NUM_X, NUM_Y + 1);
+        oled_write_raw_P(num2, KB_STAT_SIZE);
+    }
+}
+
+static void render_scroll(int SCROLL_X, int SCROLL_Y) {
+    if (led_usb_state.scroll_lock == true) {
+        static const char PROGMEM scroll[KB_STAT_SIZE] = {
+            0x00, 0xfe, 0xff, 0x07, 0xfb, 0xfb, 0x7b, 0xfb, 0x0b, 0xfb, 0x7b, 0xfb, 0xfb, 0x07, 0xff, 0xfe, 0x00, 0x00,
+        };
+        static const char PROGMEM scroll2[KB_STAT_SIZE] = {0x00, 0x3f, 0x7f, 0x70, 0x6f, 0x6b, 0x6b, 0x6a, 0x68, 0x6a, 0x6b, 0x6b, 0x6f, 0x70, 0x7f, 0x3f, 0x00, 0x00};
+        oled_set_cursor(SCROLL_X, SCROLL_Y);
+        oled_write_raw_P(scroll, KB_STAT_SIZE);
+        oled_set_cursor(SCROLL_X, SCROLL_Y + 1);
+        oled_write_raw_P(scroll2, KB_STAT_SIZE);
+    } else {
+        static const char PROGMEM scroll[KB_STAT_SIZE] = {
+            0x00, 0x00, 0x00, 0xf8, 0x04, 0x04, 0x84, 0x04, 0xf4, 0x04, 0x84, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00,
+        };
+        static const char PROGMEM scroll2[KB_STAT_SIZE] = {0x00, 0x00, 0x00, 0x0f, 0x10, 0x14, 0x14, 0x15, 0x17, 0x15, 0x14, 0x14, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00};
+        oled_set_cursor(SCROLL_X, SCROLL_Y);
+        oled_write_raw_P(scroll, KB_STAT_SIZE);
+        oled_set_cursor(SCROLL_X, SCROLL_Y + 1);
+        oled_write_raw_P(scroll2, KB_STAT_SIZE);
+    }
+}
+
+static void render_winstat(int WIN_X, int WIN_Y) {
+    static const char PROGMEM winlogo[WIN_STAT_SIZE] = {
+        0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00,
+    };
+    static const char PROGMEM winlogo2[WIN_STAT_SIZE] = {
+        0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00,
+    };
+
+    oled_set_cursor(WIN_X, WIN_Y);
+    oled_write_raw_P(winlogo, WIN_STAT_SIZE);
+    oled_set_cursor(WIN_X, WIN_Y + 1);
+    oled_write_raw_P(winlogo2, WIN_STAT_SIZE);
+
+    oled_set_cursor(WIN_X + 2, WIN_Y);
+    oled_write("WINKEY", false);
+
+    oled_set_cursor(WIN_X + 2, WIN_Y + 1);
+    if (keymap_config.no_gui) {
+        oled_write("DISABLED", false);
+    } else {
+        oled_write("ENABLED  ", false);
+    }
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    current_wpm   = get_current_wpm();
+    led_usb_state = host_keyboard_led_state();
+    render_animation(13, 3);
+    oled_set_cursor(0, 0);
+    // Host Keyboard Layer Status
+    switch (get_highest_layer(layer_state)) {
+        case MAIN:
+            oled_write("MAIN  ", false);
+            break;
+        case SECOND:
+            oled_write("SECOND", false);
+            break;
+        case THIRD:
+            oled_write("THIRD ", false);
+            break;
+        default:
+            oled_write("FOURTH", false);
+    }
+    render_caps(0, 2);
+    render_num(3, 2);
+    render_scroll(6, 2);
+    render_winstat(1, 5);
+
+    oled_set_cursor(12, 0);
+    oled_write("WPM: ", false);
+    oled_write(get_u8_str(current_wpm, '0'), false);
+    return false;
+}
+
+#    endif
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_SPC:
+            if (record->event.pressed) {
+                isJumping  = true;
+                showedJump = false;
+            } else {
+                isJumping = false;
+            }
+            break;
+    }
+    return process_record_user(keycode, record);
+}
+#endif
diff --git a/keyboards/qpockets/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h
index 6603c0e1539e..02bd670f713a 100644
--- a/keyboards/qpockets/space_space/rev2/config.h
+++ b/keyboards/qpockets/space_space/rev2/config.h
@@ -18,7 +18,4 @@
 
 #define LOCKING_SUPPORT_ENABLE
 
-#define RGBLED_NUM 4
-
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGBLIGHT_DEFAULT_HUE 130
diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json
index 635c66db9923..45cdb5870ace 100644
--- a/keyboards/qpockets/space_space/rev2/info.json
+++ b/keyboards/qpockets/space_space/rev2/info.json
@@ -19,6 +19,9 @@
       {"pin_a": "C7", "pin_b": "F7", "resolution": 3}
     ]
   },
+  "rgblight": {
+    "led_count": 4
+  },
   "ws2812": {
     "pin": "F0"
   },
diff --git a/keyboards/quad_h/lb75/config.h b/keyboards/quad_h/lb75/config.h
index 9457b2076679..50001e978cc4 100644
--- a/keyboards/quad_h/lb75/config.h
+++ b/keyboards/quad_h/lb75/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 16
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/quad_h/lb75/info.json b/keyboards/quad_h/lb75/info.json
index 786439186f4c..16701a5e99ce 100644
--- a/keyboards/quad_h/lb75/info.json
+++ b/keyboards/quad_h/lb75/info.json
@@ -21,11 +21,215 @@
         "pin": "B0"
     },
     "rgblight": {
-        "max_brightness": 220
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "max_brightness": 220,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "community_layouts": ["75_ansi", "75_iso"],
     "layouts": {
+        "LAYOUT_75_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},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+                {"matrix": [1, 7], "x": 15, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+                {"matrix": [2, 2], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 4], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 5], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 6], "x": 12, "y": 1},
+                {"matrix": [3, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [3, 7], "x": 15, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2},
+                {"matrix": [4, 1], "x": 2.5, "y": 2},
+                {"matrix": [5, 1], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2},
+                {"matrix": [5, 2], "x": 5.5, "y": 2},
+                {"matrix": [4, 3], "x": 6.5, "y": 2},
+                {"matrix": [5, 3], "x": 7.5, "y": 2},
+                {"matrix": [4, 4], "x": 8.5, "y": 2},
+                {"matrix": [5, 4], "x": 9.5, "y": 2},
+                {"matrix": [4, 5], "x": 10.5, "y": 2},
+                {"matrix": [5, 5], "x": 11.5, "y": 2},
+                {"matrix": [4, 6], "x": 12.5, "y": 2},
+                {"matrix": [4, 7], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [5, 7], "x": 15, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3},
+                {"matrix": [6, 1], "x": 2.75, "y": 3},
+                {"matrix": [7, 1], "x": 3.75, "y": 3},
+                {"matrix": [6, 2], "x": 4.75, "y": 3},
+                {"matrix": [7, 2], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [7, 3], "x": 7.75, "y": 3},
+                {"matrix": [6, 4], "x": 8.75, "y": 3},
+                {"matrix": [7, 4], "x": 9.75, "y": 3},
+                {"matrix": [6, 5], "x": 10.75, "y": 3},
+                {"matrix": [7, 5], "x": 11.75, "y": 3},
+                {"matrix": [7, 6], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [7, 7], "x": 15, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4},
+                {"matrix": [9, 1], "x": 3.25, "y": 4},
+                {"matrix": [8, 2], "x": 4.25, "y": 4},
+                {"matrix": [9, 2], "x": 5.25, "y": 4},
+                {"matrix": [8, 3], "x": 6.25, "y": 4},
+                {"matrix": [9, 3], "x": 7.25, "y": 4},
+                {"matrix": [8, 4], "x": 8.25, "y": 4},
+                {"matrix": [9, 4], "x": 9.25, "y": 4},
+                {"matrix": [8, 5], "x": 10.25, "y": 4},
+                {"matrix": [9, 5], "x": 11.25, "y": 4},
+                {"matrix": [8, 6], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4},
+
+                {"matrix": [10, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5},
+                {"matrix": [11, 5], "x": 11, "y": 5},
+                {"matrix": [10, 6], "x": 12, "y": 5},
+                {"matrix": [11, 6], "x": 13, "y": 5},
+                {"matrix": [10, 7], "x": 14, "y": 5},
+                {"matrix": [11, 7], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_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},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+                {"matrix": [1, 7], "x": 15, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+                {"matrix": [2, 2], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 4], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 5], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 6], "x": 12, "y": 1},
+                {"matrix": [3, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [3, 7], "x": 15, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2},
+                {"matrix": [4, 1], "x": 2.5, "y": 2},
+                {"matrix": [5, 1], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2},
+                {"matrix": [5, 2], "x": 5.5, "y": 2},
+                {"matrix": [4, 3], "x": 6.5, "y": 2},
+                {"matrix": [5, 3], "x": 7.5, "y": 2},
+                {"matrix": [4, 4], "x": 8.5, "y": 2},
+                {"matrix": [5, 4], "x": 9.5, "y": 2},
+                {"matrix": [4, 5], "x": 10.5, "y": 2},
+                {"matrix": [5, 5], "x": 11.5, "y": 2},
+                {"matrix": [4, 6], "x": 12.5, "y": 2},
+                {"matrix": [5, 7], "x": 15, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3},
+                {"matrix": [6, 1], "x": 2.75, "y": 3},
+                {"matrix": [7, 1], "x": 3.75, "y": 3},
+                {"matrix": [6, 2], "x": 4.75, "y": 3},
+                {"matrix": [7, 2], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [7, 3], "x": 7.75, "y": 3},
+                {"matrix": [6, 4], "x": 8.75, "y": 3},
+                {"matrix": [7, 4], "x": 9.75, "y": 3},
+                {"matrix": [6, 5], "x": 10.75, "y": 3},
+                {"matrix": [7, 5], "x": 11.75, "y": 3},
+                {"matrix": [4, 7], "x": 12.75, "y": 3},
+                {"matrix": [7, 6], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [7, 7], "x": 15, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4},
+                {"matrix": [8, 1], "x": 2.25, "y": 4},
+                {"matrix": [9, 1], "x": 3.25, "y": 4},
+                {"matrix": [8, 2], "x": 4.25, "y": 4},
+                {"matrix": [9, 2], "x": 5.25, "y": 4},
+                {"matrix": [8, 3], "x": 6.25, "y": 4},
+                {"matrix": [9, 3], "x": 7.25, "y": 4},
+                {"matrix": [8, 4], "x": 8.25, "y": 4},
+                {"matrix": [9, 4], "x": 9.25, "y": 4},
+                {"matrix": [8, 5], "x": 10.25, "y": 4},
+                {"matrix": [9, 5], "x": 11.25, "y": 4},
+                {"matrix": [8, 6], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4},
+
+                {"matrix": [10, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5},
+                {"matrix": [11, 5], "x": 11, "y": 5},
+                {"matrix": [10, 6], "x": 12, "y": 5},
+                {"matrix": [11, 6], "x": 13, "y": 5},
+                {"matrix": [10, 7], "x": 14, "y": 5},
+                {"matrix": [11, 7], "x": 15, "y": 5}
+            ]
+        },
         "LAYOUT_continuous_fnrow": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/quarkeys/z40/config.h b/keyboards/quarkeys/z40/config.h
index ece3e6113612..84b3e5c03e5d 100644
--- a/keyboards/quarkeys/z40/config.h
+++ b/keyboards/quarkeys/z40/config.h
@@ -20,9 +20,6 @@
 #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.
-#define RGB_MATRIX_SAT_STEP 8
-#define RGB_MATRIX_VAL_STEP 8
-#define RGB_MATRIX_SPD_STEP 10
 
 // RGB_MATRIX effects
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS 	            //Enables RGB_MATRIX_ALPHAS_MODS
@@ -46,23 +43,7 @@
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
 #endif
 
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 47
-#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_ALTERNATING
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLIGHT_SLEEP
-#endif
\ No newline at end of file
diff --git a/keyboards/quarkeys/z40/info.json b/keyboards/quarkeys/z40/info.json
index 3841e8c16a26..a045a9831a40 100644
--- a/keyboards/quarkeys/z40/info.json
+++ b/keyboards/quarkeys/z40/info.json
@@ -9,10 +9,27 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812",
+        "sat_steps": 8,
+        "val_steps": 8,
+        "speed_steps": 10
     },
     "rgblight": {
-        "max_brightness": 130
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 47,
+        "max_brightness": 130,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true
+        }
     },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D0", "B1", "B0"],
diff --git a/keyboards/quarkeys/z60/hotswap/config.h b/keyboards/quarkeys/z60/hotswap/config.h
index f02635a63949..d531fe5c4cf6 100644
--- a/keyboards/quarkeys/z60/hotswap/config.h
+++ b/keyboards/quarkeys/z60/hotswap/config.h
@@ -14,22 +14,7 @@
 
 #pragma once
 
-#define RGBLED_NUM 80
-#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_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/quarkeys/z60/hotswap/info.json b/keyboards/quarkeys/z60/hotswap/info.json
index 1db45e4f7ba0..d10065bbd5ca 100644
--- a/keyboards/quarkeys/z60/hotswap/info.json
+++ b/keyboards/quarkeys/z60/hotswap/info.json
@@ -16,7 +16,22 @@
         "pin": "D6"
     },
     "rgblight": {
-        "max_brightness": 140
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 80,
+        "max_brightness": 140,
+        "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
+        }
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
diff --git a/keyboards/quarkeys/z60/solder/config.h b/keyboards/quarkeys/z60/solder/config.h
index 588044ec304c..bb314ae31596 100644
--- a/keyboards/quarkeys/z60/solder/config.h
+++ b/keyboards/quarkeys/z60/solder/config.h
@@ -14,23 +14,6 @@
 
 #pragma once
 
-#define RGBLED_NUM 77
-#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_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
-
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/quarkeys/z60/solder/info.json b/keyboards/quarkeys/z60/solder/info.json
index 75316622d1c1..55e4ca33d9a0 100644
--- a/keyboards/quarkeys/z60/solder/info.json
+++ b/keyboards/quarkeys/z60/solder/info.json
@@ -16,7 +16,22 @@
         "pin": "D6"
     },
     "rgblight": {
-        "max_brightness": 180
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 77,
+        "max_brightness": 180,
+        "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
+        }
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
diff --git a/keyboards/quarkeys/z67/hotswap/config.h b/keyboards/quarkeys/z67/hotswap/config.h
index f662eb9480a5..d531fe5c4cf6 100644
--- a/keyboards/quarkeys/z67/hotswap/config.h
+++ b/keyboards/quarkeys/z67/hotswap/config.h
@@ -14,22 +14,7 @@
 
 #pragma once
 
-#define RGBLED_NUM 77
-#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_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/quarkeys/z67/hotswap/info.json b/keyboards/quarkeys/z67/hotswap/info.json
index 43a9f465f730..13a5cd09e280 100644
--- a/keyboards/quarkeys/z67/hotswap/info.json
+++ b/keyboards/quarkeys/z67/hotswap/info.json
@@ -1,8 +1,8 @@
 {
     "keyboard_name": "Z67 Hotswap",
-    "manufacturer": "Quarkeys Stuidio",
-    "url": "www.quarkeys.com",
-    "maintainer": "TommyZ",
+    "manufacturer": "Quarkeys Studio",
+    "url": "https://www.quarkeys.com/",
+    "maintainer": "tommyamoszhao",
     "usb": {
         "vid": "0x8490",
         "pid": "0x4102",
@@ -16,13 +16,32 @@
         "pin": "F0"
     },
     "rgblight": {
-        "max_brightness": 180
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 77,
+        "max_brightness": 180,
+        "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
+        }
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker"
+    },
+    "community_layouts": ["65_ansi_blocker"],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_ansi_blocker": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/quarkeys/z67/hotswap/keymaps/default/keymap.c b/keyboards/quarkeys/z67/hotswap/keymaps/default/keymap.c
index 7427419403a2..1d136ebacae4 100644
--- a/keyboards/quarkeys/z67/hotswap/keymaps/default/keymap.c
+++ b/keyboards/quarkeys/z67/hotswap/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* 
+/*
 / Copyright 2022 quarkeys
 / This program is free software: you can redistribute it and/or modify
 / it under the terms of the GNU General Public License as published by
@@ -15,10 +15,10 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	/* [0]
+    /* [0]
      * ,---------------------------------------------------------------------------------------------------------------.
-     * | Esc  |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   |  -   |  +   |  Backspace  |  Del | 
-	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+     * | Esc  |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   |  -   |  +   |  Backspace  |  Del |
+     * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
      * | Tab     |  Q   |  W   |  E   |  R   |  T   |  Y   |  U   |  I   |  O   |  P   |  {   |  }   |   \      | PgUp |
      * |---------+------+------+------+------+------+------+------+------+------+------+------+------+----------+------|
      * | Capslock   |  A   |  S   |  D   |  F   |  G   |  H   |  J   |  K   |  L   |  ;   |  "   |    Enter     | PgDn |
@@ -26,19 +26,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |   SHIFT       |  Z   |  X   |  C   |  V   |  B   |  N   |  M   |  ,   |  .   |  /   |   Shift   |  Up  |  L1  |
      * |--------+------+------+------+------+------+------+------+------+------+------+------+-----------+------+------|
      * | Ctrl   |  Win   |  ALT   |                  SPACE                   |    L2   |    L3    | Left | Down | 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_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_LGUI, KC_LALT, KC_SPC, MO(2), MO(3), 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_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,                    MO(2),   MO(3),            KC_LEFT, KC_DOWN, KC_RGHT),
 
-	/* [1]
+    /* [1]
      * ,---------------------------------------------------------------------------------------------------------------.
-     * |Reset |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |             |      | 
-	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+-------------+------|
+     * |Reset |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |             |      |
+     * |------+------+------+------+------+------+------+------+------+------+------+------+------+-------------+------|
      * |         | PgUp | Home |  Up  | End  | Del  |  \   |  7   |  8   |  9   | RTOG | RMOD | RVAI |          |      |
      * |---------+------+------+------+------+------+------+------+------+------+------+------+------+----------+------|
      * |            | PgDn | Left | Down | Rght |  +   |  -   |  4   |  5   |  6   | RSAD | RVAD |              |      |
@@ -46,15 +46,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |               | Play | Mute | VolD | VolU |  *   |  /   |  1   |  2   |  3   |  .   |           |      |      |
      * |---------------+------+------+------+------+------+------+------+------+------+------+-----------+------+------|
      * | Ctrl   |  Win   |  ALT   |                     0                     |         |         |      |      |      |
-     * `--------+--------+--------+-------------------------------------------+---------+---------+------+------+------'     
+     * `--------+--------+--------+-------------------------------------------+---------+---------+------+------+------'
      */
-	[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_PGUP, KC_HOME, KC_UP, KC_END, KC_DEL, KC_BSLS, KC_7, KC_8, KC_9, RGB_TOG, RGB_MOD, RGB_VAI, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PLUS, KC_MINS, KC_4, KC_5, KC_6, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_ASTR, KC_SLSH, KC_1, KC_2, KC_3, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};                           
+    [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,  KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,  KC_BSLS, KC_7,    KC_8,    KC_9,    RGB_TOG, RGB_MOD, RGB_VAI, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PLUS, KC_MINS, KC_4,    KC_5,    KC_6,    RGB_SAI, RGB_SAD,          KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_ASTR, KC_SLSH, KC_1,    KC_2,    KC_3,    KC_DOT,  KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_0,                      KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
+};
 
 const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({36, 1, HSV_RED});
 const rgblight_segment_t PROGMEM my_ar_numpad_layer[] = RGBLIGHT_LAYER_SEGMENTS({45, 2, HSV_WHITE});
@@ -62,10 +62,10 @@ const rgblight_segment_t PROGMEM my_symbol_layer[] = RGBLIGHT_LAYER_SEGMENTS({30
 const rgblight_segment_t PROGMEM my_other_layer[] = RGBLIGHT_LAYER_SEGMENTS({16, 2, HSV_WHITE});
 
 const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    my_capslock_layer,		// Caplock indicator
-    my_ar_numpad_layer,		// Arrow keys & Numpad, Operator keys, reset key, RGB control and media control
-	my_symbol_layer,		// F1-F12 keys & Symbols
-	my_other_layer			// Self-Defined
+    my_capslock_layer,        // Caplock indicator
+    my_ar_numpad_layer,        // Arrow keys & Numpad, Operator keys, reset key, RGB control and media control
+    my_symbol_layer,        // F1-F12 keys & Symbols
+    my_other_layer            // Self-Defined
 );
 void keyboard_post_init_user(void) {
     rgblight_layers = my_rgb_layers;
diff --git a/keyboards/quarkeys/z67/hotswap/keymaps/via/keymap.c b/keyboards/quarkeys/z67/hotswap/keymaps/via/keymap.c
index 9adb5341ef31..d0e749707cad 100644
--- a/keyboards/quarkeys/z67/hotswap/keymaps/via/keymap.c
+++ b/keyboards/quarkeys/z67/hotswap/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
-/* 
+/*
 / Copyright 2022 quarkeys
 / This program is free software: you can redistribute it and/or modify
 / it under the terms of the GNU General Public License as published by
@@ -15,20 +15,20 @@
 
 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_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, MO(2), MO(3), 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_PGUP, KC_HOME, KC_UP, KC_END, KC_DEL, KC_BSLS, KC_7, KC_8, KC_9, RGB_TOG, RGB_MOD, RGB_VAI, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PLUS, KC_MINS, KC_4, KC_5, KC_6, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_ASTR, KC_SLSH, KC_1, KC_2, KC_3, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};                           
+    [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_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,                    MO(2),   MO(3),            KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [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,  KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,  KC_BSLS, KC_7,    KC_8,    KC_9,    RGB_TOG, RGB_MOD, RGB_VAI, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PLUS, KC_MINS, KC_4,    KC_5,    KC_6,    RGB_SAI, RGB_SAD,          KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_ASTR, KC_SLSH, KC_1,    KC_2,    KC_3,    KC_DOT,  KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_0,                      KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
+};
 
 const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({36, 1, HSV_RED});
 const rgblight_segment_t PROGMEM my_ar_numpad_layer[] = RGBLIGHT_LAYER_SEGMENTS({45, 2, HSV_WHITE});
@@ -36,10 +36,10 @@ const rgblight_segment_t PROGMEM my_symbol_layer[] = RGBLIGHT_LAYER_SEGMENTS({30
 const rgblight_segment_t PROGMEM my_other_layer[] = RGBLIGHT_LAYER_SEGMENTS({16, 2, HSV_WHITE});
 
 const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    my_capslock_layer,		// Caplock indicator
-    my_ar_numpad_layer,		// Arrow keys & Numpad, Operator keys, reset key, RGB control and media control
-	my_symbol_layer,		// F1-F12 keys & Symbols
-	my_other_layer			// Self-Defined
+    my_capslock_layer,        // Caplock indicator
+    my_ar_numpad_layer,        // Arrow keys & Numpad, Operator keys, reset key, RGB control and media control
+    my_symbol_layer,        // F1-F12 keys & Symbols
+    my_other_layer            // Self-Defined
 );
 void keyboard_post_init_user(void) {
     rgblight_layers = my_rgb_layers;
diff --git a/keyboards/quarkeys/z67/hotswap/readme.md b/keyboards/quarkeys/z67/hotswap/readme.md
new file mode 100644
index 000000000000..aa14490da318
--- /dev/null
+++ b/keyboards/quarkeys/z67/hotswap/readme.md
@@ -0,0 +1,21 @@
+# Quarkeys Z67 Hotswap
+
+![Quarkeys Z67 Hotswap](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/quarkeys/z67/hotswap/72b918_11e28d17b7e648eaaacd19f6c50fc372~mv2.jpg)
+
+A hotswap 65% keyboard in ANSI layout with a 0.5u blocker, featuring per-key RGB.
+
+* Keyboard Maintainer: [TommyZ](https://github.com/tommyamoszhao)
+* Hardware Supported: Quarkeys Z67 Hotswap
+* Hardware Availability: [Quarkeys Studio](https://www.quarkeys.com/product-page/z67)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make quarkeys/z67/hotswap:default
+
+Flashing example for this keyboard:
+
+    make quarkeys/z67/hotswap:default:flash
+
+**Bootloader:** Press the `QK_BOOT` keycode at ESC position of layer 1.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/quarkeys/z67/solder/config.h b/keyboards/quarkeys/z67/solder/config.h
index e65139c5ffa0..9e4269c6d7df 100644
--- a/keyboards/quarkeys/z67/solder/config.h
+++ b/keyboards/quarkeys/z67/solder/config.h
@@ -14,21 +14,6 @@
 
 #pragma once
 
-#define RGBLED_NUM 18
-#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_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
 #define RGBLIGHT_LAYERS
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/quarkeys/z67/solder/info.json b/keyboards/quarkeys/z67/solder/info.json
index 2a1995830278..93ea9fa0fc9e 100644
--- a/keyboards/quarkeys/z67/solder/info.json
+++ b/keyboards/quarkeys/z67/solder/info.json
@@ -1,8 +1,8 @@
 {
     "keyboard_name": "Z67 Solder",
-    "manufacturer": "Quarkeys Stuidio",
-    "url": "www.quarkeys.com",
-    "maintainer": "TommyZ",
+    "manufacturer": "Quarkeys Studio",
+    "url": "http://www.quarkeys.com/",
+    "maintainer": "tommyamoszhao",
     "usb": {
         "vid": "0x8490",
         "pid": "0x4101",
@@ -16,13 +16,41 @@
         "pin": "F0"
     },
     "rgblight": {
-        "max_brightness": 180
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "max_brightness": 180,
+        "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
+        }
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "community_layouts": [
+        "65_ansi",
+        "65_ansi_split_bs",
+        "65_ansi_blocker",
+        "65_ansi_blocker_split_bs",
+        "65_iso",
+        "65_iso_split_bs",
+        "65_iso_blocker",
+        "65_iso_blocker_split_bs"
+    ],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -101,6 +129,1294 @@
                 {"matrix": [4, 9], "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, 15], "x": 15, "y": 4}
+            ]
+        },
+        "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, 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": 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, 13], "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, 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, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "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, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_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": [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": 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, 13], "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, 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, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "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, 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, 14], "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, 13], "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, 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, 7], "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": 13, "y": 4},
+                {"matrix": [4, 13], "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, 14], "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, 13], "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, 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, 7], "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": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "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, 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": 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, 13], "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, 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.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, 9], "x": 11, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "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": [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": 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, 13], "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, 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.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, 9], "x": 11, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "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": [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": 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, 13], "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, 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.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10.75, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "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": [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": 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, 13], "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, 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.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10.75, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_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, 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, 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},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "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, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "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, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_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": [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, 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},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "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, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "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, 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, 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},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "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, 7], "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": 13, "y": 4},
+                {"matrix": [4, 13], "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, 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},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "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, 7], "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": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_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, 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, 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},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "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.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, 9], "x": 11, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_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": [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, 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},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "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.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, 9], "x": 11, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_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": [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, 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},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "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.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10.75, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_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": [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, 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},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "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.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 10.75, "y": 4, "w": 1.5},
+
                 {"matrix": [4, 12], "x": 13, "y": 4},
                 {"matrix": [4, 13], "x": 14, "y": 4},
                 {"matrix": [4, 15], "x": 15, "y": 4}
diff --git a/keyboards/quarkeys/z67/solder/keymaps/default/keymap.c b/keyboards/quarkeys/z67/solder/keymaps/default/keymap.c
index e2c1fbb9fc15..448db3275ce9 100644
--- a/keyboards/quarkeys/z67/solder/keymaps/default/keymap.c
+++ b/keyboards/quarkeys/z67/solder/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* 
+/*
 / Copyright 2022 quarkeys
 / This program is free software: you can redistribute it and/or modify
 / it under the terms of the GNU General Public License as published by
@@ -15,10 +15,10 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	/* [0]
+    /* [0]
      * ,---------------------------------------------------------------------------------------------------------------.
-     * | Esc  |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   |  -   |  +   | Back |  ~   |  Del | 
-	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+     * | Esc  |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   |  -   |  +   | Back |  ~   |  Del |
+     * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
      * | Tab     |  Q   |  W   |  E   |  R   |  T   |  Y   |  U   |  I   |  O   |  P   |  {   |  }   |   \      | PgUp |
      * |---------+------+------+------+------+------+------+------+------+------+------+------+------+----------+------|
      * | Capslock   |  A   |  S   |  D   |  F   |  G   |  H   |  J   |  K   |  L   |  ;   |  "   |  ~   | Enter | PgDn |
@@ -26,19 +26,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * | SHIFT  |  \   |  Z   |  X   |  C   |  V   |  B   |  N   |  M   |  ,   |  .   |  /   |   Shift   |  Fn  |  Up  |
      * |--------+------+------+------+------+------+------+------+------+------+------+------+-----------+------+------|
      * | Ctrl   |  Win   |  ALT   |                  SPACE                   | ALT  | Win  | Ctrl | Left | Down | 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_BSPC, KC_TILD, 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_GRV, 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, MO(1), 
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(2), MO(3), 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_BSPC, KC_TILD, 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_GRV,  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,   MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    MO(2),   MO(3),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT),
 
-	/* [1]
+    /* [1]
      * ,---------------------------------------------------------------------------------------------------------------.
-     * |Reset |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  | Back |      |      | 
-	 * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+     * |Reset |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  | Back |      |      |
+     * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
      * |         | PgUp | Home |  Up  | End  | Del  |  \   |  7   |  8   |  9   | RTOG | RMOD | RVAI |          |      |
      * |---------+------+------+------+------+------+------+------+------+------+------+------+------+----------+------|
      * |            | PgDn | Left | Down | Rght |  +   |  -   |  4   |  5   |  6   | RSAD | RVAD |      |       |      |
@@ -46,12 +46,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |        |      | Play | Mute | VolD | VolU |  *   |  /   |  1   |  2   |  3   |  .   |           |      |      |
      * |--------+------+------+------+------+------+------+------+------+------+------+------+-----------+------+------|
      * |        |        |        |                    0                     |      |      |      |      |      |      |
-     * `--------+--------+--------+------------------------------------------+------+------+------+------+------+------'     
+     * `--------+--------+--------+------------------------------------------+------+------+------+------+------+------'
      */
-	[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_BSPC, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,  KC_BSLS, KC_7,    KC_8,    KC_9,    RGB_TOG,  RGB_MOD,  RGB_VAI,           KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PLUS, KC_MINS, KC_4,    KC_5,    KC_6,    RGB_SAD,  RGB_SAD,  RGB_VAD,  KC_TRNS,          KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_ASTR, KC_SLSH, KC_1,    KC_2,    KC_3,     KC_DOT,   KC_TRNS,           KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_0,                      KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS)
+    [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_BSPC, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,  KC_BSLS, KC_7,    KC_8,    KC_9,    RGB_TOG, RGB_MOD, RGB_VAI, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PLUS, KC_MINS, KC_4,    KC_5,    KC_6,    RGB_SAD, RGB_SAD, RGB_VAD, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_ASTR, KC_SLSH, KC_1,    KC_2,    KC_3,    KC_DOT,  KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_0,                      KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/quarkeys/z67/solder/keymaps/via/keymap.c b/keyboards/quarkeys/z67/solder/keymaps/via/keymap.c
index b10070ecd9b6..758f07001cae 100644
--- a/keyboards/quarkeys/z67/solder/keymaps/via/keymap.c
+++ b/keyboards/quarkeys/z67/solder/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
-/* 
+/*
 / Copyright 2022 quarkeys
 / This program is free software: you can redistribute it and/or modify
 / it under the terms of the GNU General Public License as published by
@@ -15,17 +15,17 @@
 
 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_TILD, 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_GRV, 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, MO(1), 
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(2), MO(3), 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_BSPC, KC_TILD, 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_GRV,  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,   MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    MO(2),   MO(3),   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_BSPC, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,  KC_BSLS, KC_7,    KC_8,    KC_9,    RGB_TOG,  RGB_MOD,  RGB_VAI,           KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PLUS, KC_MINS, KC_4,    KC_5,    KC_6,    RGB_SAD,  RGB_SAD,  RGB_VAD,  KC_TRNS,          KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_ASTR, KC_SLSH, KC_1,    KC_2,    KC_3,     KC_DOT,   KC_TRNS,           KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_0,                      KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS)
+    [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_BSPC, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_DEL,  KC_BSLS, KC_7,    KC_8,    KC_9,    RGB_TOG, RGB_MOD, RGB_VAI, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PLUS, KC_MINS, KC_4,    KC_5,    KC_6,    RGB_SAD, RGB_SAD, RGB_VAD, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, KC_ASTR, KC_SLSH, KC_1,    KC_2,    KC_3,    KC_DOT,  KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_0,                      KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/quarkeys/z67/solder/matrix_diagram.md b/keyboards/quarkeys/z67/solder/matrix_diagram.md
new file mode 100644
index 000000000000..90d01906a3a9
--- /dev/null
+++ b/keyboards/quarkeys/z67/solder/matrix_diagram.md
@@ -0,0 +1,30 @@
+# Matrix Diagram for Quarkeys Stuidio Z67 Solder
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│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 │1E   │1F │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2D  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2F │   │2C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3E │3F │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+│40  │41  │42  │47                      │48 │49 │4B │4C │4D │4F │
+└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+┌────────┐
+│30      │ 2.25u LShift
+└────────┘
+┌────┬────┬────┬────────────────────────┬────┬────┐
+│40  │41  │42  │47                      │48  │49  │ Blocker
+└────┴────┴────┴────────────────────────┴────┴────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┐
+│40   │41 │42   │47                         │48   │ Blocker Tsangan
+└─────┴───┴─────┴───────────────────────────┴─────┘
+┌─────┬──┬─────┬───────────────────────────┬─────┐
+│40   │  │42   │47                         │48   │ "Bauer"
+└─────┘  └─────┴───────────────────────────┴─────┘   WKL with 0.75u blockers
+```
diff --git a/keyboards/quokka/config.h b/keyboards/quokka/config.h
new file mode 100644
index 000000000000..6cacf0d54594
--- /dev/null
+++ b/keyboards/quokka/config.h
@@ -0,0 +1,34 @@
+/*
+Copyright 2023 @dlford
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have 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 150U
+
+#define WS2812_PIO_USE_PIO1
+#define RGB_MATRIX_LED_COUNT 36
+
+#define I2C_DRIVER I2CD1
+#define I2C1_SDA_PIN GP2
+#define I2C1_SCL_PIN GP3
+#define OLED_DISPLAY_128X64
+
+#define AUDIO_PIN GP9
+#define AUDIO_PWM_DRIVER PWMD4
+#define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_B
+
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_PIO_USE_PIO0
+#define SERIAL_USART_RX_PIN GP1
diff --git a/keyboards/quokka/halconf.h b/keyboards/quokka/halconf.h
new file mode 100644
index 000000000000..1ec46d2b1564
--- /dev/null
+++ b/keyboards/quokka/halconf.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2023 @dlford
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have 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_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/quokka/info.json b/keyboards/quokka/info.json
new file mode 100644
index 000000000000..86037222bbee
--- /dev/null
+++ b/keyboards/quokka/info.json
@@ -0,0 +1,121 @@
+{
+    "manufacturer": "dlford",
+    "keyboard_name": "Quokka",
+    "maintainer": "dlford",
+    "bootloader": "rp2040",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "ROW2COL",
+    "features": {
+        "audio": true,
+        "extrakey": true,
+        "lto": true,
+        "oled": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP8", "GP7", "GP6", "GP5", "GP4"],
+        "rows": ["GP10", "GP19", "GP20", "GP18"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "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 }
+        ],
+        "split_count": [18, 18]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "GP0"
+    },
+    "url": "https://github.com/dlford/quokka",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x3537",
+        "vid": "0x444D"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP29"
+    },
+    "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 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/quokka/keymaps/default/keymap.c b/keyboards/quokka/keymaps/default/keymap.c
new file mode 100644
index 000000000000..77375cd8a151
--- /dev/null
+++ b/keyboards/quokka/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2023 @dlford
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received 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_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_ESC,  KC_SPC,  KC_BSPC,   KC_DEL,   KC_TAB,  KC_ENT
+//                               |--------+--------+--------|  |--------+--------+--------|
+    ),
+};
+
+// clang-format on
diff --git a/keyboards/quokka/mcuconf.h b/keyboards/quokka/mcuconf.h
new file mode 100644
index 000000000000..32dbaa6c48c6
--- /dev/null
+++ b/keyboards/quokka/mcuconf.h
@@ -0,0 +1,26 @@
+/*
+Copyright 2023 @dlford
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should 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_PWM4
+#define RP_PWM_USE_PWM4 TRUE
+
+#undef RP_I2C_USE_I2C1
+#define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/quokka/quokka.c b/keyboards/quokka/quokka.c
new file mode 100644
index 000000000000..2225866b8c58
--- /dev/null
+++ b/keyboards/quokka/quokka.c
@@ -0,0 +1,61 @@
+/*
+Copyright 2023 @dlford
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You 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
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;
+}
+
+// Prints out logo
+static void oled_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,   128, 224, 224, 96, 96,  96,  96,  96,  96,  128, 192, 224, 224, 240, 240, 240, 224, 224, 192, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 240, 60, 30, 7, 1, 192, 224, 224, 240, 240, 240, 0,  255, 255, 255, 255, 249, 241, 241, 7, 7, 55, 247, 192, 0, 0, 0, 0, 224, 224, 224, 224, 224, 192, 192, 192, 0, 192, 224, 224, 224, 0, 0, 0, 0, 224, 224, 96, 96, 96, 96, 0, 192, 224, 96, 96, 96, 224, 192, 192, 192, 224, 96, 96, 96, 224, 192, 0, 224, 224, 96, 96, 96, 224, 192, 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, 1, 3, 15, 60, 240, 224, 134, 31,  63, 127, 255, 249, 248, 248, 127, 127, 63,  31,  0,   0,   128, 224, 248, 60,  15,  3, 1, 0, 0, 0, 127, 127, 127, 127, 113, 127, 127, 63, 31, 31, 63, 127, 127, 112, 112, 112, 112, 127, 127, 6, 6, 6, 6, 0, 127, 127, 96, 96, 96, 127, 127, 63, 127, 127, 12, 12, 60, 127, 103, 0, 127, 127, 96, 96, 96, 127, 63, 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, 0, 0, 0, 0, 0, 0, 0,   0,   0,  0,  1, 7, 14,  12,  12,  12,  12,  12,  12, 12,  12,  12,  12,  12,  14,  7,   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,
+    };
+    oled_write_raw_P(raw_logo, sizeof(raw_logo));
+}
+
+// Render logo on both displays
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    oled_render_logo();
+    return true;
+}
+#endif
+// clang-format off
+
+#ifdef SWAP_HANDS_ENABLE
+__attribute__ ((weak))
+const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+	// Left
+    {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}},
+    {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}},
+    {{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}},
+    {{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}},
+	// Right
+    {{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}},
+    {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}},
+    {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}},
+    {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}}
+};
+#endif
+
+// clang-format on
diff --git a/keyboards/quokka/readme.md b/keyboards/quokka/readme.md
new file mode 100644
index 000000000000..6acf5bc46249
--- /dev/null
+++ b/keyboards/quokka/readme.md
@@ -0,0 +1,26 @@
+# Quokka
+
+![Quokka](https://i.imgur.com/zqbb56ch.jpeg)
+
+A split ortholinear keyboard designed for the small handed.
+
+* Keyboard Maintainer: [dlford](https://github.com/dlford/), [dlford.io](https://www.dlford.io)
+* Hardware Supported: Quokka PCB, Adafruit KB2040
+* Hardware Availability: [PCB, Case Data, and Build Guide](https://github.com/dlford/quokka)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make quokka:default
+
+Flashing example for this keyboard:
+
+    make quokka:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Quickly double press and release the reset button on the the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/quokka/rules.mk b/keyboards/quokka/rules.mk
new file mode 100644
index 000000000000..c53818be7354
--- /dev/null
+++ b/keyboards/quokka/rules.mk
@@ -0,0 +1,2 @@
+AUDIO_DRIVER = pwm_hardware
+SERIAL_DRIVER = vendor
diff --git a/keyboards/qvex/lynepad/config.h b/keyboards/qvex/lynepad/config.h
index e266f72ad5b7..5bb89db2d322 100644
--- a/keyboards/qvex/lynepad/config.h
+++ b/keyboards/qvex/lynepad/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* 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 RGBLED_NUM 4
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* Definitions for encoder tilt/press support */
 #define ENC_TILT_THRESHOLD 1
 #define PIN_TW_SW D2 // Center
diff --git a/keyboards/qvex/lynepad/info.json b/keyboards/qvex/lynepad/info.json
index fa8b71b5d6d6..1a2091dc979c 100644
--- a/keyboards/qvex/lynepad/info.json
+++ b/keyboards/qvex/lynepad/info.json
@@ -23,7 +23,22 @@
       "pin": "D3"
     },
     "rgblight": {
-      "max_brightness": 240
+      "saturation_steps": 8,
+      "brightness_steps": 8,
+      "led_count": 4,
+      "max_brightness": 240,
+      "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": "caterina",
diff --git a/keyboards/qvex/lynepad2/info.json b/keyboards/qvex/lynepad2/info.json
index 02b6198bcd8b..4230fd63e0d2 100644
--- a/keyboards/qvex/lynepad2/info.json
+++ b/keyboards/qvex/lynepad2/info.json
@@ -50,20 +50,24 @@
                 { "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": [3, 3], "x": 3, "y": 3 },
-                { "matrix": [4, 0], "x": 0, "y": 4 },
-                { "matrix": [4, 1], "x": 1, "y": 4 }
+
+                { "matrix": [3, 0], "x": 4.75, "y": 1.3 },
+                { "matrix": [3, 1], "x": 4.75, "y": 3.7 },
+                { "matrix": [3, 2], "x": 3.55, "y": 2.5 },
+                { "matrix": [3, 3], "x": 5.95, "y": 2.5 },
+                { "matrix": [4, 0], "x": 4.55, "y": 2.3, "w": 1.4, "h": 1.4 },
+
+                { "matrix": [4, 1], "x": 3.4, "y": 5.2, "w": 1.6, "h": 1.6 }
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/qvex/lynepad2/matrix_diagram.md b/keyboards/qvex/lynepad2/matrix_diagram.md
new file mode 100644
index 000000000000..29ab7d6d2519
--- /dev/null
+++ b/keyboards/qvex/lynepad2/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for QVEX Tech Lynepad
+
+```
+┌───┬───┬───┬───┐
+│00 │01 │02 │03 │
+├───┼───┼───┼───┤
+│10 │11 │12 │13 │  ┌───┐
+├───┼───┼───┼───┘╱ │30 │ ╲
+│20 │21 │22 │  ┌───┼───┼───┐
+└───┴───┴───┘  │32 │40 │33 │
+               └───┼───┼───┘
+                 ╲ │31 │ ╱
+                   └───┘
+                ┌───┐
+              ╱ │   │ ╲
+            ┌───┼───┼───┐
+            │   │41 │   │
+            └───┼───┼───┘
+              ╲ │   │ ╱
+                └───┘
+```
diff --git a/keyboards/qwertykeys/qk100/ansi/ansi.c b/keyboards/qwertykeys/qk100/ansi/ansi.c
new file mode 100644
index 000000000000..87e1b99e1b7e
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/ansi.c
@@ -0,0 +1,197 @@
+/*
+Copyright 2023 Qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You 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 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- . */
+};
+
+bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
+    if (record->event.pressed) {
+        switch (keycode) {
+            case QK_KB_0:
+                rgb_matrix_toggle();
+                break;
+
+            case QK_KB_1:
+                rgb_matrix_step();
+                break;
+
+            case QK_KB_2:
+                rgb_matrix_step_reverse();
+                break;
+
+            case QK_KB_3:
+                rgb_matrix_increase_hue(); // Increase the hue for effect range LEDs
+                break;
+
+            case QK_KB_4:
+                rgb_matrix_decrease_hue(); // Decrease the hue for effect range LEDs
+                break;
+
+            case QK_KB_5:
+                rgb_matrix_increase_sat(); // Increase the saturation for effect range LEDs
+                break;
+
+            case QK_KB_6:
+                rgb_matrix_decrease_sat(); // Decrease the saturation for effect range LEDs
+                break;
+
+            case QK_KB_7:
+                rgb_matrix_increase_val(); // Increase the value for effect range LEDs
+                break;
+
+            case QK_KB_8:
+                rgb_matrix_decrease_val(); // Decrease the value for effect range LEDs
+                break;
+
+            case QK_KB_9:
+                rgb_matrix_increase_speed(); // Increase the speed of the animations
+                break;
+
+            case QK_KB_10:
+                rgb_matrix_decrease_speed(); // Decrease the speed of the animations
+                break;
+
+            default:
+                break;
+        }
+    }
+    return process_record_user(keycode, record);
+}
+#endif
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 3, HSV_WHITE});
+
+const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({3, 3, HSV_WHITE});
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_capslock_layer, my_numlock_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.num_lock);
+    }
+    return res;
+}
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/config.h b/keyboards/qwertykeys/qk100/ansi/config.h
new file mode 100644
index 000000000000..6d0401a3dc80
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/config.h
@@ -0,0 +1,43 @@
+/* 
+Copyright 2023 Qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have 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_LAYERS_RETAIN_VAL      
+#    define RGBLIGHT_DEFAULT_VAL 10
+#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5
+#    define RGBLIGHT_SLEEP
+/*== customize breathing effect ==*/
+#    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 DRIVER_COUNT                  1
+#    define RGB_MATRIX_LED_COUNT          101 
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/halconf.h b/keyboards/qwertykeys/qk100/ansi/halconf.h
new file mode 100644
index 000000000000..0deaa06aa2e5
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 Qwertykeys
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have 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>
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/info.json b/keyboards/qwertykeys/qk100/ansi/info.json
new file mode 100644
index 000000000000..e9cd6ca3f204
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/info.json
@@ -0,0 +1,266 @@
+{
+    "keyboard_name": "QK100 ANSI",
+    "usb": {
+        "pid": "0x3030",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "is31fl3741",
+        "max_brightness": 200,
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 18, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 30, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 42, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 54, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 72, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 84, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 96, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 108, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 126, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 138, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 150, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 162, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 188, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 200, "y": 0, "flags": 1},
+            {"matrix": [0, 15], "x": 212, "y": 0, "flags": 1},
+            {"matrix": [0, 16], "x": 224, "y": 0, "flags": 1},
+            {"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": 36, "y": 13, "flags": 4},
+            {"matrix": [1, 4], "x": 48, "y": 13, "flags": 4},
+            {"matrix": [1, 5], "x": 60, "y": 13, "flags": 4},
+            {"matrix": [1, 6], "x": 72, "y": 13, "flags": 4},
+            {"matrix": [1, 7], "x": 84, "y": 13, "flags": 4},
+            {"matrix": [1, 8], "x": 96, "y": 13, "flags": 4},
+            {"matrix": [1, 9], "x": 108, "y": 13, "flags": 4},
+            {"matrix": [1, 10], "x": 120, "y": 13, "flags": 4},
+            {"matrix": [1, 11], "x": 132, "y": 13, "flags": 4},
+            {"matrix": [1, 12], "x": 144, "y": 13, "flags": 4},
+            {"matrix": [1, 13], "x": 156, "y": 13, "flags": 1},
+            {"matrix": [1, 15], "x": 188, "y": 13, "flags": 1},
+            {"matrix": [1, 16], "x": 200, "y": 13, "flags": 1},
+            {"matrix": [1, 17], "x": 212, "y": 13, "flags": 1},
+            {"matrix": [1, 18], "x": 224, "y": 13, "flags": 1},
+            {"matrix": [2, 0], "x": 0, "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": 90, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 102, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 114, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 126, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 138, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 150, "y": 26, "flags": 4},
+            {"matrix": [2, 13], "x": 162, "y": 26, "flags": 4},
+            {"matrix": [2, 14], "x": 176, "y": 26, "flags": 1},
+            {"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": 0, "y": 39, "flags": 1},
+            {"matrix": [3, 1], "x": 20, "y": 39, "flags": 4},
+            {"matrix": [3, 2], "x": 32, "y": 39, "flags": 4},
+            {"matrix": [3, 3], "x": 44, "y": 39, "flags": 4},
+            {"matrix": [3, 4], "x": 56, "y": 39, "flags": 4},
+            {"matrix": [3, 5], "x": 68, "y": 39, "flags": 4},
+            {"matrix": [3, 6], "x": 80, "y": 39, "flags": 4},
+            {"matrix": [3, 7], "x": 92, "y": 39, "flags": 4},
+            {"matrix": [3, 8], "x": 104, "y": 39, "flags": 4},
+            {"matrix": [3, 9], "x": 116, "y": 39, "flags": 4},
+            {"matrix": [3, 10], "x": 128, "y": 39, "flags": 4},
+            {"matrix": [3, 11], "x": 140, "y": 39, "flags": 4},
+            {"matrix": [3, 13], "x": 158, "y": 39, "flags": 1},
+            {"matrix": [3, 14], "x": 176, "y": 39, "flags": 1},
+            {"matrix": [3, 15], "x": 188, "y": 39, "flags": 4},
+            {"matrix": [3, 16], "x": 200, "y": 39, "flags": 4},
+            {"matrix": [3, 17], "x": 212, "y": 39, "flags": 4},
+            {"matrix": [3, 18], "x": 224, "y": 39, "flags": 1},
+            {"matrix": [4, 0], "x": 0, "y": 52, "flags": 1},
+            {"matrix": [4, 1], "x": 26, "y": 52, "flags": 4},
+            {"matrix": [4, 2], "x": 38, "y": 52, "flags": 4},
+            {"matrix": [4, 3], "x": 50, "y": 52, "flags": 4},
+            {"matrix": [4, 4], "x": 62, "y": 52, "flags": 4},
+            {"matrix": [4, 5], "x": 74, "y": 52, "flags": 4},
+            {"matrix": [4, 6], "x": 86, "y": 52, "flags": 4},
+            {"matrix": [4, 7], "x": 98, "y": 52, "flags": 4},
+            {"matrix": [4, 8], "x": 110, "y": 52, "flags": 4},
+            {"matrix": [4, 9], "x": 122, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 134, "y": 52, "flags": 4},
+            {"matrix": [4, 11], "x": 150, "y": 52, "flags": 1},
+            {"matrix": [4, 13], "x": 170, "y": 52, "flags": 1},
+            {"matrix": [4, 15], "x": 188, "y": 52, "flags": 4},
+            {"matrix": [4, 16], "x": 200, "y": 52, "flags": 4},
+            {"matrix": [4, 17], "x": 212, "y": 52, "flags": 4},
+            {"matrix": [4, 18], "x": 224, "y": 52, "flags": 1},
+            {"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},
+            {"matrix": [5, 5], "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},
+            {"matrix": [5, 13], "x": 170, "y": 52, "flags": 1},
+            {"matrix": [5, 14], "x": 182, "y": 52, "flags": 1},
+            {"matrix": [5, 15], "x": 196, "y": 52, "flags": 4},
+            {"matrix": [5, 17], "x": 212, "y": 52, "flags": 4}
+        ],
+        "animations": {
+            "solid_color": true,
+            "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
+        }
+    },
+    "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, 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, 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.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, 15], "x":16.5, "y":1.25},
+                {"matrix": [1, 16], "x":17.5, "y":1.25},
+                {"matrix": [1, 17], "x":18.5, "y":1.25},
+                {"matrix": [1, 18], "x":19.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},
+                {"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.25, "y":2.25},
+                {"matrix": [2, 15], "x":16.5, "y":2.25},
+                {"matrix": [2, 16], "x":17.5, "y":2.25},
+                {"matrix": [2, 17], "x":18.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.25, "y":3.25},
+                {"matrix": [3, 15], "x":16.5, "y":3.25},
+                {"matrix": [3, 16], "x":17.5, "y":3.25},
+                {"matrix": [3, 17], "x":18.5, "y":3.25},
+                {"matrix": [3, 18], "x":19.5, "y":2.25, "h":2},
+                {"matrix": [4, 0], "x":0, "y":4.25, "w":2.25},
+                {"matrix": [4, 1], "x":2.25, "y":4.25},
+                {"matrix": [4, 2], "x":3.25, "y":4.25},
+                {"matrix": [4, 3], "x":4.25, "y":4.25},
+                {"matrix": [4, 4], "x":5.25, "y":4.25},
+                {"matrix": [4, 5], "x":6.25, "y":4.25},
+                {"matrix": [4, 6], "x":7.25, "y":4.25},
+                {"matrix": [4, 7], "x":8.25, "y":4.25},
+                {"matrix": [4, 8], "x":9.25, "y":4.25},
+                {"matrix": [4, 9], "x":10.25, "y":4.25},
+                {"matrix": [4, 10], "x":11.25, "y":4.25},
+                {"matrix": [4, 11], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix": [4, 13], "x":14.25, "y":4.5},
+                {"matrix": [4, 15], "x":16.5, "y":4.25},
+                {"matrix": [4, 16], "x":17.5, "y":4.25},
+                {"matrix": [4, 17], "x":18.5, "y":4.25},
+                {"matrix": [4, 18], "x":19.5, "y":4.25, "h":2},
+                {"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, 10], "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},
+                {"matrix": [5, 15], "x":16.5, "y":5.25, "w":2},
+                {"matrix": [5, 17], "x":18.5, "y":5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/keymaps/default/keymap.c b/keyboards/qwertykeys/qk100/ansi/keymaps/default/keymap.c
new file mode 100644
index 000000000000..f081299d50e7
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/* 
+Copyright 2023 Qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along 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_END,  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_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_PGUP, 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_PGDN, 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, MO(1),            KC_LEFT, KC_DOWN, KC_RIGHT,KC_P0,            KC_PDOT
+   ),
+   [1] = LAYOUT(
+     QK_KB_0, QK_KB_1, QK_KB_2, QK_KB_3, QK_KB_4, QK_KB_5, QK_KB_6, QK_KB_7, QK_KB_8, QK_KB_9, QK_KB_10,KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, 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, KC_TRNS, KC_TRNS,          KC_TRNS
+   )
+};
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/keymaps/via/keymap.c b/keyboards/qwertykeys/qk100/ansi/keymaps/via/keymap.c
new file mode 100644
index 000000000000..f081299d50e7
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/keymaps/via/keymap.c
@@ -0,0 +1,38 @@
+/* 
+Copyright 2023 Qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along 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_END,  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_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_PGUP, 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_PGDN, 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, MO(1),            KC_LEFT, KC_DOWN, KC_RIGHT,KC_P0,            KC_PDOT
+   ),
+   [1] = LAYOUT(
+     QK_KB_0, QK_KB_1, QK_KB_2, QK_KB_3, QK_KB_4, QK_KB_5, QK_KB_6, QK_KB_7, QK_KB_8, QK_KB_9, QK_KB_10,KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, 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, KC_TRNS, KC_TRNS,          KC_TRNS
+   )
+};
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/keymaps/via/rules.mk b/keyboards/qwertykeys/qk100/ansi/keymaps/via/rules.mk
new file mode 100644
index 000000000000..43061db1dd46
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/mcuconf.h b/keyboards/qwertykeys/qk100/ansi/mcuconf.h
new file mode 100644
index 000000000000..a8228a149f1f
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2023 Qwertykeys
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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>
+
+/*
+ * I2C driver system settings.
+ */
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1                  TRUE
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/readme.md b/keyboards/qwertykeys/qk100/ansi/readme.md
new file mode 100644
index 000000000000..d3360b0420b3
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/readme.md
@@ -0,0 +1,21 @@
+# qk100 - ANSI PCB
+
+![qk100](https://i.imgur.com/im0iArYh.jpg)
+
+A 100% made by Qwertykeys.
+
+* Keyboard Maintainer: [Qwertykeys](https://github.com/owlab-git)
+* Hardware Supported: qk100 ANSI PCB
+* Hardware Availability: Ended groupbuy: https://www.zfrontier.com/app/flow/qRwKr7mW1oWy
+
+Make example for this keyboard (after setting up your build environment):
+
+    make qwertykeys/qk100/ansi:default
+
+Flashing example for this keyboard:
+
+    make qwertykeys/qk100/ansi:default:flash
+
+**Bootloader:** Press the button B on PCB while plugging in the board.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/qwertykeys/qk100/ansi/rules.mk b/keyboards/qwertykeys/qk100/ansi/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/ansi/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/info.json b/keyboards/qwertykeys/qk100/info.json
new file mode 100644
index 000000000000..c8498f3eafc7
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/info.json
@@ -0,0 +1,43 @@
+{
+    "manufacturer": "Qwertykeys",
+    "url": "",
+    "maintainer": "Qwertykeys",
+    "usb": {
+        "vid": "0x4F53"
+    },
+    "matrix_pins": {
+        "cols": ["A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B4", "B5", "B8", "B9", "C13" ],
+        "rows": ["A1", "A2", "A3", "A5", "A4", "A6" ]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgblight": true,
+        "nkro": true
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "ws2812": {
+        "pin": "B3"
+    },
+    "rgblight": {
+        "animations": {
+            "breathing": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "static_gradient": true
+        },
+        "brightness_steps": 10,
+        "saturation_steps": 8,
+        "led_count": 6,
+        "max_brightness": 120
+        
+    },
+    "dynamic_keymap": {
+        "layer_count": 2
+    }
+}
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/solder/config.h b/keyboards/qwertykeys/qk100/solder/config.h
new file mode 100644
index 000000000000..714f01a1daae
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/solder/config.h
@@ -0,0 +1,29 @@
+/* 
+Copyright 2023 Qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have 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_LAYERS_RETAIN_VAL      
+#    define RGBLIGHT_DEFAULT_VAL 10
+#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5
+#    define RGBLIGHT_SLEEP
+/*== 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
diff --git a/keyboards/qwertykeys/qk100/solder/info.json b/keyboards/qwertykeys/qk100/solder/info.json
new file mode 100644
index 000000000000..64f8945b7fd6
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/solder/info.json
@@ -0,0 +1,114 @@
+{
+    "keyboard_name": "qk100 Solder",
+    "usb": {
+        "pid": "0x3053",
+        "device_version": "0.0.1"
+    },
+    "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, 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, 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.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": [2, 13], "x":13, "y":1.25},
+                {"matrix": [1, 13], "x":14, "y":1.25},
+                {"matrix": [1, 15], "x":16.5, "y":1.25},
+                {"matrix": [1, 16], "x":17.5, "y":1.25},
+                {"matrix": [1, 17], "x":18.5, "y":1.25},
+                {"matrix": [1, 18], "x":19.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},
+                {"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.5, "y":2.25},
+                {"matrix": [2, 16], "x":17.5, "y":2.25},
+                {"matrix": [2, 17], "x":18.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.25, "y":3.25},
+                {"matrix": [3, 15], "x":16.5, "y":3.25},
+                {"matrix": [3, 16], "x":17.5, "y":3.25},
+                {"matrix": [3, 17], "x":18.5, "y":3.25},
+                {"matrix": [3, 18], "x":19.5, "y":2.25, "h":2},
+                {"matrix": [4, 0], "x":0, "y":4.25, "w":1.25},
+                {"matrix": [5, 3], "x":1.25, "y":4.25},
+                {"matrix": [4, 1], "x":2.25, "y":4.25},
+                {"matrix": [4, 2], "x":3.25, "y":4.25},
+                {"matrix": [4, 3], "x":4.25, "y":4.25},
+                {"matrix": [4, 4], "x":5.25, "y":4.25},
+                {"matrix": [4, 5], "x":6.25, "y":4.25},
+                {"matrix": [4, 6], "x":7.25, "y":4.25},
+                {"matrix": [4, 7], "x":8.25, "y":4.25},
+                {"matrix": [4, 8], "x":9.25, "y":4.25},
+                {"matrix": [4, 9], "x":10.25, "y":4.25},
+                {"matrix": [4, 10], "x":11.25, "y":4.25},
+                {"matrix": [4, 11], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix": [4, 13], "x":14.25, "y":4.5},
+                {"matrix": [4, 15], "x":16.5, "y":4.25},
+                {"matrix": [4, 16], "x":17.5, "y":4.25},
+                {"matrix": [4, 17], "x":18.5, "y":4.25},
+                {"matrix": [4, 18], "x":19.5, "y":4.25, "h":2},
+                {"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, 10], "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},
+                {"matrix": [5, 15], "x":16.5, "y":5.25, "w":2},
+                {"matrix": [5, 17], "x":18.5, "y":5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/solder/keymaps/default/keymap.c b/keyboards/qwertykeys/qk100/solder/keymaps/default/keymap.c
new file mode 100644
index 000000000000..20d727431cbe
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/solder/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/* 
+Copyright 2023 Qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along 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_END,  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_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_PGUP, 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_PGDN, 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),            KC_LEFT, KC_DOWN, KC_RIGHT,KC_P0,            KC_PDOT
+   ),
+   [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, 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, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, 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, KC_TRNS, KC_TRNS,          KC_TRNS
+   )
+};
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/solder/keymaps/via/keymap.c b/keyboards/qwertykeys/qk100/solder/keymaps/via/keymap.c
new file mode 100644
index 000000000000..20d727431cbe
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/solder/keymaps/via/keymap.c
@@ -0,0 +1,38 @@
+/* 
+Copyright 2023 Qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along 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_END,  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_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_PGUP, 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_PGDN, 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),            KC_LEFT, KC_DOWN, KC_RIGHT,KC_P0,            KC_PDOT
+   ),
+   [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, 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, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, 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, KC_TRNS, KC_TRNS,          KC_TRNS
+   )
+};
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/solder/keymaps/via/rules.mk b/keyboards/qwertykeys/qk100/solder/keymaps/via/rules.mk
new file mode 100644
index 000000000000..43061db1dd46
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/solder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/solder/readme.md b/keyboards/qwertykeys/qk100/solder/readme.md
new file mode 100644
index 000000000000..f660fe0d42c8
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/solder/readme.md
@@ -0,0 +1,21 @@
+# qk100 - Solder PCB
+
+![qk100](https://i.imgur.com/im0iArYh.jpg)
+
+A 100% made by Qwertykeys.
+
+* Keyboard Maintainer: [Qwertykeys](https://github.com/owlab-git)
+* Hardware Supported: qk100 Solder PCB
+* Hardware Availability: Ended groupbuy: https://www.zfrontier.com/app/flow/qRwKr7mW1oWy
+
+Make example for this keyboard (after setting up your build environment):
+
+    make qwertykeys/qk100/solder:default
+
+Flashing example for this keyboard:
+
+    make qwertykeys/qk100/solder:default:flash
+
+**Bootloader:** Press the button B on PCB while plugging in the board.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/qwertykeys/qk100/solder/rules.mk b/keyboards/qwertykeys/qk100/solder/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/solder/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/solder/solder.c b/keyboards/qwertykeys/qk100/solder/solder.c
new file mode 100644
index 000000000000..8a3e46dab798
--- /dev/null
+++ b/keyboards/qwertykeys/qk100/solder/solder.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2023 Qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You 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, 3, HSV_WHITE});
+
+const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({3, 3, HSV_WHITE});
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_capslock_layer, my_numlock_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.num_lock);
+    }
+    return res;
+}
\ No newline at end of file
diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h
index 8bc386dcabe6..8e59e903ac09 100644
--- a/keyboards/qwertyydox/config.h
+++ b/keyboards/qwertyydox/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-    #define RGBLED_NUM 12
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-
 /* 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/qwertyydox/info.json b/keyboards/qwertyydox/info.json
index fcc14084b07e..5f1eb80da84c 100644
--- a/keyboards/qwertyydox/info.json
+++ b/keyboards/qwertyydox/info.json
@@ -13,6 +13,24 @@
     "cols": ["F7", "F6", "F5", "C6", "D7", "D4", "D1"],
     "rows": ["B6", "B2", "B3", "B1"]
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 12,
+    "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": "D6"
   },
diff --git a/keyboards/raindrop/info.json b/keyboards/raindrop/info.json
index 738e1719ea97..bc67d437fa39 100644
--- a/keyboards/raindrop/info.json
+++ b/keyboards/raindrop/info.json
@@ -27,6 +27,9 @@
         "rgblight": false,
         "sleep_led": false
     },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_64_ansi_split_bs"
+    },
     "community_layouts": ["60_hhkb", "60_ansi", "64_ansi"],
     "layouts": {
         "LAYOUT_60_ansi": {
@@ -98,6 +101,77 @@
                 {"matrix": [4, 7], "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": [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, 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, 3], "x":3.75, "y":4, "w":6.25},
+                {"matrix": [4, 4], "x":10, "y":4, "w":1.25},
+                {"matrix": [4, 5], "x":11.25, "y":4, "w":1.25},
+                {"matrix": [4, 6], "x":12.5, "y":4, "w":1.25},
+                {"matrix": [4, 7], "x":13.75, "y":4, "w":1.25}
+            ]
+        },
         "LAYOUT_60_hhkb": {
             "layout": [
                 {"matrix": [0, 0], "x":0, "y":0},
@@ -238,7 +312,7 @@
                 {"matrix": [4, 8], "x": 14, "y": 4}
             ]
         },
-        "LAYOUT_all": {
+        "LAYOUT_64_ansi_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x":0, "y":0},
                 {"matrix": [0, 1], "x":1, "y":0},
diff --git a/keyboards/raindrop/matrix_diagram.md b/keyboards/raindrop/matrix_diagram.md
new file mode 100644
index 000000000000..4ba15ecabc13
--- /dev/null
+++ b/keyboards/raindrop/matrix_diagram.md
@@ -0,0 +1,30 @@
+# Matrix Diagram for Laneware Peripherals Raindrop
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │
+├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤
+│30     │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │
+├────┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┼───┼───┼───┼───┤
+│40  │41  │42  │43                      │44 │45 │46 │47 │48 │
+└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+┌────────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┬───┐
+│30      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B    │3D │ 2.25u LShift + 1.75u/1u RShift
+└────────┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴──────┴───┘
+                                                 ┌──────────┐
+                                                 │3B        │ 2.25u LShift + 2.75u RShift
+                                                 └──────────┘
+┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
+│40  │41  │42  │43                      │44  │45  │46  │47  │ Standard
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+└──────┬───┬─────┬─────────────────────────┬─────┬───┬──────┘
+       │41 │42   │43                       │45   │46 │        HHKB (1u/1.5u/6.25u/1.5u/1u)
+       └───┴─────┴─────────────────────────┴─────┴───┘
+```
diff --git a/keyboards/rainkeebs/delilah/config.h b/keyboards/rainkeebs/delilah/config.h
index 3f9d574f77e2..30e2a8bf276e 100644
--- a/keyboards/rainkeebs/delilah/config.h
+++ b/keyboards/rainkeebs/delilah/config.h
@@ -20,18 +20,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 8
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rainkeebs/delilah/info.json b/keyboards/rainkeebs/delilah/info.json
index 891c48477850..714308d41647 100644
--- a/keyboards/rainkeebs/delilah/info.json
+++ b/keyboards/rainkeebs/delilah/info.json
@@ -8,6 +8,23 @@
         "pid": "0x645C",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "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": "B3"
     },
diff --git a/keyboards/rainkeebs/rainkeeb/rules.mk b/keyboards/rainkeebs/rainkeeb/rules.mk
index ed4adffba93d..866521b42882 100644
--- a/keyboards/rainkeebs/rainkeeb/rules.mk
+++ b/keyboards/rainkeebs/rainkeeb/rules.mk
@@ -13,7 +13,6 @@ RGBLIGHT_ENABLE = no
 
 # OLED enable
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 # Encoder enable
 ENCODER_ENABLE = yes
diff --git a/keyboards/rainkeebs/yasui/config.h b/keyboards/rainkeebs/yasui/config.h
index 5033c1ceac10..30e2a8bf276e 100644
--- a/keyboards/rainkeebs/yasui/config.h
+++ b/keyboards/rainkeebs/yasui/config.h
@@ -20,18 +20,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 10
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rainkeebs/yasui/info.json b/keyboards/rainkeebs/yasui/info.json
index c1c874c77bcb..5e7ea06deb39 100644
--- a/keyboards/rainkeebs/yasui/info.json
+++ b/keyboards/rainkeebs/yasui/info.json
@@ -8,6 +8,23 @@
         "pid": "0x7973",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "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": "D1"
     },
diff --git a/keyboards/rart/rart4x4/config.h b/keyboards/rart/rart4x4/config.h
index 76ffbba1cf67..42556799eb87 100644
--- a/keyboards/rart/rart4x4/config.h
+++ b/keyboards/rart/rart4x4/config.h
@@ -22,19 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 7
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/rart/rart4x4/info.json b/keyboards/rart/rart4x4/info.json
index 3cd5710ddf9d..aa822b8f5c0d 100644
--- a/keyboards/rart/rart4x4/info.json
+++ b/keyboards/rart/rart4x4/info.json
@@ -12,7 +12,23 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 240
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 7,
+        "max_brightness": 240,
+        "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": ["F7", "B2", "B5", "B4"],
diff --git a/keyboards/rart/rart67/config.h b/keyboards/rart/rart67/config.h
index 21a2aba522a5..42556799eb87 100644
--- a/keyboards/rart/rart67/config.h
+++ b/keyboards/rart/rart67/config.h
@@ -22,19 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 11
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/rart/rart67/info.json b/keyboards/rart/rart67/info.json
index d12df10ae120..a6722f4432e8 100644
--- a/keyboards/rart/rart67/info.json
+++ b/keyboards/rart/rart67/info.json
@@ -12,7 +12,23 @@
         "pin": "B7"
     },
     "rgblight": {
-        "max_brightness": 240
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 11,
+        "max_brightness": 240,
+        "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": ["B3", "B2", "B1", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F7", "F6", "F5", "F4", "F1", "E6"],
diff --git a/keyboards/rart/rart67m/rules.mk b/keyboards/rart/rart67m/rules.mk
index 9d9090d7ea04..5a309870d338 100644
--- a/keyboards/rart/rart67m/rules.mk
+++ b/keyboards/rart/rart67m/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/rart/rart75hs/config.h b/keyboards/rart/rart75hs/config.h
index 26adeb96a737..3715a98a6d1d 100644
--- a/keyboards/rart/rart75hs/config.h
+++ b/keyboards/rart/rart75hs/config.h
@@ -22,16 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_TWINKLE
-/* You can change the number of RGB strip */
-#define RGBLED_NUM 11
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/rart/rart75hs/info.json b/keyboards/rart/rart75hs/info.json
index 80b09b6357c4..148dfba38524 100644
--- a/keyboards/rart/rart75hs/info.json
+++ b/keyboards/rart/rart75hs/info.json
@@ -26,7 +26,19 @@
         "pin": "C0"
     },
     "rgblight": {
-        "max_brightness": 240
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 11,
+        "max_brightness": 240,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "knight": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
     },
     "bootmagic": {
         "matrix": [0, 1]
diff --git a/keyboards/rart/rart75m/rules.mk b/keyboards/rart/rart75m/rules.mk
index 6d03cffdfe79..5277f7c480d6 100644
--- a/keyboards/rart/rart75m/rules.mk
+++ b/keyboards/rart/rart75m/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/rart/rart80/config.h b/keyboards/rart/rart80/config.h
index 4c08a231aab2..3715a98a6d1d 100644
--- a/keyboards/rart/rart80/config.h
+++ b/keyboards/rart/rart80/config.h
@@ -22,16 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_TWINKLE
-/* You can change the number of RGB strip */
-#define RGBLED_NUM 6
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/rart/rart80/info.json b/keyboards/rart/rart80/info.json
index 5b9f768c74de..e2093e502924 100644
--- a/keyboards/rart/rart80/info.json
+++ b/keyboards/rart/rart80/info.json
@@ -21,7 +21,19 @@
         "pin": "D5"
     },
     "rgblight": {
-        "max_brightness": 240
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "max_brightness": 240,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "knight": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
     },
     "bootmagic": {
         "matrix": [0, 1]
diff --git a/keyboards/rart/rartand/rules.mk b/keyboards/rart/rartand/rules.mk
index b9cc25d86e28..7b55e77aeedf 100644
--- a/keyboards/rart/rartand/rules.mk
+++ b/keyboards/rart/rartand/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/rart/rartland/rules.mk b/keyboards/rart/rartland/rules.mk
index 06d9ea1b916d..5e5e0f090d75 100644
--- a/keyboards/rart/rartland/rules.mk
+++ b/keyboards/rart/rartland/rules.mk
@@ -15,5 +15,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/rart/rartlice/config.h b/keyboards/rart/rartlice/config.h
index b242e63013b7..9673097c3825 100644
--- a/keyboards/rart/rartlice/config.h
+++ b/keyboards/rart/rartlice/config.h
@@ -22,17 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 11
 #define WS2812_SPI SPID2
 
 /*
diff --git a/keyboards/rart/rartlice/info.json b/keyboards/rart/rartlice/info.json
index b1046227cc5d..d800165b53ae 100644
--- a/keyboards/rart/rartlice/info.json
+++ b/keyboards/rart/rartlice/info.json
@@ -19,6 +19,21 @@
         "scroll_lock": "A9",
         "on_state": 0
     },
+    "rgblight": {
+        "led_count": 11,
+        "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"
diff --git a/keyboards/rart/rartlice/rules.mk b/keyboards/rart/rartlice/rules.mk
index 49179d2fb92f..b3f4fc8b8a7b 100644
--- a/keyboards/rart/rartlice/rules.mk
+++ b/keyboards/rart/rartlice/rules.mk
@@ -12,7 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SLEEP_LED_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
-
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/rart/rartpad/config.h b/keyboards/rart/rartpad/config.h
index bf87b3204da6..42556799eb87 100644
--- a/keyboards/rart/rartpad/config.h
+++ b/keyboards/rart/rartpad/config.h
@@ -22,19 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 5
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/rart/rartpad/info.json b/keyboards/rart/rartpad/info.json
index 01929e017640..8c921931a8c0 100644
--- a/keyboards/rart/rartpad/info.json
+++ b/keyboards/rart/rartpad/info.json
@@ -26,7 +26,23 @@
     "pin": "F7"
   },
   "rgblight": {
-    "max_brightness": 240
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 5,
+    "max_brightness": 240,
+    "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
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/rastersoft/minitkl/info.json b/keyboards/rastersoft/minitkl/info.json
new file mode 100644
index 000000000000..e8d069195977
--- /dev/null
+++ b/keyboards/rastersoft/minitkl/info.json
@@ -0,0 +1,341 @@
+{
+    "keyboard_name": "MiniTKL",
+    "manufacturer": "Rastersoft",
+    "url": "https://gitlab.com/rastersoft/full-ten-keyless",
+    "maintainer": "rastersoft",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x68F1",
+        "device_version": "0.0.1"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "rows": ["D6", "D4", "B6", "D5", "B4", "D3", "D7", "D1", "C6", "D2", "C7", "D0"],
+        "cols": ["F4", "F1", "F0", "F5", "F6", "F7", "B7", "B5"]
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "led_count": 3,
+        "pin": "B2",
+        "hue_steps": 8,
+        "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
+        },
+        "layers": {
+            "enabled": true
+        }
+    },
+    "ws2812": {
+        "pin": "B2"
+    },
+    "layouts": {
+        "LAYOUT_iso": {
+            "layout": [
+                {"label":"esc", "x":0, "y":0, "matrix": [0, 0]},
+                {"label":"F1", "x":1.25, "y":0, "matrix": [0, 1]},
+                {"label":"F2", "x":2.25, "y":0, "matrix": [0, 2]},
+                {"label":"F3", "x":3.25, "y":0, "matrix": [0, 3]},
+                {"label":"F4", "x":4.25, "y":0, "matrix": [0, 4]},
+                {"label":"F5", "x":5.5, "y":0, "matrix": [0, 5]},
+                {"label":"F6", "x":6.5, "y":0, "matrix": [0, 6]},
+                {"label":"F7", "x":7.5, "y":0, "matrix": [0, 7]},
+                {"label":"F8", "x":8.5, "y":0, "matrix": [1, 7]},
+                {"label":"F9", "x":9.75, "y":0, "matrix": [1, 6]},
+                {"label":"F10", "x":10.75, "y":0, "matrix": [1, 5]},
+                {"label":"F11", "x":11.75, "y":0, "matrix": [1, 4]},
+                {"label":"F12", "x":12.75, "y":0, "matrix": [1, 3]},
+                {"label":"PrtScr", "x":14, "y":0, "matrix": [1, 2]},
+                {"label":"ScrollLock", "x":15, "y":0, "matrix": [1, 1]},
+                {"label":"Pause", "x":16, "y":0, "matrix": [1, 0]},
+
+                {"label":"º", "x":0, "y":1, "matrix": [2, 0]},
+                {"label":"1", "x":1, "y":1, "matrix": [2, 1]},
+                {"label":"2", "x":2, "y":1, "matrix": [2, 2]},
+                {"label":"3", "x":3, "y":1, "matrix": [2, 3]},
+                {"label":"4", "x":4, "y":1, "matrix": [2, 4]},
+                {"label":"5", "x":5, "y":1, "matrix": [2, 5]},
+                {"label":"6", "x":6, "y":1, "matrix": [2, 6]},
+                {"label":"7", "x":7, "y":1, "matrix": [2, 7]},
+                {"label":"8", "x":8, "y":1, "matrix": [3, 7]},
+                {"label":"9", "x":9, "y":1, "matrix": [3, 6]},
+                {"label":"0", "x":10, "y":1, "matrix": [3, 5]},
+                {"label":"'", "x":11, "y":1, "matrix": [3, 4]},
+                {"label":"\u00bf", "x":12, "y":1, "matrix": [3, 3]},
+                {"label":"Backspace", "x":13, "y":1, "matrix": [3, 2], "w":2},
+                {"label":"Home", "x":15, "y":1, "matrix": [3, 1]},
+                {"label":"End", "x":16, "y":1, "matrix": [3, 0]},
+
+                {"label":"Tab", "x":0, "y":2, "w":1.5, "matrix": [4, 0]},
+                {"label":"Q", "x":1.5, "y":2, "matrix": [4, 1]},
+                {"label":"W", "x":2.5, "y":2, "matrix": [4, 2]},
+                {"label":"E", "x":3.5, "y":2, "matrix": [4, 3]},
+                {"label":"R", "x":4.5, "y":2, "matrix": [4, 4]},
+                {"label":"T", "x":5.5, "y":2, "matrix": [4, 5]},
+                {"label":"Y", "x":6.5, "y":2, "matrix": [4, 6]},
+                {"label":"U", "x":7.5, "y":2, "matrix": [4, 7]},
+                {"label":"I", "x":8.5, "y":2, "matrix": [5, 7]},
+                {"label":"O", "x":9.5, "y":2, "matrix": [5, 6]},
+                {"label":"P", "x":10.5, "y":2, "matrix": [5, 5]},
+                {"label":"^", "x":11.5, "y":2, "matrix": [5, 4]},
+                {"label":"*", "x":12.5, "y":2, "matrix": [5, 3]},
+                {"label":"Insert", "x":15, "y":2, "matrix": [5, 1]},
+                {"label":"PgUp", "x":16, "y":2, "matrix": [5, 0]},
+
+                {"label":"Shift Lock", "x":0, "y":3, "w":1.75, "matrix": [6, 0]},
+                {"label":"A", "x":1.75, "y":3, "matrix": [6, 1]},
+                {"label":"S", "x":2.75, "y":3, "matrix": [6, 2]},
+                {"label":"D", "x":3.75, "y":3, "matrix": [6, 3]},
+                {"label":"F", "x":4.75, "y":3, "matrix": [6, 4]},
+                {"label":"G", "x":5.75, "y":3, "matrix": [6, 5]},
+                {"label":"H", "x":6.75, "y":3, "matrix": [6, 6]},
+                {"label":"J", "x":7.75, "y":3, "matrix": [6, 7]},
+                {"label":"K", "x":8.75, "y":3, "matrix": [7, 7]},
+                {"label":"L", "x":9.75, "y":3, "matrix": [7, 6]},
+                {"label":"\u00d1", "x":10.75, "y":3, "matrix": [7, 5]},
+                {"label":"\u00a8", "x":11.75, "y":3, "matrix": [7, 4]},
+                {"label":"ç", "x":12.75, "y":3, "matrix": [7, 3]},
+                {"label":"Return", "x":13.75, "y":2, "w":1.25, "h":2, "matrix": [5, 2]},
+                {"label":"Del", "x":15, "y":3, "matrix": [7, 1]},
+                {"label":"PgDow", "x":16, "y":3, "matrix": [7, 0]},
+
+                {"label":"Shift", "x":0, "y":4, "w":1.25, "matrix": [8, 0]},
+                {"label":">", "x":1.25, "y":4, "matrix": [8, 1]},
+                {"label":"Z", "x":2.25, "y":4, "matrix": [8, 2]},
+                {"label":"X", "x":3.25, "y":4, "matrix": [8, 3]},
+                {"label":"C", "x":4.25, "y":4, "matrix": [8, 4]},
+                {"label":"V", "x":5.25, "y":4, "matrix": [8, 5]},
+                {"label":"B", "x":6.25, "y":4, "matrix": [8, 6]},
+                {"label":"N", "x":7.25, "y":4, "matrix": [8, 7]},
+                {"label":"M", "x":8.25, "y":4, "matrix": [9, 7]},
+                {"label":";", "x":9.25, "y":4, "matrix": [9, 6]},
+                {"label":":", "x":10.25, "y":4, "matrix": [9, 5]},
+                {"label":"_", "x":11.25, "y":4, "matrix": [9, 4]},
+                {"label":"Shift", "x":12.25, "y":4, "w":2.75, "matrix": [9, 3]},
+                {"label":"Up", "x":15, "y":4, "matrix": [9, 1]},
+                {"label":"Fn", "x":16, "y":4, "matrix": [9, 0]},
+
+                {"label":"Ctrl", "x":0, "y":5, "w":1.25, "matrix": [10, 0]},
+                {"label":"Mod", "x":1.25, "y":5, "w":1.25, "matrix": [10, 1]},
+                {"label":"Alt", "x":2.5, "y":5, "w":1.25, "matrix": [10, 2]},
+                {"label":"Space", "x":3.75, "y":5, "w":6.5, "matrix": [10, 6]},
+                {"label":"AltGr", "x":10.25, "y":5, "w":1.25, "matrix": [11, 5]},
+                {"label":"Menu", "x":11.5, "y":5, "w":1.25, "matrix": [11, 4]},
+                {"label":"Ctrl", "x":12.75, "y":5, "w":1.25, "matrix": [11, 3]},
+                {"label":"Left", "x":14, "y":5, "matrix": [11, 2]},
+                {"label":"Bottom", "x":15, "y":5, "matrix": [11, 1]},
+                {"label":"Right", "x":16, "y":5, "matrix": [11, 0]}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label":"esc", "x":0, "y":0, "matrix": [0, 0]},
+                {"label":"F1", "x":1.25, "y":0, "matrix": [0, 1]},
+                {"label":"F2", "x":2.25, "y":0, "matrix": [0, 2]},
+                {"label":"F3", "x":3.25, "y":0, "matrix": [0, 3]},
+                {"label":"F4", "x":4.25, "y":0, "matrix": [0, 4]},
+                {"label":"F5", "x":5.5, "y":0, "matrix": [0, 5]},
+                {"label":"F6", "x":6.5, "y":0, "matrix": [0, 6]},
+                {"label":"F7", "x":7.5, "y":0, "matrix": [0, 7]},
+                {"label":"F8", "x":8.5, "y":0, "matrix": [1, 7]},
+                {"label":"F9", "x":9.75, "y":0, "matrix": [1, 6]},
+                {"label":"F10", "x":10.75, "y":0, "matrix": [1, 5]},
+                {"label":"F11", "x":11.75, "y":0, "matrix": [1, 4]},
+                {"label":"F12", "x":12.75, "y":0, "matrix": [1, 3]},
+                {"label":"PrtScr", "x":14, "y":0, "matrix": [1, 2]},
+                {"label":"ScrollLock", "x":15, "y":0, "matrix": [1, 1]},
+                {"label":"Pause", "x":16, "y":0, "matrix": [1, 0]},
+
+                {"label":"º", "x":0, "y":1, "matrix": [2, 0]},
+                {"label":"1", "x":1, "y":1, "matrix": [2, 1]},
+                {"label":"2", "x":2, "y":1, "matrix": [2, 2]},
+                {"label":"3", "x":3, "y":1, "matrix": [2, 3]},
+                {"label":"4", "x":4, "y":1, "matrix": [2, 4]},
+                {"label":"5", "x":5, "y":1, "matrix": [2, 5]},
+                {"label":"6", "x":6, "y":1, "matrix": [2, 6]},
+                {"label":"7", "x":7, "y":1, "matrix": [2, 7]},
+                {"label":"8", "x":8, "y":1, "matrix": [3, 7]},
+                {"label":"9", "x":9, "y":1, "matrix": [3, 6]},
+                {"label":"0", "x":10, "y":1, "matrix": [3, 5]},
+                {"label":"-", "x":11, "y":1, "matrix": [3, 4]},
+                {"label":"=", "x":12, "y":1, "matrix": [3, 3]},
+                {"label":"Backspace", "x":13, "y":1, "matrix": [3, 2], "w":2},
+                {"label":"Home", "x":15, "y":1, "matrix": [3, 1]},
+                {"label":"End", "x":16, "y":1, "matrix": [3, 0]},
+
+                {"label":"Tab", "x":0, "y":2, "w":1.5, "matrix": [4, 0]},
+                {"label":"Q", "x":1.5, "y":2, "matrix": [4, 1]},
+                {"label":"W", "x":2.5, "y":2, "matrix": [4, 2]},
+                {"label":"E", "x":3.5, "y":2, "matrix": [4, 3]},
+                {"label":"R", "x":4.5, "y":2, "matrix": [4, 4]},
+                {"label":"T", "x":5.5, "y":2, "matrix": [4, 5]},
+                {"label":"Y", "x":6.5, "y":2, "matrix": [4, 6]},
+                {"label":"U", "x":7.5, "y":2, "matrix": [4, 7]},
+                {"label":"I", "x":8.5, "y":2, "matrix": [5, 7]},
+                {"label":"O", "x":9.5, "y":2, "matrix": [5, 6]},
+                {"label":"P", "x":10.5, "y":2, "matrix": [5, 5]},
+                {"label":"[", "x":11.5, "y":2, "matrix": [5, 4]},
+                {"label":"]", "x":12.5, "y":2, "matrix": [5, 3]},
+                {"label":"|", "x":13.5, "y":2, "w":1.5, "matrix": [5, 2]},
+                {"label":"Insert", "x":15, "y":2, "matrix": [5, 1]},
+                {"label":"PgUp", "x":16, "y":2, "matrix": [5, 0]},
+
+                {"label":"Shift Lock", "x":0, "y":3, "w":1.75, "matrix": [6, 0]},
+                {"label":"A", "x":1.75, "y":3, "matrix": [6, 1]},
+                {"label":"S", "x":2.75, "y":3, "matrix": [6, 2]},
+                {"label":"D", "x":3.75, "y":3, "matrix": [6, 3]},
+                {"label":"F", "x":4.75, "y":3, "matrix": [6, 4]},
+                {"label":"G", "x":5.75, "y":3, "matrix": [6, 5]},
+                {"label":"H", "x":6.75, "y":3, "matrix": [6, 6]},
+                {"label":"J", "x":7.75, "y":3, "matrix": [6, 7]},
+                {"label":"K", "x":8.75, "y":3, "matrix": [7, 7]},
+                {"label":"L", "x":9.75, "y":3, "matrix": [7, 6]},
+                {"label":";", "x":10.75, "y":3, "matrix": [7, 5]},
+                {"label":"\u00a8", "x":11.75, "y":3, "matrix": [7, 4]},
+                {"label":"Return", "x":12.75, "y":3, "w":2.25, "matrix": [7, 3]},
+                {"label":"Del", "x":15, "y":3, "matrix": [7, 1]},
+                {"label":"PgDow", "x":16, "y":3, "matrix": [7, 0]},
+
+                {"label":"Shift", "x":0, "y":4, "w":2.25, "matrix": [8, 0]},
+                {"label":"Z", "x":2.25, "y":4, "matrix": [8, 2]},
+                {"label":"X", "x":3.25, "y":4, "matrix": [8, 3]},
+                {"label":"C", "x":4.25, "y":4, "matrix": [8, 4]},
+                {"label":"V", "x":5.25, "y":4, "matrix": [8, 5]},
+                {"label":"B", "x":6.25, "y":4, "matrix": [8, 6]},
+                {"label":"N", "x":7.25, "y":4, "matrix": [8, 7]},
+                {"label":"M", "x":8.25, "y":4, "matrix": [9, 7]},
+                {"label":";", "x":9.25, "y":4, "matrix": [9, 6]},
+                {"label":":", "x":10.25, "y":4, "matrix": [9, 5]},
+                {"label":"_", "x":11.25, "y":4, "matrix": [9, 4]},
+                {"label":"Shift", "x":12.25, "y":4, "w":2.75, "matrix": [9, 3]},
+                {"label":"Up", "x":15, "y":4, "matrix": [9, 1]},
+                {"label":"Fn", "x":16, "y":4, "matrix": [9, 0]},
+
+                {"label":"Ctrl", "x":0, "y":5, "w":1.25, "matrix": [10, 0]},
+                {"label":"Mod", "x":1.25, "y":5, "w":1.25, "matrix": [10, 1]},
+                {"label":"Alt", "x":2.5, "y":5, "w":1.25, "matrix": [10, 2]},
+                {"label":"Space", "x":3.75, "y":5, "w":6.5, "matrix": [10, 6]},
+                {"label":"AltGr", "x":10.25, "y":5, "w":1.25, "matrix": [11, 5]},
+                {"label":"Menu", "x":11.5, "y":5, "w":1.25, "matrix": [11, 4]},
+                {"label":"Ctrl", "x":12.75, "y":5, "w":1.25, "matrix": [11, 3]},
+                {"label":"Left", "x":14, "y":5, "matrix": [11, 2]},
+                {"label":"Bottom", "x":15, "y":5, "matrix": [11, 1]},
+                {"label":"Right", "x":16, "y":5, "matrix": [11, 0]}
+            ]
+        },
+        "LAYOUT_hybrid": {
+            "layout": [
+                {"label":"esc", "x":0, "y":0, "matrix": [0, 0]},
+                {"label":"F1", "x":1.25, "y":0, "matrix": [0, 1]},
+                {"label":"F2", "x":2.25, "y":0, "matrix": [0, 2]},
+                {"label":"F3", "x":3.25, "y":0, "matrix": [0, 3]},
+                {"label":"F4", "x":4.25, "y":0, "matrix": [0, 4]},
+                {"label":"F5", "x":5.5, "y":0, "matrix": [0, 5]},
+                {"label":"F6", "x":6.5, "y":0, "matrix": [0, 6]},
+                {"label":"F7", "x":7.5, "y":0, "matrix": [0, 7]},
+                {"label":"F8", "x":8.5, "y":0, "matrix": [1, 7]},
+                {"label":"F9", "x":9.75, "y":0, "matrix": [1, 6]},
+                {"label":"F10", "x":10.75, "y":0, "matrix": [1, 5]},
+                {"label":"F11", "x":11.75, "y":0, "matrix": [1, 4]},
+                {"label":"F12", "x":12.75, "y":0, "matrix": [1, 3]},
+                {"label":"PrtScr", "x":14, "y":0, "matrix": [1, 2]},
+                {"label":"ScrollLock", "x":15, "y":0, "matrix": [1, 1]},
+                {"label":"Pause", "x":16, "y":0, "matrix": [1, 0]},
+
+                {"label":"º", "x":0, "y":1, "matrix": [2, 0]},
+                {"label":"1", "x":1, "y":1, "matrix": [2, 1]},
+                {"label":"2", "x":2, "y":1, "matrix": [2, 2]},
+                {"label":"3", "x":3, "y":1, "matrix": [2, 3]},
+                {"label":"4", "x":4, "y":1, "matrix": [2, 4]},
+                {"label":"5", "x":5, "y":1, "matrix": [2, 5]},
+                {"label":"6", "x":6, "y":1, "matrix": [2, 6]},
+                {"label":"7", "x":7, "y":1, "matrix": [2, 7]},
+                {"label":"8", "x":8, "y":1, "matrix": [3, 7]},
+                {"label":"9", "x":9, "y":1, "matrix": [3, 6]},
+                {"label":"0", "x":10, "y":1, "matrix": [3, 5]},
+                {"label":"-", "x":11, "y":1, "matrix": [3, 4]},
+                {"label":"=", "x":12, "y":1, "matrix": [3, 3]},
+                {"label":"Backspace", "x":13, "y":1, "matrix": [3, 2], "w":2},
+                {"label":"Home", "x":15, "y":1, "matrix": [3, 1]},
+                {"label":"End", "x":16, "y":1, "matrix": [3, 0]},
+
+                {"label":"Tab", "x":0, "y":2, "w":1.5, "matrix": [4, 0]},
+                {"label":"Q", "x":1.5, "y":2, "matrix": [4, 1]},
+                {"label":"W", "x":2.5, "y":2, "matrix": [4, 2]},
+                {"label":"E", "x":3.5, "y":2, "matrix": [4, 3]},
+                {"label":"R", "x":4.5, "y":2, "matrix": [4, 4]},
+                {"label":"T", "x":5.5, "y":2, "matrix": [4, 5]},
+                {"label":"Y", "x":6.5, "y":2, "matrix": [4, 6]},
+                {"label":"U", "x":7.5, "y":2, "matrix": [4, 7]},
+                {"label":"I", "x":8.5, "y":2, "matrix": [5, 7]},
+                {"label":"O", "x":9.5, "y":2, "matrix": [5, 6]},
+                {"label":"P", "x":10.5, "y":2, "matrix": [5, 5]},
+                {"label":"[", "x":11.5, "y":2, "matrix": [5, 4]},
+                {"label":"]", "x":12.5, "y":2, "matrix": [5, 3]},
+                {"label":"|", "x":13.5, "y":2, "w":1.5, "matrix": [5, 2]},
+                {"label":"Insert", "x":15, "y":2, "matrix": [5, 1]},
+                {"label":"PgUp", "x":16, "y":2, "matrix": [5, 0]},
+
+                {"label":"Shift Lock", "x":0, "y":3, "w":1.75, "matrix": [6, 0]},
+                {"label":"A", "x":1.75, "y":3, "matrix": [6, 1]},
+                {"label":"S", "x":2.75, "y":3, "matrix": [6, 2]},
+                {"label":"D", "x":3.75, "y":3, "matrix": [6, 3]},
+                {"label":"F", "x":4.75, "y":3, "matrix": [6, 4]},
+                {"label":"G", "x":5.75, "y":3, "matrix": [6, 5]},
+                {"label":"H", "x":6.75, "y":3, "matrix": [6, 6]},
+                {"label":"J", "x":7.75, "y":3, "matrix": [6, 7]},
+                {"label":"K", "x":8.75, "y":3, "matrix": [7, 7]},
+                {"label":"L", "x":9.75, "y":3, "matrix": [7, 6]},
+                {"label":";", "x":10.75, "y":3, "matrix": [7, 5]},
+                {"label":"\u00a8", "x":11.75, "y":3, "matrix": [7, 4]},
+                {"label":"Return", "x":12.75, "y":3, "w":2.25, "matrix": [7, 3]},
+                {"label":"Del", "x":15, "y":3, "matrix": [7, 1]},
+                {"label":"PgDow", "x":16, "y":3, "matrix": [7, 0]},
+
+                {"label":"Shift", "x":0, "y":4, "w":1.25, "matrix": [8, 0]},
+                {"label":">", "x":1.25, "y":4, "matrix": [8, 1]},
+                {"label":"Z", "x":2.25, "y":4, "matrix": [8, 2]},
+                {"label":"X", "x":3.25, "y":4, "matrix": [8, 3]},
+                {"label":"C", "x":4.25, "y":4, "matrix": [8, 4]},
+                {"label":"V", "x":5.25, "y":4, "matrix": [8, 5]},
+                {"label":"B", "x":6.25, "y":4, "matrix": [8, 6]},
+                {"label":"N", "x":7.25, "y":4, "matrix": [8, 7]},
+                {"label":"M", "x":8.25, "y":4, "matrix": [9, 7]},
+                {"label":";", "x":9.25, "y":4, "matrix": [9, 6]},
+                {"label":":", "x":10.25, "y":4, "matrix": [9, 5]},
+                {"label":"_", "x":11.25, "y":4, "matrix": [9, 4]},
+                {"label":"Shift", "x":12.25, "y":4, "w":2.75, "matrix": [9, 3]},
+                {"label":"Up", "x":15, "y":4, "matrix": [9, 1]},
+                {"label":"Fn", "x":16, "y":4, "matrix": [9, 0]},
+
+                {"label":"Ctrl", "x":0, "y":5, "w":1.25, "matrix": [10, 0]},
+                {"label":"Mod", "x":1.25, "y":5, "w":1.25, "matrix": [10, 1]},
+                {"label":"Alt", "x":2.5, "y":5, "w":1.25, "matrix": [10, 2]},
+                {"label":"Space", "x":3.75, "y":5, "w":6.5, "matrix": [10, 6]},
+                {"label":"AltGr", "x":10.25, "y":5, "w":1.25, "matrix": [11, 5]},
+                {"label":"Menu", "x":11.5, "y":5, "w":1.25, "matrix": [11, 4]},
+                {"label":"Ctrl", "x":12.75, "y":5, "w":1.25, "matrix": [11, 3]},
+                {"label":"Left", "x":14, "y":5, "matrix": [11, 2]},
+                {"label":"Bottom", "x":15, "y":5, "matrix": [11, 1]},
+                {"label":"Right", "x":16, "y":5, "matrix": [11, 0]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rastersoft/minitkl/keymaps/ansi/keymap.c b/keyboards/rastersoft/minitkl/keymaps/ansi/keymap.c
new file mode 100644
index 000000000000..fce96e6a05e0
--- /dev/null
+++ b/keyboards/rastersoft/minitkl/keymaps/ansi/keymap.c
@@ -0,0 +1,37 @@
+/*
+ * 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_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_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_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_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_ansi(
+        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,          KC_VOLU, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX,                                              XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD, KC_VOLD, KC_VOLU
+    ),
+};
diff --git a/keyboards/rastersoft/minitkl/keymaps/ansi/readme.md b/keyboards/rastersoft/minitkl/keymaps/ansi/readme.md
new file mode 100644
index 000000000000..7b3324b99c5a
--- /dev/null
+++ b/keyboards/rastersoft/minitkl/keymaps/ansi/readme.md
@@ -0,0 +1,5 @@
+# The ANSI keymap for MiniTKL
+
+![keymap](https://images2.imgbox.com/2e/e5/vj7f99XL_o.png)
+
+The `Fn` key trigger `KC_APP` when tapped, and activate Layer 1 when held.
diff --git a/keyboards/rastersoft/minitkl/keymaps/default/keymap.c b/keyboards/rastersoft/minitkl/keymaps/default/keymap.c
new file mode 100644
index 000000000000..12d9548433ae
--- /dev/null
+++ b/keyboards/rastersoft/minitkl/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/*
+ * 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_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_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_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_NUHS, 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_iso(
+        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/default/readme.md b/keyboards/rastersoft/minitkl/keymaps/default/readme.md
new file mode 100644
index 000000000000..6962acb70b41
--- /dev/null
+++ b/keyboards/rastersoft/minitkl/keymaps/default/readme.md
@@ -0,0 +1,5 @@
+# The default keymap for MiniTKL
+
+![keymap](https://images2.imgbox.com/53/28/YxGS3GJT_o.png)
+
+The `Fn` key trigger `KC_APP` when tapped, and activate Layer 1 when held.
diff --git a/keyboards/rastersoft/minitkl/keymaps/hybrid/keymap.c b/keyboards/rastersoft/minitkl/keymaps/hybrid/keymap.c
new file mode 100644
index 000000000000..a65df705739c
--- /dev/null
+++ b/keyboards/rastersoft/minitkl/keymaps/hybrid/keymap.c
@@ -0,0 +1,37 @@
+/*
+ * 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
new file mode 100644
index 000000000000..121f6277f2c3
--- /dev/null
+++ b/keyboards/rastersoft/minitkl/keymaps/hybrid/readme.md
@@ -0,0 +1,11 @@
+# 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/rastersoft/minitkl/minitkl.c b/keyboards/rastersoft/minitkl/minitkl.c
new file mode 100644
index 000000000000..3d5135b332f9
--- /dev/null
+++ b/keyboards/rastersoft/minitkl/minitkl.c
@@ -0,0 +1,54 @@
+/*
+ * 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 "quantum.h"
+
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 3, 85,255,192} // not-so-bright HSV_GREEN for CAPS LOCK
+);
+const rgblight_segment_t PROGMEM my_scroll_lock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 3, HSV_RED} // HSV_RED for SCROLL LOCK
+);
+const rgblight_segment_t PROGMEM my_fn_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 3, HSV_ORANGE} // HSV_ORANGE for Fn key pressed
+);
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer,
+    my_scroll_lock_layer,
+    my_fn_layer
+);
+
+void keyboard_post_init_kb(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+    keyboard_post_init_user();
+}
+
+bool led_update_kb(led_t led_state) {
+    if (led_update_user(led_state)) {
+            rgblight_set_layer_state(0, led_state.caps_lock); // all LEDs green in caps lock
+            rgblight_set_layer_state(1, led_state.scroll_lock); // all LEDs red in scroll lock
+    }
+    return true;
+}
+
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    rgblight_set_layer_state(2, layer_state_cmp(state, 1)); // all LEDs orange if FN is pressed
+    return layer_state_set_user(state);
+}
diff --git a/keyboards/rastersoft/minitkl/readme.md b/keyboards/rastersoft/minitkl/readme.md
new file mode 100644
index 000000000000..e2f75d39890e
--- /dev/null
+++ b/keyboards/rastersoft/minitkl/readme.md
@@ -0,0 +1,31 @@
+# MiniTKL
+
+![MiniTKL](https://images2.imgbox.com/53/28/YxGS3GJT_o.png)
+
+A compact TenKeyLess keyboard.
+
+* Keyboard maintainer: [Sergio Costas](https://github.com/rastersoft)
+* Hardware supported: ISO version. ANSI will be added in a future.
+* Hardware Availability: it's a build-yourself keyboard.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rastersoft/minitkl:default
+
+Flashing example for this keyboard:
+
+    make rastersoft/minitkl:default:flash
+
+![PCB](https://images2.imgbox.com/84/b3/GnPfMO94_o.png)
+
+![Result](https://images2.imgbox.com/78/90/rM5iLSdx_o.jpg)
+
+The default layout is ISO. Replace 'default' with 'ansi' for ANSI layout, or 'hybrid' for the ANSI/ISO hybrid layout.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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
+
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+
+More info: [gitlab.com/rastersoft/full-ten-keyless](https://gitlab.com/rastersoft/full-ten-keyless)
diff --git a/keyboards/rastersoft/minitkl/rules.mk b/keyboards/rastersoft/minitkl/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/rastersoft/minitkl/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/rate/pistachio/rev1/config.h b/keyboards/rate/pistachio/rev1/config.h
index cf7e2cdfb027..cad548df8e65 100644
--- a/keyboards/rate/pistachio/rev1/config.h
+++ b/keyboards/rate/pistachio/rev1/config.h
@@ -19,13 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define USE_I2C
 
-/* ws2812 RGB LED */
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 1, 1 }
-#define RGBLED_NUM 2
 #define RGBLIGHT_LAYERS
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
   #define USB_MAX_POWER_CONSUMPTION 400
diff --git a/keyboards/rate/pistachio/rev1/info.json b/keyboards/rate/pistachio/rev1/info.json
index a50ae8b99194..2bec0c52af25 100644
--- a/keyboards/rate/pistachio/rev1/info.json
+++ b/keyboards/rate/pistachio/rev1/info.json
@@ -1,4 +1,9 @@
 {
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 2,
+        "split_count": [1, 1]
+    },
     "ws2812": {
         "pin": "D2"
     },
diff --git a/keyboards/rate/pistachio/rev2/config.h b/keyboards/rate/pistachio/rev2/config.h
index 5ac0b8fbfa48..8b5dcbc9f493 100644
--- a/keyboards/rate/pistachio/rev2/config.h
+++ b/keyboards/rate/pistachio/rev2/config.h
@@ -22,13 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Split hand configration */
 #define SPLIT_HAND_MATRIX_GRID D4,D3
 
-/* ws2812 RGB LED */
-#define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 38, 46 }
-#define RGBLED_NUM 84
 #define RGBLIGHT_LAYERS
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
   #define USB_MAX_POWER_CONSUMPTION 400
diff --git a/keyboards/rate/pistachio/rev2/info.json b/keyboards/rate/pistachio/rev2/info.json
index a1ea3be3cb34..9f0c169b873a 100644
--- a/keyboards/rate/pistachio/rev2/info.json
+++ b/keyboards/rate/pistachio/rev2/info.json
@@ -3,7 +3,10 @@
         "pin": "D2"
     },
     "rgblight": {
-        "max_brightness": 195
+        "hue_steps": 10,
+        "led_count": 84,
+        "max_brightness": 195,
+        "split_count": [38, 46]
     },
     "matrix_pins": {
         "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3"],
diff --git a/keyboards/rate/pistachio_mp/config.h b/keyboards/rate/pistachio_mp/config.h
index 25aac817da70..eaa46500a1fe 100644
--- a/keyboards/rate/pistachio_mp/config.h
+++ b/keyboards/rate/pistachio_mp/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 3
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
   #define USB_MAX_POWER_CONSUMPTION 400
 #else
diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json
index 07943e5ca32f..a37b55b6aba2 100644
--- a/keyboards/rate/pistachio_mp/info.json
+++ b/keyboards/rate/pistachio_mp/info.json
@@ -9,6 +9,10 @@
         "device_version": "0.0.1",
         "force_nkro": true
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 3
+    },
     "ws2812": {
         "pin": "D2"
     },
diff --git a/keyboards/rate/pistachio_mp/keymaps/default/keymap.c b/keyboards/rate/pistachio_mp/keymaps/default/keymap.c
index 86f88d914395..e73abd09eb89 100644
--- a/keyboards/rate/pistachio_mp/keymaps/default/keymap.c
+++ b/keyboards/rate/pistachio_mp/keymaps/default/keymap.c
@@ -41,16 +41,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_NO,            KC_NO,    KC_NO
     )
 };
-#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);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/rate/pistachio_mp/keymaps/via/keymap.c b/keyboards/rate/pistachio_mp/keymaps/via/keymap.c
index f459a7697025..5e4dc36887fd 100644
--- a/keyboards/rate/pistachio_mp/keymaps/via/keymap.c
+++ b/keyboards/rate/pistachio_mp/keymaps/via/keymap.c
@@ -23,29 +23,10 @@ enum layer_names {
     _RESERVE_1
 };
 
-static uint8_t encoder_state = 0;
-static const keypos_t ENC_CW = {.row = 3, .col = 3};
-static const keypos_t ENC_CCW = {.row = 4, .col = 1};
-
-#define LAYOUT_via( \
-         ECW,ECCW, K07, \
-    K00, K01, K02, K03, \
-    K04, K05, K06,      \
-    K08, K09, K10, K11, \
-    K12, K13, K14,      \
-    K15,      K16, K17 ) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K04,   K05,   K06,   K07 }, \
-    { K08,   K09,   K10,   K11 }, \
-    { K12,   K13,   K14,   ECCW }, \
-    { K15,   ECW,   K16,   K17 }, \
-}
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [_BASE] = LAYOUT_via(
-                           KC_VOLU,KC_VOLD,KC_MPLY,
+    [_BASE] = LAYOUT(
+                                           KC_MPLY,
     LT(_FN, KC_NUM),   KC_PSLS,  KC_PAST,  KC_PMNS,
     KC_P7,             KC_P8,    KC_P9,
     KC_P4,             KC_P5,    KC_P6,    KC_PPLS,
@@ -53,8 +34,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_P0,                       KC_PDOT,  KC_PENT
     ),
     /* Fn */
-    [_FN] = LAYOUT_via(
-                KC_VOLU,KC_VOLD,KC_NO,
+    [_FN] = LAYOUT(
+                                KC_NO,
     KC_NO,   KC_NO,   KC_NO,    KC_NO,
     RGB_HUI, RGB_SAI, RGB_VAI,
     RGB_HUD, RGB_SAD, RGB_VAD,  RGB_TOG,
@@ -62,8 +43,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_NO,            KC_NO,    KC_NO
     ),
     /* Reserve */
-    [_RESERVE_0] = LAYOUT_via(
-                KC_VOLU,KC_VOLD,KC_TRNS,
+    [_RESERVE_0] = 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,
@@ -71,8 +52,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,          KC_TRNS,  KC_TRNS
     ),
     /* Reserve */
-    [_RESERVE_1] = LAYOUT_via(
-                KC_VOLU,KC_VOLD,KC_TRNS,
+    [_RESERVE_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,
@@ -81,43 +62,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-#ifdef ENCODER_ENABLE
-void encoder_action_unregister(void) {
-    if (encoder_state) {
-        keyevent_t encoder_event = (keyevent_t) {
-            .key = encoder_state >> 1 ? ENC_CW : ENC_CCW,
-            .pressed = false,
-            .time = timer_read(),
-            .type = KEY_EVENT
-        };
-        encoder_state = 0;
-        action_exec(encoder_event);
-    }
-    return;
-}
-
-void encoder_action_register(uint8_t index, bool clockwise) {
-    keyevent_t encoder_event = (keyevent_t) {
-        .key = clockwise ? ENC_CW : ENC_CCW,
-        .pressed = true,
-        .time = timer_read(),
-        .type = KEY_EVENT
-    };
-    encoder_state = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-    return;
-}
-
-void matrix_scan_kb(void) {
-    encoder_action_unregister();
-    matrix_scan_user();
-    return;
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    encoder_action_register(index, clockwise);
-    // don't return user actions, because they are in the keymap
-    // encoder_update_user(index, clockwise);
-    return true;
+#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(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
 };
 #endif
diff --git a/keyboards/rate/pistachio_mp/keymaps/via/rules.mk b/keyboards/rate/pistachio_mp/keymaps/via/rules.mk
index 036bd6d1c3ec..f1adcab005e8 100644
--- a/keyboards/rate/pistachio_mp/keymaps/via/rules.mk
+++ b/keyboards/rate/pistachio_mp/keymaps/via/rules.mk
@@ -1 +1,2 @@
-VIA_ENABLE = yes
\ No newline at end of file
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rate/pistachio_pro/keymaps/default/keymap.c b/keyboards/rate/pistachio_pro/keymaps/default/keymap.c
index 5a543ef11ccb..a757bcce3265 100644
--- a/keyboards/rate/pistachio_pro/keymaps/default/keymap.c
+++ b/keyboards/rate/pistachio_pro/keymaps/default/keymap.c
@@ -91,20 +91,6 @@ bool oled_task_user(void) {
     return false;
 }
 
-/* Encoder */
-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);
-        }
-    }
-
-    return true;
-}
-
 /* Keyboard */
 void keyboard_post_init_user(void) {
     bme280_init();
diff --git a/keyboards/rate/pistachio_pro/keymaps/via/keymap.c b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
index b5b8e3c44045..30156f08980d 100644
--- a/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
+++ b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
@@ -26,54 +26,34 @@ enum layer_names {
     _RESERVE_1
 };
 
-static uint8_t encoder_state = 0;
-static const keypos_t ENC_CW = {.row = 0, .col = 14 };
-static const keypos_t ENC_CCW = {.row = 0, .col = 15 };
-
-#define LAYOUT_via( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, ENC_CW, ENC_CCW, k013, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, k117, \
-    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, \
-    k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413, \
-    k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k510, k511, k512, k513 ) { \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, ENC_CW, ENC_CCW, KC_NO, KC_NO }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  k115,  k116,  k117  }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214,  k215,  KC_NO, KC_NO }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k510, k511, k512, k513, KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [_BASE] = LAYOUT_via(
-      KC_ESC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,    KC_F7,    KC_F8,     KC_F9,     KC_F10,     KC_F11,  KC_F12,        KC_VOLU,KC_VOLD,KC_MPLY,
+    [_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_MPLY,
       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_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,    JP_AT,    JP_LBRC,                      KC_DEL,  KC_END,  KC_PGDN,
       JP_EISU,       KC_A,    KC_S,   KC_D,   KC_F,   KC_G,    KC_H,    KC_J,   KC_K,    KC_L,    JP_SCLN, JP_COLN,  JP_RBRC,       KC_ENT,
       KC_LSFT,         KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,    KC_N,    KC_M,   JP_COMM, JP_DOT,  JP_SLSH, JP_BSLS,               KC_RSFT,              KC_UP,
       KC_LCTL,  KC_LGUI,  KC_LALT,   JP_MHEN,    KC_SPC,      KC_SPC,      LT(_FN, JP_HENK),    JP_KANA,   KC_RALT,     KC_APP,    KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [_FN] = LAYOUT_via(
-      KC_TRNS, KC_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_MPLY,
+    [_FN] = 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_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, 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, 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_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,    JP_DOT,    JP_DOT,      KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    [_RESERVE_0] = LAYOUT_via(
-      KC_TRNS, KC_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_MPLY,
+    [_RESERVE_0] = 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_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, KC_TRNS,
       KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,
       KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,              KC_TRNS,
       KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,      KC_TRNS,          KC_TRNS,          KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    [_RESERVE_1] = LAYOUT_via(
-      KC_TRNS, KC_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_MPLY,
+    [_RESERVE_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_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, KC_TRNS,
       KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,
@@ -129,40 +109,6 @@ bool oled_task_user(void) {
     return false;
 }
 
-/* Encoder */
-void encoder_action_unregister(void) {
-    if (encoder_state) {
-        keyevent_t encoder_event = (keyevent_t) {
-            .key = encoder_state >> 1 ? ENC_CW : ENC_CCW,
-            .pressed = false,
-            .time = timer_read(),
-            .type = KEY_EVENT
-        };
-        encoder_state = 0;
-        action_exec(encoder_event);
-    }
-}
-
-void encoder_action_register(uint8_t index, bool clockwise) {
-    keyevent_t encoder_event = (keyevent_t) {
-        .key = clockwise ? ENC_CW : ENC_CCW,
-        .pressed = true,
-        .time = timer_read(),
-        .type = KEY_EVENT
-    };
-    encoder_state = (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;
-}
-
 /* Keyboard */
 void keyboard_post_init_user(void) {
     bme280_init();
@@ -179,3 +125,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
     return true;
 }
+
+#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(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/rate/pistachio_pro/keymaps/via/rules.mk b/keyboards/rate/pistachio_pro/keymaps/via/rules.mk
index 36b7ba9cbc98..1189f4ad1927 100644
--- a/keyboards/rate/pistachio_pro/keymaps/via/rules.mk
+++ b/keyboards/rate/pistachio_pro/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rate/pistachio_pro/rules.mk b/keyboards/rate/pistachio_pro/rules.mk
index df27be46be33..7d8b50ef3fd2 100644
--- a/keyboards/rate/pistachio_pro/rules.mk
+++ b/keyboards/rate/pistachio_pro/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 
 CUSTOM_MATRIX = lite
diff --git a/keyboards/rationalist/ratio60_hotswap/keymaps/default/keymap.c b/keyboards/rationalist/ratio60_hotswap/keymaps/default/keymap.c
new file mode 100644
index 000000000000..48d264064a18
--- /dev/null
+++ b/keyboards/rationalist/ratio60_hotswap/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+/*
+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] = {
+
+[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_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_APP,  MO(1)),
+
+[1] = LAYOUT_60_ansi_split_bs_rshift(
+  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_UP,   _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______ ),
+};
+
+#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/rationalist/ratio60_hotswap/keymaps/default/rules.mk b/keyboards/rationalist/ratio60_hotswap/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/rationalist/ratio60_hotswap/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rationalist/ratio60_hotswap/keymaps/via/keymap.c b/keyboards/rationalist/ratio60_hotswap/keymaps/via/keymap.c
new file mode 100644
index 000000000000..9fd68711a3a6
--- /dev/null
+++ b/keyboards/rationalist/ratio60_hotswap/keymaps/via/keymap.c
@@ -0,0 +1,41 @@
+/*
+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] = {
+
+[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_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_APP,  MO(1)),
+
+[1] = LAYOUT_60_ansi_split_bs_rshift(
+  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_UP,   _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______ )
+};
+
+#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/rationalist/ratio60_hotswap/keymaps/via/rules.mk b/keyboards/rationalist/ratio60_hotswap/keymaps/via/rules.mk
new file mode 100644
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/rationalist/ratio60_hotswap/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rationalist/ratio60_hotswap/readme.md b/keyboards/rationalist/ratio60_hotswap/readme.md
new file mode 100644
index 000000000000..7085b8484371
--- /dev/null
+++ b/keyboards/rationalist/ratio60_hotswap/readme.md
@@ -0,0 +1,24 @@
+# Rati(o)60
+
+A 60% hot swap PCB for both tray mount and o-ring mount
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: Rati(o)60 Rev A
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rationalist/ratio60_hotswap/rev_a:default
+
+Flashing example for this keyboard:
+
+    make rationalist/ratio60_hotswap/rev_a: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 Escape and plug in the keyboard
+* **Physical reset button**: Press and hold the button on the back of the PCB or short the reset header for about 3 seconds then release the buttom/remove the short
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/rationalist/ratio60_hotswap/rev_a/config.h b/keyboards/rationalist/ratio60_hotswap/rev_a/config.h
new file mode 100644
index 000000000000..eb7d87e083a0
--- /dev/null
+++ b/keyboards/rationalist/ratio60_hotswap/rev_a/config.h
@@ -0,0 +1,19 @@
+/*
+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/rationalist/ratio60_hotswap/rev_a/info.json b/keyboards/rationalist/ratio60_hotswap/rev_a/info.json
new file mode 100644
index 000000000000..5d3763d52d92
--- /dev/null
+++ b/keyboards/rationalist/ratio60_hotswap/rev_a/info.json
@@ -0,0 +1,377 @@
+{
+    "manufacturer": "Rationalist",
+    "keyboard_name": "Rati(o)60 Hotswap Rev A",
+    "maintainer": "4pplet",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A1", "pin_b": "A0", "resolution": 2}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B2", "A4", "A3", "A2", "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": 16
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0003",
+        "vid": "0x4446"
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_hhkb", "60_tsangan_hhkb"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "Esc", "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": "Backspace", "matrix": [1, 13], "x": 13, "y": 0, "w": 2},
+                {"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": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"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": "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": 2.75},
+                {"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, 8], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "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": "|", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [1, 13], "x": 14, "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": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"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": "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": "Fn", "matrix": [3, 13], "x": 14, "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, 8], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "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": "Backspace", "matrix": [1, 13], "x": 13, "y": 0, "w": 2},
+                {"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": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"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": "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": 2.75},
+                {"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": "Win", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label": "Esc", "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": "|", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [1, 13], "x": 14, "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": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"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": "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": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+                {"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": "Win", "matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "Esc", "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": "|", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [1, 13], "x": 14, "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": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"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": "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": "Fn", "matrix": [3, 13], "x": 14, "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": "Win", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rationalist/ratio60_hotswap/rev_a/rules.mk b/keyboards/rationalist/ratio60_hotswap/rev_a/rules.mk
new file mode 100644
index 000000000000..04fe1eba2acd
--- /dev/null
+++ b/keyboards/rationalist/ratio60_hotswap/rev_a/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/config.h b/keyboards/rationalist/ratio65_hotswap/rev_a/config.h
deleted file mode 100644
index 17ec1a2babc6..000000000000
--- a/keyboards/rationalist/ratio65_hotswap/rev_a/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#define RGBLED_NUM 18
-
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/info.json b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json
index c9fb81dad882..e53227ce7f0f 100644
--- a/keyboards/rationalist/ratio65_hotswap/rev_a/info.json
+++ b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json
@@ -8,6 +8,23 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "D3"
     },
diff --git a/keyboards/rationalist/ratio65_solder/rev_a/config.h b/keyboards/rationalist/ratio65_solder/rev_a/config.h
deleted file mode 100644
index c3f781ab7c5c..000000000000
--- a/keyboards/rationalist/ratio65_solder/rev_a/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#define RGBLED_NUM 18
-
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
diff --git a/keyboards/rationalist/ratio65_solder/rev_a/info.json b/keyboards/rationalist/ratio65_solder/rev_a/info.json
index a35fb509720d..0ef22251029c 100644
--- a/keyboards/rationalist/ratio65_solder/rev_a/info.json
+++ b/keyboards/rationalist/ratio65_solder/rev_a/info.json
@@ -8,6 +8,23 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "D3"
     },
diff --git a/keyboards/recompile_keys/mio/config.h b/keyboards/recompile_keys/mio/config.h
deleted file mode 100644
index 2a9f3d4187c0..000000000000
--- a/keyboards/recompile_keys/mio/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2021 recompile keys
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#    define RGBLED_NUM 8
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
diff --git a/keyboards/recompile_keys/mio/info.json b/keyboards/recompile_keys/mio/info.json
index 450cf1c3b0bf..0456937cc5af 100644
--- a/keyboards/recompile_keys/mio/info.json
+++ b/keyboards/recompile_keys/mio/info.json
@@ -8,6 +8,24 @@
     "pid": "0x4D41",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 8,
+    "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": "B3"
   },
diff --git a/keyboards/rect44/config.h b/keyboards/rect44/config.h
deleted file mode 100644
index 6fb0d430fbcc..000000000000
--- a/keyboards/rect44/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2020-2021 koshinoya
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#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
diff --git a/keyboards/rect44/info.json b/keyboards/rect44/info.json
index bf985f6202f2..2a127db83154 100644
--- a/keyboards/rect44/info.json
+++ b/keyboards/rect44/info.json
@@ -8,6 +8,21 @@
         "pid": "0x4DD7",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 12,
+        "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": "B6"
     },
diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h
index 5b44f7541f08..fdda27552df6 100644
--- a/keyboards/redox/rev1/config.h
+++ b/keyboards/redox/rev1/config.h
@@ -22,10 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 14    // Number of LEDs
-
-#define RGBLIGHT_SPLIT   // sync LEDs between RIGHT and LEFT hand
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/redox/rev1/info.json b/keyboards/redox/rev1/info.json
index 908404466a98..c0c5ce6e1a69 100644
--- a/keyboards/redox/rev1/info.json
+++ b/keyboards/redox/rev1/info.json
@@ -8,6 +8,10 @@
     "pid": "0x5244",
     "device_version": "1.0.0"
   },
+  "rgblight": {
+    "led_count": 14,
+    "split": true
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/redragon/k667/config.h b/keyboards/redragon/k667/config.h
new file mode 100644
index 000000000000..e17865a40394
--- /dev/null
+++ b/keyboards/redragon/k667/config.h
@@ -0,0 +1,28 @@
+/* Copyright 2023 temp4gh
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have 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_ADDR_1 0b1010000
+#define DRIVER_ADDR_2 0b1010011
+
+#define DRIVER_COUNT 2
+#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/halconf.h b/keyboards/redragon/k667/halconf.h
new file mode 100644
index 000000000000..f1dae7232ed1
--- /dev/null
+++ b/keyboards/redragon/k667/halconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 temp4gh
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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_I2C
+#define HAL_USE_I2C TRUE
diff --git a/keyboards/redragon/k667/info.json b/keyboards/redragon/k667/info.json
new file mode 100644
index 000000000000..889ecd56c0c9
--- /dev/null
+++ b/keyboards/redragon/k667/info.json
@@ -0,0 +1,235 @@
+{
+    "manufacturer": "redragon",
+    "keyboard_name": "k667",
+    "bootloader": "stm32duino",
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B4"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "console": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "indicators": {
+        "caps_lock": "B8",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "C4", "C5", "B0", "B1", "C6", "C7", "C8", "C9", "A8", "A9", "A10", "A13", "A14", "A15"],
+        "rows": ["A0", "A1", "A2", "A3", "A4", "A5"]
+    },
+    "processor": "STM32F103",
+    "rgb_matrix": {
+        "animations": {
+            "solid_color": true,
+            "band_sat": true,
+            "band_spiral_val": true,
+            "band_spiral_sat": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_wave": true,
+            "pixel_fractal": true
+        },
+        "driver": "is31fl3733",
+        "layout": [
+            {"matrix": [0, 0], "x": 7, "y": 2, "flags": 4},
+            {"matrix": [0, 2], "x": 34, "y": 2, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 2, "flags": 4},
+            {"matrix": [0, 4], "x": 61, "y": 2, "flags": 4},
+            {"matrix": [0, 5], "x": 75, "y": 2, "flags": 4},
+            {"matrix": [0, 6], "x": 95, "y": 2, "flags": 4},
+            {"matrix": [0, 7], "x": 109, "y": 2, "flags": 4},
+            {"matrix": [0, 8], "x": 122, "y": 2, "flags": 4},
+            {"matrix": [0, 9], "x": 136, "y": 2, "flags": 4},
+            {"matrix": [0, 10], "x": 157, "y": 2, "flags": 4},
+            {"matrix": [0, 11], "x": 170, "y": 2, "flags": 4},
+            {"matrix": [0, 12], "x": 184, "y": 2, "flags": 4},
+            {"matrix": [0, 13], "x": 198, "y": 2, "flags": 4},
+            {"matrix": [0, 14], "x": 217, "y": 2, "flags": 4},
+            {"matrix": [1, 0], "x": 7, "y": 14, "flags": 4},
+            {"matrix": [1, 1], "x": 20, "y": 14, "flags": 4},
+            {"matrix": [1, 2], "x": 34, "y": 14, "flags": 4},
+            {"matrix": [1, 3], "x": 48, "y": 14, "flags": 4},
+            {"matrix": [1, 4], "x": 61, "y": 14, "flags": 4},
+            {"matrix": [1, 5], "x": 75, "y": 14, "flags": 4},
+            {"matrix": [1, 6], "x": 89, "y": 14, "flags": 4},
+            {"matrix": [1, 7], "x": 102, "y": 14, "flags": 4},
+            {"matrix": [1, 8], "x": 116, "y": 14, "flags": 4},
+            {"matrix": [1, 9], "x": 129, "y": 14, "flags": 4},
+            {"matrix": [1, 10], "x": 143, "y": 14, "flags": 4},
+            {"matrix": [1, 11], "x": 157, "y": 14, "flags": 4},
+            {"matrix": [1, 12], "x": 170, "y": 14, "flags": 4},
+            {"matrix": [1, 13], "x": 190, "y": 14, "flags": 4},
+            {"matrix": [1, 14], "x": 217, "y": 14, "flags": 4},
+            {"matrix": [2, 0], "x": 10, "y": 24, "flags": 4},
+            {"matrix": [2, 1], "x": 27, "y": 24, "flags": 4},
+            {"matrix": [2, 2], "x": 40, "y": 24, "flags": 4},
+            {"matrix": [2, 3], "x": 54, "y": 24, "flags": 4},
+            {"matrix": [2, 4], "x": 68, "y": 24, "flags": 4},
+            {"matrix": [2, 5], "x": 81, "y": 24, "flags": 4},
+            {"matrix": [2, 6], "x": 95, "y": 24, "flags": 4},
+            {"matrix": [2, 7], "x": 109, "y": 24, "flags": 4},
+            {"matrix": [2, 8], "x": 122, "y": 24, "flags": 4},
+            {"matrix": [2, 9], "x": 136, "y": 24, "flags": 4},
+            {"matrix": [2, 10], "x": 150, "y": 24, "flags": 4},
+            {"matrix": [2, 11], "x": 163, "y": 24, "flags": 4},
+            {"matrix": [2, 12], "x": 177, "y": 24, "flags": 4},
+            {"matrix": [2, 13], "x": 194, "y": 24, "flags": 4},
+            {"matrix": [2, 14], "x": 217, "y": 24, "flags": 4},
+            {"matrix": [3, 0], "x": 12, "y": 34, "flags": 4},
+            {"matrix": [3, 1], "x": 30, "y": 34, "flags": 4},
+            {"matrix": [3, 2], "x": 44, "y": 34, "flags": 4},
+            {"matrix": [3, 3], "x": 58, "y": 34, "flags": 4},
+            {"matrix": [3, 4], "x": 71, "y": 34, "flags": 4},
+            {"matrix": [3, 5], "x": 85, "y": 34, "flags": 4},
+            {"matrix": [3, 6], "x": 99, "y": 34, "flags": 4},
+            {"matrix": [3, 7], "x": 112, "y": 34, "flags": 4},
+            {"matrix": [3, 8], "x": 126, "y": 34, "flags": 4},
+            {"matrix": [3, 9], "x": 140, "y": 34, "flags": 4},
+            {"matrix": [3, 10], "x": 153, "y": 34, "flags": 4},
+            {"matrix": [3, 11], "x": 167, "y": 34, "flags": 4},
+            {"x": 180, "y": 34, "flags": 4},
+            {"matrix": [3, 13], "x": 189, "y": 34, "flags": 4},
+            {"matrix": [3, 14], "x": 217, "y": 34, "flags": 4},
+            {"matrix": [4, 0], "x": 8, "y": 44, "flags": 4},
+            {"x": 24, "y": 44, "flags": 4},
+            {"matrix": [4, 2], "x": 38, "y": 44, "flags": 4},
+            {"matrix": [4, 3], "x": 51, "y": 44, "flags": 4},
+            {"matrix": [4, 4], "x": 65, "y": 44, "flags": 4},
+            {"matrix": [4, 5], "x": 78, "y": 44, "flags": 4},
+            {"matrix": [4, 6], "x": 92, "y": 44, "flags": 4},
+            {"matrix": [4, 7], "x": 106, "y": 44, "flags": 4},
+            {"matrix": [4, 8], "x": 119, "y": 44, "flags": 4},
+            {"matrix": [4, 9], "x": 133, "y": 44, "flags": 4},
+            {"matrix": [4, 10], "x": 147, "y": 44, "flags": 4},
+            {"matrix": [4, 11], "x": 160, "y": 44, "flags": 4},
+            {"matrix": [4, 12], "x": 179, "y": 44, "flags": 4},
+            {"matrix": [4, 13], "x": 201, "y": 46, "flags": 4},
+            {"matrix": [4, 14], "x": 217, "y": 44, "flags": 4},
+            {"matrix": [5, 0], "x": 8, "y": 54, "flags": 4},
+            {"matrix": [5, 1], "x": 25, "y": 54, "flags": 4},
+            {"matrix": [5, 2], "x": 43, "y": 54, "flags": 4},
+            {"x": 67, "y": 57, "flags": 4},
+            {"x": 80, "y": 57, "flags": 4},
+            {"x": 94, "y": 54, "flags": 4},
+            {"matrix": [5, 6], "x": 107, "y": 57, "flags": 4},
+            {"x": 120, "y": 57, "flags": 4},
+            {"matrix": [5, 9], "x": 143, "y": 54, "flags": 4},
+            {"matrix": [5, 10], "x": 157, "y": 54, "flags": 4},
+            {"matrix": [5, 11], "x": 170, "y": 54, "flags": 4},
+            {"matrix": [5, 12], "x": 187, "y": 56, "flags": 4},
+            {"matrix": [5, 13], "x": 201, "y": 56, "flags": 4},
+            {"matrix": [5, 14], "x": 214, "y": 56, "flags": 4},
+            {"x": 207, "y": 23, "flags": 8},
+            {"x": 207, "y": 27, "flags": 8}
+        ]
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0021",
+        "vid": "0x369B"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "END", "matrix": [0, 15], "x": 16.5, "y": 0},
+                {"label": "GRV", "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": "MINS", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "EQL", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "BSPC", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"label": "HOME", "matrix": [1, 14], "x": 16.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": "LBRC", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "RBRC", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "BSLS", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "DEL", "matrix": [2, 14], "x": 16.5, "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": "SCLN", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "QUOT", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "ENT", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+                {"label": "PGUP", "matrix": [3, 14], "x": 16.5, "y": 3.25},
+                {"label": "LSFT", "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": "COMM", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": "DOT", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "SLSH", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "RSFT", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "UP", "matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"label": "PGDN", "matrix": [4, 14], "x": 16.5, "y": 4.25},
+                {"label": "LCTL", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "LGUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "LALT", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "SPC", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "RALT", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "MO(1)", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "RCTL", "matrix": [5, 11], "x": 13, "y": 5.25, "w": 1.25},
+                {"label": "LEFT", "matrix": [5, 12], "x": 14.25, "y": 5.25},
+                {"label": "DOWN", "matrix": [5, 13], "x": 15.25, "y": 5.25},
+                {"label": "RGHT", "matrix": [5, 14], "x": 16.5, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/redragon/k667/k667.c b/keyboards/redragon/k667/k667.c
new file mode 100644
index 000000000000..81aeef449463
--- /dev/null
+++ b/keyboards/redragon/k667/k667.c
@@ -0,0 +1,112 @@
+/* Copyright 2023 temp4gh
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You 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 is31_led PROGMEM g_is31_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}
+};
+#endif
diff --git a/keyboards/redragon/k667/keymaps/default/keymap.c b/keyboards/redragon/k667/keymaps/default/keymap.c
new file mode 100644
index 000000000000..d4c2eb964a28
--- /dev/null
+++ b/keyboards/redragon/k667/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2023 temp4gh
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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,
+    _FnLay,
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_BASE] =   {   ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [_FnLay] =  {   ENCODER_CCW_CW(RGB_VAD, RGB_VAI)  },
+};
+#endif
+
+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_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_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(_FnLay), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [_FnLay] = LAYOUT(
+    QK_BOOT,          KC_MY_COMPUTER, KC_WWW_HOME, KC_CALCULATOR, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY,  KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MAIL,          XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, 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_VAI, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX,                            RGB_TOG,                   XXXXXXX, _______,   XXXXXXX, RGB_SPD, RGB_VAD, RGB_SPI
+    )    
+};
diff --git a/keyboards/redragon/k667/keymaps/default/rules.mk b/keyboards/redragon/k667/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/redragon/k667/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/redragon/k667/keymaps/via/keymap.c b/keyboards/redragon/k667/keymaps/via/keymap.c
new file mode 100644
index 000000000000..d4c2eb964a28
--- /dev/null
+++ b/keyboards/redragon/k667/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2023 temp4gh
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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,
+    _FnLay,
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_BASE] =   {   ENCODER_CCW_CW(KC_VOLD, KC_VOLU)  },
+    [_FnLay] =  {   ENCODER_CCW_CW(RGB_VAD, RGB_VAI)  },
+};
+#endif
+
+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_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_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(_FnLay), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [_FnLay] = LAYOUT(
+    QK_BOOT,          KC_MY_COMPUTER, KC_WWW_HOME, KC_CALCULATOR, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY,  KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MAIL,          XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, 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_VAI, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX,                            RGB_TOG,                   XXXXXXX, _______,   XXXXXXX, RGB_SPD, RGB_VAD, RGB_SPI
+    )    
+};
diff --git a/keyboards/redragon/k667/keymaps/via/rules.mk b/keyboards/redragon/k667/keymaps/via/rules.mk
new file mode 100644
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/redragon/k667/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/redragon/k667/mcuconf.h b/keyboards/redragon/k667/mcuconf.h
new file mode 100644
index 000000000000..9187c76aad0d
--- /dev/null
+++ b/keyboards/redragon/k667/mcuconf.h
@@ -0,0 +1,22 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/redragon/k667/readme.md b/keyboards/redragon/k667/readme.md
new file mode 100644
index 000000000000..71e5349ff642
--- /dev/null
+++ b/keyboards/redragon/k667/readme.md
@@ -0,0 +1,21 @@
+# K667
+
+![k667](https://i.imgur.com/7K5h5Obh.jpg)
+
+A customizable 75% keyboard.
+
+- Keyboard Maintainer: [temp4gh](https://github.com/temp4gh)
+- Hardware Supported: K667 PCB
+- Hardware Availability: www.redragonzone.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make redragon/k667:default
+
+Flashing example for this keyboard:
+
+    make redragon/k667:default:flash
+
+**Reset Key**: Hold down the key located at *K10*, commonly programmed as *Grave* 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).
diff --git a/keyboards/redragon/k667/rules.mk b/keyboards/redragon/k667/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/redragon/k667/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/retro_75/config.h b/keyboards/retro_75/config.h
index a5d547936b27..1464cc5f23d4 100644
--- a/keyboards/retro_75/config.h
+++ b/keyboards/retro_75/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 18
-//   #define RGBLIGHT_HUE_STEP 8
-//   #define RGBLIGHT_SAT_STEP 8
-//   #define RGBLIGHT_VAL_STEP 8
-//   #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
-
 /* 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/retro_75/info.json b/keyboards/retro_75/info.json
index 1b15ca5e805b..2a3e249d4731 100644
--- a/keyboards/retro_75/info.json
+++ b/keyboards/retro_75/info.json
@@ -8,6 +8,21 @@
         "pid": "0x5275",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 18,
+        "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": "A9"
     },
diff --git a/keyboards/reversestudio/decadepad/config.h b/keyboards/reversestudio/decadepad/config.h
index a730f35d8c6d..69c6b57a35bc 100644
--- a/keyboards/reversestudio/decadepad/config.h
+++ b/keyboards/reversestudio/decadepad/config.h
@@ -23,21 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 20
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/reversestudio/decadepad/info.json b/keyboards/reversestudio/decadepad/info.json
index 3b56eb8c5362..18ea68a9352b 100644
--- a/keyboards/reversestudio/decadepad/info.json
+++ b/keyboards/reversestudio/decadepad/info.json
@@ -8,6 +8,23 @@
         "pid": "0x4450",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "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": "D5"
     },
diff --git a/keyboards/reviung/reviung33/config.h b/keyboards/reviung/reviung33/config.h
index 269d01a9ee80..a07115110182 100644
--- a/keyboards/reviung/reviung33/config.h
+++ b/keyboards/reviung/reviung33/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 5
-#    define RGBLIGHT_HUE_STEP 16
-#    define RGBLIGHT_SAT_STEP 16
-#    define RGBLIGHT_VAL_STEP 16
-#    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
-
 /* 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/reviung/reviung33/info.json b/keyboards/reviung/reviung33/info.json
index d5dfa7061a1c..d292748b2f77 100644
--- a/keyboards/reviung/reviung33/info.json
+++ b/keyboards/reviung/reviung33/info.json
@@ -8,6 +8,25 @@
         "pid": "0x516D",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 16,
+        "saturation_steps": 16,
+        "brightness_steps": 16,
+        "led_count": 5,
+        "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": "D3"
     },
diff --git a/keyboards/reviung/reviung41/config.h b/keyboards/reviung/reviung41/config.h
index 0269cf131b08..a07115110182 100644
--- a/keyboards/reviung/reviung41/config.h
+++ b/keyboards/reviung/reviung41/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 11
-  #define RGBLIGHT_HUE_STEP 16
-  #define RGBLIGHT_SAT_STEP 16
-  #define RGBLIGHT_VAL_STEP 16
-  #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
-
 /* 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/reviung/reviung41/info.json b/keyboards/reviung/reviung41/info.json
index 6344a3e53e12..f4a434db7799 100644
--- a/keyboards/reviung/reviung41/info.json
+++ b/keyboards/reviung/reviung41/info.json
@@ -8,6 +8,25 @@
         "pid": "0xDCCB",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 16,
+        "saturation_steps": 16,
+        "brightness_steps": 16,
+        "led_count": 11,
+        "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": "D3"
     },
diff --git a/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c b/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c
index 98dda7fe1994..a4279821ccc1 100644
--- a/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c
+++ b/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c
@@ -265,7 +265,7 @@
     *                             +-------------/         \--------------+
     */
 
-     [_ADJUST] = LAYOUT_reviung41(X(GRINNING_FACE), X(GRINNING_FACE_WITH_SWEAT), X(ROLLING_LAUGHING), X(WINKING_FACE), X(SMILING_FACE_HALO), X(SMILING_FACE_HEARTS), RGB_VAI, RGB_HUI, RGB_MOD, KC_BRIU, KC_MPLY, KC_VOLU, X(SMILING_FACE_HEART_EYES), X(FACE_BLOWING_KISS), X(FACE_ROLLING_EYES), X(PENSIVE_FACE), X(LOUDLY_CRYING_FACE), X(PILE_POO), RGB_VAD, RGB_HUD, RGB_RMOD, KC_BRID, KC_MSTP, KC_VOLD, X(THUMBSUP), X(THUMBSDOWN), X(CLAPPING_HANDS), X(EYES), X(MAN_FACEPALMING), X(GHOST), RGB_TOG, RGB_SAD, RGB_SAI, RGB_SPD, RGB_SPI, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+     [_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)
 
  };
 
diff --git a/keyboards/reviung/reviung5/config.h b/keyboards/reviung/reviung5/config.h
index d955973b258b..4977d4b5872d 100644
--- a/keyboards/reviung/reviung5/config.h
+++ b/keyboards/reviung/reviung5/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM         4
-#    define RGBLIGHT_HUE_STEP  16
-#    define RGBLIGHT_SAT_STEP  16
-#    define RGBLIGHT_VAL_STEP  16
-#    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
-
 /* 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/reviung/reviung5/info.json b/keyboards/reviung/reviung5/info.json
index 59ca122b113b..d3503be13e7e 100644
--- a/keyboards/reviung/reviung5/info.json
+++ b/keyboards/reviung/reviung5/info.json
@@ -8,6 +8,25 @@
         "pid": "0x4F0D",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 16,
+        "saturation_steps": 16,
+        "brightness_steps": 16,
+        "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": "D3"
     },
diff --git a/keyboards/reviung/reviung53/config.h b/keyboards/reviung/reviung53/config.h
index 5d55e83d358d..321f116f92b3 100644
--- a/keyboards/reviung/reviung53/config.h
+++ b/keyboards/reviung/reviung53/config.h
@@ -3,22 +3,6 @@
 
 #pragma once
 
-#define RGBLED_NUM 10
-#define RGBLIGHT_HUE_STEP 16
-#define RGBLIGHT_SAT_STEP 16
-#define RGBLIGHT_VAL_STEP 16
-#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
-
 /* 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/reviung/reviung53/info.json b/keyboards/reviung/reviung53/info.json
index d79d31ae9eaa..6f0549d374e2 100644
--- a/keyboards/reviung/reviung53/info.json
+++ b/keyboards/reviung/reviung53/info.json
@@ -8,6 +8,25 @@
         "pid": "0x4E09",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "hue_steps": 16,
+        "saturation_steps": 16,
+        "brightness_steps": 16,
+        "led_count": 10,
+        "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": "D3"
     },
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index 5b411a8c5294..fd2e366614ca 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -9,8 +9,6 @@
 
 #pragma once
 
-#define MATRIX_IO_DELAY 5
-
 #define BUSY_WAIT
 #define BUSY_WAIT_INSTRUCTIONS 35 // Increase if two rows are pressed at the same time.
 #define GPIO_INPUT_PIN_DELAY 10
@@ -48,20 +46,6 @@
 #define SPLIT_LED_STATE_ENABLE
 #define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC
 
-/* RGB LED Configuration */
-#define RGBLED_NUM 98
-#define RGBLED_SPLIT { 49, 49 }
-#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_LED_COUNT 98
 #define RGB_MATRIX_SPLIT { 49, 49 }
 #define RGB_MATRIX_CENTER { 128, 34 }
@@ -135,7 +119,6 @@
 
 #define TOUCH_UPDATE_INTERVAL 33
 #define OLED_UPDATE_INTERVAL 33
-#define TAP_CODE_DELAY 5
 
 #define WEAR_LEVELING_BACKING_SIZE 4096
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
diff --git a/keyboards/rgbkb/mun/keymaps/default/keymap.c b/keyboards/rgbkb/mun/keymaps/default/keymap.c
index a1b9dcfe460a..aa8ba1eba0f2 100644
--- a/keyboards/rgbkb/mun/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/default/keymap.c
@@ -66,9 +66,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
      * | Ctrl   | Win    | Alt    | RGBTOG | Adjust | Space  | Bksp   |  | Enter  | Space  | 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 |
      * '--------+--------+--------+--------+--------'                                      '--------+--------+--------+--------+--------'
@@ -80,7 +77,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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, SC_SENT,
         KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG, ADJUST,  KC_SPC,  KC_DEL,    KC_ENT,    KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,KC_RCTL,
 
-        KC_VOLU, KC_VOLD, KC_VOLU, KC_VOLD,                                                          KC_PGDN, KC_PGUP, KC_PGDN, KC_PGUP,
         KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV,                                        RGB_HUI, RGB_HUD, RGB_RMOD,RGB_TOG, RGB_MOD
     ),
 
@@ -91,7 +87,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-        _______, _______, _______, _______,                                                       _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______
     ),
 
@@ -102,7 +97,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_F4,   KC_F8,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
         _______, KC_NO,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-        _______, _______, _______, _______,                                                       _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______
     ),
 
@@ -113,7 +107,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, TCH_TOG, _______, _______, _______, _______, _______, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,
 
-        _______, _______, _______, _______,                                                       _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______
     ),
 
@@ -124,7 +117,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_SPD, _______, RGB_SPI, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, GAME,
         _______, RGB_RMOD,_______, RGB_MOD, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_NUM,  QWERTY, COLEMAK,
 
-        _______, _______, _______, _______,                                                       _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______
     ),
 
@@ -135,7 +127,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-        _______, _______, _______, _______,                                                       _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______
     ),
 
@@ -146,7 +137,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-        _______, _______, _______, _______,                                                       _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______
     ),
 
@@ -157,7 +147,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-        _______, _______, _______, _______,                                                       _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______
     ),
 };
@@ -251,3 +240,10 @@ bool oled_task_user(void) {
 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(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
+    [1 ... 7] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
+};
+#endif
diff --git a/keyboards/rgbkb/mun/keymaps/default/rules.mk b/keyboards/rgbkb/mun/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/rgbkb/mun/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c b/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c
index 8767edbb57c2..4d62b95b963b 100644
--- a/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/peott-fr/keymap.c
@@ -42,40 +42,49 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * '--------+--------+--------+--------+--------'                                      '--------+--------+--------+--------+--------'
      */
     [_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_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, 
+			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_VOLU, KC_VOLD, KC_VOLU, KC_VOLD, KC_PGDN, KC_PGUP, KC_PGDN, KC_PGUP, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV, RGB_HUI, RGB_HUD, RGB_RMOD, RGB_TOG, RGB_MOD
+			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, 
+			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_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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+			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, 
+			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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+			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, 
+			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+			KC_NO, KC_NO, 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, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 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
+};
+
+#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/peott-fr/rules.mk b/keyboards/rgbkb/mun/keymaps/peott-fr/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/rgbkb/mun/keymaps/peott-fr/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rgbkb/mun/keymaps/via/keymap.c b/keyboards/rgbkb/mun/keymaps/via/keymap.c
index a1b9dcfe460a..aa8ba1eba0f2 100644
--- a/keyboards/rgbkb/mun/keymaps/via/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/via/keymap.c
@@ -66,9 +66,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
      * | Ctrl   | Win    | Alt    | RGBTOG | Adjust | Space  | Bksp   |  | Enter  | Space  | 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 |
      * '--------+--------+--------+--------+--------'                                      '--------+--------+--------+--------+--------'
@@ -80,7 +77,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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, SC_SENT,
         KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG, ADJUST,  KC_SPC,  KC_DEL,    KC_ENT,    KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,KC_RCTL,
 
-        KC_VOLU, KC_VOLD, KC_VOLU, KC_VOLD,                                                          KC_PGDN, KC_PGUP, KC_PGDN, KC_PGUP,
         KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV,                                        RGB_HUI, RGB_HUD, RGB_RMOD,RGB_TOG, RGB_MOD
     ),
 
@@ -91,7 +87,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-        _______, _______, _______, _______,                                                       _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______
     ),
 
@@ -102,7 +97,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_F4,   KC_F8,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
         _______, KC_NO,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-        _______, _______, _______, _______,                                                       _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______
     ),
 
@@ -113,7 +107,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, TCH_TOG, _______, _______, _______, _______, _______, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,
 
-        _______, _______, _______, _______,                                                       _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______
     ),
 
@@ -124,7 +117,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_SPD, _______, RGB_SPI, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, GAME,
         _______, RGB_RMOD,_______, RGB_MOD, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_NUM,  QWERTY, COLEMAK,
 
-        _______, _______, _______, _______,                                                       _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______
     ),
 
@@ -135,7 +127,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-        _______, _______, _______, _______,                                                       _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______
     ),
 
@@ -146,7 +137,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-        _______, _______, _______, _______,                                                       _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______
     ),
 
@@ -157,7 +147,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-        _______, _______, _______, _______,                                                       _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______
     ),
 };
@@ -251,3 +240,10 @@ bool oled_task_user(void) {
 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(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
+    [1 ... 7] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
+};
+#endif
diff --git a/keyboards/rgbkb/mun/keymaps/via/rules.mk b/keyboards/rgbkb/mun/keymaps/via/rules.mk
index 40bded399190..74b4513b046f 100644
--- a/keyboards/rgbkb/mun/keymaps/via/rules.mk
+++ b/keyboards/rgbkb/mun/keymaps/via/rules.mk
@@ -1 +1,2 @@
-VIA_ENABLE=yes
\ No newline at end of file
+VIA_ENABLE=yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
index 960cc9266dab..eefb59e676aa 100644
--- a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
@@ -46,9 +46,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
      * | Ctrl-  | Win    | Alt    | Del    | Space  |        | ADJ    |  | FN     |        | Space  | '"     | Alt    | App    | 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 |
      * '--------+--------+--------+--------+--------'                                      '--------+--------+--------+--------+--------'
@@ -60,7 +57,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_VOLU, KC_VOLD, KC_VOLU, KC_VOLD,                                                          MENU_DN, MENU_UP, MENU_DN, MENU_UP,
         KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV,                                        RGB_HUI, RGB_HUD, RGB_RMOD,RGB_TOG, RGB_MOD
     ),
 
@@ -76,9 +72,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
      * |        |        |        |        |        |        |        |  |        |        | Play   | Prev   | Next   | VolUp  | VolDn  |
      * '--------+--------+--------+--------+--------+--------+--------'  '--------+--------+--------+--------+--------+--------+--------'
-     *      Encoder 1         Encoder 2                                                                  Encoder 3         Encoder 4
-     * .-----------------------------------.                                                        .-----------------------------------.
-     * |        |        |        |        |                                                        |        |        |        |        |
      * |--------+--------+--------+--------+--------.                                      .--------+--------+--------+--------+--------|
      * |        |        |        |        |        | Touch Encoder          Touch Encoder |        |        |        |        |        |
      * '--------+--------+--------+--------+--------'                                      '--------+--------+--------+--------+--------'
@@ -90,7 +83,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_RST, _______, _______, _______, RGB_TOG, _______,    _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, _______,
         _______, _______, _______, _______, _______, _______, _______,    _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, KC_VOLU, KC_VOLD,
 
-        _______, _______, _______, _______,                                                          _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______
     ),
 
@@ -120,7 +112,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, EE_CLR,  _______,    _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, _______,
         _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, KC_KP_0, KC_PDOT, KC_PENT, _______,
 
-        _______, _______, _______, _______,                                                          _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______
     )
 };
@@ -247,3 +238,11 @@ bool oled_task_user(void) {
 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
index a087f669da47..e6b71e56d178 100644
--- a/keyboards/rgbkb/mun/keymaps/xulkal2/rules.mk
+++ b/keyboards/rgbkb/mun/keymaps/xulkal2/rules.mk
@@ -1,3 +1,5 @@
 MOUSEKEY_ENABLE = yes	# using for mouse wheel up and down, more granular than page up/down
 
-OPT_DEFS += -DRGB_UNLIMITED_POWER
\ No newline at end of file
+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 36b1ab000309..5d380de5c746 100644
--- a/keyboards/rgbkb/mun/rev1/info.json
+++ b/keyboards/rgbkb/mun/rev1/info.json
@@ -8,16 +8,33 @@
         "pid": "0x3505",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 98,
+        "split_count": [49, 49],
+        "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": "B5",
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["A0", "B11", "B0", "B10", "B12", "B2", "A8"],
-        "rows": ["A1", "A3", "B3", "A13", "B15", null, null]
+        "rows": ["A1", "A3", "B3", "A13", "B15", null, null],
+        "io_delay": 5
     },
     "diode_direction": "COL2ROW",
     "encoder": {
@@ -26,6 +43,9 @@
             {"pin_a": "B9", "pin_b": "A15"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 5
+    },
     "split": {
         "soft_serial_pin": "A9"
     },
@@ -114,16 +134,6 @@
                 {"matrix": [11, 1], "x": 12.5, "y": 4},
                 {"matrix": [11, 0], "x": 13.5, "y": 4},
 
-                {"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, 3], "x": 3, "y": 5.5},
-
-                {"matrix": [12, 0], "x": 10.5, "y": 5.5},
-                {"matrix": [12, 1], "x": 11.5, "y": 5.5},
-                {"matrix": [12, 2], "x": 12.5, "y": 5.5},
-                {"matrix": [12, 3], "x": 13.5, "y": 5.5},
-
                 {"matrix": [6, 0], "x": 0, "y": 6.5},
                 {"matrix": [6, 1], "x": 1, "y": 6.5},
                 {"matrix": [6, 2], "x": 2, "y": 6.5},
diff --git a/keyboards/rgbkb/mun/rev1/rev1.c b/keyboards/rgbkb/mun/rev1/rev1.c
index 564ce4dfb947..986916b4a98f 100644
--- a/keyboards/rgbkb/mun/rev1/rev1.c
+++ b/keyboards/rgbkb/mun/rev1/rev1.c
@@ -12,25 +12,12 @@
 #define NUMBER_OF_TOUCH_ENCODERS 2
 #define TOUCH_ENCODER_OPTIONS TOUCH_SEGMENTS + 2
 
-#define NUMBER_OF_ENCODERS 4
-#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 1 matrix entries
-    { {  5, 2 }, {  5, 3 } }, // Encoder 2 matrix entries
-    { { 12, 0 }, { 12, 1 } }, // Encoder 3 matrix entries
-    { { 12, 2 }, { 12, 3 } }, // Encoder 4 matrix entries
-}; 
-
-const encodermap_t touch_encoder_map[NUMBER_OF_TOUCH_ENCODERS][TOUCH_ENCODER_OPTIONS] = 
+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 1 matrix entries
     { { 13, 0 }, { 13, 1 }, { 13, 2 }, { 13, 3 }, { 13, 4 } }  // Touch Encoder 2 matrix entries
@@ -44,24 +31,6 @@ static void process_encoder_matrix(encodermap_t pos) {
     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;
diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk
index 0862bde4e54c..18dfc8edf708 100644
--- a/keyboards/rgbkb/mun/rules.mk
+++ b/keyboards/rgbkb/mun/rules.mk
@@ -19,7 +19,6 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 RGB_MATRIX_ENABLE = yes
 
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable the OLED Driver
 
 ENCODER_ENABLE = yes
 
diff --git a/keyboards/rgbkb/pan/config.h b/keyboards/rgbkb/pan/config.h
index b89b6b4f658c..58b047c2b35f 100644
--- a/keyboards/rgbkb/pan/config.h
+++ b/keyboards/rgbkb/pan/config.h
@@ -16,18 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 64
-#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_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 64
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/rgbkb/pan/info.json b/keyboards/rgbkb/pan/info.json
index 5c3ed6f6101b..fdf3519bb65e 100644
--- a/keyboards/rgbkb/pan/info.json
+++ b/keyboards/rgbkb/pan/info.json
@@ -12,7 +12,20 @@
         "driver": "custom"
     },
     "rgblight": {
-        "max_brightness": 120
+        "led_count": 64,
+        "max_brightness": 120,
+        "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_all": {
diff --git a/keyboards/rgbkb/pan/rules.mk b/keyboards/rgbkb/pan/rules.mk
index 775fa48e1219..3f1097a7e86e 100644
--- a/keyboards/rgbkb/pan/rules.mk
+++ b/keyboards/rgbkb/pan/rules.mk
@@ -11,7 +11,6 @@ AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 # RGB layout selection
 RGB_ENCODERS = yes # For RGB encoders, solder on both WS2811 chips
diff --git a/keyboards/rgbkb/sol/config.h b/keyboards/rgbkb/sol/config.h
index 5c327fd760da..9a05fa04e3a9 100644
--- a/keyboards/rgbkb/sol/config.h
+++ b/keyboards/rgbkb/sol/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define TAPPING_TERM 150
-
 #define EE_HANDS
 
 #ifdef IOS_DEVICE_ENABLE
@@ -84,17 +81,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define LED_HITS_TO_REMEMBER 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_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for Helix keyboard
 //  120  RGBoff, OLEDoff
diff --git a/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c b/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
index c476f4c2df51..194ec4de2f0f 100644
--- a/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
@@ -254,10 +254,10 @@ static void render_status(void) {
   }
 
   // Host Keyboard LED Status
-  uint8_t led_usb_state = host_keyboard_leds();
-  oled_write_P(led_usb_state & (1<<USB_LED_NUM_LOCK) ? PSTR("NUMLOCK ") : PSTR("        "), false);
-  oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK) ? PSTR("CAPS ") : PSTR("     "), false);
-  oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("SCLK ") : PSTR("     "), false);
+  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) {
diff --git a/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c b/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c
index 6f222dcd7161..24583f0d17a2 100644
--- a/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c
@@ -318,10 +318,10 @@ static void render_status(void) {
   }
 
   // Host Keyboard LED Status
-  uint8_t led_usb_state = host_keyboard_leds();
-  oled_write_P(led_usb_state & (1<<USB_LED_NUM_LOCK) ? PSTR("NUMLOCK ") : PSTR("        "), false);
-  oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK) ? PSTR("CAPS ") : PSTR("     "), false);
-  oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("SCLK ") : PSTR("     "), false);
+  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) {
diff --git a/keyboards/rgbkb/sol/keymaps/default/keymap.c b/keyboards/rgbkb/sol/keymaps/default/keymap.c
index 60e48732752a..4a6511cbfc74 100644
--- a/keyboards/rgbkb/sol/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/default/keymap.c
@@ -344,11 +344,11 @@ static void render_status(void) {
   }
 
   // Host Keyboard LED Status
-    uint8_t led_state = host_keyboard_leds();
+    led_t led_state = host_keyboard_led_state();
     oled_write_P(PSTR("-----"), false);
-    oled_write_P(IS_LED_ON(led_state, USB_LED_NUM_LOCK) ? PSTR("NUMLK") : PSTR("     "), false);
-    oled_write_P(IS_LED_ON(led_state, USB_LED_CAPS_LOCK) ? PSTR("CAPLK") : PSTR("     "), false);
-    oled_write_P(IS_LED_ON(led_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLK") : 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 };
diff --git a/keyboards/rgbkb/sol/keymaps/xyverz/config.h b/keyboards/rgbkb/sol/keymaps/xyverz/config.h
deleted file mode 100644
index 334eee608c67..000000000000
--- a/keyboards/rgbkb/sol/keymaps/xyverz/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/>.
-*/
-
-#pragma once
-
-
-// place overrides here
-
-/* #define SSD1306OLED */
diff --git a/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c b/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
index a5b62eb1daa3..0ef9def55de5 100644
--- a/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
@@ -334,11 +334,11 @@ static void render_status(void) {
   }
 
   // Host Keyboard LED Status
-    uint8_t led_state = host_keyboard_leds();
+    led_t led_state = host_keyboard_led_state();
     oled_write_P(PSTR("-----"), false);
-    oled_write_P(IS_LED_ON(led_state, USB_LED_NUM_LOCK) ? PSTR("NUMLK") : PSTR("     "), false);
-    oled_write_P(IS_LED_ON(led_state, USB_LED_CAPS_LOCK) ? PSTR("CAPLK") : PSTR("     "), false);
-    oled_write_P(IS_LED_ON(led_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLK") : 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 };
diff --git a/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk b/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk
index 073cb668f0f7..36416c8dbee5 100644
--- a/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk
+++ b/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk
@@ -24,7 +24,6 @@ IOS_DEVICE_ENABLE = no      # Limit max brightness to connect to IOS device (iPa
 DEFAULT_FOLDER = rgbkb/sol/rev1
 ENCODER_ENABLE = no
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 # Do not edit past here
 
diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json
index b0b8fc12d023..5b288088a9ea 100644
--- a/keyboards/rgbkb/sol/rev1/info.json
+++ b/keyboards/rgbkb/sol/rev1/info.json
@@ -9,7 +9,21 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
+    },
+    "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
+        }
     },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
@@ -24,6 +38,9 @@
     "split": {
         "soft_serial_pin": "D3"
     },
+    "tapping": {
+        "term": 150
+    },
     "ws2812": {
         "pin": "B3"
     },
diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json
index 1eec8a393035..c71efbc76987 100644
--- a/keyboards/rgbkb/sol/rev2/info.json
+++ b/keyboards/rgbkb/sol/rev2/info.json
@@ -9,7 +9,21 @@
         "device_version": "0.0.2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
+    },
+    "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
+        }
     },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
@@ -19,6 +33,9 @@
     "split": {
         "soft_serial_pin": "D3"
     },
+    "tapping": {
+        "term": 150
+    },
     "ws2812": {
         "pin": "B7"
     },
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index 1b8fa2314f9b..3a0b61bfd54f 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -9,8 +9,6 @@
 
 #pragma once
 
-#define MATRIX_IO_DELAY 5
-
 #define BUSY_WAIT
 #define BUSY_WAIT_INSTRUCTIONS 35 // Increase if two rows are pressed at the same time.
 #define GPIO_INPUT_PIN_DELAY 10
@@ -52,24 +50,6 @@
 #define DIP_SWITCH_PINS { A14, B13 }
 #define DIP_SWITCH_PINS_RIGHT { A14, B0 }
 
-/* RGB LED Configuration */
-#define RGBLED_NUM 156
-#define RGBLED_SPLIT { 78, 78 }
-
-// RGB Lighting Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgblight?id=effect-and-animation-toggles
-#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_LED_COUNT 156
 #define RGB_MATRIX_SPLIT { 78, 78 }
 #define RGB_MATRIX_CENTER { 81, 28 }
@@ -137,7 +117,6 @@
 
 #define TOUCH_UPDATE_INTERVAL 33
 #define OLED_UPDATE_INTERVAL 33
-#define TAP_CODE_DELAY 5
 
 /* Audio Configuration */
 #define AUDIO_PIN A4
diff --git a/keyboards/rgbkb/sol3/keymaps/default/keymap.c b/keyboards/rgbkb/sol3/keymaps/default/keymap.c
index 19499ab3c3b8..dacdf98a4057 100644
--- a/keyboards/rgbkb/sol3/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/sol3/keymaps/default/keymap.c
@@ -23,9 +23,6 @@
  * └──────┴──────┴──────┴──────┴──────┤ Space├──────┤  ├──────┤ Space├──────┴──────┴──────┴──────┴──────┘
  *                                    │      │ DEL  │  │ Enter│      │
  *                                    └──────┴──────┘  └──────┴──────┘
- * ┌──────┬──────┬──────┬──────┬──────┬──────┐                ┌──────┬──────┬──────┬──────┬──────┬──────┐
- * │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 │
  * └──────┴──────┴──────┴──────┴──────┘                              └──────┴──────┴──────┴──────┴──────┘
@@ -65,7 +62,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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, SC_SENT,
         KC_LCTL,  KC_LGUI, KC_LALT, RGB_TOG, ADJUST,  KC_SPC,  KC_PGDN, KC_DEL, KC_ENT,  KC_PGUP, KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, 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_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV,                                                       KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV
     ),
 
@@ -76,7 +72,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______,                   _______, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
     ),
 
@@ -87,7 +82,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_F4,                     KC_F8,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
         _______, KC_NO,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
     ),
 
@@ -98,7 +92,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, AU_TOGG, MU_TOGG, MU_NEXT, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
         _______, CK_TOGG,   CK_UP, CK_DOWN, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,
 
-        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
     ),
 
@@ -109,7 +102,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_SPD, _______, RGB_SPI, _______, _______, DM_RSTP,                   _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, GAME,
         _______, RGB_RMOD,RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_NUM,  QWERTY,  COLEMAK,
 
-        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
     ),
 
@@ -171,3 +163,12 @@ void render_layer_status(void) {
             oled_write_ln_P(PSTR("Undef"), false);
     }
 }
+
+#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_VOLD, KC_VOLU),
+                  ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
+    [1 ... 4] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______),
+                  ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
+};
+#endif
diff --git a/keyboards/rgbkb/sol3/keymaps/default/rules.mk b/keyboards/rgbkb/sol3/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/rgbkb/sol3/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c b/keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c
index ab8f7d0ce3f0..0f92110ff4c4 100644
--- a/keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c
+++ b/keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c
@@ -28,7 +28,6 @@ extern keymap_config_t keymap_config;
   *                                    `-------------'  `--------=----'
   */
 #define EXPAND_LAYOUT(...) LAYOUT(__VA_ARGS__, \
-      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_MNXT, KC_MPLY, KC_MPRV, KC_VOLD, KC_VOLU,                                                       KC_MNXT, KC_MPLY, KC_MPRV, KC_VOLD, KC_VOLU )
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -59,3 +58,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       )
 
 };
+
+#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_VOLD, KC_VOLU),
+                  ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1 ... 4] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______),
+                  ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
+};
+#endif
diff --git a/keyboards/rgbkb/sol3/keymaps/kageurufu/rules.mk b/keyboards/rgbkb/sol3/keymaps/kageurufu/rules.mk
index 1e5b99807cb7..f1adcab005e8 100644
--- a/keyboards/rgbkb/sol3/keymaps/kageurufu/rules.mk
+++ b/keyboards/rgbkb/sol3/keymaps/kageurufu/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rgbkb/sol3/keymaps/via/keymap.c b/keyboards/rgbkb/sol3/keymaps/via/keymap.c
index 11479259080b..9ceb324f6458 100644
--- a/keyboards/rgbkb/sol3/keymaps/via/keymap.c
+++ b/keyboards/rgbkb/sol3/keymaps/via/keymap.c
@@ -23,9 +23,6 @@
  * └──────┴──────┴──────┴──────┴──────┤ Space├──────┤  ├──────┤ Space├──────┴──────┴──────┴──────┴──────┘
  *                                    │      │ DEL  │  │ Enter│      │
  *                                    └──────┴──────┘  └──────┴──────┘
- * ┌──────┬──────┬──────┬──────┬──────┬──────┐                ┌──────┬──────┬──────┬──────┬──────┬──────┐
- * │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 │
  * └──────┴──────┴──────┴──────┴──────┘                              └──────┴──────┴──────┴──────┴──────┘
@@ -68,7 +65,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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, SC_SENT,
         KC_LCTL,  KC_LGUI, KC_LALT, RGB_TOG, ADJUST,  KC_SPC,  KC_PGDN, KC_DEL, KC_ENT,  KC_PGUP, KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, 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_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV,                                                       KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV
     ),
 
@@ -79,7 +75,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______,                   _______, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
     ),
 
@@ -90,7 +85,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_F4,                     KC_F8,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
         _______, KC_NO,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
     ),
 
@@ -101,7 +95,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, AU_TOGG, MU_TOGG, MU_NEXT, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
         _______, CK_TOGG,   CK_UP, CK_DOWN, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,
 
-        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
     ),
 
@@ -112,7 +105,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, RGB_SPD, _______, RGB_SPI, _______, _______, DM_RSTP,                   _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, GAME,
         _______, RGB_RMOD,RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_NUM,  QWERTY,  COLEMAK,
 
-        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
     ),
 
@@ -123,7 +115,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
     ),
 
@@ -134,7 +125,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
     ),
 
@@ -145,7 +135,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 
-        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
     )
 
@@ -216,3 +205,12 @@ void render_layer_status(void) {
             oled_write_ln_P(PSTR("Undef"), false);
     }
 }
+
+#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_VOLD, KC_VOLU),
+                  ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
+    [1 ... 7] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______),
+                  ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
+};
+#endif
diff --git a/keyboards/rgbkb/sol3/keymaps/via/rules.mk b/keyboards/rgbkb/sol3/keymaps/via/rules.mk
index 1e5b99807cb7..f1adcab005e8 100644
--- a/keyboards/rgbkb/sol3/keymaps/via/rules.mk
+++ b/keyboards/rgbkb/sol3/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json
index 74af9d21faf5..b80161995f05 100644
--- a/keyboards/rgbkb/sol3/rev1/info.json
+++ b/keyboards/rgbkb/sol3/rev1/info.json
@@ -8,16 +8,33 @@
         "pid": "0x3510",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 156,
+        "split_count": [78, 78],
+        "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": "B5",
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["A6", "A7", "B0", "B2", "B1", "B9", "B3", "B4"],
-        "rows": ["B15", "A8", "A15", "B12", "A3", null]
+        "rows": ["B15", "A8", "A15", "B12", "A3", null],
+        "io_delay": 5
     },
     "diode_direction": "COL2ROW",
     "encoder": {
@@ -45,6 +62,9 @@
             }
         }
     },
+    "qmk": {
+        "tap_keycode_delay": 5
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "layouts": {
@@ -132,20 +152,6 @@
                 {"matrix": [10, 1], "x": 14.5, "y": 4},
                 {"matrix": [10, 0], "x": 15.5, "y": 4, "w": 1.5},
 
-                {"matrix": [5, 0], "x": 0, "y": 7, "w": 0.8, "h": 0.8},
-                {"matrix": [5, 1], "x": 0.8, "y": 7, "w": 0.8, "h": 0.8},
-                {"matrix": [5, 2], "x": 1.6, "y": 7, "w": 0.8, "h": 0.8},
-                {"matrix": [5, 3], "x": 2.4, "y": 7, "w": 0.8, "h": 0.8},
-                {"matrix": [5, 4], "x": 3.2, "y": 7, "w": 0.8, "h": 0.8},
-                {"matrix": [5, 5], "x": 4, "y": 7, "w": 0.8, "h": 0.8},
-
-                {"matrix": [11, 0], "x": 12.2, "y": 7, "w": 0.8, "h": 0.8},
-                {"matrix": [11, 1], "x": 13, "y": 7, "w": 0.8, "h": 0.8},
-                {"matrix": [11, 2], "x": 13.8, "y": 7, "w": 0.8, "h": 0.8},
-                {"matrix": [11, 3], "x": 14.6, "y": 7, "w": 0.8, "h": 0.8},
-                {"matrix": [11, 4], "x": 15.4, "y": 7, "w": 0.8, "h": 0.8},
-                {"matrix": [11, 5], "x": 16.2, "y": 7, "w": 0.8, "h": 0.8},
-
                 {"matrix": [0, 7], "x": 0, "y": 7.8, "w": 0.8, "h": 0.8},
                 {"matrix": [1, 7], "x": 0.8, "y": 7.8, "w": 0.8, "h": 0.8},
                 {"matrix": [2, 7], "x": 1.6, "y": 7.8, "w": 0.8, "h": 0.8},
diff --git a/keyboards/rgbkb/sol3/rev1/rev1.c b/keyboards/rgbkb/sol3/rev1/rev1.c
index ff330a83d66d..e853ed9b9869 100644
--- a/keyboards/rgbkb/sol3/rev1/rev1.c
+++ b/keyboards/rgbkb/sol3/rev1/rev1.c
@@ -13,27 +13,12 @@
 #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
-    { { 11, 0 }, { 11, 1 } }, // Encoder 3 matrix entries
-    { { 11, 2 }, { 11, 3 } }, // Encoder 4 matrix entries
-    { { 11, 4 }, { 11, 5 } }  // Encoder 5 matrix entries
-};
-
-const encodermap_t touch_encoder_map[NUMBER_OF_TOUCH_ENCODERS][TOUCH_ENCODER_OPTIONS] = 
+const encodermap_t touch_encoder_map[NUMBER_OF_TOUCH_ENCODERS][TOUCH_ENCODER_OPTIONS] =
 {
     { { 1, 7 }, { 0, 7 }, { 2, 7 }, {  5, 6 }, {  5, 7 }, }, // Touch Encoder 0 matrix entries
     { { 7, 7 }, { 6, 7 }, { 8, 7 }, { 11, 6 }, { 11, 7 }, }  // Touch Encoder 1 matrix entries
@@ -43,7 +28,7 @@ static bool limit_lightning = true;
 
 RGB rgb_matrix_hsv_to_rgb(HSV hsv) {
     if (limit_lightning) hsv.v /= 2;
-    return hsv_to_rgb(hsv); 
+    return hsv_to_rgb(hsv);
 }
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
@@ -72,15 +57,6 @@ static void process_encoder_matrix(encodermap_t pos) {
     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;
@@ -189,7 +165,7 @@ void rgb_matrix_increase_flags(void)
 #endif
 
 
-__attribute__((weak)) 
+__attribute__((weak))
 void render_layer_status(void) {
     // Keymap specific, expected to be overridden
     // Host Keyboard Layer Status
@@ -245,7 +221,7 @@ oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
 bool oled_task_kb(void) {
     if (!oled_task_user())
         return false;
-    
+
     if (is_keyboard_left()) {
         render_icon();
         oled_write_P(PSTR("     "), false);
diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk
index 382b858f4654..9cb54cfa1519 100644
--- a/keyboards/rgbkb/sol3/rules.mk
+++ b/keyboards/rgbkb/sol3/rules.mk
@@ -23,7 +23,6 @@ RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
 
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable the OLED Driver
 
 ENCODER_ENABLE = yes
 
diff --git a/keyboards/rgbkb/zen/rev1/config.h b/keyboards/rgbkb/zen/rev1/config.h
index 88951a1b4497..1578432cf80b 100644
--- a/keyboards/rgbkb/zen/rev1/config.h
+++ b/keyboards/rgbkb/zen/rev1/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 RGBLED_NUM 16    // Number of LEDs
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/info.json
index 940df081c96d..81370b916ddb 100644
--- a/keyboards/rgbkb/zen/rev1/info.json
+++ b/keyboards/rgbkb/zen/rev1/info.json
@@ -16,6 +16,9 @@
   "split": {
     "soft_serial_pin": "D0"
   },
+  "rgblight": {
+    "led_count": 16
+  },
   "ws2812": {
     "pin": "D1"
   },
diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h
index 394fd1630bc5..1578432cf80b 100644
--- a/keyboards/rgbkb/zen/rev2/config.h
+++ b/keyboards/rgbkb/zen/rev2/config.h
@@ -22,19 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* ws2812 RGB LED */
-#define RGBLED_NUM 34    // 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
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json
index eed39e56287a..8d486e53b870 100644
--- a/keyboards/rgbkb/zen/rev2/info.json
+++ b/keyboards/rgbkb/zen/rev2/info.json
@@ -21,6 +21,21 @@
     "split": {
       "soft_serial_pin": "D3"
     },
+    "rgblight": {
+      "led_count": 34,
+      "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": "B6"
     },
diff --git a/keyboards/rgbkb/zen/rev2/rev2.c b/keyboards/rgbkb/zen/rev2/rev2.c
index 4c308264d679..c36a32c161b0 100644
--- a/keyboards/rgbkb/zen/rev2/rev2.c
+++ b/keyboards/rgbkb/zen/rev2/rev2.c
@@ -40,11 +40,11 @@ void render_status(void) {
   oled_write_P(layer_name_user(get_highest_layer(layer_state)), false);
 
   // Host Keyboard LED Status
-  uint8_t led_usb_state = host_keyboard_leds();
+  led_t led_state = host_keyboard_led_state();
   oled_set_cursor(0, oled_max_lines() - 4); // Line 13
-  oled_write_P(led_usb_state & (1<<USB_LED_NUM_LOCK) ? PSTR("NUMLK") : PSTR("     "), false); // Line 14
-  oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK) ? PSTR("CAPLK") : PSTR("     "), false); // Line 15
-  oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("SCRLK") : PSTR("     "), false); // Line 16
+  oled_write_P(led_state.num_lock ? PSTR("NUMLK") : PSTR("     "), false); // Line 14
+  oled_write_P(led_state.caps_lock ? PSTR("CAPLK") : PSTR("     "), false); // Line 15
+  oled_write_P(led_state.scroll_lock ? PSTR("SCRLK") : PSTR("     "), false); // Line 16
 }
 
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
diff --git a/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c
index 131ac0e820c7..4aeaddc39f5a 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c
+++ b/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c
@@ -3,9 +3,6 @@
 #include "lufa.h"
 #include "split_util.h"
 #endif
-#ifdef SSD1306OLED
-  #include "common/ssd1306.h"
-#endif
 
 extern keymap_config_t keymap_config;
 
@@ -171,112 +168,4 @@ void matrix_init_user(void) {
     #ifdef RGBLIGHT_ENABLE
       RGB_current_mode = rgblight_config.mode;
     #endif
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init(!has_usb());   // turns on the display
-    #endif
-}
-
-
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-
-// hook point for 'led_test' keymap
-//   'default' keymap's led_test_init() is empty function, do nothing
-//   'led_test' keymap's led_test_init() force rgblight_mode_noeeprom(35);
-__attribute__ ((weak))
-void led_test_init(void) {}
-
-void matrix_scan_user(void) {
-    led_test_init();
-    iota_gfx_task();  // this is what updates the display continuously
-}
-
-void matrix_update(struct CharacterMatrix *dest,
-                          const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-//assign the right code to your layers for OLED display
-#define L_BASE 0
-#define L_FN (1<<_FN)
-#define L_ADJ (1<<_ADJ)
-
-static void render_logo(struct CharacterMatrix *matrix) {
-
-  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};
-  matrix_write(matrix, logo);
-  //matrix_write_P(&matrix, PSTR(" Split keyboard kit"));
-}
-
-
-
-void render_status(struct CharacterMatrix *matrix) {
-
-  // Render to mode icon
-  static char logo[][2][3]={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
-  if(keymap_config.swap_lalt_lgui==false){
-    matrix_write(matrix, logo[0][0]);
-    matrix_write_P(matrix, PSTR("\n"));
-    matrix_write(matrix, logo[0][1]);
-  }else{
-    matrix_write(matrix, logo[1][0]);
-    matrix_write_P(matrix, PSTR("\n"));
-    matrix_write(matrix, logo[1][1]);
-  }
-
-  // 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[40];
-  snprintf(buf,sizeof(buf), "Undef-%ld", layer_state);
-  matrix_write_P(matrix, PSTR("\nLayer: "));
-    switch (layer_state) {
-        case L_BASE:
-           matrix_write_P(matrix, PSTR("Default"));
-           break;
-        case L_FN:
-           matrix_write_P(matrix, PSTR("FN"));
-           break;
-        case L_ADJ:
-        case L_ADJ_TRI:
-           matrix_write_P(matrix, PSTR("ADJ"));
-           break;
-        default:
-           matrix_write(matrix, buf);
-    }
-
-  // Host Keyboard LED Status
-  char led[40];
-    snprintf(led, sizeof(led), "\n%s  %s  %s",
-            (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? "NUMLOCK" : "       ",
-            (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? "CAPS" : "    ",
-            (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ? "SCLK" : "    ");
-  matrix_write(matrix, led);
-}
-
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-
-#if DEBUG_TO_SCREEN
-  if (debug_enable) {
-    return;
-  }
-#endif
-
-  matrix_clear(&matrix);
-  if(is_master){
-    render_status(&matrix);
-  }else{
-    render_logo(&matrix);
-  }
-  matrix_update(&display, &matrix);
 }
-
-#endif
diff --git a/keyboards/rgbkb/zygomorph/keymaps/default/readme.md b/keyboards/rgbkb/zygomorph/keymaps/default/readme.md
index e3e663db5dda..e1984691c659 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/default/readme.md
+++ b/keyboards/rgbkb/zygomorph/keymaps/default/readme.md
@@ -97,10 +97,7 @@ RGBLIGHT_FULL_POWER = yes   # Allow maximum RGB brightness. Otherwise, limited t
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 ENCODER_ENABLE = yes        # Enable rotary encoder (+90)
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable the OLED Driver (+5000)
 IOS_DEVICE_ENABLE = no      # Limit max brightness to connect to IOS device (iPad,iPhone)
-
-
 ```
 ## Compile
 
diff --git a/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c
index 63a26989b18c..c4da28ba357b 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c
+++ b/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c
@@ -216,10 +216,10 @@ static void render_status(void) {
   }
 
   // Host Keyboard LED Status
-  uint8_t led_usb_state = host_keyboard_leds();
-  oled_write_P(led_usb_state & (1<<USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR("       "), false);
-  oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR("       "), false);
-  oled_write_ln_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR("       "), false);
+  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_ln_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
 }
 
 bool oled_task_user(void) {
diff --git a/keyboards/rgbkb/zygomorph/keymaps/default_oled/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/default_oled/rules.mk
index 2eb5fbab49da..aa8c4326463a 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/default_oled/rules.mk
+++ b/keyboards/rgbkb/zygomorph/keymaps/default_oled/rules.mk
@@ -11,7 +11,6 @@ RGBLIGHT_FULL_POWER = yes   # Allow maximum RGB brightness. Otherwise, limited t
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 ENCODER_ENABLE = yes        # Enable rotary encoder
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable the OLED Driver
 IOS_DEVICE_ENABLE = no      # Limit max brightness to connect to IOS device (iPad,iPhone)
 LTO_ENABLE = yes     # Enable optimizations to reduce firmware size. Also disables action macros and functions.
 
diff --git a/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk
index ca9d0bc9a57b..69d469b1e917 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk
+++ b/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk
@@ -11,7 +11,6 @@ NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: ht
 RGBLIGHT_ENABLE = no        # Enable global lighting effects. Do not enable with RGB Matrix
 RGBLIGHT_SPLIT_ENABLE = no  # Split RGBLight Support
 RGB_MATRIX_ENABLE = yes  	# Enable per-key coordinate based RGB effects. Do not enable with RGBlight
-RGB_MATRIX_DRIVER = WS2812
 RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects.
 SPLIT_RGB_MATRIX_ENABLE = yes # For split RGB Matrix support
 RGBLIGHT_FULL_POWER = yes   # Allow maximum RGB brightness. Otherwise, limited to a safe level for a normal USB-A port
diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h
index 022e361de16e..8a46a941b7c5 100644
--- a/keyboards/rgbkb/zygomorph/rev1/config.h
+++ b/keyboards/rgbkb/zygomorph/rev1/config.h
@@ -25,20 +25,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLED_NUM 30
 #else
     #define RGBLED_NUM 60
-    #define RGBLED_SPLIT { 30, 30 }
 #endif
 
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
 #define RGB_MATRIX_LED_COUNT 60
 #define RGB_MATRIX_SPLIT { 30, 30 }
 
diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/info.json
index 4be3dd61d36f..4cd4c876f00a 100644
--- a/keyboards/rgbkb/zygomorph/rev1/info.json
+++ b/keyboards/rgbkb/zygomorph/rev1/info.json
@@ -9,7 +9,7 @@
       "device_version": "0.0.1"
     },
     "rgb_matrix": {
-      "driver": "WS2812"
+      "driver": "ws2812"
     },
     "matrix_pins": {
       "cols": ["F4", "F6", "C7", "C6", "B6", "D4"],
@@ -24,6 +24,21 @@
     "split": {
       "soft_serial_pin": "D3"
     },
+    "rgblight": {
+      "split_count": [30, 30],
+      "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"
     },
diff --git a/keyboards/rico/phoenix_project_no1/info.json b/keyboards/rico/phoenix_project_no1/info.json
index 7b13e4a0dfa4..4d354ce0af7b 100644
--- a/keyboards/rico/phoenix_project_no1/info.json
+++ b/keyboards/rico/phoenix_project_no1/info.json
@@ -44,8 +44,11 @@
         "driver": "vendor",
         "pin": "GP28"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -118,6 +121,610 @@
                 {"matrix": [4, 14], "x": 14, "y": 4},
                 {"matrix": [4, 15], "x": 15, "y": 4}
             ]
+        },
+        "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, 14], "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": 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, 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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "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, 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, 13], "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, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "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_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, "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, "y": 1},
+
+                {"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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "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, 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, 13], "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, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "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_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, 14], "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": 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, 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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "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, 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, 13], "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": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "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": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "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": [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": 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, 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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "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, 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, 13], "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": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "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": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "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, 14], "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, 15], "x": 15, "y": 1},
+
+                {"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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "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, 13], "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, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "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_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, "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, 15], "x": 15, "y": 1},
+
+                {"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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "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, 13], "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, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "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_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, 14], "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, 15], "x": 15, "y": 1},
+
+                {"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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "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, 13], "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": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "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": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_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, "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, 15], "x": 15, "y": 1},
+
+                {"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},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "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, 13], "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": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "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": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/rico/phoenix_project_no1/keymaps/default/keymap.c b/keyboards/rico/phoenix_project_no1/keymaps/default/keymap.c
index a4d58d9097e0..414260112586 100644
--- a/keyboards/rico/phoenix_project_no1/keymaps/default/keymap.c
+++ b/keyboards/rico/phoenix_project_no1/keymaps/default/keymap.c
@@ -25,21 +25,21 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
+    [_BASE] = LAYOUT_all(
         KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_NO,   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_NO,   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(_FN),
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,   KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
     ),
-    [_FN] = LAYOUT(
+    [_FN] = LAYOUT_all(
         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, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, 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(_FN2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    [_FN2] = LAYOUT(
+    [_FN2] = 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,
diff --git a/keyboards/rico/phoenix_project_no1/keymaps/via/keymap.c b/keyboards/rico/phoenix_project_no1/keymaps/via/keymap.c
index a4d58d9097e0..414260112586 100644
--- a/keyboards/rico/phoenix_project_no1/keymaps/via/keymap.c
+++ b/keyboards/rico/phoenix_project_no1/keymaps/via/keymap.c
@@ -25,21 +25,21 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
+    [_BASE] = LAYOUT_all(
         KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_NO,   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_NO,   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(_FN),
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,   KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
     ),
-    [_FN] = LAYOUT(
+    [_FN] = LAYOUT_all(
         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, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, 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(_FN2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    [_FN2] = LAYOUT(
+    [_FN2] = 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,
diff --git a/keyboards/rico/phoenix_project_no1/matrix_diagram.md b/keyboards/rico/phoenix_project_no1/matrix_diagram.md
new file mode 100644
index 000000000000..0a13aecc838d
--- /dev/null
+++ b/keyboards/rico/phoenix_project_no1/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for Rico Phoenix Project No 1
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0E     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│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 │1E   │1F │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2E  │ ISO Enter
+│20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E      │2F │   │2D │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │3F │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
+│40  │41  │42  │46                      │4A   │4C   │4D │4E │4F │
+└────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
+┌────────┐
+│30      │ 2.25u LShift
+└────────┘
+┌─────┬─────┬───────────────────────────┬─────┬─────┐
+│40   │42   │46                         │4A   │4C   │ WKL
+└─────┴─────┴───────────────────────────┴─────┴─────┘
+```
diff --git a/keyboards/riot_pad/config.h b/keyboards/riot_pad/config.h
new file mode 100644
index 000000000000..97dcb1de3c7f
--- /dev/null
+++ b/keyboards/riot_pad/config.h
@@ -0,0 +1,8 @@
+// Copyright 2023 ShandonCodes (@ShandonCodes)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define WS2812_SPI SPID1
+#define WS2812_SPI_MOSI_PAL_MODE 0
+#define WS2812_SPI_SCK_PAL_MODE 0
+#define WS2812_SPI_SCK_PIN A5
diff --git a/keyboards/riot_pad/halconf.h b/keyboards/riot_pad/halconf.h
new file mode 100644
index 000000000000..555a60902955
--- /dev/null
+++ b/keyboards/riot_pad/halconf.h
@@ -0,0 +1,7 @@
+// Copyright 2023 ShandonCodes (@ShandonCodes)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_SPI TRUE
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/riot_pad/info.json b/keyboards/riot_pad/info.json
new file mode 100644
index 000000000000..ab732ef0b03c
--- /dev/null
+++ b/keyboards/riot_pad/info.json
@@ -0,0 +1,57 @@
+{
+    "manufacturer": "ShandonCodes",
+    "keyboard_name": "RiotPad",
+    "maintainer": "ShandonCodes",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B14", "A8", "A9"],
+        "rows": ["B13", "B15"]
+    },
+    "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": 12
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x1000",
+        "vid": "0x7877"
+    },
+    "ws2812": {
+        "driver": "spi",
+        "pin": "A7"
+    },
+    "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/riot_pad/keymaps/default/keymap.c b/keyboards/riot_pad/keymaps/default/keymap.c
new file mode 100644
index 000000000000..0e6eda839e42
--- /dev/null
+++ b/keyboards/riot_pad/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 ShandonCodes (@ShandonCodes)
+// 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 │ Fn │
+     * └───┴───┴────┘
+     */
+    [0] = LAYOUT_ortho_2x3(
+        KC_A,    KC_B,    KC_C,
+        KC_D,    KC_E,    MO(1)
+    ),
+    [1] = LAYOUT_ortho_2x3(
+        RGB_MOD,    RGB_RMOD,    RGB_TOG,
+        RGB_VAI,    RGB_VAD,    KC_TRNS
+    )
+};
diff --git a/keyboards/riot_pad/keymaps/via/keymap.c b/keyboards/riot_pad/keymaps/via/keymap.c
new file mode 100644
index 000000000000..0e6eda839e42
--- /dev/null
+++ b/keyboards/riot_pad/keymaps/via/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 ShandonCodes (@ShandonCodes)
+// 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 │ Fn │
+     * └───┴───┴────┘
+     */
+    [0] = LAYOUT_ortho_2x3(
+        KC_A,    KC_B,    KC_C,
+        KC_D,    KC_E,    MO(1)
+    ),
+    [1] = LAYOUT_ortho_2x3(
+        RGB_MOD,    RGB_RMOD,    RGB_TOG,
+        RGB_VAI,    RGB_VAD,    KC_TRNS
+    )
+};
diff --git a/keyboards/riot_pad/keymaps/via/rules.mk b/keyboards/riot_pad/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/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/riot_pad/mcuconf.h
new file mode 100644
index 000000000000..7c3eec48021c
--- /dev/null
+++ b/keyboards/riot_pad/mcuconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 ShandonCodes (@ShandonCodes)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
\ No newline at end of file
diff --git a/keyboards/riot_pad/readme.md b/keyboards/riot_pad/readme.md
new file mode 100644
index 000000000000..c2c3ffd4be5e
--- /dev/null
+++ b/keyboards/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 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/riot_pad/rules.mk b/keyboards/riot_pad/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/riot_pad/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/ristretto/rules.mk b/keyboards/ristretto/rules.mk
index cb202f5b9b19..13002485f83b 100644
--- a/keyboards/ristretto/rules.mk
+++ b/keyboards/ristretto/rules.mk
@@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WAIT_FOR_USB = yes
diff --git a/keyboards/rkg68/info.json b/keyboards/rkg68/info.json
index c0043377a958..72244d50d69a 100644
--- a/keyboards/rkg68/info.json
+++ b/keyboards/rkg68/info.json
@@ -30,8 +30,12 @@
         "pid": "0x0049",
         "vid": "0x0049"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi"
+    },
+    "community_layouts": ["65_ansi"],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_ansi": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/rkg68/keymaps/default/keymap.c b/keyboards/rkg68/keymaps/default/keymap.c
index 2631452b5ba6..09f81e64511e 100644
--- a/keyboards/rkg68/keymaps/default/keymap.c
+++ b/keyboards/rkg68/keymaps/default/keymap.c
@@ -17,18 +17,18 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [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_CAPS, KC_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(
+    [1] = 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, 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_HOME, KC_END,  RGB_MOD, 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_BRK,
         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_SCRL,
-        QK_BOOT,   KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_VAD, RGB_SPD
+        QK_BOOT, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_VAD, RGB_SPD
     )
-};
\ No newline at end of file
+};
diff --git a/keyboards/rkg68/keymaps/via/keymap.c b/keyboards/rkg68/keymaps/via/keymap.c
index 2631452b5ba6..09f81e64511e 100644
--- a/keyboards/rkg68/keymaps/via/keymap.c
+++ b/keyboards/rkg68/keymaps/via/keymap.c
@@ -17,18 +17,18 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [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_CAPS, KC_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(
+    [1] = 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, 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_HOME, KC_END,  RGB_MOD, 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_BRK,
         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_SCRL,
-        QK_BOOT,   KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_VAD, RGB_SPD
+        QK_BOOT, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_VAD, RGB_SPD
     )
-};
\ No newline at end of file
+};
diff --git a/keyboards/rkg68/readme.md b/keyboards/rkg68/readme.md
index 8069a53169eb..c0c4a583ba59 100644
--- a/keyboards/rkg68/readme.md
+++ b/keyboards/rkg68/readme.md
@@ -1,10 +1,10 @@
-# RK G68
+# Royal Kludge RK G68
 
-![Keyboard picture](https://imgur.com/UnOJPZrh.jpg)
+![Royal Kludge RK G68](https://imgur.com/UnOJPZrh.jpg)
 
-* Keyboard Maintainer: [Royal Kludge](https://rkgamingstore.com/)
-* Hardware Supported: Royal Kludge RK G68
-* Hardware Availability: [RKG 68](http://en.rkgaming.com/download/1/)
+* Keyboard Maintainer: [Thomaz Peres](https://github.com/Thomaz-Peres)
+* Hardware Supported: Royal Kludge RK G68, RGB version
+* Hardware Availability: [RKGaming.com](http://en.rkgaming.com/product/13/), [Amazon.com](https://www.amazon.com/RK-ROYAL-KLUDGE-Bluetooth-Mechanical/dp/B08JCRMZX9/)
 
 After setting up your build environment, you can compile the  default keymap by using:
 
@@ -24,8 +24,8 @@ 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 `FN` and `Left CTRL`.
 
-## Layouts
+## Layout
 
-- ANSI layout;
+- 65% Standard ANSI layout
 
 ![Imgur](https://i.imgur.com/l7ka1gkh.png)
diff --git a/keyboards/rmi_kb/chevron/info.json b/keyboards/rmi_kb/chevron/info.json
index ef1d82353628..48f4373c2635 100644
--- a/keyboards/rmi_kb/chevron/info.json
+++ b/keyboards/rmi_kb/chevron/info.json
@@ -10,7 +10,7 @@
     },
     "matrix_pins": {
         "cols": ["A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "A4", "A3", "A2", "B4"],
-        "rows": ["D5", "D6", "C0", "D7", null]
+        "rows": ["D5", "D6", "C0", "D7"]
     },
     "diode_direction": "COL2ROW",
     "encoder": {
@@ -126,66 +126,6 @@
                 {"matrix": [2, 12], "x": 11.75, "y": 3, "w": 1.75},
                 {"matrix": [2, 13], "x": 13.5, "y": 3},
 
-                {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [3, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [3, 4], "x": 3.75, "y": 4, "w": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 4},
-                {"matrix": [3, 8], "x": 7.75, "y": 4, "w": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 4, "w": 1.25},
-                {"matrix": [3, 12], "x": 12, "y": 4, "w": 1.25},
-                {"matrix": [3, 13], "x": 13.25, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [4, 0], "x": 11.5, "y": 0},
-                {"matrix": [1, 13], "x": 12.5, "y": 0},
-                {"matrix": [4, 1], "x": 13.5, "y": 0},
-
-                {"matrix": [0, 0], "x": 0, "y": 1},
-                {"matrix": [0, 1], "x": 1, "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, "y": 1},
-                {"matrix": [0, 7], "x": 7, "y": 1},
-                {"matrix": [0, 8], "x": 8, "y": 1},
-                {"matrix": [0, 9], "x": 9, "y": 1},
-                {"matrix": [0, 10], "x": 10, "y": 1},
-                {"matrix": [0, 11], "x": 11, "y": 1},
-                {"matrix": [0, 12], "x": 12, "y": 1},
-                {"matrix": [0, 13], "x": 13, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 2},
-                {"matrix": [1, 2], "x": 2.25, "y": 2},
-                {"matrix": [1, 3], "x": 3.25, "y": 2},
-                {"matrix": [1, 4], "x": 4.25, "y": 2},
-                {"matrix": [1, 5], "x": 5.25, "y": 2},
-                {"matrix": [1, 6], "x": 6.25, "y": 2},
-                {"matrix": [1, 7], "x": 7.25, "y": 2},
-                {"matrix": [1, 8], "x": 8.25, "y": 2},
-                {"matrix": [1, 9], "x": 9.25, "y": 2},
-                {"matrix": [1, 10], "x": 10.25, "y": 2},
-                {"matrix": [1, 11], "x": 11.25, "y": 2},
-                {"matrix": [1, 12], "x": 12.25, "y": 2, "w": 2.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 3},
-                {"matrix": [2, 2], "x": 2.75, "y": 3},
-                {"matrix": [2, 3], "x": 3.75, "y": 3},
-                {"matrix": [2, 4], "x": 4.75, "y": 3},
-                {"matrix": [2, 5], "x": 5.75, "y": 3},
-                {"matrix": [2, 6], "x": 6.75, "y": 3},
-                {"matrix": [2, 7], "x": 7.75, "y": 3},
-                {"matrix": [2, 8], "x": 8.75, "y": 3},
-                {"matrix": [2, 9], "x": 9.75, "y": 3},
-                {"matrix": [2, 10], "x": 10.75, "y": 3},
-                {"matrix": [2, 12], "x": 11.75, "y": 3, "w": 1.75},
-                {"matrix": [2, 13], "x": 13.5, "y": 3},
-
                 {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
                 {"matrix": [3, 1], "x": 1.25, "y": 4, "w": 1.25},
                 {"matrix": [3, 2], "x": 2.5, "y": 4, "w": 1.25},
diff --git a/keyboards/rmi_kb/chevron/keymaps/via/keymap.c b/keyboards/rmi_kb/chevron/keymaps/via/keymap.c
index 8651a3dee7e8..6ebf4eb7c02c 100644
--- a/keyboards/rmi_kb/chevron/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/chevron/keymaps/via/keymap.c
@@ -16,29 +16,29 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_all(
-                                                                                                           KC_VOLD, KC_MUTE, KC_VOLU,
+    [0] = LAYOUT_ansi(
+                                                                                                                    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_LBRC, KC_RBRC, 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_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,           MO(1),            KC_BSPC,                   KC_RALT, KC_RGUI, KC_RCTL
     ),
-    [1] = LAYOUT_all(
-                                                                                                           _______, _______, _______,
+    [1] = 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_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,          _______,
         _______, KC_F11,  KC_F12,  _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______,          _______,          _______,          _______,                   _______, _______, _______
     ),
-    [2] = LAYOUT_all(
-                                                                                                           _______, _______, _______,
+    [2] = LAYOUT_ansi(
+                                                                                                                    _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______,          _______,          _______,          _______,                   _______, _______, _______
     ),
-    [3] = LAYOUT_all(
-                                                                                                           _______, _______, _______,
+    [3] = LAYOUT_ansi(
+                                                                                                                    _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
@@ -46,43 +46,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-keyevent_t encoder_ccw = {
-    .key = (keypos_t){.row = 4, .col = 0},
-    .pressed = false,
-    .type = KEY_EVENT
+#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(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
 };
-
-keyevent_t encoder_cw = {
-    .key = (keypos_t){.row = 4, .col = 1},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-void matrix_scan_user(void) {
-    if (encoder_ccw.pressed) {
-        encoder_ccw.pressed = false;
-        encoder_ccw.time = timer_read();
-        action_exec(encoder_ccw);
-    }
-
-    if (encoder_cw.pressed) {
-        encoder_cw.pressed = false;
-        encoder_cw.time = timer_read();
-        action_exec(encoder_cw);
-    }
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-        encoder_cw.pressed = true;
-        encoder_cw.time = timer_read();
-        action_exec(encoder_cw);
-        wait_ms(20);
-    } else {
-        encoder_ccw.pressed = true;
-        encoder_ccw.time = timer_read();
-        action_exec(encoder_ccw);
-        wait_ms(20);
-    }
-    return true;
-}
+#endif
diff --git a/keyboards/rmi_kb/chevron/keymaps/via/rules.mk b/keyboards/rmi_kb/chevron/keymaps/via/rules.mk
index 1e5b99807cb7..f1adcab005e8 100644
--- a/keyboards/rmi_kb/chevron/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/chevron/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rmi_kb/herringbone/pro/info.json b/keyboards/rmi_kb/herringbone/pro/info.json
index e02c428ab86d..caab0f11e15a 100644
--- a/keyboards/rmi_kb/herringbone/pro/info.json
+++ b/keyboards/rmi_kb/herringbone/pro/info.json
@@ -15,7 +15,7 @@
     "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
-            {"pin_a": "C3", "pin_b": "C2"}
+            {"pin_a": "C3", "pin_b": "C2", "resolution": 2}
         ]
     },
     "processor": "atmega32a",
@@ -247,9 +247,7 @@
 
                 {"matrix": [0, 13], "x": 14, "y": 0},
 
-                {"matrix": [6, 0], "x": 15.25, "y": 0},
-                {"matrix": [0, 14], "x": 16.25, "y": 0},
-                {"matrix": [6, 1], "x": 17.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
 
                 {"matrix": [1, 0], "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "x": 1, "y": 1.25},
diff --git a/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c b/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c
index dbf282b68f59..9df8143fb72b 100644
--- a/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c
@@ -19,7 +19,7 @@
 
 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_VOLD, KC_MUTE, KC_VOLU,
+        KC_ESC,  KC_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_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,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,          KC_NO,   KC_SPC,           KC_NO,   KC_RALT, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_all(
-        QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,          _______, _______,          _______,  _______, _______,                   _______, _______, _______
     ),
     [2] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,          _______, _______,          _______,  _______, _______,                   _______, _______, _______
     ),
     [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
@@ -52,31 +52,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-keyevent_t encoder_ccw = {
-    .key = (keypos_t){.row = 6, .col = 0},
-    .pressed = false,
-    .type = KEY_EVENT
- };
-
-keyevent_t encoder_cw = {
-    .key = (keypos_t){.row = 6, .col = 1},
-    .pressed = false,
-    .type = KEY_EVENT
+#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(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
 };
-
-void matrix_scan_user(void) {
-    if (encoder_ccw.pressed) {
-        encoder_ccw.pressed = false;
-        encoder_ccw.time = timer_read();
-        action_exec(encoder_ccw);
-    }
-
-    if (encoder_cw.pressed) {
-        encoder_cw.pressed = false;
-        encoder_cw.time = timer_read();
-        action_exec(encoder_cw);
-    }
-}
+#endif
 
 #ifdef OLED_ENABLE
 uint32_t anim_timer = 0;
@@ -85,25 +68,6 @@ uint8_t current_frame = 0;
 
 #define FRAME_DURATION 50
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-        encoder_cw.pressed = true;
-        encoder_cw.time = timer_read();
-        action_exec(encoder_cw);
-        wait_ms(20);
-        anim_sleep = timer_read32();
-        oled_on();
-    } else {
-        encoder_ccw.pressed = true;
-        encoder_ccw.time = timer_read();
-        action_exec(encoder_ccw);
-        wait_ms(20);
-        anim_sleep = timer_read32();
-        oled_on();
-    }
-    return true;
-}
-
 static void render_pattern(void) {
     void animate(void) {
         oled_set_cursor(4, 0);
diff --git a/keyboards/rmi_kb/herringbone/pro/keymaps/via/rules.mk b/keyboards/rmi_kb/herringbone/pro/keymaps/via/rules.mk
index 1e5b99807cb7..f1adcab005e8 100644
--- a/keyboards/rmi_kb/herringbone/pro/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/herringbone/pro/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rmi_kb/herringbone/pro/rules.mk b/keyboards/rmi_kb/herringbone/pro/rules.mk
index db45e4f61c55..890f20de86ab 100644
--- a/keyboards/rmi_kb/herringbone/pro/rules.mk
+++ b/keyboards/rmi_kb/herringbone/pro/rules.mk
@@ -15,7 +15,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 LTO_ENABLE = yes
 
diff --git a/keyboards/rmi_kb/squishy65/config.h b/keyboards/rmi_kb/squishy65/config.h
index b4efbc241c71..4b007cf387ee 100644
--- a/keyboards/rmi_kb/squishy65/config.h
+++ b/keyboards/rmi_kb/squishy65/config.h
@@ -17,18 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 18
-#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
-
 /* 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/rmi_kb/squishy65/info.json b/keyboards/rmi_kb/squishy65/info.json
index 35aeac5706fe..1af28e861c78 100644
--- a/keyboards/rmi_kb/squishy65/info.json
+++ b/keyboards/rmi_kb/squishy65/info.json
@@ -8,6 +8,21 @@
         "pid": "0x10B5",
         "device_version": "0.6.5"
     },
+    "rgblight": {
+        "led_count": 18,
+        "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"
     },
diff --git a/keyboards/rmi_kb/squishy65/rules.mk b/keyboards/rmi_kb/squishy65/rules.mk
index 4eaa5819ac42..31f4f7acad00 100644
--- a/keyboards/rmi_kb/squishy65/rules.mk
+++ b/keyboards/rmi_kb/squishy65/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/rmi_kb/squishyfrl/config.h b/keyboards/rmi_kb/squishyfrl/config.h
index 1433de81063a..f36369d6c75f 100644
--- a/keyboards/rmi_kb/squishyfrl/config.h
+++ b/keyboards/rmi_kb/squishyfrl/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 16
-//#    define RGBLIGHT_HUE_STEP 8
-//#    define RGBLIGHT_SAT_STEP 8
-//#    define RGBLIGHT_VAL_STEP 8
-//#    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
-
 /* 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/rmi_kb/squishyfrl/info.json b/keyboards/rmi_kb/squishyfrl/info.json
index f6ab10f5d939..a19d0bde7dd9 100644
--- a/keyboards/rmi_kb/squishyfrl/info.json
+++ b/keyboards/rmi_kb/squishyfrl/info.json
@@ -8,6 +8,21 @@
         "pid": "0x4BE5",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 16,
+        "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": "C15"
     },
diff --git a/keyboards/rmi_kb/squishyfrl/rules.mk b/keyboards/rmi_kb/squishyfrl/rules.mk
index 5c31520ab483..d612de6c5f50 100644
--- a/keyboards/rmi_kb/squishyfrl/rules.mk
+++ b/keyboards/rmi_kb/squishyfrl/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/rmi_kb/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h
index 1433de81063a..f36369d6c75f 100644
--- a/keyboards/rmi_kb/squishytkl/config.h
+++ b/keyboards/rmi_kb/squishytkl/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 16
-//#    define RGBLIGHT_HUE_STEP 8
-//#    define RGBLIGHT_SAT_STEP 8
-//#    define RGBLIGHT_VAL_STEP 8
-//#    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
-
 /* 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/rmi_kb/squishytkl/info.json b/keyboards/rmi_kb/squishytkl/info.json
index b49d72c82939..64b13752d9f0 100644
--- a/keyboards/rmi_kb/squishytkl/info.json
+++ b/keyboards/rmi_kb/squishytkl/info.json
@@ -8,6 +8,21 @@
         "pid": "0x00B1",
         "device_version": "1.0.0"
     },
+    "rgblight": {
+        "led_count": 16,
+        "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": "C15"
     },
@@ -350,117 +365,114 @@
         },
         "LAYOUT_all": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.5},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0.5},
-                {"matrix": [0, 2], "x": 2.25, "y": 0.5},
-                {"matrix": [0, 3], "x": 3.25, "y": 0.5},
-                {"matrix": [0, 4], "x": 4.25, "y": 0.5},
-
-                {"matrix": [1, 0], "x": 5.5, "y": 0.5},
-                {"matrix": [1, 1], "x": 6.5, "y": 0.5},
-                {"matrix": [1, 2], "x": 7.5, "y": 0.5},
-                {"matrix": [1, 3], "x": 8.5, "y": 0.5},
-
-                {"matrix": [2, 0], "x": 9.75, "y": 0.5},
-                {"matrix": [2, 1], "x": 10.75, "y": 0.5},
-                {"matrix": [2, 2], "x": 11.75, "y": 0.5},
-                {"matrix": [2, 3], "x": 12.75, "y": 0.5},
-
-                {"matrix": [2, 4], "x": 14, "y": 0.5},
-
-                {"matrix": [3, 20], "x": 15.25, "y": 0.5},
-                {"matrix": [3, 21], "x": 16.25, "y": 0.5},
-                {"matrix": [3, 22], "x": 17.25, "y": 0.5},
-
-                {"matrix": [8, 5], "x": 0, "y": 1.75},
-                {"matrix": [8, 6], "x": 1, "y": 1.75},
-                {"matrix": [8, 7], "x": 2, "y": 1.75},
-                {"matrix": [8, 8], "x": 3, "y": 1.75},
-                {"matrix": [8, 9], "x": 4, "y": 1.75},
-                {"matrix": [8, 10], "x": 5, "y": 1.75},
-                {"matrix": [8, 11], "x": 6, "y": 1.75},
-                {"matrix": [8, 12], "x": 7, "y": 1.75},
-                {"matrix": [8, 13], "x": 8, "y": 1.75},
-                {"matrix": [8, 14], "x": 9, "y": 1.75},
-                {"matrix": [8, 15], "x": 10, "y": 1.75},
-                {"matrix": [8, 16], "x": 11, "y": 1.75},
-                {"matrix": [8, 17], "x": 12, "y": 1.75},
-                {"matrix": [8, 18], "x": 13, "y": 1.75},
-                {"matrix": [8, 19], "x": 14, "y": 1.75},
-
-                {"matrix": [4, 20], "x": 15.25, "y": 1.75},
-                {"matrix": [4, 21], "x": 16.25, "y": 1.75},
-                {"matrix": [4, 22], "x": 17.25, "y": 1.75},
-
-                {"matrix": [9, 5], "x": 0, "y": 2.75, "w": 1.5},
-                {"matrix": [9, 6], "x": 1.5, "y": 2.75},
-                {"matrix": [9, 7], "x": 2.5, "y": 2.75},
-                {"matrix": [9, 8], "x": 3.5, "y": 2.75},
-                {"matrix": [9, 9], "x": 4.5, "y": 2.75},
-                {"matrix": [9, 10], "x": 5.5, "y": 2.75},
-                {"matrix": [9, 11], "x": 6.5, "y": 2.75},
-                {"matrix": [9, 12], "x": 7.5, "y": 2.75},
-                {"matrix": [9, 13], "x": 8.5, "y": 2.75},
-                {"matrix": [9, 14], "x": 9.5, "y": 2.75},
-                {"matrix": [9, 15], "x": 10.5, "y": 2.75},
-                {"matrix": [9, 16], "x": 11.5, "y": 2.75},
-                {"matrix": [9, 17], "x": 12.5, "y": 2.75},
-                {"matrix": [9, 19], "x": 13.5, "y": 2.75, "w": 1.5},
-
-                {"matrix": [5, 20], "x": 15.25, "y": 2.75},
-                {"matrix": [5, 21], "x": 16.25, "y": 2.75},
-                {"matrix": [5, 22], "x": 17.25, "y": 2.75},
-
-                {"matrix": [10, 5], "x": 0, "y": 3.75, "w": 1.75},
-                {"matrix": [10, 6], "x": 1.75, "y": 3.75},
-                {"matrix": [10, 7], "x": 2.75, "y": 3.75},
-                {"matrix": [10, 8], "x": 3.75, "y": 3.75},
-                {"matrix": [10, 9], "x": 4.75, "y": 3.75},
-                {"matrix": [10, 10], "x": 5.75, "y": 3.75},
-                {"matrix": [10, 11], "x": 6.75, "y": 3.75},
-                {"matrix": [10, 12], "x": 7.75, "y": 3.75},
-                {"matrix": [10, 13], "x": 8.75, "y": 3.75},
-                {"matrix": [10, 14], "x": 9.75, "y": 3.75},
-                {"matrix": [10, 15], "x": 10.75, "y": 3.75},
-                {"matrix": [10, 16], "x": 11.75, "y": 3.75},
-                {"matrix": [10, 18], "x": 12.75, "y": 3.75, "w": 2.25},
-
-                {"matrix": [11, 5], "x": 0, "y": 4.75, "w": 1.25},
-                {"matrix": [11, 6], "x": 1.25, "y": 4.75},
-                {"matrix": [11, 7], "x": 2.25, "y": 4.75},
-                {"matrix": [11, 8], "x": 3.25, "y": 4.75},
-                {"matrix": [11, 9], "x": 4.25, "y": 4.75},
-                {"matrix": [11, 10], "x": 5.25, "y": 4.75},
-                {"matrix": [11, 11], "x": 6.25, "y": 4.75},
-                {"matrix": [11, 12], "x": 7.25, "y": 4.75},
-                {"matrix": [11, 13], "x": 8.25, "y": 4.75},
-                {"matrix": [11, 14], "x": 9.25, "y": 4.75},
-                {"matrix": [11, 15], "x": 10.25, "y": 4.75},
-                {"matrix": [11, 16], "x": 11.25, "y": 4.75},
-                {"matrix": [11, 18], "x": 12.25, "y": 4.75, "w": 1.75},
-                {"matrix": [11, 19], "x": 14, "y": 4.75},
-
-                {"matrix": [6, 24], "x": 16.25, "y": 4.75},
-
-                {"matrix": [12, 5], "x": 0, "y": 5.75, "w": 1.25},
-                {"matrix": [12, 6], "x": 1.25, "y": 5.75, "w": 1.25},
-                {"matrix": [12, 7], "x": 2.5, "y": 5.75, "w": 1.25},
-                {"matrix": [12, 8], "x": 3.75, "y": 5.75},
-                {"matrix": [12, 9], "x": 4.75, "y": 5.75, "w": 1.5},
-                {"matrix": [12, 13], "x": 6.25, "y": 5.75},
-                {"matrix": [12, 14], "x": 7.25, "y": 5.75, "w": 2.75},
-                {"matrix": [12, 15], "x": 10, "y": 5.75, "w": 1.25},
-                {"matrix": [12, 16], "x": 11.25, "y": 5.75, "w": 1.25},
-                {"matrix": [12, 18], "x": 12.5, "y": 5.75, "w": 1.25},
-                {"matrix": [12, 19], "x": 13.75, "y": 5.75, "w": 1.25},
-
-                {"matrix": [7, 23], "x": 15.25, "y": 5.75},
-                {"matrix": [7, 24], "x": 16.25, "y": 5.75},
-                {"matrix": [7, 25], "x": 17.25, "y": 5.75},
-
-                {"matrix": [13, 0], "x": 18.5, "y": 0},
-                {"matrix": [13, 1], "x": 18.5, "y": 1}
+                {"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": [1, 0], "x": 5.5, "y": 0},
+                {"matrix": [1, 1], "x": 6.5, "y": 0},
+                {"matrix": [1, 2], "x": 7.5, "y": 0},
+                {"matrix": [1, 3], "x": 8.5, "y": 0},
+
+                {"matrix": [2, 0], "x": 9.75, "y": 0},
+                {"matrix": [2, 1], "x": 10.75, "y": 0},
+                {"matrix": [2, 2], "x": 11.75, "y": 0},
+                {"matrix": [2, 3], "x": 12.75, "y": 0},
+
+                {"matrix": [2, 4], "x": 14, "y": 0},
+
+                {"matrix": [3, 20], "x": 15.25, "y": 0},
+                {"matrix": [3, 21], "x": 16.25, "y": 0},
+                {"matrix": [3, 22], "x": 17.25, "y": 0},
+
+                {"matrix": [8, 5], "x": 0, "y": 1.25},
+                {"matrix": [8, 6], "x": 1, "y": 1.25},
+                {"matrix": [8, 7], "x": 2, "y": 1.25},
+                {"matrix": [8, 8], "x": 3, "y": 1.25},
+                {"matrix": [8, 9], "x": 4, "y": 1.25},
+                {"matrix": [8, 10], "x": 5, "y": 1.25},
+                {"matrix": [8, 11], "x": 6, "y": 1.25},
+                {"matrix": [8, 12], "x": 7, "y": 1.25},
+                {"matrix": [8, 13], "x": 8, "y": 1.25},
+                {"matrix": [8, 14], "x": 9, "y": 1.25},
+                {"matrix": [8, 15], "x": 10, "y": 1.25},
+                {"matrix": [8, 16], "x": 11, "y": 1.25},
+                {"matrix": [8, 17], "x": 12, "y": 1.25},
+                {"matrix": [8, 18], "x": 13, "y": 1.25},
+                {"matrix": [8, 19], "x": 14, "y": 1.25},
+
+                {"matrix": [4, 20], "x": 15.25, "y": 1.25},
+                {"matrix": [4, 21], "x": 16.25, "y": 1.25},
+                {"matrix": [4, 22], "x": 17.25, "y": 1.25},
+
+                {"matrix": [9, 5], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [9, 6], "x": 1.5, "y": 2.25},
+                {"matrix": [9, 7], "x": 2.5, "y": 2.25},
+                {"matrix": [9, 8], "x": 3.5, "y": 2.25},
+                {"matrix": [9, 9], "x": 4.5, "y": 2.25},
+                {"matrix": [9, 10], "x": 5.5, "y": 2.25},
+                {"matrix": [9, 11], "x": 6.5, "y": 2.25},
+                {"matrix": [9, 12], "x": 7.5, "y": 2.25},
+                {"matrix": [9, 13], "x": 8.5, "y": 2.25},
+                {"matrix": [9, 14], "x": 9.5, "y": 2.25},
+                {"matrix": [9, 15], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 16], "x": 11.5, "y": 2.25},
+                {"matrix": [9, 17], "x": 12.5, "y": 2.25},
+                {"matrix": [9, 19], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 20], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 21], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 22], "x": 17.25, "y": 2.25},
+
+                {"matrix": [10, 5], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [10, 6], "x": 1.75, "y": 3.25},
+                {"matrix": [10, 7], "x": 2.75, "y": 3.25},
+                {"matrix": [10, 8], "x": 3.75, "y": 3.25},
+                {"matrix": [10, 9], "x": 4.75, "y": 3.25},
+                {"matrix": [10, 10], "x": 5.75, "y": 3.25},
+                {"matrix": [10, 11], "x": 6.75, "y": 3.25},
+                {"matrix": [10, 12], "x": 7.75, "y": 3.25},
+                {"matrix": [10, 13], "x": 8.75, "y": 3.25},
+                {"matrix": [10, 14], "x": 9.75, "y": 3.25},
+                {"matrix": [10, 15], "x": 10.75, "y": 3.25},
+                {"matrix": [10, 16], "x": 11.75, "y": 3.25},
+                {"matrix": [10, 18], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [11, 5], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 1.25, "y": 4.25},
+                {"matrix": [11, 7], "x": 2.25, "y": 4.25},
+                {"matrix": [11, 8], "x": 3.25, "y": 4.25},
+                {"matrix": [11, 9], "x": 4.25, "y": 4.25},
+                {"matrix": [11, 10], "x": 5.25, "y": 4.25},
+                {"matrix": [11, 11], "x": 6.25, "y": 4.25},
+                {"matrix": [11, 12], "x": 7.25, "y": 4.25},
+                {"matrix": [11, 13], "x": 8.25, "y": 4.25},
+                {"matrix": [11, 14], "x": 9.25, "y": 4.25},
+                {"matrix": [11, 15], "x": 10.25, "y": 4.25},
+                {"matrix": [11, 16], "x": 11.25, "y": 4.25},
+                {"matrix": [11, 18], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [11, 19], "x": 14, "y": 4.25},
+
+                {"matrix": [6, 24], "x": 16.25, "y": 4.25},
+
+                {"matrix": [12, 5], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [12, 6], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [12, 7], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [12, 8], "x": 3.75, "y": 5.25},
+                {"matrix": [12, 9], "x": 4.75, "y": 5.25, "w": 1.5},
+                {"matrix": [12, 13], "x": 6.25, "y": 5.25},
+                {"matrix": [12, 14], "x": 7.25, "y": 5.25, "w": 2.75},
+                {"matrix": [12, 15], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [12, 16], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [12, 18], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [12, 19], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [7, 23], "x": 15.25, "y": 5.25},
+                {"matrix": [7, 24], "x": 16.25, "y": 5.25},
+                {"matrix": [7, 25], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
index 2c33b4869cfd..ea11eadd080e 100644
--- a/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
@@ -22,46 +22,12 @@ 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_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_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_UP,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_NO,   KC_NO,            KC_SPC,           KC_NO,            KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT,
-        KC_VOLU, KC_VOLD
-    ),
+        KC_LCTL, KC_LGUI, KC_LALT, KC_NO,   KC_NO,            KC_SPC,           KC_NO,            KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    )
 };
 
-keyevent_t encoder_ccw = {
-    .key = (keypos_t){.row = 13, .col = 0},
-    .pressed = false,
-    .type = KEY_EVENT
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
 };
-
-keyevent_t encoder_cw = {
-    .key = (keypos_t){.row = 13, .col = 1},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-void matrix_scan_user(void) {
-    if (encoder_ccw.pressed) {
-        encoder_ccw.pressed = false;
-        encoder_ccw.time = timer_read();
-        action_exec(encoder_ccw);
-    }
-
-    if (encoder_cw.pressed) {
-        encoder_cw.pressed = false;
-        encoder_cw.time = timer_read();
-        action_exec(encoder_cw);
-    }
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-        encoder_cw.pressed = true;
-        encoder_cw.time = timer_read();
-        action_exec(encoder_cw);
-    } else {
-        encoder_ccw.pressed = true;
-        encoder_ccw.time = timer_read();
-        action_exec(encoder_ccw);
-    }
-    return true;
-}
+#endif
diff --git a/keyboards/rmi_kb/squishytkl/keymaps/via/rules.mk b/keyboards/rmi_kb/squishytkl/keymaps/via/rules.mk
index 1e5b99807cb7..f1adcab005e8 100644
--- a/keyboards/rmi_kb/squishytkl/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/squishytkl/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rmi_kb/squishytkl/rules.mk b/keyboards/rmi_kb/squishytkl/rules.mk
index ae292c0a5af0..a84e51ab51c2 100644
--- a/keyboards/rmi_kb/squishytkl/rules.mk
+++ b/keyboards/rmi_kb/squishytkl/rules.mk
@@ -11,6 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes 		# Enable rotary encoder fuctionality
-
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
\ No newline at end of file
diff --git a/keyboards/rmi_kb/tkl_ff/v2/config.h b/keyboards/rmi_kb/tkl_ff/v2/config.h
index b5d023489af7..6159ac1bd06c 100644
--- a/keyboards/rmi_kb/tkl_ff/v2/config.h
+++ b/keyboards/rmi_kb/tkl_ff/v2/config.h
@@ -18,18 +18,3 @@
 
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-
-#    define RGBLED_NUM 26
-#    define RGBLIGHT_HUE_STEP 32
-#    define RGBLIGHT_SAT_STEP 32
-#    define RGBLIGHT_VAL_STEP 32
-//#    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
diff --git a/keyboards/rmi_kb/tkl_ff/v2/info.json b/keyboards/rmi_kb/tkl_ff/v2/info.json
index a7617b5f30e9..72a3406af3e9 100644
--- a/keyboards/rmi_kb/tkl_ff/v2/info.json
+++ b/keyboards/rmi_kb/tkl_ff/v2/info.json
@@ -2,6 +2,21 @@
     "usb": {
         "pid": "0x10FF"
     },
+    "rgblight": {
+        "hue_steps": 32,
+        "saturation_steps": 32,
+        "brightness_steps": 32,
+        "led_count": 26,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        }
+    },
     "ws2812": {
         "pin": "E2"
     }
diff --git a/keyboards/rmi_kb/wete/v1/config.h b/keyboards/rmi_kb/wete/v1/config.h
index c4d0637afe2a..b3b42c6c3ec8 100644
--- a/keyboards/rmi_kb/wete/v1/config.h
+++ b/keyboards/rmi_kb/wete/v1/config.h
@@ -21,18 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_CHANNEL 1
 #define BACKLIGHT_PAL_MODE 1
 
-#define RGBLED_NUM 24
-#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 SLEEP_LED_GPT_DRIVER GPTD1
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/rmi_kb/wete/v1/info.json b/keyboards/rmi_kb/wete/v1/info.json
index c3ae142d3197..47a6befec341 100644
--- a/keyboards/rmi_kb/wete/v1/info.json
+++ b/keyboards/rmi_kb/wete/v1/info.json
@@ -18,6 +18,21 @@
         "levels": 24,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 24,
+        "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": "B4"
     },
diff --git a/keyboards/rmi_kb/wete/v1/rules.mk b/keyboards/rmi_kb/wete/v1/rules.mk
index e81a5dd98ede..108db79ad0b7 100644
--- a/keyboards/rmi_kb/wete/v1/rules.mk
+++ b/keyboards/rmi_kb/wete/v1/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SLEEP_LED_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/rmi_kb/wete/v2/config.h b/keyboards/rmi_kb/wete/v2/config.h
index 3c46afada598..121c9046e028 100644
--- a/keyboards/rmi_kb/wete/v2/config.h
+++ b/keyboards/rmi_kb/wete/v2/config.h
@@ -20,21 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 
-#    define RGBLED_NUM 18
-#    define RGBLIGHT_HUE_STEP 32
-#    define RGBLIGHT_SAT_STEP 32
-#    define RGBLIGHT_VAL_STEP 32
-//#    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
-
 /* 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/rmi_kb/wete/v2/info.json b/keyboards/rmi_kb/wete/v2/info.json
index f1e87a6e2876..45ae1b5708ce 100644
--- a/keyboards/rmi_kb/wete/v2/info.json
+++ b/keyboards/rmi_kb/wete/v2/info.json
@@ -18,6 +18,21 @@
             {"pin_a": "D2", "pin_b": "D1"}
         ]
     },
+    "rgblight": {
+        "hue_steps": 32,
+        "saturation_steps": 32,
+        "brightness_steps": 32,
+        "led_count": 18,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        }
+    },
     "ws2812": {
         "pin": "D0"
     },
@@ -393,10 +408,7 @@
                 {"matrix": [10, 8], "x": 16.25, "y": 5.25},
                 {"matrix": [11, 8], "x": 17.25, "y": 5.25},
                 {"matrix": [10, 9], "x": 18.25, "y": 5.25},
-                {"matrix": [11, 9], "x": 19.25, "y": 5.25},
-
-                {"matrix": [12, 0], "x": 19, "y": 0, "w": 0.5},
-                {"matrix": [12, 1], "x": 20.5, "y": 0, "w": 0.5}
+                {"matrix": [11, 9], "x": 19.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c b/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c
index 05df87fc94c8..8d4f3c88eb60 100644
--- a/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c
@@ -14,6 +14,7 @@
  * along 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_PSCR, KC_SCRL, KC_PAUS, KC_INS,  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
@@ -21,8 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_END,
         KC_P4,   KC_P5,   KC_P6,   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_PGUP,
         KC_P1,   KC_P2,   KC_P3,   KC_PENT, 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_PGDN,
-        KC_P0,   KC_NO,   KC_PDOT, KC_NO,   KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, KC_RCTL, KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT,
-        KC_VOLD, KC_VOLU
+        KC_P0,   KC_NO,   KC_PDOT, KC_NO,   KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, KC_RCTL, KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_all(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -30,49 +30,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______, _______,
-        _______, _______
+        _______, _______, _______, _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______, _______
     ),
 };
 
-keyevent_t encoder_ccw = {
-    .key = (keypos_t){.row = 12, .col = 0},
-    .pressed = false,
-    .type = KEY_EVENT
-};
-
-keyevent_t encoder_cw = {
-    .key = (keypos_t){.row = 12, .col = 1},
-    .pressed = false,
-    .type = KEY_EVENT
+#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(_______, _______) }
 };
-
-void matrix_scan_user(void) {
-    if (encoder_ccw.pressed) {
-        encoder_ccw.pressed = false;
-        encoder_ccw.time = timer_read();
-        action_exec(encoder_ccw);
-    }
-
-    if (encoder_cw.pressed) {
-        encoder_cw.pressed = false;
-        encoder_cw.time = timer_read();
-        action_exec(encoder_cw);
-    }
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-        encoder_cw.pressed = true;
-        encoder_cw.time = timer_read();
-        action_exec(encoder_cw);
-    } else {
-        encoder_ccw.pressed = true;
-        encoder_ccw.time = timer_read();
-        action_exec(encoder_ccw);
-    }
-    return true;
-}
+#endif
 
 #ifdef RGBLIGHT_ENABLE
 // Can probably still be optimized, but I like it as is for clarity
diff --git a/keyboards/rmi_kb/wete/v2/keymaps/via/rules.mk b/keyboards/rmi_kb/wete/v2/keymaps/via/rules.mk
index 1e5b99807cb7..f1adcab005e8 100644
--- a/keyboards/rmi_kb/wete/v2/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/wete/v2/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rmkeebs/rm_fullsize/info.json b/keyboards/rmkeebs/rm_fullsize/info.json
index 4b02137ad3e3..f9ff4dd5b86b 100644
--- a/keyboards/rmkeebs/rm_fullsize/info.json
+++ b/keyboards/rmkeebs/rm_fullsize/info.json
@@ -29,8 +29,11 @@
             { "pin_a": "GP11", "pin_b": "GP10" }
         ]
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 { "matrix": [0, 0], "x": 0, "y": 0.25 },
                 { "matrix": [0, 2], "x": 2, "y": 0.25 },
@@ -150,6 +153,239 @@
                 { "matrix": [5, 18], "x": 20.5, "y": 5.5 },
                 { "matrix": [5, 19], "x": 21.5, "y": 5.5 }
             ]
+        },
+        "LAYOUT_fullsize_108_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "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.25},
+                {"matrix": [0, 9], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 11, "y": 0.25},
+                {"matrix": [0, 11], "x": 12, "y": 0.25},
+                {"matrix": [0, 12], "x": 13, "y": 0.25},
+                {"matrix": [0, 13], "x": 14, "y": 0.25},
+                {"matrix": [0, 14], "x": 15.25, "y": 0.25},
+                {"matrix": [0, 15], "x": 16.25, "y": 0.25},
+                {"matrix": [3, 15], "x": 17.25, "y": 0.25},
+                {"matrix": [0, 16], "x": 18.5, "y": 0.25},
+                {"matrix": [0, 17], "x": 19.5, "y": 0.25},
+                {"matrix": [0, 18], "x": 20.5, "y": 0.25},
+                {"matrix": [0, 19], "x": 21.75, "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": [2, 13], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 15], "x": 17.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 18], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 19], "x": 21.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.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": [5, 15], "x": 17.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 18], "x": 20.5, "y": 2.5},
+                {"matrix": [3, 19], "x": 21.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, "w": 2.25},
+                {"matrix": [3, 16], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 19.5, "y": 3.5},
+                {"matrix": [3, 18], "x": 20.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"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], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [3, 14], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 16], "x": 18.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 19.5, "y": 4.5},
+                {"matrix": [4, 18], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 19], "x": 21.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, 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": [4, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_fullsize_108_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "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.25},
+                {"matrix": [0, 9], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 11, "y": 0.25},
+                {"matrix": [0, 11], "x": 12, "y": 0.25},
+                {"matrix": [0, 12], "x": 13, "y": 0.25},
+                {"matrix": [0, 13], "x": 14, "y": 0.25},
+                {"matrix": [0, 14], "x": 15.25, "y": 0.25},
+                {"matrix": [0, 15], "x": 16.25, "y": 0.25},
+                {"matrix": [3, 15], "x": 17.25, "y": 0.25},
+                {"matrix": [0, 16], "x": 18.5, "y": 0.25},
+                {"matrix": [0, 17], "x": 19.5, "y": 0.25},
+                {"matrix": [0, 18], "x": 20.5, "y": 0.25},
+                {"matrix": [0, 19], "x": 21.75, "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": [2, 13], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 15], "x": 17.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 18], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 19], "x": 21.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.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": [5, 15], "x": 17.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 18], "x": 20.5, "y": 2.5},
+                {"matrix": [3, 19], "x": 21.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, "w": 2.25},
+                {"matrix": [3, 16], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 19.5, "y": 3.5},
+                {"matrix": [3, 18], "x": 20.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"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], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [3, 14], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 16], "x": 18.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 19.5, "y": 4.5},
+                {"matrix": [4, 18], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 19], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"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, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/rmkeebs/rm_fullsize/keymaps/default/keymap.c b/keyboards/rmkeebs/rm_fullsize/keymaps/default/keymap.c
index c94cc2e526e3..8f9f2356e990 100644
--- a/keyboards/rmkeebs/rm_fullsize/keymaps/default/keymap.c
+++ b/keyboards/rmkeebs/rm_fullsize/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │Ctrl│GUI │Alt │                        │ Alt│ GUI│Menu│Ctrl│ │ ← │ ↓ │ → │ │ 0 │ 00│ . │Del│
      * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───┴───┴───┴───┘
      */
-    [0] = LAYOUT(
+    [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_MPLY, KC_MPRV, KC_MNXT,   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,  C(KC_Z), KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
diff --git a/keyboards/rmkeebs/rm_fullsize/matrix_diagram.md b/keyboards/rmkeebs/rm_fullsize/matrix_diagram.md
new file mode 100644
index 000000000000..32c62990bcaa
--- /dev/null
+++ b/keyboards/rmkeebs/rm_fullsize/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for RuckerMachine rm_fullsize
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │2D     │
+                                                    └───────┘                           ┌───┐
+┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐┌───┬───┬───┐ │0J │
+│00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │3F ││0G │0H │0I │ └───┘
+└───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘└───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐┌───┬───┬───┬───┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │2D ││1E │1F │4F ││1G │1H │1I │1J │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤├───┼───┼───┼───┤   ┌───┐
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │3D   ││2E │2F │5F ││2G │2H │2I │2J │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘├───┼───┼───┼───┤   │3J │ 2u Numpad Plus
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C      │             │3G │3H │3I │3J │   │   │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐    ├───┼───┼───┼───┤   ├───┤
+│40      │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B        │    │3E │    │4G │4H │4I │4J │   │   │
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐├───┼───┼───┼───┤   │5J │ 2u Numpad Enter
+│50  │51  │52  │56                      │59  │5A  │5B  │5C  ││5D │4E │5E ││5G │5H │5I │5J │   │   │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘└───┴───┴───┴───┘   └───┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐             ┌───────┐
+│50   │51 │52   │56                         │5A   │5B │5C   │ Tsangan     │5G     │ 2u Numpad Zero
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘             └───────┘
+```
diff --git a/keyboards/rocketboard_16/config.h b/keyboards/rocketboard_16/config.h
index 64c493ace874..5e04a24ba58a 100644
--- a/keyboards/rocketboard_16/config.h
+++ b/keyboards/rocketboard_16/config.h
@@ -17,27 +17,10 @@ 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 RGBLED_NUM 16
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-
 // OLED stuff
 #define OLED_DISPLAY_128X64
 #define OLED_FONT_H "custom_font.h"
 
-// Allows for rotary encoder volume control
-#define TAP_CODE_DELAY 20
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 
diff --git a/keyboards/rocketboard_16/info.json b/keyboards/rocketboard_16/info.json
index 00006749d80d..5e3ee7b0e8f3 100644
--- a/keyboards/rocketboard_16/info.json
+++ b/keyboards/rocketboard_16/info.json
@@ -21,9 +21,29 @@
             {"pin_a": "A2", "pin_b": "A3"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 20
+    },
     "bootmagic": {
         "matrix": [4, 1]
     },
+    "rgblight": {
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "A4"
     },
diff --git a/keyboards/rocketboard_16/rules.mk b/keyboards/rocketboard_16/rules.mk
index dd493f5f18b1..dcc3d4516bda 100644
--- a/keyboards/rocketboard_16/rules.mk
+++ b/keyboards/rocketboard_16/rules.mk
@@ -17,12 +17,8 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB backlit keys
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 
 RAW_ENABLE = yes            # Enables HID RAW communication between the board and the PC
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 LTO_ENABLE = yes
diff --git a/keyboards/rominronin/katana60/rev1/config.h b/keyboards/rominronin/katana60/rev1/config.h
index 6c1b144b58cf..13f0a19cbd26 100644
--- a/keyboards/rominronin/katana60/rev1/config.h
+++ b/keyboards/rominronin/katana60/rev1/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 TAPPING_TERM 200
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/keymap.c b/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/keymap.c
index 02bd23a9b420..ca2be62a1948 100644
--- a/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/keymap.c
+++ b/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/keymap.c
@@ -120,14 +120,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 )
 };
 
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case M_QWERTY:
@@ -157,7 +149,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     }
     return true;
 }
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/msiu/keymap.c b/keyboards/rominronin/katana60/rev1/keymaps/msiu/keymap.c
index a65a5260b5df..7850d38c9039 100644
--- a/keyboards/rominronin/katana60/rev1/keymaps/msiu/keymap.c
+++ b/keyboards/rominronin/katana60/rev1/keymaps/msiu/keymap.c
@@ -48,23 +48,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
     )
 };
-
-
-
-
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/rominronin/keymap.c b/keyboards/rominronin/katana60/rev1/keymaps/rominronin/keymap.c
index 6fa09146ede8..615de932f89f 100644
--- a/keyboards/rominronin/katana60/rev1/keymaps/rominronin/keymap.c
+++ b/keyboards/rominronin/katana60/rev1/keymaps/rominronin/keymap.c
@@ -63,20 +63,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 
 };
-
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/rominronin/katana60/rev2/config.h b/keyboards/rominronin/katana60/rev2/config.h
index 0de481d0defd..8e3d35a7beb0 100644
--- a/keyboards/rominronin/katana60/rev2/config.h
+++ b/keyboards/rominronin/katana60/rev2/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 TAPPING_TERM 200
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/rpiguy9907/southpaw66/config.h b/keyboards/rpiguy9907/southpaw66/config.h
index 99fb7f54ea54..b4da5d530f8e 100644
--- a/keyboards/rpiguy9907/southpaw66/config.h
+++ b/keyboards/rpiguy9907/southpaw66/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-
-#define TAPPING_TERM 400
-
 /* 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/rpiguy9907/southpaw66/info.json b/keyboards/rpiguy9907/southpaw66/info.json
index 3cebdcb4a8c0..6c90980e7c5b 100644
--- a/keyboards/rpiguy9907/southpaw66/info.json
+++ b/keyboards/rpiguy9907/southpaw66/info.json
@@ -16,6 +16,9 @@
     "bootmagic": {
         "matrix": [1, 0]
     },
+    "tapping": {
+        "term": 400
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/rubi/rules.mk b/keyboards/rubi/rules.mk
index e2279a08a6c0..e4810730443b 100644
--- a/keyboards/rubi/rules.mk
+++ b/keyboards/rubi/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 
 SRC += lib/oled.c \
diff --git a/keyboards/runes/vaengr/config.h b/keyboards/runes/vaengr/config.h
deleted file mode 100644
index 2f307f633f5c..000000000000
--- a/keyboards/runes/vaengr/config.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-Copyright 2021 Vicktor
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have 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 RGBLED_NUM 10
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
-/*
- * 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/runes/vaengr/info.json b/keyboards/runes/vaengr/info.json
index 98354c2900bb..cf55a4093f02 100644
--- a/keyboards/runes/vaengr/info.json
+++ b/keyboards/runes/vaengr/info.json
@@ -9,6 +9,23 @@
         "device_version": "0.0.1",
         "force_nkro": true
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 10,
+        "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": "C7"
     },
diff --git a/keyboards/rura66/rev1/config.h b/keyboards/rura66/rev1/config.h
index 8afe563b68f5..e9a1ae40890f 100644
--- a/keyboards/rura66/rev1/config.h
+++ b/keyboards/rura66/rev1/config.h
@@ -20,27 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Split hand configration */
 #define MASTER_LEFT
 
-#ifdef RGBLIGHT_ENABLE
-  #define RGBLED_NUM 66 // Number of LEDs
-  #define RGBLIGHT_SPLIT
-  #define RGBLED_SPLIT { 33, 33 }
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RGB_TEST
-//  #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
-  /*== choose animations ==*/
-//  #define RGBLIGHT_EFFECT_BREATHING
-  #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-  #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-  #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-  #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
 
 /* Custom font */
 #define OLED_FONT_H "keyboards/rura66/common/glcdfont.c"
diff --git a/keyboards/rura66/rev1/info.json b/keyboards/rura66/rev1/info.json
index e312323c4dd3..591d6228b72b 100644
--- a/keyboards/rura66/rev1/info.json
+++ b/keyboards/rura66/rev1/info.json
@@ -1,111 +1,121 @@
 {
-  "keyboard_name": "RURA66",
-  "manufacturer": "ShinoharaTa",
-  "url": "https://github.com/ShinoharaTa/keyboards/tree/master/RURA66",
-  "maintainer": "ShinoharaTa",
-  "usb": {
-    "vid": "0x7335",
-    "pid": "0x0200",
-    "device_version": "0.0.1"
-  },
-  "rgb_matrix": {
-    "driver": "WS2812"
-  },
-  "rgblight": {
-    "max_brightness": 120
-  },
-  "matrix_pins": {
-    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-    "rows": ["D4", "C6", "D7", "E6", "B4"]
-  },
-  "diode_direction": "COL2ROW",
-  "split": {
-    "soft_serial_pin": "D2"
-  },
-  "ws2812": {
-    "pin": "D3"
-  },
-  "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": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
+    "keyboard_name": "RURA66",
+    "manufacturer": "ShinoharaTa",
+    "url": "https://github.com/ShinoharaTa/keyboards/tree/master/RURA66",
+    "maintainer": "ShinoharaTa",
+    "usb": {
+        "vid": "0x7335",
+        "pid": "0x0200",
+        "device_version": "0.0.1"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 66,
+        "max_brightness": 120,
+        "split_count": [33, 33],
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true,
+            "rgb_test": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "soft_serial_pin": "D2"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.75},
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
 
-        {"matrix": [5, 5], "x": 10, "y": 0},
-        {"matrix": [5, 4], "x": 11, "y": 0},
-        {"matrix": [5, 3], "x": 12, "y": 0},
-        {"matrix": [5, 2], "x": 13, "y": 0},
-        {"matrix": [5, 1], "x": 14, "y": 0},
-        {"matrix": [5, 0], "x": 15, "y": 0},
+                {"matrix": [5, 5], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0},
+                {"matrix": [5, 2], "x": 14, "y": 0.25},
+                {"matrix": [5, 1], "x": 15, "y": 0.75},
+                {"matrix": [5, 0], "x": 16, "y": 0.75},
 
-        {"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, 0], "x": 0, "y": 1.75},
+                {"matrix": [1, 1], "x": 1, "y": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
 
-        {"matrix": [6, 5], "x": 10, "y": 1},
-        {"matrix": [6, 4], "x": 11, "y": 1},
-        {"matrix": [6, 3], "x": 12, "y": 1},
-        {"matrix": [6, 2], "x": 13, "y": 1},
-        {"matrix": [6, 1], "x": 14, "y": 1},
-        {"matrix": [6, 0], "x": 15, "y": 1},
+                {"matrix": [6, 5], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 2], "x": 14, "y": 1.25},
+                {"matrix": [6, 1], "x": 15, "y": 1.75},
+                {"matrix": [6, 0], "x": 16, "y": 1.75},
 
-        {"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, 0], "x": 0, "y": 2.75},
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"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": [7, 6], "x": 9, "y": 2},
-        {"matrix": [7, 5], "x": 10, "y": 2},
-        {"matrix": [7, 4], "x": 11, "y": 2},
-        {"matrix": [7, 3], "x": 12, "y": 2},
-        {"matrix": [7, 2], "x": 13, "y": 2},
-        {"matrix": [7, 1], "x": 14, "y": 2},
-        {"matrix": [7, 0], "x": 15, "y": 2},
+                {"matrix": [7, 6], "x": 10, "y": 2},
+                {"matrix": [7, 5], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 2], "x": 14, "y": 2.25},
+                {"matrix": [7, 1], "x": 15, "y": 2.75},
+                {"matrix": [7, 0], "x": 16, "y": 2.75},
 
-        {"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": [0, 6], "x": 7, "y": 3},
-        {"matrix": [5, 6], "x": 8, "y": 3},
-        {"matrix": [8, 6], "x": 9, "y": 3},
-        {"matrix": [8, 5], "x": 10, "y": 3},
-        {"matrix": [8, 4], "x": 11, "y": 3},
-        {"matrix": [8, 3], "x": 12, "y": 3},
-        {"matrix": [8, 2], "x": 13, "y": 3},
-        {"matrix": [8, 1], "x": 14, "y": 3},
-        {"matrix": [8, 0], "x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3.75},
+                {"matrix": [3, 1], "x": 1, "y": 3.75},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"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": [0, 6], "x": 7, "y": 3.8},
+                {"matrix": [5, 6], "x": 9, "y": 3.8},
+                {"matrix": [8, 6], "x": 10, "y": 3},
+                {"matrix": [8, 5], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3},
+                {"matrix": [8, 3], "x": 13, "y": 3},
+                {"matrix": [8, 2], "x": 14, "y": 3.25},
+                {"matrix": [8, 1], "x": 15, "y": 3.75},
+                {"matrix": [8, 0], "x": 16, "y": 3.75},
 
-        {"matrix": [4, 0], "x": 0, "y": 4},
-        {"matrix": [4, 1], "x": 1, "y": 4},
-        {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 0], "x": 0, "y": 4.75, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.75, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
 
-        {"matrix": [4, 5], "x": 5, "y": 4},
-        {"matrix": [4, 6], "x": 6, "y": 4},
-        {"matrix": [1, 6], "x": 7, "y": 4},
-        {"matrix": [6, 6], "x": 8, "y": 4},
-        {"matrix": [9, 6], "x": 9, "y": 4},
-        {"matrix": [9, 5], "x": 10, "y": 4},
+                {"matrix": [4, 5], "x": 4.8, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4.4},
+                {"matrix": [1, 6], "x": 7, "y": 4.8},
+                {"matrix": [6, 6], "x": 9, "y": 4.8},
+                {"matrix": [9, 6], "x": 10, "y": 4.4},
+                {"matrix": [9, 5], "x": 11.2, "y": 4},
 
-        {"matrix": [9, 2], "x": 13, "y": 4},
-        {"matrix": [9, 1], "x": 14, "y": 4},
-        {"matrix": [9, 0], "x": 15, "y": 4}
-      ]
+                {"matrix": [9, 2], "x": 13.25, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 1], "x": 14.5, "y": 4.75, "w": 1.25},
+                {"matrix": [9, 0], "x": 15.75, "y": 4.75, "w": 1.25}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/rura66/rev1/rules.mk b/keyboards/rura66/rev1/rules.mk
index 0f2fb66a8017..1c7bdc0c3cd5 100644
--- a/keyboards/rura66/rev1/rules.mk
+++ b/keyboards/rura66/rev1/rules.mk
@@ -2,7 +2,6 @@ EXTRAKEY_ENABLE = yes    # Audio control and System control
 RGBLIGHT_ENABLE = yes    # Enable keyboard RGB underglow
 SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = no
 LTO_ENABLE = yes
 
diff --git a/keyboards/ryanbaekr/rb18/config.h b/keyboards/ryanbaekr/rb18/config.h
index 835872aed579..9024fa25d5bd 100644
--- a/keyboards/ryanbaekr/rb18/config.h
+++ b/keyboards/ryanbaekr/rb18/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Underglow options */
-#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 3
-#define RGBLED_HUE_STEP 8
-#define RGBLED_SAT_STEP 8
-#define RGBLED_VAL_STEP 8
-
 /* 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/ryanbaekr/rb18/info.json b/keyboards/ryanbaekr/rb18/info.json
index 2ee09674860c..f03a29dfb1f2 100644
--- a/keyboards/ryanbaekr/rb18/info.json
+++ b/keyboards/ryanbaekr/rb18/info.json
@@ -8,6 +8,21 @@
         "pid": "0x0018",
         "device_version": "0.0.3"
     },
+    "rgblight": {
+        "led_count": 3,
+        "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": "B0"
     },
diff --git a/keyboards/ryanbaekr/rb69/config.h b/keyboards/ryanbaekr/rb69/config.h
index 5614dfa1005a..2e802ba36309 100644
--- a/keyboards/ryanbaekr/rb69/config.h
+++ b/keyboards/ryanbaekr/rb69/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Underglow options */
-#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 RGBLED_HUE_STEP 8
-#define RGBLED_SAT_STEP 8
-#define RGBLED_VAL_STEP 8
-
 /* 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/ryanbaekr/rb69/info.json b/keyboards/ryanbaekr/rb69/info.json
index 0b514a46f677..8f132e6f5f06 100644
--- a/keyboards/ryanbaekr/rb69/info.json
+++ b/keyboards/ryanbaekr/rb69/info.json
@@ -8,6 +8,21 @@
         "pid": "0x0069",
         "device_version": "0.0.3"
     },
+    "rgblight": {
+        "led_count": 14,
+        "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": "B0"
     },
@@ -16,8 +31,8 @@
         "rows": ["D7", "C6", "D4", "D0", "D1"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "elite_c",
+    "pin_compatible": "elite_c",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/ryanbaekr/rb86/info.json b/keyboards/ryanbaekr/rb86/info.json
index 5c4c3485dff7..fb4b9a4d21cc 100644
--- a/keyboards/ryanbaekr/rb86/info.json
+++ b/keyboards/ryanbaekr/rb86/info.json
@@ -13,8 +13,8 @@
         "rows": ["B0", "B1", "B2", "B3", "B4", "D7"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "elite_c",
+    "pin_compatible": "elite_c",
     "layout_aliases": {
         "LAYOUT_numpad_6x17": "LAYOUT"
     },
diff --git a/keyboards/ryanbaekr/rb87/config.h b/keyboards/ryanbaekr/rb87/config.h
index ca1f8284c527..9024fa25d5bd 100644
--- a/keyboards/ryanbaekr/rb87/config.h
+++ b/keyboards/ryanbaekr/rb87/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Underglow options */
-#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 RGBLED_HUE_STEP 8
-#define RGBLED_SAT_STEP 8
-#define RGBLED_VAL_STEP 8
-
 /* 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/ryanbaekr/rb87/info.json b/keyboards/ryanbaekr/rb87/info.json
index 8741408aaa17..cade6f129311 100644
--- a/keyboards/ryanbaekr/rb87/info.json
+++ b/keyboards/ryanbaekr/rb87/info.json
@@ -3,13 +3,28 @@
     "manufacturer": "ryanbaekr",
     "url": "",
     "maintainer": "ryanbaekr",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "development_board": "elite_c",
+    "pin_compatible": "elite_c",
     "usb": {
         "vid": "0x7262",
         "pid": "0x0087",
         "device_version": "0.0.3"
     },
+    "rgblight": {
+        "led_count": 15,
+        "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": "B0"
     },
diff --git a/keyboards/ryanskidmore/rskeys100/info.json b/keyboards/ryanskidmore/rskeys100/info.json
index 90b739b7d1ec..1e7bf808289f 100644
--- a/keyboards/ryanskidmore/rskeys100/info.json
+++ b/keyboards/ryanskidmore/rskeys100/info.json
@@ -11,7 +11,7 @@
         "pin": "C7"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/ryloo_studio/m0110/config.h b/keyboards/ryloo_studio/m0110/config.h
index 9ed41827d0c3..592d0be42a96 100755
--- a/keyboards/ryloo_studio/m0110/config.h
+++ b/keyboards/ryloo_studio/m0110/config.h
@@ -22,18 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 18
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ryloo_studio/m0110/info.json b/keyboards/ryloo_studio/m0110/info.json
index cded8206f4af..2df9f04cc7e0 100644
--- a/keyboards/ryloo_studio/m0110/info.json
+++ b/keyboards/ryloo_studio/m0110/info.json
@@ -21,7 +21,22 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 123
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "max_brightness": 123,
+        "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",
diff --git a/keyboards/s_ol/0xc_pad/0xc_pad.c b/keyboards/s_ol/0xc_pad/0xc_pad.c
index c471da92cc5f..ba8cd96aec20 100644
--- a/keyboards/s_ol/0xc_pad/0xc_pad.c
+++ b/keyboards/s_ol/0xc_pad/0xc_pad.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "0xc_pad.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/s_ol/0xc_pad/0xc_pad.h b/keyboards/s_ol/0xc_pad/0xc_pad.h
deleted file mode 100644
index 013f4c89dcb9..000000000000
--- a/keyboards/s_ol/0xc_pad/0xc_pad.h
+++ /dev/null
@@ -1,24 +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
-
-#include "quantum.h"
-
-#define LED_LAYOUT(                                             \
-                                                                \
-    k01, k05, k02, k06, k10, k03, k07, k11, k15, k08, k12, k16) \
-                                                                \
-    { k01, k02, k03, k08, k07, k06, k05, k10, k11, k12, k16, k15, }
diff --git a/keyboards/s_ol/0xc_pad/info.json b/keyboards/s_ol/0xc_pad/info.json
index a35c054900bc..980923026096 100644
--- a/keyboards/s_ol/0xc_pad/info.json
+++ b/keyboards/s_ol/0xc_pad/info.json
@@ -10,7 +10,7 @@
         "pin": "C7"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/saevus/cor_tkl/config.h b/keyboards/saevus/cor_tkl/config.h
index b42ece99a60a..7fedf4dce12d 100644
--- a/keyboards/saevus/cor_tkl/config.h
+++ b/keyboards/saevus/cor_tkl/config.h
@@ -20,5 +20,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* RGB Matrix setup */
 #define RGB_MATRIX_LED_COUNT 2
-#define RGBLED_NUM 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/saevus/cor_tkl/info.json b/keyboards/saevus/cor_tkl/info.json
index 54451c1077e6..98880e4834d5 100644
--- a/keyboards/saevus/cor_tkl/info.json
+++ b/keyboards/saevus/cor_tkl/info.json
@@ -35,7 +35,7 @@
         "rows": ["GP0", "GP1", "GP2", "GP21", "GP3", "GP4"]
     },
     "rgb_matrix": {
-      "driver": "WS2812"
+      "driver": "ws2812"
     },
     "ws2812": {
         "pin": "GP19",
diff --git a/keyboards/salicylic_acid3/7skb/rev1/config.h b/keyboards/salicylic_acid3/7skb/rev1/config.h
index 573efb81c713..644ce27575be 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/config.h
+++ b/keyboards/salicylic_acid3/7skb/rev1/config.h
@@ -25,23 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#ifndef RGBLED_NUM
-  #define RGBLED_NUM 12
-  #define RGBLIGHT_SPLIT
-  #define RGBLED_SPLIT { 6, 6 }
-#endif
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 180
   #define RGBLIGHT_VAL_STEP 17
@@ -49,8 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LIMIT_VAL 50
   #define RGBLIGHT_VAL_STEP 4
 #endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for naked48 keyboard
diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json
index 12f0b6f42481..89e675db5252 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/info.json
+++ b/keyboards/salicylic_acid3/7skb/rev1/info.json
@@ -16,6 +16,23 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 12,
+        "split_count": [6, 6],
+        "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": "D3"
     },
diff --git a/keyboards/salicylic_acid3/7splus/config.h b/keyboards/salicylic_acid3/7splus/config.h
index 82eec4a3066f..3a82c91526a1 100644
--- a/keyboards/salicylic_acid3/7splus/config.h
+++ b/keyboards/salicylic_acid3/7splus/config.h
@@ -24,23 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#ifndef RGBLED_NUM
-  #define RGBLED_NUM 31
-  #define RGBLIGHT_SPLIT
-  #define RGBLED_SPLIT { 11, 20 }
-#endif
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 180
   #define RGBLIGHT_VAL_STEP 17
@@ -48,8 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LIMIT_VAL 50
   #define RGBLIGHT_VAL_STEP 4
 #endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for naked48 keyboard
diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json
index 524ecc34ea70..35b3d7ec170a 100644
--- a/keyboards/salicylic_acid3/7splus/info.json
+++ b/keyboards/salicylic_acid3/7splus/info.json
@@ -16,6 +16,23 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 31,
+        "split_count": [11, 20],
+        "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": "D3"
     },
diff --git a/keyboards/salicylic_acid3/ergoarrows/config.h b/keyboards/salicylic_acid3/ergoarrows/config.h
index dcbdb0f5374a..e373d2a88b79 100644
--- a/keyboards/salicylic_acid3/ergoarrows/config.h
+++ b/keyboards/salicylic_acid3/ergoarrows/config.h
@@ -24,23 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#ifndef RGBLED_NUM
-  #define RGBLED_NUM 86
-  #define RGBLIGHT_SPLIT
-  #define RGBLED_SPLIT { 43, 43 }
-#endif
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 90
   #define RGBLIGHT_VAL_STEP 17
@@ -48,8 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LIMIT_VAL 30
   #define RGBLIGHT_VAL_STEP 4
 #endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for naked48 keyboard
diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json
index 1665fce7e8fb..3b4df223632d 100644
--- a/keyboards/salicylic_acid3/ergoarrows/info.json
+++ b/keyboards/salicylic_acid3/ergoarrows/info.json
@@ -16,6 +16,23 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 86,
+        "split_count": [43, 43],
+        "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": "D3"
     },
diff --git a/keyboards/salicylic_acid3/getta25/keymaps/oled/rules.mk b/keyboards/salicylic_acid3/getta25/keymaps/oled/rules.mk
index d34d066ded93..dd68e9d3b090 100644
--- a/keyboards/salicylic_acid3/getta25/keymaps/oled/rules.mk
+++ b/keyboards/salicylic_acid3/getta25/keymaps/oled/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/salicylic_acid3/getta25/rev1/config.h b/keyboards/salicylic_acid3/getta25/rev1/config.h
index cdc803a98c6f..a8fd75dc9db4 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/config.h
+++ b/keyboards/salicylic_acid3/getta25/rev1/config.h
@@ -23,18 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 9    // 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
-
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 180
   #define RGBLIGHT_VAL_STEP 17
@@ -42,8 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LIMIT_VAL 50
   #define RGBLIGHT_VAL_STEP 4
 #endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for naked48 keyboard
diff --git a/keyboards/salicylic_acid3/getta25/rev1/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json
index de9fe887e761..e2148f9302a0 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/info.json
+++ b/keyboards/salicylic_acid3/getta25/rev1/info.json
@@ -8,6 +8,22 @@
         "pid": "0x3060",
         "device_version": "0.1.3"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 9,
+        "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": "D3"
     },
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/config.h b/keyboards/salicylic_acid3/jisplit89/rev1/config.h
index 51b6d454e5f5..144d743b3277 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/config.h
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/config.h
@@ -24,23 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#ifndef RGBLED_NUM
-  #define RGBLED_NUM 32
-  #define RGBLIGHT_SPLIT
-  #define RGBLED_SPLIT { 11, 21 }
-#endif
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 180
   #define RGBLIGHT_VAL_STEP 17
@@ -48,8 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LIMIT_VAL 50
   #define RGBLIGHT_VAL_STEP 4
 #endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for naked48 keyboard
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/info.json
index 63feabb93937..e3d884bdb1b3 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/info.json
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/info.json
@@ -16,6 +16,23 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 32,
+        "split_count": [11, 21],
+        "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": "D3"
     },
diff --git a/keyboards/salicylic_acid3/nafuda/config.h b/keyboards/salicylic_acid3/nafuda/config.h
index 94d44bfce83f..fb94963ca0e9 100644
--- a/keyboards/salicylic_acid3/nafuda/config.h
+++ b/keyboards/salicylic_acid3/nafuda/config.h
@@ -23,18 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 7    // 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
-
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 180
   #define RGBLIGHT_VAL_STEP 17
@@ -42,8 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LIMIT_VAL 50
   #define RGBLIGHT_VAL_STEP 4
 #endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
   #define USB_MAX_POWER_CONSUMPTION 400
diff --git a/keyboards/salicylic_acid3/nafuda/info.json b/keyboards/salicylic_acid3/nafuda/info.json
index ea2645cf23fa..b42cfeb6b4f4 100644
--- a/keyboards/salicylic_acid3/nafuda/info.json
+++ b/keyboards/salicylic_acid3/nafuda/info.json
@@ -8,6 +8,22 @@
         "pid": "0x3060",
         "device_version": "0.1.2"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "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": "D3"
     },
diff --git a/keyboards/salicylic_acid3/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h
index c7246fad769a..84dbacba5496 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked48/rev1/config.h
@@ -22,22 +22,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#ifndef RGBLED_NUM
-  #define RGBLED_NUM 48
-#endif
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
 #define RGBLIGHT_DEFAULT_VAL 50
-
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json
index a378952d2525..a2d7b0c8497e 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked48/rev1/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D7", "E6", "B4", "B5"],
@@ -25,6 +25,22 @@
             }
         }
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 48,
+        "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": "D3"
     },
diff --git a/keyboards/salicylic_acid3/naked64/rev1/config.h b/keyboards/salicylic_acid3/naked64/rev1/config.h
index 33ee2b503027..a8fd75dc9db4 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked64/rev1/config.h
@@ -23,9 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 12    // Number of LEDs
-#define RGBLIGHT_LED_MAP { 0, 1, 3, 2, 2, 3, 2, 3, 4, 5, 6, 7 }
-
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 180
   #define RGBLIGHT_VAL_STEP 17
@@ -33,12 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LIMIT_VAL 50
   #define RGBLIGHT_VAL_STEP 4
 #endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-
-// Selection of RGBLIGHT MODE to use.
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_SNAKE
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for naked48 keyboard
diff --git a/keyboards/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json
index a58acf807b00..a95f8d60fe0b 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked64/rev1/info.json
@@ -22,6 +22,15 @@
             }
         }
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 12,
+        "led_map": [0, 1, 3, 2, 2, 3, 2, 3, 4, 5, 6, 7],
+        "animations": {
+            "breathing": true,
+            "snake": true
+        }
+    },
     "ws2812": {
         "pin": "B6"
     },
diff --git a/keyboards/salicylic_acid3/nknl7en/config.h b/keyboards/salicylic_acid3/nknl7en/config.h
index 9f39d06f61f3..5bc9c2c789b6 100644
--- a/keyboards/salicylic_acid3/nknl7en/config.h
+++ b/keyboards/salicylic_acid3/nknl7en/config.h
@@ -24,23 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#ifndef RGBLED_NUM
-  #define RGBLED_NUM 21
-  #define RGBLIGHT_SPLIT
-  #define RGBLED_SPLIT { 9, 12 }
-#endif
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 180
   #define RGBLIGHT_VAL_STEP 17
@@ -48,8 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LIMIT_VAL 50
   #define RGBLIGHT_VAL_STEP 4
 #endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for naked48 keyboard
diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json
index f0f45f077a4c..fad22122f6cd 100644
--- a/keyboards/salicylic_acid3/nknl7en/info.json
+++ b/keyboards/salicylic_acid3/nknl7en/info.json
@@ -16,6 +16,23 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 21,
+        "split_count": [9, 12],
+        "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": "D3"
     },
diff --git a/keyboards/salicylic_acid3/nknl7jp/config.h b/keyboards/salicylic_acid3/nknl7jp/config.h
index 65091cadc073..5bc9c2c789b6 100644
--- a/keyboards/salicylic_acid3/nknl7jp/config.h
+++ b/keyboards/salicylic_acid3/nknl7jp/config.h
@@ -24,23 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#ifndef RGBLED_NUM
-  #define RGBLED_NUM 20
-  #define RGBLIGHT_SPLIT
-  #define RGBLED_SPLIT { 9, 11 }
-#endif
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 180
   #define RGBLIGHT_VAL_STEP 17
@@ -48,8 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LIMIT_VAL 50
   #define RGBLIGHT_VAL_STEP 4
 #endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for naked48 keyboard
diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json
index 5713ad908469..7bafe46d9a01 100644
--- a/keyboards/salicylic_acid3/nknl7jp/info.json
+++ b/keyboards/salicylic_acid3/nknl7jp/info.json
@@ -16,6 +16,23 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 20,
+        "split_count": [9, 11],
+        "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": "D3"
     },
diff --git a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c
index e117d26eee4d..b7cde4d4e098 100644
--- a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c
+++ b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c
@@ -173,8 +173,8 @@ void render_layer_state(void) {
     oled_write_P(PSTR(" Macro "), layer_state_is(_MACRO));
 }
 
-void render_keylock_status(uint8_t led_usb_state) {
-    oled_write_P(PSTR("NumLock"), led_usb_state & (1 << USB_LED_NUM_LOCK));
+void render_keylock_status(led_t led_state) {
+    oled_write_P(PSTR("NumLock"), led_state.num_lock);
     oled_write_P(PSTR("              "), false);
 }
 
@@ -186,7 +186,7 @@ void render_layer_messages(void) {
 void render_status(void) {
     /* Show Keyboard Layout  */
     render_layer_messages();
-    render_keylock_status(host_keyboard_leds());
+    render_keylock_status(host_keyboard_led_state());
     render_layer_state();
 }
 
diff --git a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/rules.mk
index 69864a316621..ad721c13de4c 100644
--- a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/rules.mk
+++ b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/rules.mk
@@ -1,4 +1,3 @@
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/salicylic_acid3/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h
index eb9e0b5b1dc3..fb94963ca0e9 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/config.h
+++ b/keyboards/salicylic_acid3/setta21/rev1/config.h
@@ -23,18 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 21    // 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
-
 #ifndef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 180
   #define RGBLIGHT_VAL_STEP 17
@@ -42,8 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LIMIT_VAL 50
   #define RGBLIGHT_VAL_STEP 4
 #endif
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
   #define USB_MAX_POWER_CONSUMPTION 400
diff --git a/keyboards/salicylic_acid3/setta21/rev1/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json
index 642bde6298a7..d510c2c3b2a5 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/info.json
+++ b/keyboards/salicylic_acid3/setta21/rev1/info.json
@@ -8,11 +8,27 @@
         "pid": "0x3060",
         "device_version": "0.1.1"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 21,
+        "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": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
diff --git a/keyboards/sam/s80/config.h b/keyboards/sam/s80/config.h
deleted file mode 100644
index 4c3d6ae50496..000000000000
--- a/keyboards/sam/s80/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2020 CMM。Studio 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/>.
- */
-
-#pragma once
-
-#    define RGBLED_NUM 20
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/sam/s80/info.json b/keyboards/sam/s80/info.json
index 73794ba3eb94..3949a2680ab4 100644
--- a/keyboards/sam/s80/info.json
+++ b/keyboards/sam/s80/info.json
@@ -20,6 +20,9 @@
         "pin": "E2"
     },
     "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
         "max_brightness": 100
     },
     "processor": "atmega32u4",
diff --git a/keyboards/sam/sg81m/config.h b/keyboards/sam/sg81m/config.h
deleted file mode 100644
index b999af6eec4c..000000000000
--- a/keyboards/sam/sg81m/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 CMM.Studio 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/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 10
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json
index baa1cec9a75b..ca06c38aa4ce 100644
--- a/keyboards/sam/sg81m/info.json
+++ b/keyboards/sam/sg81m/info.json
@@ -16,6 +16,24 @@
     "indicators": {
         "caps_lock": "B0"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "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": "E6"
     },
diff --git a/keyboards/sandwich/keeb68/info.json b/keyboards/sandwich/keeb68/info.json
index ec09badedfa9..df8b91a3385a 100644
--- a/keyboards/sandwich/keeb68/info.json
+++ b/keyboards/sandwich/keeb68/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "C7",
         "levels": 5,
         "breathing": true
diff --git a/keyboards/sapuseven/macropad12/info.json b/keyboards/sapuseven/macropad12/info.json
index aafd8fcd0f38..28e8c19bf811 100644
--- a/keyboards/sapuseven/macropad12/info.json
+++ b/keyboards/sapuseven/macropad12/info.json
@@ -22,8 +22,11 @@
         "vid": "0x1209",
         "pid": "0x7337"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_3x4"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_3x4": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/sapuseven/macropad12/keymaps/default/keymap.c b/keyboards/sapuseven/macropad12/keymaps/default/keymap.c
index 1cfa2601037e..3a498e6aafeb 100644
--- a/keyboards/sapuseven/macropad12/keymaps/default/keymap.c
+++ b/keyboards/sapuseven/macropad12/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_ortho_3x4(
         KC_1, KC_2, KC_3, KC_PLUS,
         KC_4, KC_5, KC_6, KC_MINUS,
         KC_7, KC_8, KC_9, KC_0
diff --git a/keyboards/sapuseven/macropad12/keymaps/via/keymap.c b/keyboards/sapuseven/macropad12/keymaps/via/keymap.c
index 771c3efc9a37..06879d1b4386 100644
--- a/keyboards/sapuseven/macropad12/keymaps/via/keymap.c
+++ b/keyboards/sapuseven/macropad12/keymaps/via/keymap.c
@@ -17,22 +17,22 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_ortho_3x4(
         KC_1, KC_2, KC_3, KC_PLUS,
         KC_4, KC_5, KC_6, KC_MINUS,
         KC_7, KC_8, KC_9, KC_0
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_ortho_3x4(
         KC_F1, KC_F2, KC_F3, KC_F4,
         KC_F5, KC_F6, KC_F7, KC_F8,
         KC_F9, KC_F10, KC_F11, KC_F12
     ),
-    [2] = LAYOUT(
+    [2] = LAYOUT_ortho_3x4(
         KC_F13, KC_F14, KC_F15, KC_F16,
         KC_F17, KC_F18, KC_F19, KC_F20,
         KC_F21, KC_F22, KC_F23, KC_F24
     ),
-    [3] = LAYOUT(
+    [3] = LAYOUT_ortho_3x4(
         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/satt/comet46/lib/host_led_state_reader.c b/keyboards/satt/comet46/lib/host_led_state_reader.c
index 758fc4c1dcb6..e9910e014149 100644
--- a/keyboards/satt/comet46/lib/host_led_state_reader.c
+++ b/keyboards/satt/comet46/lib/host_led_state_reader.c
@@ -4,12 +4,12 @@
 char host_led_state_str[22];
 
 const char *read_host_led_state(void) {
-  uint8_t leds = host_keyboard_leds();
+  led_t led_state = host_keyboard_led_state();
 
   snprintf(host_led_state_str, sizeof(host_led_state_str), "Lock: %s%s%s",
-           (leds & (1 << USB_LED_CAPS_LOCK)) ? "CAPL " : "",
-           (leds & (1 << USB_LED_SCROLL_LOCK)) ? "SCRL " : "",
-           (leds & (1 << USB_LED_NUM_LOCK)) ? "NUML" : "");
+           led_state.caps_lock ? "CAPL " : "",
+           led_state.scroll_lock ? "SCRL " : "",
+           led_state.num_lock ? "NUML" : "");
 
   return host_led_state_str;
 }
diff --git a/keyboards/satt/comet46/rules.mk b/keyboards/satt/comet46/rules.mk
index 687d594ecbf1..fe692cc5c344 100644
--- a/keyboards/satt/comet46/rules.mk
+++ b/keyboards/satt/comet46/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
-OLED_DRIVER = SSD1306
 
 # project specific files
 SRC += matrix.c
diff --git a/keyboards/satt/vision/rules.mk b/keyboards/satt/vision/rules.mk
index 0aeca0dd9f35..7f4f202a1b70 100644
--- a/keyboards/satt/vision/rules.mk
+++ b/keyboards/satt/vision/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/sauce/mild/rules.mk b/keyboards/sauce/mild/rules.mk
index eed469b44e83..ca4d3845848e 100644
--- a/keyboards/sauce/mild/rules.mk
+++ b/keyboards/sauce/mild/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
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/sawnsprojects/amber80/solder/config.h b/keyboards/sawnsprojects/amber80/solder/config.h
deleted file mode 100644
index b47e1efd74af..000000000000
--- a/keyboards/sawnsprojects/amber80/solder/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2022 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
-
-/* RGB */
-    #define RGBLED_NUM 22
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== or choose animations ==*/
-    #define RGBLIGHT_EFFECT_BREATHING
-    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-    #define RGBLIGHT_EFFECT_SNAKE
-    #define RGBLIGHT_EFFECT_KNIGHT
-    #define RGBLIGHT_EFFECT_CHRISTMAS
-    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-    #define RGBLIGHT_EFFECT_RGB_TEST
-    #define RGBLIGHT_EFFECT_ALTERNATING
diff --git a/keyboards/sawnsprojects/amber80/solder/info.json b/keyboards/sawnsprojects/amber80/solder/info.json
index 9fe412c3cd4b..f6c458a9b722 100644
--- a/keyboards/sawnsprojects/amber80/solder/info.json
+++ b/keyboards/sawnsprojects/amber80/solder/info.json
@@ -18,6 +18,23 @@
         "scroll_lock": "B0",
         "on_state": 0
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 22,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "D2"
     },
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/config.h b/keyboards/sawnsprojects/krush/krush60/solder/config.h
deleted file mode 100644
index 9cdc6354ecc2..000000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/config.h
+++ /dev/null
@@ -1,34 +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 RGBLED_NUM 20
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations 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
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/info.json b/keyboards/sawnsprojects/krush/krush60/solder/info.json
index 2cdecaaeb41d..7aeb5ad38ab7 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/info.json
+++ b/keyboards/sawnsprojects/krush/krush60/solder/info.json
@@ -21,7 +21,23 @@
         "pin": "F1"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "max_brightness": 200,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
deleted file mode 100644
index 380a50edbec0..000000000000
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h
+++ /dev/null
@@ -1,40 +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
-
-/* Encoders */
-
-#define ENCODERS_CW_KEY  { { 12, 3 } }
-#define ENCODERS_CCW_KEY { { 12, 4 } }
-
-/* RGB */
-    #define RGBLED_NUM 20
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations 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
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.c b/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.c
deleted file mode 100644
index 96fcc9a6141d..000000000000
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- * Copyright 2021 drashna jael're (@drashna)
- * Copyright 2021 uybv
- * 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 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 "encoder_actions.h"
-
-#ifdef ENCODER_ENABLE
-static uint8_t  encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS]    = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS]   = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
-
-#endif
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.h b/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.h
deleted file mode 100644
index fb226326324d..000000000000
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can 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 "quantum.h"
-
-void encoder_action_unregister(void);
-
-void encoder_action_register(uint8_t index, bool clockwise);
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.h b/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.h
deleted file mode 100644
index 5f25d9c5c344..000000000000
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.h
+++ /dev/null
@@ -1,20 +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
-
-#include "quantum.h"
-#include "encoder_actions.h"
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
index 4cec48d86e60..5f8036cd3aab 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json
@@ -26,12 +26,28 @@
         "pin": "E6"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "max_brightness": 200,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -109,88 +125,6 @@
                 {"matrix": [4, 14], "x": 14, "y": 4},
                 {"matrix": [4, 15], "x": 15, "y": 4}
             ]
-        },
-        "LAYOUT_via_rotary": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.75},
-                {"matrix": [0, 1], "x": 1, "y": 0.75},
-                {"matrix": [0, 2], "x": 2, "y": 0.75},
-                {"matrix": [0, 3], "x": 3, "y": 0.75},
-                {"matrix": [0, 4], "x": 4, "y": 0.75},
-                {"matrix": [0, 5], "x": 5, "y": 0.75},
-                {"matrix": [0, 6], "x": 6, "y": 0.75},
-                {"matrix": [0, 7], "x": 7, "y": 0.75},
-                {"matrix": [0, 8], "x": 8, "y": 0.75},
-                {"matrix": [0, 9], "x": 9, "y": 0.75},
-                {"matrix": [0, 10], "x": 10, "y": 0.75},
-                {"matrix": [0, 11], "x": 11, "y": 0.75},
-                {"matrix": [0, 12], "x": 12, "y": 0.75},
-                {"matrix": [0, 13], "x": 13, "y": 0.75},
-                {"matrix": [0, 14], "x": 14, "y": 0.75},
-                {"matrix": [0, 15], "x": 15, "y": 0.75},
-
-                {"matrix": [3, 12], "x": 14.75, "y": 0, "w": 0.75, "h": 0.75},
-                {"matrix": [4, 12], "x": 15.5, "y": 0, "w": 0.75, "h": 0.75},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.75, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1.75},
-                {"matrix": [1, 2], "x": 2.5, "y": 1.75},
-                {"matrix": [1, 3], "x": 3.5, "y": 1.75},
-                {"matrix": [1, 4], "x": 4.5, "y": 1.75},
-                {"matrix": [1, 5], "x": 5.5, "y": 1.75},
-                {"matrix": [1, 6], "x": 6.5, "y": 1.75},
-                {"matrix": [1, 7], "x": 7.5, "y": 1.75},
-                {"matrix": [1, 8], "x": 8.5, "y": 1.75},
-                {"matrix": [1, 9], "x": 9.5, "y": 1.75},
-                {"matrix": [1, 10], "x": 10.5, "y": 1.75},
-                {"matrix": [1, 11], "x": 11.5, "y": 1.75},
-                {"matrix": [1, 12], "x": 12.5, "y": 1.75},
-                {"matrix": [1, 13], "x": 13.5, "y": 1.75, "w": 1.5},
-                {"matrix": [1, 15], "x": 15, "y": 1.75},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.75, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2.75},
-                {"matrix": [2, 2], "x": 2.75, "y": 2.75},
-                {"matrix": [2, 3], "x": 3.75, "y": 2.75},
-                {"matrix": [2, 4], "x": 4.75, "y": 2.75},
-                {"matrix": [2, 5], "x": 5.75, "y": 2.75},
-                {"matrix": [2, 6], "x": 6.75, "y": 2.75},
-                {"matrix": [2, 7], "x": 7.75, "y": 2.75},
-                {"matrix": [2, 8], "x": 8.75, "y": 2.75},
-                {"matrix": [2, 9], "x": 9.75, "y": 2.75},
-                {"matrix": [2, 10], "x": 10.75, "y": 2.75},
-                {"matrix": [2, 11], "x": 11.75, "y": 2.75},
-                {"matrix": [2, 13], "x": 12.75, "y": 2.75, "w": 2.25},
-                {"matrix": [2, 15], "x": 15, "y": 2.75},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.75, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3.75},
-                {"matrix": [3, 3], "x": 3.25, "y": 3.75},
-                {"matrix": [3, 4], "x": 4.25, "y": 3.75},
-                {"matrix": [3, 5], "x": 5.25, "y": 3.75},
-                {"matrix": [3, 6], "x": 6.25, "y": 3.75},
-                {"matrix": [3, 7], "x": 7.25, "y": 3.75},
-                {"matrix": [3, 8], "x": 8.25, "y": 3.75},
-                {"matrix": [3, 9], "x": 9.25, "y": 3.75},
-                {"matrix": [3, 10], "x": 10.25, "y": 3.75},
-                {"matrix": [3, 11], "x": 11.25, "y": 3.75},
-                {"matrix": [3, 13], "x": 12.25, "y": 3.75, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3.75},
-                {"matrix": [3, 15], "x": 15, "y": 3.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.75, "w": 1.25},
-                {"matrix": [4, 2], "x": 1.25, "y": 4.75, "w": 1.25},
-                {"matrix": [4, 3], "x": 2.5, "y": 4.75, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4.75, "w": 2.25},
-                {"matrix": [4, 6], "x": 6, "y": 4.75, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.75, "w": 2.75},
-                {"matrix": [4, 8], "x": 10, "y": 4.75, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.75, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 13, "y": 4.75},
-                {"matrix": [4, 14], "x": 14, "y": 4.75},
-                {"matrix": [4, 15], "x": 15, "y": 4.75}
-            ]
         }
     }
 }
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/default/keymap.c b/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/default/keymap.c
index 13883d07e45e..8487c555bae6 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/default/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
-    [0] = LAYOUT_all(
+    [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_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, 
@@ -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_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  
     ),
 
-    [1] = LAYOUT_all(
+    [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_TRNS, KC_TRNS, 
         KC_TRNS, KC_TRNS, 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/hotswap/keymaps/via/keymap.c b/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/keymap.c
index d55eb74fb0d4..7d239cc5232b 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/keymap.c
@@ -19,42 +19,42 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
-    [0] = LAYOUT_via_rotary(
-        KC_ESC,  KC_1,    KC_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_VOLD ,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_CAPS, KC_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  
+    [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_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_via_rotary(
-        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, KC_TRNS, KC_TRNS  
+    [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_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_via_rotary(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
     ),
-    [3] = LAYOUT_via_rotary(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
     ),
 };
 
-
-void matrix_scan_user(void) {
-    encoder_action_unregister();
-}
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    encoder_action_register(index, clockwise);
-    return false; // override kb default behavior
-};
\ No newline at end of file
+#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(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/rules.mk b/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/rules.mk
index a9739430b9a1..1189f4ad1927 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/rules.mk
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/keymaps/via/rules.mk
@@ -1,5 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-# Added encoder Action
-SRC +=  encoder_actions.c
\ No newline at end of file
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/config.h b/keyboards/sawnsprojects/krush/krush65/solder/config.h
deleted file mode 100644
index c5b074931d33..000000000000
--- a/keyboards/sawnsprojects/krush/krush65/solder/config.h
+++ /dev/null
@@ -1,34 +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 RGBLED_NUM 20
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations 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
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/info.json b/keyboards/sawnsprojects/krush/krush65/solder/info.json
index bd84e19a0ea8..853f95b45e21 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/info.json
+++ b/keyboards/sawnsprojects/krush/krush65/solder/info.json
@@ -26,7 +26,23 @@
         "pin": "F1"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "max_brightness": 200,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/sawnsprojects/okayu/halconf.h b/keyboards/sawnsprojects/okayu/halconf.h
new file mode 100644
index 000000000000..eb4e81c9ac84
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/halconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 MaiTheSan
+// 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/sawnsprojects/okayu/info.json b/keyboards/sawnsprojects/okayu/info.json
new file mode 100644
index 000000000000..89743590368f
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/info.json
@@ -0,0 +1,766 @@
+{
+    "keyboard_name": "Okayu",
+    "manufacturer": "Salane",
+    "url": "",
+    "maintainer": "Mai The San",
+    "usb": {
+        "vid": "0x5350",
+        "pid": "0x00A1",
+        "device_version": "1.0.0",
+        "force_nkro": true
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan"
+    ],
+    "matrix_pins": {
+        "cols": ["A9", "A0", "A8", "C13", "A1", "A2", "B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4"],
+        "rows": ["B3", "A15", "A3", "A10", "B14"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "B12",
+        "on_state": 0
+    },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
+    "rgblight": {
+        "led_count": 24,
+        "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
+        }
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "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": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K2D", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2C", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K4A", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K4B", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+           ]
+        },
+        "LAYOUT_60_ansi": {
+            "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": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2C", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K4A", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K4B", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+           ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "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": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K2D", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2C", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+                
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K4A", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K4B", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+           ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "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": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2C", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "K41", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "K46", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "K4B", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+           ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "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": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K2D", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2C", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "K41", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "K46", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "K4B", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+           ]
+        },
+        "LAYOUT_60_hhkb": {
+            "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": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K2D", "matrix": [2, 13], "x": 14, "y": 0},
+                
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2C", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "K41", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "K46", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "K4B", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4}
+           ]
+        },
+        "LAYOUT_60_iso": {
+            "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": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K1D", "matrix": [1, 13], "x": 12.75, "y": 2},
+
+                {"label": "K2C", "matrix": [2, 12], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K4A", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K4B", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+           ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "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": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K2D", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K1D", "matrix": [1, 13], "x": 12.75, "y": 2},
+
+                {"label": "K2C", "matrix": [2, 12], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+                
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K4A", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K4B", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+           ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "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": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K1D", "matrix": [1, 13], "x": 12.75, "y": 2},
+
+                {"label": "K2C", "matrix": [2, 12], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "K41", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "K46", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "K4B", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+           ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "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": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K2D", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K1D", "matrix": [1, 13], "x": 12.75, "y": 2},
+
+                {"label": "K2C", "matrix": [2, 12], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+                
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "K41", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "K46", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "K4B", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "K4D", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sawnsprojects/okayu/keymaps/default/keymap.c b/keyboards/sawnsprojects/okayu/keymaps/default/keymap.c
new file mode 100644
index 000000000000..f5290a50064a
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+// Copyright 2023 MaiTheSan (@maithesan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum {
+    _BL,
+    _FL,
+    _AL,
+    _CL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_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,  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,  TG(_AL),
+    KC_LCTL, KC_LGUI, KC_LALT,       KC_SPACE,             MO(_FL), KC_RALT, KC_RGUI, KC_RCTL),
+
+[_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,
+    BL_TOGG, BL_UP,    BL_DOWN, BL_STEP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______,
+    VK_TOGG, _______,  RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
+    _______, _______,  _______,       MO(_CL),                               _______, _______, _______, _______),
+
+[_AL] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______,
+    _______, _______, _______,       _______,                               _______, KC_LEFT, KC_DOWN, KC_RIGHT),
+
+[_CL] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+    _______, _______, _______,       _______,                               _______, _______, _______, _______)
+
+ };
diff --git a/keyboards/sawnsprojects/okayu/keymaps/via/keymap.c b/keyboards/sawnsprojects/okayu/keymaps/via/keymap.c
new file mode 100644
index 000000000000..f5290a50064a
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/keymaps/via/keymap.c
@@ -0,0 +1,42 @@
+// Copyright 2023 MaiTheSan (@maithesan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum {
+    _BL,
+    _FL,
+    _AL,
+    _CL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_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,  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,  TG(_AL),
+    KC_LCTL, KC_LGUI, KC_LALT,       KC_SPACE,             MO(_FL), KC_RALT, KC_RGUI, KC_RCTL),
+
+[_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,
+    BL_TOGG, BL_UP,    BL_DOWN, BL_STEP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______,
+    VK_TOGG, _______,  RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
+    _______, _______,  _______,       MO(_CL),                               _______, _______, _______, _______),
+
+[_AL] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______,
+    _______, _______, _______,       _______,                               _______, KC_LEFT, KC_DOWN, KC_RIGHT),
+
+[_CL] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+    _______, _______, _______,       _______,                               _______, _______, _______, _______)
+
+ };
diff --git a/keyboards/sawnsprojects/okayu/keymaps/via/rules.mk b/keyboards/sawnsprojects/okayu/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/okayu/readme.md b/keyboards/sawnsprojects/okayu/readme.md
new file mode 100644
index 000000000000..d49415865b90
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/readme.md
@@ -0,0 +1,27 @@
+# Okayu
+
+![Okayu](https://i.imgur.com/pRnRHl8h.png)
+
+A Wibu 60% keyboard PCB Design by inspire of Nekomata Okayu and can fit many keyboard case
+
+* Keyboard Maintainer: [Mai The San](https://github.com/maithesan)
+* Hardware Supported: Several 60% keyboard (RE60, Krush60, Unikorn, Tinyneko, Bakeneko60...)
+* Hardware Availability: NuxrosKB, Salane Discord
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sawnsprojects/okayu:default
+
+Flashing example for this keyboard:
+
+    make sawnsprojects/okayu: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/okayu/rules.mk b/keyboards/sawnsprojects/okayu/rules.mk
new file mode 100644
index 000000000000..59655554eb2c
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = sawnsprojects/okayu/stm32f072
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/okayu/stm32f072/config.h b/keyboards/sawnsprojects/okayu/stm32f072/config.h
new file mode 100644
index 000000000000..c47f1928c848
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f072/config.h
@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define WS2812_SPI SPID1
+#define WS2812_SPI_MOSI_PAL_MODE 5
+#define WS2812_SPI_SCK_PIN B13
+#define WS2812_SPI_SCK_PAL_MODE 5
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/okayu/stm32f072/info.json b/keyboards/sawnsprojects/okayu/stm32f072/info.json
new file mode 100644
index 000000000000..b5d728b1cdf1
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f072/info.json
@@ -0,0 +1,4 @@
+{
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+}
diff --git a/keyboards/sawnsprojects/okayu/stm32f072/mcuconf.h b/keyboards/sawnsprojects/okayu/stm32f072/mcuconf.h
new file mode 100644
index 000000000000..7cd72d9a86b9
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f072/mcuconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
diff --git a/keyboards/sawnsprojects/okayu/stm32f072/rules.mk b/keyboards/sawnsprojects/okayu/stm32f072/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/sawnsprojects/okayu/stm32f103/config.h b/keyboards/sawnsprojects/okayu/stm32f103/config.h
new file mode 100644
index 000000000000..eff3605470a9
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f103/config.h
@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define WS2812_SPI SPID2
+#define WS2812_SPI_MOSI_PAL_MODE 5 
+#define WS2812_SPI_SCK_PIN B13
+#define WS2812_SPI_SCK_PAL_MODE 5
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/okayu/stm32f103/info.json b/keyboards/sawnsprojects/okayu/stm32f103/info.json
new file mode 100644
index 000000000000..31fd483f66be
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f103/info.json
@@ -0,0 +1,3 @@
+{
+    "development_board": "bluepill"
+}
diff --git a/keyboards/sawnsprojects/okayu/stm32f103/mcuconf.h b/keyboards/sawnsprojects/okayu/stm32f103/mcuconf.h
new file mode 100644
index 000000000000..8ab476c663ec
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f103/mcuconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// 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/sawnsprojects/okayu/stm32f103/rules.mk b/keyboards/sawnsprojects/okayu/stm32f103/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/sawnsprojects/okayu/stm32f303/config.h b/keyboards/sawnsprojects/okayu/stm32f303/config.h
new file mode 100644
index 000000000000..c47f1928c848
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f303/config.h
@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define WS2812_SPI SPID1
+#define WS2812_SPI_MOSI_PAL_MODE 5
+#define WS2812_SPI_SCK_PIN B13
+#define WS2812_SPI_SCK_PAL_MODE 5
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/okayu/stm32f303/info.json b/keyboards/sawnsprojects/okayu/stm32f303/info.json
new file mode 100644
index 000000000000..84661311fd2b
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f303/info.json
@@ -0,0 +1,4 @@
+{
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu"
+}
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/okayu/stm32f303/mcuconf.h b/keyboards/sawnsprojects/okayu/stm32f303/mcuconf.h
new file mode 100644
index 000000000000..7cd72d9a86b9
--- /dev/null
+++ b/keyboards/sawnsprojects/okayu/stm32f303/mcuconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
diff --git a/keyboards/sawnsprojects/okayu/stm32f303/rules.mk b/keyboards/sawnsprojects/okayu/stm32f303/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h
index b7b343605127..d649c698abad 100644
--- a/keyboards/sawnsprojects/satxri6key/config.h
+++ b/keyboards/sawnsprojects/satxri6key/config.h
@@ -16,22 +16,6 @@
 
 #pragma once
 
-    #define RGBLED_NUM 6
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-
 #define RGB_MATRIX_LED_COUNT 6
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/sawnsprojects/satxri6key/info.json b/keyboards/sawnsprojects/satxri6key/info.json
index 642f813a67ef..5d92db728ab0 100644
--- a/keyboards/sawnsprojects/satxri6key/info.json
+++ b/keyboards/sawnsprojects/satxri6key/info.json
@@ -8,6 +8,24 @@
         "pid": "0x0727",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "F0"
     },
diff --git a/keyboards/sawnsprojects/satxri6key/keymaps/default/rules.mk b/keyboards/sawnsprojects/satxri6key/keymaps/default/rules.mk
index 70b7f6921fa9..3d821b064a39 100644
--- a/keyboards/sawnsprojects/satxri6key/keymaps/default/rules.mk
+++ b/keyboards/sawnsprojects/satxri6key/keymaps/default/rules.mk
@@ -1,4 +1,4 @@
 VIA_ENABLE = no
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
+RGB_MATRIX_DRIVER = ws2812
diff --git a/keyboards/sawnsprojects/vcl65/solder/config.h b/keyboards/sawnsprojects/vcl65/solder/config.h
deleted file mode 100644
index 4fd203480c34..000000000000
--- a/keyboards/sawnsprojects/vcl65/solder/config.h
+++ /dev/null
@@ -1,35 +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 RGBLED_NUM 20
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-/*== all animations 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
diff --git a/keyboards/sawnsprojects/vcl65/solder/info.json b/keyboards/sawnsprojects/vcl65/solder/info.json
index 47b141ad4e19..a7c3975ccf08 100644
--- a/keyboards/sawnsprojects/vcl65/solder/info.json
+++ b/keyboards/sawnsprojects/vcl65/solder/info.json
@@ -21,7 +21,23 @@
         "pin": "B7"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "max_brightness": 200,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/sck/gtm/config.h b/keyboards/sck/gtm/config.h
index c95d84b30d06..5f360813239b 100644
--- a/keyboards/sck/gtm/config.h
+++ b/keyboards/sck/gtm/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-
-#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 RGBLED_NUM 4
-#endif
diff --git a/keyboards/sck/gtm/info.json b/keyboards/sck/gtm/info.json
index 422fb0c0f1e9..7925b109ece9 100644
--- a/keyboards/sck/gtm/info.json
+++ b/keyboards/sck/gtm/info.json
@@ -8,6 +8,21 @@
         "pid": "0x6090",
         "device_version": "0.0.2"
     },
+    "rgblight": {
+        "led_count": 4,
+        "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": "B0"
     },
diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h
deleted file mode 100644
index cc6739122e2d..000000000000
--- a/keyboards/sck/osa/config.h
+++ /dev/null
@@ -1,40 +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 RGBLED_NUM 9
-   #define RGBLIGHT_HUE_STEP 10
-   #define RGBLIGHT_SAT_STEP 17
-   #define RGBLIGHT_VAL_STEP 17
-   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
-/*
- * 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/sck/osa/info.json b/keyboards/sck/osa/info.json
index ae63add06254..823b94f47777 100644
--- a/keyboards/sck/osa/info.json
+++ b/keyboards/sck/osa/info.json
@@ -18,6 +18,11 @@
         "num_lock": "C7",
         "scroll_lock": "B6"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 9,
+        "sleep": true
+    },
     "ws2812": {
         "pin": "D4"
     },
diff --git a/keyboards/sck/osa/keymaps/ocm/keymap.c b/keyboards/sck/osa/keymaps/ocm/keymap.c
index cd48b57291f7..87544b7375ea 100644
--- a/keyboards/sck/osa/keymaps/ocm/keymap.c
+++ b/keyboards/sck/osa/keymaps/ocm/keymap.c
@@ -15,13 +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: (Base Layer) Default Layer
    * .----.,----------------------------------------------------------------------.
@@ -84,40 +77,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	          KC_LCTL,          KC_LALT,          KC_SPC, MO(1),                     KC_SPC,                    KC_RALT,                            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;
-//}
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/sck/osa/keymaps/splitbs/keymap.c b/keyboards/sck/osa/keymaps/splitbs/keymap.c
index 528e45329b78..367e084443a6 100644
--- a/keyboards/sck/osa/keymaps/splitbs/keymap.c
+++ b/keyboards/sck/osa/keymaps/splitbs/keymap.c
@@ -15,13 +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: (Base Layer) Default Layer
    * .----.,----------------------------------------------------------------------.
@@ -64,40 +57,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	          KC_LCTL,          KC_LALT,          KC_SPC, _______,                     KC_SPC,                    KC_RALT,                            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;
-//}
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/sck/osa/keymaps/splitrs/keymap.c b/keyboards/sck/osa/keymaps/splitrs/keymap.c
index 3c64300667e3..92f156321c9d 100644
--- a/keyboards/sck/osa/keymaps/splitrs/keymap.c
+++ b/keyboards/sck/osa/keymaps/splitrs/keymap.c
@@ -15,13 +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: (Base Layer) Default Layer
    * .----.,----------------------------------------------------------------------.
@@ -64,40 +57,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	          KC_LCTL,          KC_LALT,          KC_SPC, _______,                     KC_SPC,                    KC_RALT,                            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;
-//}
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/sendyyeah/pix/config.h b/keyboards/sendyyeah/pix/config.h
index 071064c8bcb7..d6dfea8506bb 100644
--- a/keyboards/sendyyeah/pix/config.h
+++ b/keyboards/sendyyeah/pix/config.h
@@ -25,20 +25,5 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 15
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYER_BLINK
diff --git a/keyboards/sendyyeah/pix/info.json b/keyboards/sendyyeah/pix/info.json
index c1ca4137cccd..9701dffb1593 100644
--- a/keyboards/sendyyeah/pix/info.json
+++ b/keyboards/sendyyeah/pix/info.json
@@ -8,6 +8,24 @@
         "pid": "0x4E34",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 15,
+        "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": "B5"
     },
diff --git a/keyboards/sendyyeah/pix/rules.mk b/keyboards/sendyyeah/pix/rules.mk
index a6fe4b81c41e..83231e1022bc 100644
--- a/keyboards/sendyyeah/pix/rules.mk
+++ b/keyboards/sendyyeah/pix/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/senselessclay/ck60/info.json b/keyboards/senselessclay/ck60/info.json
index 0e27424dac29..f05d94c9de41 100644
--- a/keyboards/senselessclay/ck60/info.json
+++ b/keyboards/senselessclay/ck60/info.json
@@ -12,7 +12,7 @@
         "pin": "B1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F0", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
diff --git a/keyboards/senselessclay/ck65/config.h b/keyboards/senselessclay/ck65/config.h
index 9aad2f69c34d..7c029a283dbf 100644
--- a/keyboards/senselessclay/ck65/config.h
+++ b/keyboards/senselessclay/ck65/config.h
@@ -38,17 +38,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* RGB Backlighting */
-#define RGBLED_NUM 69
-#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_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL+5
diff --git a/keyboards/senselessclay/ck65/info.json b/keyboards/senselessclay/ck65/info.json
index 75bff408c687..129c487e19d1 100644
--- a/keyboards/senselessclay/ck65/info.json
+++ b/keyboards/senselessclay/ck65/info.json
@@ -12,7 +12,21 @@
         "pin": "B1"
     },
     "rgblight": {
-        "max_brightness": 122
+        "led_count": 69,
+        "max_brightness": 122,
+        "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": ["F0", "D5", "D3", "D2", "D1", "D0", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
diff --git a/keyboards/senselessclay/gos65/config.h b/keyboards/senselessclay/gos65/config.h
index 907e7dea5d3d..cef01cf341c9 100644
--- a/keyboards/senselessclay/gos65/config.h
+++ b/keyboards/senselessclay/gos65/config.h
@@ -37,17 +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
-
-/* RGB Backlighting */
-#define RGBLED_NUM 68
-#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/senselessclay/gos65/info.json b/keyboards/senselessclay/gos65/info.json
index eb59447c39eb..c834b8152f1a 100644
--- a/keyboards/senselessclay/gos65/info.json
+++ b/keyboards/senselessclay/gos65/info.json
@@ -12,7 +12,21 @@
       "pin": "B0"
     },
     "rgblight": {
-      "max_brightness": 125
+      "led_count": 68,
+      "max_brightness": 125,
+      "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": ["F4", "D5", "D3", "D2", "D1", "D0", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
diff --git a/keyboards/sentraq/number_pad/config.h b/keyboards/sentraq/number_pad/config.h
deleted file mode 100644
index d1cb9939bd98..000000000000
--- a/keyboards/sentraq/number_pad/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2019 QMK Community
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-  #define RGBLED_NUM 13
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
diff --git a/keyboards/sentraq/number_pad/info.json b/keyboards/sentraq/number_pad/info.json
index 61b085d86f84..7852587d3942 100644
--- a/keyboards/sentraq/number_pad/info.json
+++ b/keyboards/sentraq/number_pad/info.json
@@ -7,6 +7,24 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 13,
+    "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": "B0"
   },
diff --git a/keyboards/sentraq/s60_x/default/config.h b/keyboards/sentraq/s60_x/default/config.h
index 1fa22a6e9db1..c265dc1ef128 100644
--- a/keyboards/sentraq/s60_x/default/config.h
+++ b/keyboards/sentraq/s60_x/default/config.h
@@ -6,7 +6,4 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
 #define NO_ACTION_ONESHOT
diff --git a/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c
index 6337639143f6..f1c8c29128e9 100644
--- a/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c
+++ b/keyboards/sentraq/s60_x/keymaps/ansi_qwertz/keymap.c
@@ -34,9 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KC_FUNC MO(2)
 #define MICMUTE RCTL(KC_LCTL)
 
-enum function_codes {
-};
-
 enum layer_names {
     DEFAULT,
     GAMING,
@@ -144,14 +141,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
 bool process_german(uint16_t keycode, keyrecord_t *record) {
     uint16_t send_code = 0;
     if (record->event.pressed) {
@@ -208,7 +197,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 #endif
 }
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/sentraq/s60_x/rgb/config.h b/keyboards/sentraq/s60_x/rgb/config.h
index da4d3257a62a..5f360813239b 100644
--- a/keyboards/sentraq/s60_x/rgb/config.h
+++ b/keyboards/sentraq/s60_x/rgb/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 10
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/sentraq/s60_x/rgb/info.json b/keyboards/sentraq/s60_x/rgb/info.json
index c311c6a5134e..108eb42b3f22 100644
--- a/keyboards/sentraq/s60_x/rgb/info.json
+++ b/keyboards/sentraq/s60_x/rgb/info.json
@@ -9,6 +9,23 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "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": "F6"
     },
diff --git a/keyboards/sentraq/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h
index 900ea0aa40a7..675b4c58fa74 100644
--- a/keyboards/sentraq/s65_plus/config.h
+++ b/keyboards/sentraq/s65_plus/config.h
@@ -1,19 +1,5 @@
 #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 RGBLED_NUM 20
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/sentraq/s65_plus/info.json b/keyboards/sentraq/s65_plus/info.json
index f9287f2507f0..bac1729ce4e7 100644
--- a/keyboards/sentraq/s65_plus/info.json
+++ b/keyboards/sentraq/s65_plus/info.json
@@ -16,6 +16,23 @@
   "backlight": {
     "pin": "B7"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 20,
+    "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": "D3"
   },
diff --git a/keyboards/sentraq/s65_x/config.h b/keyboards/sentraq/s65_x/config.h
index 7b388614f4b0..675b4c58fa74 100644
--- a/keyboards/sentraq/s65_x/config.h
+++ b/keyboards/sentraq/s65_x/config.h
@@ -1,21 +1,6 @@
 #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 RGBLED_NUM 20
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20
-#define RGBLIGHT_SLEEP
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/sentraq/s65_x/info.json b/keyboards/sentraq/s65_x/info.json
index d87a6873cac0..416baa89df37 100644
--- a/keyboards/sentraq/s65_x/info.json
+++ b/keyboards/sentraq/s65_x/info.json
@@ -18,6 +18,24 @@
     "levels": 5,
     "as_caps_lock": true
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 20,
+    "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": "D3"
   },
diff --git a/keyboards/sets3n/kk980/config.h b/keyboards/sets3n/kk980/config.h
index d7b29ad73281..c19b74dc539c 100644
--- a/keyboards/sets3n/kk980/config.h
+++ b/keyboards/sets3n/kk980/config.h
@@ -22,33 +22,10 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 102
-#define RGBLIGHT_LED_MAP { 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, 87, 88, 89, 90, 91, 92, 93, 94, 95, \
-	96, 97, 98, 99, 100, 101, 102 }	// 1 --> ScollLock 2 --> CapsLock 3 --> Bluetooth 4 --> NumLock
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LAYERS
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 102
 #define RGB_MATRIX_KEYPRESSES
 #endif
diff --git a/keyboards/sets3n/kk980/info.json b/keyboards/sets3n/kk980/info.json
index f59f186bf4c4..2efdb4dafeff 100644
--- a/keyboards/sets3n/kk980/info.json
+++ b/keyboards/sets3n/kk980/info.json
@@ -12,7 +12,22 @@
         "pin": "B7"
     },
     "rgblight": {
-        "max_brightness": 230
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 102,
+        "max_brightness": 230,
+        "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": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "B1", "B0", "D0", "D1"],
diff --git a/keyboards/shoc/info.json b/keyboards/shoc/info.json
index fca5fdca0b73..276e64adee99 100644
--- a/keyboards/shoc/info.json
+++ b/keyboards/shoc/info.json
@@ -26,6 +26,12 @@
                 {"matrix": [0, 5], "x": 5, "y": 0},
                 {"matrix": [0, 6], "x": 6, "y": 0},
                 {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [5, 4], "x": 8, "y": 0},
+                {"matrix": [5, 3], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 1], "x": 11, "y": 0},
+                {"matrix": [5, 0], "x": 12, "y": 0, "w": 2},
+
                 {"matrix": [1, 0], "x": 0, "y": 1},
                 {"matrix": [1, 1], "x": 1, "y": 1},
                 {"matrix": [1, 2], "x": 2, "y": 1},
@@ -34,6 +40,13 @@
                 {"matrix": [1, 5], "x": 5, "y": 1},
                 {"matrix": [1, 6], "x": 6, "y": 1},
                 {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [5, 5], "x": 8, "y": 1},
+                {"matrix": [5, 6], "x": 9, "y": 1},
+                {"matrix": [5, 7], "x": 10, "y": 1},
+                {"matrix": [7, 0], "x": 11, "y": 1},
+                {"matrix": [7, 1], "x": 12, "y": 1},
+                {"matrix": [7, 2], "x": 13, "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},
@@ -42,6 +55,12 @@
                 {"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": [7, 7], "x": 8.5, "y": 2},
+                {"matrix": [7, 6], "x": 9.5, "y": 2},
+                {"matrix": [7, 5], "x": 10.5, "y": 2},
+                {"matrix": [7, 4], "x": 11.5, "y": 2},
+                {"matrix": [7, 3], "x": 12.5, "y": 2, "w": 1.5},
+
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
                 {"matrix": [3, 1], "x": 2, "y": 3},
                 {"matrix": [3, 2], "x": 3, "y": 3},
@@ -50,6 +69,12 @@
                 {"matrix": [3, 5], "x": 6, "y": 3},
                 {"matrix": [3, 6], "x": 7, "y": 3},
                 {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [6, 7], "x": 9, "y": 3},
+                {"matrix": [6, 6], "x": 10, "y": 3},
+                {"matrix": [6, 5], "x": 11, "y": 3},
+                {"matrix": [6, 4], "x": 12, "y": 3},
+                {"matrix": [6, 3], "x": 13, "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},
@@ -58,30 +83,9 @@
                 {"matrix": [4, 5], "x": 7, "y": 4, "w": 2},
                 {"matrix": [4, 6], "x": 9, "y": 4},
                 {"matrix": [4, 7], "x": 10, "y": 4},
-                {"matrix": [5, 0], "x": 12, "y": 0, "w": 2},
-                {"matrix": [5, 1], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 9, "y": 0},
-                {"matrix": [5, 4], "x": 8, "y": 0},
-                {"matrix": [5, 5], "x": 8, "y": 1},
-                {"matrix": [5, 6], "x": 9, "y": 1},
-                {"matrix": [5, 7], "x": 10, "y": 1},
-                {"matrix": [6, 0], "x": 13, "y": 4},
-                {"matrix": [6, 1], "x": 12, "y": 4},
                 {"matrix": [6, 2], "x": 11, "y": 4},
-                {"matrix": [6, 3], "x": 13, "y": 3},
-                {"matrix": [6, 4], "x": 12, "y": 3},
-                {"matrix": [6, 5], "x": 11, "y": 3},
-                {"matrix": [6, 6], "x": 10, "y": 3},
-                {"matrix": [6, 7], "x": 9, "y": 3},
-                {"matrix": [7, 0], "x": 11, "y": 1},
-                {"matrix": [7, 1], "x": 12, "y": 1},
-                {"matrix": [7, 2], "x": 13, "y": 1},
-                {"matrix": [7, 3], "x": 12.5, "y": 2, "w": 1.5},
-                {"matrix": [7, 4], "x": 11.5, "y": 2},
-                {"matrix": [7, 5], "x": 10.5, "y": 2},
-                {"matrix": [7, 6], "x": 9.5, "y": 2},
-                {"matrix": [7, 7], "x": 8.5, "y": 2}
+                {"matrix": [6, 1], "x": 12, "y": 4},
+                {"matrix": [6, 0], "x": 13, "y": 4}
             ]
         }
     }
diff --git a/keyboards/shoc/keymaps/bongo/keymap.c b/keyboards/shoc/keymaps/bongo/keymap.c
index 14779f1d7555..0242e5adad36 100644
--- a/keyboards/shoc/keymaps/bongo/keymap.c
+++ b/keyboards/shoc/keymaps/bongo/keymap.c
@@ -17,32 +17,26 @@
 
 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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U,
-		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,
-		KC_LSFT, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL,
-		KC_BSPC, KC_MINS, KC_0, KC_9, KC_8, KC_I, KC_O, KC_P,
-		KC_RGHT, KC_DOWN, KC_LEFT, KC_EQL, KC_UP, KC_SLSH, KC_COMM, KC_DOT,
-		KC_RBRC, KC_LBRC, KC_BSLS, KC_ENT, KC_QUOT, KC_SCLN, KC_L, KC_K),
+    [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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U,
-		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,
-		KC_LSFT, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL,
-		KC_BSPC, KC_F11, KC_F10, KC_F9, KC_F8, KC_I, KC_O, KC_P,
-		KC_RGHT, KC_DOWN, KC_LEFT, KC_DEL, KC_UP, KC_SLSH, KC_COMM, KC_DOT,
-		KC_RBRC, KC_LBRC, KC_BSLS, KC_ENT, KC_QUOT, KC_SCLN, KC_L, KC_K)
+        KC_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;
+    return OLED_ROTATION_0;
 }
 //full credit goes to https://www.reddit.com/user/Pop-X-/ only small feature comforts were added
 
@@ -163,7 +157,7 @@ bool oled_task_user(void) {
     oled_set_cursor(0,6);
     oled_write_P(PSTR("       WPM: "), false);
     oled_write(get_u8_str(get_current_wpm(), '0'), false);
-    if(host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)){
+    if(host_keyboard_led_state().caps_lock){
         oled_set_cursor(0,5);
         oled_write_P(PSTR("      CAPS  LOCK"), false);
     }
diff --git a/keyboards/shoc/keymaps/default/keymap.c b/keyboards/shoc/keymaps/default/keymap.c
index a5916db65a50..beb5fb7d3def 100644
--- a/keyboards/shoc/keymaps/default/keymap.c
+++ b/keyboards/shoc/keymaps/default/keymap.c
@@ -17,25 +17,19 @@
 
 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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U,
-		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,
-		KC_LSFT, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL,
-		KC_BSPC, KC_MINS, KC_0, KC_9, KC_8, KC_I, KC_O, KC_P,
-		KC_RGHT, KC_DOWN, KC_LEFT, KC_EQL, KC_UP, KC_SLSH, KC_COMM, KC_DOT,
-		KC_RBRC, KC_LBRC, KC_BSLS, KC_ENT, KC_QUOT, KC_SCLN, KC_L, KC_K),
+    [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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U,
-		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,
-		KC_LSFT, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL,
-		KC_BSPC, KC_F11, KC_F10, KC_F9, KC_F8, KC_I, KC_O, KC_P,
-		KC_RGHT, KC_DOWN, KC_LEFT, KC_DEL, KC_UP, KC_SLSH, KC_COMM, KC_DOT,
-		KC_RBRC, KC_LBRC, KC_BSLS, KC_ENT, KC_QUOT, KC_SCLN, KC_L, KC_K)
+        KC_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)
 
 
 };
diff --git a/keyboards/shoc/rules.mk b/keyboards/shoc/rules.mk
index 806df5042105..5d17ed9492a8 100644
--- a/keyboards/shoc/rules.mk
+++ b/keyboards/shoc/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
diff --git a/keyboards/shostudio/arc/info.json b/keyboards/shostudio/arc/info.json
index 0e7f21464961..33f9deb866a0 100644
--- a/keyboards/shostudio/arc/info.json
+++ b/keyboards/shostudio/arc/info.json
@@ -29,181 +29,269 @@
     "bootloader": "stm32duino",
     "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": [4, 7], "x": 8.25, "y": 0},
-                    {"matrix": [0, 8], "x": 10.75, "y": 0},
-                    {"matrix": [0, 9], "x": 11.75, "y": 0},
-                    {"matrix": [0, 10], "x": 12.75, "y": 0},
-                    {"matrix": [0, 11], "x": 13.75, "y": 0},
-                    {"matrix": [0, 12], "x": 14.75, "y": 0},
-                    {"matrix": [0, 13], "x": 15.75, "y": 0},
-                    {"matrix": [0, 14], "x": 16.75, "y": 0},
-                    {"matrix": [0, 15], "x": 17.75, "y": 0},
-                    {"matrix": [0, 16], "x": 18.75, "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": 10.25, "y": 1},
-                    {"matrix": [1, 9], "x": 11.25, "y": 1},
-                    {"matrix": [1, 10], "x": 12.25, "y": 1},
-                    {"matrix": [1, 11], "x": 13.25, "y": 1},
-                    {"matrix": [1, 12], "x": 14.25, "y": 1},
-                    {"matrix": [1, 13], "x": 15.25, "y": 1},
-                    {"matrix": [1, 14], "x": 16.25, "y": 1},
-                    {"matrix": [1, 15], "x": 17.25, "y": 1, "w": 1.5},
-                    {"matrix": [1, 16], "x": 18.75, "y": 1},
-    
-                    {"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": 10.5, "y": 2},
-                    {"matrix": [2, 9], "x": 11.5, "y": 2},
-                    {"matrix": [2, 10], "x": 12.5, "y": 2},
-                    {"matrix": [2, 11], "x": 13.5, "y": 2},
-                    {"matrix": [2, 12], "x": 14.5, "y": 2},
-                    {"matrix": [2, 13], "x": 15.5, "y": 2},
-                    {"matrix": [2, 14], "x": 16.5, "y": 2},
-                    {"matrix": [2, 15], "x": 17.5, "y": 2, "w": 1.25},
-                    {"matrix": [2, 16], "x": 18.75, "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": 1.25},
-                    {"matrix": [4, 3], "x": 3.5, "y": 3},
-                    {"matrix": [3, 3], "x": 4.5, "y": 3},
-                    {"matrix": [3, 4], "x": 5.5, "y": 3},
-                    {"matrix": [3, 5], "x": 6.5, "y": 3},
-                    {"matrix": [3, 6], "x": 7.5, "y": 3},
-                    {"matrix": [3, 7], "x": 8.5, "y": 3},
-                    {"matrix": [3, 8], "x": 10, "y": 3},
-                    {"matrix": [3, 9], "x": 11, "y": 3},
-                    {"matrix": [3, 10], "x": 12, "y": 3},
-                    {"matrix": [3, 11], "x": 13, "y": 3},
-                    {"matrix": [3, 12], "x": 14, "y": 3},
-                    {"matrix": [3, 13], "x": 15, "y": 3},
-                    {"matrix": [3, 14], "x": 16, "y": 3, "w": 1.75},
-                    {"matrix": [3, 15], "x": 17.75, "y": 3},
-                    {"matrix": [3, 16], "x": 18.75, "y": 3},
-    
-                    {"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, 4], "x": 5, "y": 4, "w": 1.5},
-                    {"matrix": [4, 5], "x": 6.5, "y": 4, "w": 2.25},
-                    {"matrix": [4, 6], "x": 8.75, "y": 4},
-                    {"matrix": [4, 9], "x": 10, "y": 4, "w": 2.75},
-                    {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
-                    {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
-                    {"matrix": [4, 14], "x": 16.75, "y": 4},
-                    {"matrix": [4, 15], "x": 17.75, "y": 4},
-                    {"matrix": [4, 16], "x": 18.75, "y": 4}
-                ]
+            "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": [4, 7], "x": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 10.75, "y": 0},
+                {"matrix": [0, 9], "x": 11.75, "y": 0},
+                {"matrix": [0, 10], "x": 12.75, "y": 0},
+                {"matrix": [0, 11], "x": 13.75, "y": 0},
+                {"matrix": [0, 12], "x": 14.75, "y": 0},
+                {"matrix": [0, 13], "x": 15.75, "y": 0},
+                {"matrix": [0, 14], "x": 16.75, "y": 0},
+                {"matrix": [0, 15], "x": 17.75, "y": 0},
+                {"matrix": [0, 16], "x": 18.75, "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": 10.25, "y": 1},
+                {"matrix": [1, 9], "x": 11.25, "y": 1},
+                {"matrix": [1, 10], "x": 12.25, "y": 1},
+                {"matrix": [1, 11], "x": 13.25, "y": 1},
+                {"matrix": [1, 12], "x": 14.25, "y": 1},
+                {"matrix": [1, 13], "x": 15.25, "y": 1},
+                {"matrix": [1, 14], "x": 16.25, "y": 1},
+                {"matrix": [1, 15], "x": 17.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 18.75, "y": 1},
+
+                {"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": 10.5, "y": 2},
+                {"matrix": [2, 9], "x": 11.5, "y": 2},
+                {"matrix": [2, 10], "x": 12.5, "y": 2},
+                {"matrix": [2, 11], "x": 13.5, "y": 2},
+                {"matrix": [2, 12], "x": 14.5, "y": 2},
+                {"matrix": [2, 13], "x": 15.5, "y": 2},
+                {"matrix": [2, 14], "x": 16.5, "y": 2},
+                {"matrix": [2, 15], "x": 17.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 16], "x": 18.75, "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": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+                {"matrix": [3, 7], "x": 8.5, "y": 3},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3},
+                {"matrix": [3, 10], "x": 12, "y": 3},
+                {"matrix": [3, 11], "x": 13, "y": 3},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+                {"matrix": [3, 14], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 17.75, "y": 3},
+                {"matrix": [3, 16], "x": 18.75, "y": 3},
+
+                {"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, 4], "x": 5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.75, "y": 4},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 16.75, "y": 4},
+                {"matrix": [4, 15], "x": 17.75, "y": 4},
+                {"matrix": [4, 16], "x": 18.75, "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": [4, 7], "x": 8.25, "y": 0},
-                    {"matrix": [0, 8], "x": 10.75, "y": 0},
-                    {"matrix": [0, 9], "x": 11.75, "y": 0},
-                    {"matrix": [0, 10], "x": 12.75, "y": 0},
-                    {"matrix": [0, 11], "x": 13.75, "y": 0},
-                    {"matrix": [0, 12], "x": 14.75, "y": 0},
-                    {"matrix": [0, 13], "x": 15.75, "y": 0},
-                    {"matrix": [0, 14], "x": 16.75, "y": 0, "w": 2},
-                    {"matrix": [0, 16], "x": 18.75, "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": 10.25, "y": 1},
-                    {"matrix": [1, 9], "x": 11.25, "y": 1},
-                    {"matrix": [1, 10], "x": 12.25, "y": 1},
-                    {"matrix": [1, 11], "x": 13.25, "y": 1},
-                    {"matrix": [1, 12], "x": 14.25, "y": 1},
-                    {"matrix": [1, 13], "x": 15.25, "y": 1},
-                    {"matrix": [1, 14], "x": 16.25, "y": 1},
-                    {"matrix": [1, 15], "x": 17.25, "y": 1, "w": 1.5},
-                    {"matrix": [1, 16], "x": 18.75, "y": 1},
-    
-                    {"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": 10.5, "y": 2},
-                    {"matrix": [2, 9], "x": 11.5, "y": 2},
-                    {"matrix": [2, 10], "x": 12.5, "y": 2},
-                    {"matrix": [2, 11], "x": 13.5, "y": 2},
-                    {"matrix": [2, 12], "x": 14.5, "y": 2},
-                    {"matrix": [2, 13], "x": 15.5, "y": 2},
-                    {"matrix": [2, 15], "x": 16.5, "y": 2, "w": 2.25},
-                    {"matrix": [2, 16], "x": 18.75, "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, 3], "x": 4.5, "y": 3},
-                    {"matrix": [3, 4], "x": 5.5, "y": 3},
-                    {"matrix": [3, 5], "x": 6.5, "y": 3},
-                    {"matrix": [3, 6], "x": 7.5, "y": 3},
-                    {"matrix": [3, 7], "x": 8.5, "y": 3},
-                    {"matrix": [3, 8], "x": 10, "y": 3},
-                    {"matrix": [3, 9], "x": 11, "y": 3},
-                    {"matrix": [3, 10], "x": 12, "y": 3},
-                    {"matrix": [3, 11], "x": 13, "y": 3},
-                    {"matrix": [3, 12], "x": 14, "y": 3},
-                    {"matrix": [3, 13], "x": 15, "y": 3},
-                    {"matrix": [3, 14], "x": 16, "y": 3, "w": 1.75},
-                    {"matrix": [3, 15], "x": 17.75, "y": 3},
-                    {"matrix": [3, 16], "x": 18.75, "y": 3},
-    
-                    {"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, 4], "x": 5, "y": 4, "w": 1.5},
-                    {"matrix": [4, 5], "x": 6.5, "y": 4, "w": 2.25},
-                    {"matrix": [4, 6], "x": 8.75, "y": 4},
-                    {"matrix": [4, 9], "x": 10, "y": 4, "w": 2.75},
-                    {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
-                    {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
-                    {"matrix": [4, 14], "x": 16.75, "y": 4},
-                    {"matrix": [4, 15], "x": 17.75, "y": 4},
-                    {"matrix": [4, 16], "x": 18.75, "y": 4}
-                ]
+                {"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": [4, 7], "x": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 10.75, "y": 0},
+                {"matrix": [0, 9], "x": 11.75, "y": 0},
+                {"matrix": [0, 10], "x": 12.75, "y": 0},
+                {"matrix": [0, 11], "x": 13.75, "y": 0},
+                {"matrix": [0, 12], "x": 14.75, "y": 0},
+                {"matrix": [0, 13], "x": 15.75, "y": 0},
+                {"matrix": [0, 14], "x": 16.75, "y": 0, "w": 2},
+                {"matrix": [0, 16], "x": 18.75, "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": 10.25, "y": 1},
+                {"matrix": [1, 9], "x": 11.25, "y": 1},
+                {"matrix": [1, 10], "x": 12.25, "y": 1},
+                {"matrix": [1, 11], "x": 13.25, "y": 1},
+                {"matrix": [1, 12], "x": 14.25, "y": 1},
+                {"matrix": [1, 13], "x": 15.25, "y": 1},
+                {"matrix": [1, 14], "x": 16.25, "y": 1},
+                {"matrix": [1, 15], "x": 17.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 18.75, "y": 1},
+
+                {"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": 10.5, "y": 2},
+                {"matrix": [2, 9], "x": 11.5, "y": 2},
+                {"matrix": [2, 10], "x": 12.5, "y": 2},
+                {"matrix": [2, 11], "x": 13.5, "y": 2},
+                {"matrix": [2, 12], "x": 14.5, "y": 2},
+                {"matrix": [2, 13], "x": 15.5, "y": 2},
+                {"matrix": [2, 15], "x": 16.5, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 18.75, "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, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+                {"matrix": [3, 7], "x": 8.5, "y": 3},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3},
+                {"matrix": [3, 10], "x": 12, "y": 3},
+                {"matrix": [3, 11], "x": 13, "y": 3},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+                {"matrix": [3, 14], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 17.75, "y": 3},
+                {"matrix": [3, 16], "x": 18.75, "y": 3},
+
+                {"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, 4], "x": 5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.75, "y": 4},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 16.75, "y": 4},
+                {"matrix": [4, 15], "x": 17.75, "y": 4},
+                {"matrix": [4, 16], "x": 18.75, "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": [4, 7], "x": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 10.75, "y": 0},
+                {"matrix": [0, 9], "x": 11.75, "y": 0},
+                {"matrix": [0, 10], "x": 12.75, "y": 0},
+                {"matrix": [0, 11], "x": 13.75, "y": 0},
+                {"matrix": [0, 12], "x": 14.75, "y": 0},
+                {"matrix": [0, 13], "x": 15.75, "y": 0},
+                {"matrix": [0, 14], "x": 16.75, "y": 0},
+                {"matrix": [0, 15], "x": 17.75, "y": 0},
+                {"matrix": [0, 16], "x": 18.75, "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": 10.25, "y": 1},
+                {"matrix": [1, 9], "x": 11.25, "y": 1},
+                {"matrix": [1, 10], "x": 12.25, "y": 1},
+                {"matrix": [1, 11], "x": 13.25, "y": 1},
+                {"matrix": [1, 12], "x": 14.25, "y": 1},
+                {"matrix": [1, 13], "x": 15.25, "y": 1},
+                {"matrix": [1, 14], "x": 16.25, "y": 1},
+                {"matrix": [1, 15], "x": 17.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 18.75, "y": 1},
+
+                {"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": 10.5, "y": 2},
+                {"matrix": [2, 9], "x": 11.5, "y": 2},
+                {"matrix": [2, 10], "x": 12.5, "y": 2},
+                {"matrix": [2, 11], "x": 13.5, "y": 2},
+                {"matrix": [2, 12], "x": 14.5, "y": 2},
+                {"matrix": [2, 13], "x": 15.5, "y": 2},
+                {"matrix": [2, 15], "x": 16.5, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 18.75, "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, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+                {"matrix": [3, 7], "x": 8.5, "y": 3},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3},
+                {"matrix": [3, 10], "x": 12, "y": 3},
+                {"matrix": [3, 11], "x": 13, "y": 3},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+                {"matrix": [3, 14], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 17.75, "y": 3},
+                {"matrix": [3, 16], "x": 18.75, "y": 3},
+
+                {"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, 4], "x": 5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.75, "y": 4},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 16.75, "y": 4},
+                {"matrix": [4, 15], "x": 17.75, "y": 4},
+                {"matrix": [4, 16], "x": 18.75, "y": 4}
+            ]
         },
         "LAYOUT_iso": {
             "layout": [
diff --git a/keyboards/shostudio/arc/matrix_diagram.md b/keyboards/shostudio/arc/matrix_diagram.md
new file mode 100644
index 000000000000..f0df7ca89f6f
--- /dev/null
+++ b/keyboards/shostudio/arc/matrix_diagram.md
@@ -0,0 +1,22 @@
+# Matrix Diagram for shostudios ARC
+
+
+```
+┌───┬───┐┌───┬───┬───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐
+│00 │01 ││02 │03 │04 │05 │06 │07 │47 │       │08 │09 │0A │0B │0C │0D │0E │0F │0G │    │0E     │ 2u Backspace
+├───┼───┤├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
+│10 │11 ││12   │13 │14 │15 │16 │17 │       │18 │19 │1A │1B │1C │1D │1E │1F   │1G │      │     │
+├───┼───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐      └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2F  │ ISO Enter
+│20 │21 ││22    │23 │24 │25 │26 │27 │       │28 │29 │2A │2B │2C │2D │2F      │2G │   │2E │    │
+├───┼───┤├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐   ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+│30 │31 ││32  │43 │33 │34 │35 │36 │37 │   │38 │39 │3A │3B │3C │3D │3E    │3F │3G │
+├───┼───┤├────┴┬──┴─┬─┴───┼───┴───┴┬──┴┐  ├───┴───┴──┬┴───┼───┴┬──┴──┬───┼───┼───┤
+│40 │41 ││42   │    │44   │45      │46 │  │49        │4B  │4C  │     │4E │4F │4G │
+└───┴───┘└─────┘    └─────┴────────┴───┘  └──────────┴────┴────┘     └───┴───┴───┘
+         ┌────────┐       ┌───┬────────┐             ┌───┬─────┐
+         │32      │       │45 │46      │             │4B │4C   │
+         └────────┘       └───┴────────┘             └───┴─────┘
+          2.25u                                      ┌─────┬───┐
+          LShift                                     │4B   │4C │
+                                                     └─────┴───┘
+```
diff --git a/keyboards/signum/3_0/keymaps/default/generate_km.py b/keyboards/signum/3_0/keymaps/default/generate_km.py
index cfa8edf57a76..a939e4e73a40 100755
--- a/keyboards/signum/3_0/keymaps/default/generate_km.py
+++ b/keyboards/signum/3_0/keymaps/default/generate_km.py
@@ -39,7 +39,7 @@ def _translate(s):
     elif re.match("^TT[0-9]{1,2}$", s):  # Tn, works from TT0 to TT99
         return ("TT({0})".format(s[2:]), "{0:^7}".format(s))
     elif s in layout.uc_dict:
-        return ("X("+s+")", "   {0}   ".format(chr(int(layout.uc_dict[s], 0))))
+        return ("UM("+s+")", "   {0}   ".format(chr(int(layout.uc_dict[s], 0))))
     elif s in layout.qmk_dict:
         return (layout.qmk_dict[s], "{0:^7}".format(s))
     elif s == s.upper() and s.startswith("KC_"):
diff --git a/keyboards/signum/3_0/keymaps/default/layout.py b/keyboards/signum/3_0/keymaps/default/layout.py
index 90fb1d9c9458..4691985d29d3 100644
--- a/keyboards/signum/3_0/keymaps/default/layout.py
+++ b/keyboards/signum/3_0/keymaps/default/layout.py
@@ -396,7 +396,7 @@
     # One Shot Keys missing
     # Swap Hands
     "_sp_swp": "SHT(KC_SPC)",
-    # Unicode support (via X()) included implicitly
+    # Unicode support included implicitly
     # Switching Unicode Input Modes
     "UC_win": "UC_WINC", "UC_lnx": "UC_LINX", "UC_mac": "UC_MAC",
 
diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h
index 5485a99f59d6..e8f1cca7ebb3 100644
--- a/keyboards/silverbullet44/config.h
+++ b/keyboards/silverbullet44/config.h
@@ -19,39 +19,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MASTER_RIGHT
 
-  //#define RGBLIGHT_SPLIT
-  #define RGBLED_SPLIT {26, 26}
-  #define RGBLED_NUM 52
   #ifdef RGB_MATRIX_ENABLE
     #define RGB_MATRIX_LED_COUNT 52
     #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 8
-
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
     #define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
 
     #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP
   #else
-    #define RGBLIGHT_LED_MAP { 0,1,2,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,3,4,5,6, \
-                              26,27,28,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,29,30,31,32 }
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-  //#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-    #define RGBLIGHT_EFFECT_BREATHING
-    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-    #define RGBLIGHT_EFFECT_SNAKE
-//  #define RGBLIGHT_EFFECT_KNIGHT
-//  #define RGBLIGHT_EFFECT_CHRISTMAS
-//  #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//  #define RGBLIGHT_EFFECT_RGB_TEST
-//  #define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
     #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json
index 5fc8686de25e..a761288fb4df 100644
--- a/keyboards/silverbullet44/info.json
+++ b/keyboards/silverbullet44/info.json
@@ -12,10 +12,24 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812",
+        "sat_steps": 8,
+        "val_steps": 8,
+        "speed_steps": 8
     },
     "rgblight": {
-        "max_brightness": 150
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 52,
+        "max_brightness": 150,
+        "led_map": [0, 1, 2, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 3, 4, 5, 6, 26, 27, 28, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 29, 30, 31, 32],
+        "split_count": [26, 26],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true
+        }
     },
     "matrix_pins": {
         "cols": ["B3", "B1", "F7", "F6", "F5", "F4"],
diff --git a/keyboards/singa/config.h b/keyboards/singa/config.h
deleted file mode 100644
index 75b78de22de1..000000000000
--- a/keyboards/singa/config.h
+++ /dev/null
@@ -1,32 +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
-
-
-#define RGBLED_NUM 18
-
-#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/singa/info.json b/keyboards/singa/info.json
index 4c582df85845..0987506b36e2 100644
--- a/keyboards/singa/info.json
+++ b/keyboards/singa/info.json
@@ -16,6 +16,21 @@
     "backlight": {
       "pin": "D4"
     },
+    "rgblight": {
+      "led_count": 18,
+      "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": {
       "driver": "i2c"
     },
diff --git a/keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c b/keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c
index f63da310fd7e..5b55d1ba2460 100644
--- a/keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c
+++ b/keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c
@@ -130,14 +130,6 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     )
 };
 
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    switch (keycode) {
     case MAC:
@@ -171,7 +163,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
   return true;
 }
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/skeletn87/hotswap/config.h b/keyboards/skeletn87/hotswap/config.h
deleted file mode 100644
index 26ec63afd496..000000000000
--- a/keyboards/skeletn87/hotswap/config.h
+++ /dev/null
@@ -1,34 +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
-
-#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
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/skeletn87/hotswap/info.json b/keyboards/skeletn87/hotswap/info.json
index 6eccddef6b4a..c7eac83fc3dc 100644
--- a/keyboards/skeletn87/hotswap/info.json
+++ b/keyboards/skeletn87/hotswap/info.json
@@ -26,7 +26,23 @@
         "pin": "B3"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "max_brightness": 200,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/skeletn87/soldered/config.h b/keyboards/skeletn87/soldered/config.h
deleted file mode 100644
index 26ec63afd496..000000000000
--- a/keyboards/skeletn87/soldered/config.h
+++ /dev/null
@@ -1,34 +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
-
-#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
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/skeletn87/soldered/info.json b/keyboards/skeletn87/soldered/info.json
index fefb5073bb1e..304fa00dc493 100644
--- a/keyboards/skeletn87/soldered/info.json
+++ b/keyboards/skeletn87/soldered/info.json
@@ -26,7 +26,23 @@
         "pin": "B2"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "max_brightness": 200,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/skeletonkbd/frost68/info.json b/keyboards/skeletonkbd/frost68/info.json
index 3099b26ecaa1..742daf8d5786 100644
--- a/keyboards/skeletonkbd/frost68/info.json
+++ b/keyboards/skeletonkbd/frost68/info.json
@@ -13,6 +13,9 @@
         "nkro": true,
         "rgb_matrix": true
     },
+    "build": {
+        "debounce_type": "sym_eager_pk"
+    },
     "matrix_pins": {
         "cols": ["GP21", "GP22", "GP23", "GP24", "GP25", "GP26", "GP28", "GP3", "GP4", "GP5", "GP6", "GP9", "GP10", "GP11", "GP12", "GP13"],
         "rows": ["GP29", "GP27", "GP20", "GP19", "GP18"]
@@ -23,7 +26,7 @@
         "pin": "GP0"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"matrix": [0, 0], "x": 33.1, "y": 3.7, "flags": 4},
             {"matrix": [0, 1], "x": 45.7, "y": 3.7, "flags": 4},
diff --git a/keyboards/skeletonkbd/frost68/rules.mk b/keyboards/skeletonkbd/frost68/rules.mk
index 13195723492d..e69de29bb2d1 100644
--- a/keyboards/skeletonkbd/frost68/rules.mk
+++ b/keyboards/skeletonkbd/frost68/rules.mk
@@ -1 +0,0 @@
-DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/skeletonkbd/skeletonnumpad/config.h b/keyboards/skeletonkbd/skeletonnumpad/config.h
index 829b08ea52d4..1636a977cf05 100644
--- a/keyboards/skeletonkbd/skeletonnumpad/config.h
+++ b/keyboards/skeletonkbd/skeletonnumpad/config.h
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 17
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/skeletonkbd/skeletonnumpad/info.json b/keyboards/skeletonkbd/skeletonnumpad/info.json
index 7ed7ee39490c..7f4c72248d69 100644
--- a/keyboards/skeletonkbd/skeletonnumpad/info.json
+++ b/keyboards/skeletonkbd/skeletonnumpad/info.json
@@ -12,7 +12,22 @@
         "pin": "D4"
     },
     "rgblight": {
-        "max_brightness": 120
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 17,
+        "max_brightness": 120,
+        "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
+        }
     },
     "matrix_pins": {
         "cols": ["D6", "D7", "B4", "B5"],
diff --git a/keyboards/skippys_custom_pcs/rooboard65/config.h b/keyboards/skippys_custom_pcs/rooboard65/config.h
index 5932113c9475..afdacdd0803e 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/config.h
+++ b/keyboards/skippys_custom_pcs/rooboard65/config.h
@@ -22,22 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Define RGB Underglow */
-#define RGBLED_NUM 68
-#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_VAL_STEP 12
 #define RGBLIGHT_DEFAULT_SPD 144
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-/* #define RGBLIGHT_LAYER_BLINK*/
 
 /* Define less important options */
 
diff --git a/keyboards/skippys_custom_pcs/rooboard65/info.json b/keyboards/skippys_custom_pcs/rooboard65/info.json
index ca86bae4b981..11a50e87b1f7 100644
--- a/keyboards/skippys_custom_pcs/rooboard65/info.json
+++ b/keyboards/skippys_custom_pcs/rooboard65/info.json
@@ -12,7 +12,20 @@
         "pin": "F7"
     },
     "rgblight": {
-        "max_brightness": 96
+        "led_count": 68,
+        "max_brightness": 96,
+        "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": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"],
diff --git a/keyboards/skippys_custom_pcs/roopad/config.h b/keyboards/skippys_custom_pcs/roopad/config.h
deleted file mode 100644
index f787da4012fa..000000000000
--- a/keyboards/skippys_custom_pcs/roopad/config.h
+++ /dev/null
@@ -1,32 +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 RGBLED_NUM 21
-#define RGBLIGHT_SLEEP
-
-#define RGBLIGHT_EFFECT_ALTERNATING
-#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
diff --git a/keyboards/skippys_custom_pcs/roopad/info.json b/keyboards/skippys_custom_pcs/roopad/info.json
index 0bf27a69dce8..c44fcd1541f2 100644
--- a/keyboards/skippys_custom_pcs/roopad/info.json
+++ b/keyboards/skippys_custom_pcs/roopad/info.json
@@ -8,6 +8,22 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 21,
+        "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": "B6"
     },
diff --git a/keyboards/skmt/15k/config.h b/keyboards/skmt/15k/config.h
index 9d7338ccce98..6e0360ec7b3c 100644
--- a/keyboards/skmt/15k/config.h
+++ b/keyboards/skmt/15k/config.h
@@ -19,7 +19,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define RGBLED_NUM 15 // Number of LEDs
 #define RGB_MATRIX_LED_COUNT 15 // Number of LEDs
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
diff --git a/keyboards/skmt/15k/info.json b/keyboards/skmt/15k/info.json
index 38215ef661ef..0f3336209200 100644
--- a/keyboards/skmt/15k/info.json
+++ b/keyboards/skmt/15k/info.json
@@ -47,7 +47,7 @@
         }
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [2, 4], "x": 224, "y": 64},
             {"flags": 4, "matrix": [2, 3], "x": 168, "y": 64},
diff --git a/keyboards/skyloong/dt40/config.h b/keyboards/skyloong/dt40/config.h
new file mode 100644
index 000000000000..e67b7ae0a9a0
--- /dev/null
+++ b/keyboards/skyloong/dt40/config.h
@@ -0,0 +1,36 @@
+/* Copyright 2021 JZ-Skyloong (@JZ-Skyloong)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have 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 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
+#define WS2812_TRST_US 200  //The Trst period between frames
+//set ' WS2812_DRIVER = pwm ' in rule.mk
+#define WS2812_PWM_DRIVER PWMD3
+#define WS2812_PWM_CHANNEL 1
+#define WS2812_PWM_PAL_MODE 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_DMA_CHANNEL 3
+
+
diff --git a/keyboards/skyloong/dt40/dt40.c b/keyboards/skyloong/dt40/dt40.c
new file mode 100644
index 000000000000..359e425b8de6
--- /dev/null
+++ b/keyboards/skyloong/dt40/dt40.c
@@ -0,0 +1,24 @@
+/* Copyright 2021 JZ-Skyloong (@JZ-Skyloong)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You 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_USART1_REMAP | AFIO_MAPR_TIM3_REMAP_PARTIALREMAP;
+
+}
diff --git a/keyboards/skyloong/dt40/halconf.h b/keyboards/skyloong/dt40/halconf.h
new file mode 100644
index 000000000000..f9301ae83bfa
--- /dev/null
+++ b/keyboards/skyloong/dt40/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2021 JZ-Skyloong (@JZ-Skyloong)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have 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/skyloong/dt40/info.json b/keyboards/skyloong/dt40/info.json
new file mode 100644
index 000000000000..b6172465e688
--- /dev/null
+++ b/keyboards/skyloong/dt40/info.json
@@ -0,0 +1,165 @@
+{
+    "manufacturer": "JZ-Skyloong",
+    "keyboard_name": "DT40",
+    "maintainer": "JZ-Skyloong",
+    "bootloader": "stm32duino",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B12", "B5", "B8", "B9", "B10", "B11", "A15", "B7", "A2", "A1", "A0"],
+        "rows": ["B6", "B15", "B2", "B14"]
+    },
+    "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,
+            "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_beacom": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "ranbow_beacon": true
+        },
+        "driver": "ws2812",
+        "hue_steps": 20,
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 28, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 47, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 84, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 103, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 121, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 140, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 159, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 177, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 223, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 21, "flags": 4},
+            {"matrix": [1, 1], "x": 33, "y": 21, "flags": 4},
+            {"matrix": [1, 2], "x": 51, "y": 21, "flags": 4},
+            {"matrix": [1, 3], "x": 70, "y": 21, "flags": 4},
+            {"matrix": [1, 4], "x": 89, "y": 21, "flags": 4},
+            {"matrix": [1, 5], "x": 107, "y": 21, "flags": 4},
+            {"matrix": [1, 6], "x": 126, "y": 21, "flags": 4},
+            {"matrix": [1, 7], "x": 145, "y": 21, "flags": 4},
+            {"matrix": [1, 8], "x": 182, "y": 21, "flags": 4},
+            {"matrix": [1, 9], "x": 196, "y": 0, "flags": 4},
+            {"matrix": [1, 10], "x": 219, "y": 21, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 43, "flags": 4},
+            {"matrix": [2, 1], "x": 42, "y": 43, "flags": 4},
+            {"matrix": [2, 2], "x": 61, "y": 43, "flags": 4},
+            {"matrix": [2, 3], "x": 79, "y": 43, "flags": 4},
+            {"matrix": [2, 4], "x": 98, "y": 43, "flags": 4},
+            {"matrix": [2, 5], "x": 117, "y": 43, "flags": 4},
+            {"matrix": [2, 6], "x": 135, "y": 43, "flags": 4},
+            {"matrix": [2, 7], "x": 154, "y": 43, "flags": 4},
+            {"matrix": [2, 8], "x": 180, "y": 43, "flags": 4},
+            {"matrix": [2, 9], "x": 205, "y": 43, "flags": 4},
+            {"matrix": [2, 10], "x":224, "y": 43, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 64, "flags": 4},
+            {"matrix": [3, 1], "x": 23, "y": 64, "flags": 4},
+            {"matrix": [3, 2], "x": 42, "y": 64, "flags": 4},
+            {"matrix": [3, 3], "x": 63, "y": 64, "flags": 4},
+            {"matrix": [3, 4], "x": 100, "y": 64, "flags": 4},
+            {"matrix": [3, 5], "x": 163, "y":21, "flags": 4},
+            {"matrix": [3, 6], "x": 145, "y": 64, "flags": 4},
+            {"matrix": [3, 7], "x": 165, "y": 64, "flags": 4},
+            {"matrix": [3, 8], "x": 187, "y": 64, "flags": 4},
+            {"matrix": [3, 9], "x": 205, "y":64, "flags": 4},
+            {"matrix": [3, 10], "x": 224, "y": 64, "flags": 4}
+        ],
+        "max_brightness": 180,
+        "sat_steps": 20,
+        "speed_steps": 20,
+        "val_steps": 20
+    },
+    "url": "https://github.com/JZ-Skyloong",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x6040",
+        "vid": "0x1EA7"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "B4"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"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": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0, "w": 1.5},
+                {"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},
+                {"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": 9.75, "y": 1},
+                {"matrix": [1, 9], "x": 10.5, "y": 0},
+                {"matrix": [1, 10], "x": 10.75, "y": 1, "w": 2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 2},
+                {"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": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "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, "w": 1.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3, "w": 3},
+                {"matrix": [3, 5], "x": 8.75, "y": 1},
+                {"matrix": [3, 6], "x": 7.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 7], "x": 8.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3},
+                {"matrix": [3, 10], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
+
diff --git a/keyboards/skyloong/dt40/keymaps/default/keymap.c b/keyboards/skyloong/dt40/keymaps/default/keymap.c
new file mode 100644
index 000000000000..c8f828156a97
--- /dev/null
+++ b/keyboards/skyloong/dt40/keymaps/default/keymap.c
@@ -0,0 +1,30 @@
+/* Copyright 2021 JZ-Skyloong (@JZ-Skyloong)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT(
+        KC_ESC,     KC_Q,    KC_W,     KC_E,    KC_R,   KC_T,   KC_Y,     KC_U,      KC_O,      KC_I,    KC_BSPC,
+       KC_CAPS,     KC_A,    KC_S,     KC_D,    KC_F,   KC_G,   KC_H,     KC_J,      KC_L,      KC_P,     KC_ENT,
+       KC_LSFT,     KC_Z,    KC_X,     KC_C,    KC_V,   KC_B,   KC_N,     KC_M,   KC_RSFT,     KC_UP,    RGB_TOG,
+       KC_LCTL,  KC_LALT,  KC_SPC,  KC_LWIN,  KC_SPC,   KC_K, KC_SPC, 	KC_APP,   KC_LEFT,   KC_DOWN,    KC_RGHT
+    )
+};
+
+
diff --git a/keyboards/skyloong/dt40/keymaps/via/keymap.c b/keyboards/skyloong/dt40/keymaps/via/keymap.c
new file mode 100644
index 000000000000..40721123cdba
--- /dev/null
+++ b/keyboards/skyloong/dt40/keymaps/via/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2021 JZ-Skyloong (@JZ-Skyloong)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received 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,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_QWERTY] = LAYOUT(
+         KC_ESC,     KC_Q,    KC_W,      KC_E,     KC_R,   KC_T,    KC_Y,     KC_U,      KC_O,      KC_I,   KC_BSPC,
+        KC_CAPS,     KC_A,    KC_S,      KC_D,     KC_F,   KC_G,    KC_H,     KC_J,      KC_L,      KC_P,    KC_ENT,
+        KC_LSFT,     KC_Z,    KC_X,      KC_C,     KC_V,   KC_B,    KC_N,     KC_M,   KC_RSFT,     KC_UP,     MO(3),
+        KC_LCTL,  KC_LALT,   MO(1),   KC_LWIN,   KC_SPC,   KC_K,   MO(2),   KC_APP,   KC_LEFT,   KC_DOWN,   KC_RGHT
+    ),
+
+    [_LOWER] = LAYOUT(
+         RGB_TOG,  RGB_M_P,  RGB_M_R,  RGB_M_B, RGB_M_SW, _______, _______, _______,   KC_EQL, KC_MINS,  _______,
+         _______,  _______,  _______,  _______,  _______, _______, _______, _______,  KC_RBRC, KC_BSLS,  _______,
+         _______,  _______,  _______,  _______,  _______, _______, _______, _______,  _______, RGB_VAI,  _______,
+         _______,  _______,  _______,  _______,  _______, KC_LBRC, _______, _______, RGB_RMOD, RGB_VAD,  RGB_MOD
+    ),
+
+    [_RAISE] = LAYOUT(
+        _______,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_9,    KC_8, _______,
+         KC_TAB,   KC_GRV, _______, _______, _______, _______, _______, KC_SCLN, _______,    KC_0, _______,
+        _______,  _______, _______, _______, _______, KC_COMM,  KC_DOT, KC_SLSH, _______, _______, _______,
+        _______,  _______, _______, _______, _______, KC_QUOT, _______, _______, _______, _______, _______
+    ),
+
+    [_ADJUST] = LAYOUT(
+        _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F9,   KC_F8, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______,  KC_F12,  KC_F10, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,  KC_F11, _______, _______, _______, _______, _______
+    )
+
+};
+
diff --git a/keyboards/skyloong/dt40/keymaps/via/rules.mk b/keyboards/skyloong/dt40/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/skyloong/dt40/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/skyloong/dt40/mcuconf.h b/keyboards/skyloong/dt40/mcuconf.h
new file mode 100644
index 000000000000..a40226eaaa63
--- /dev/null
+++ b/keyboards/skyloong/dt40/mcuconf.h
@@ -0,0 +1,24 @@
+/* Copyright 2021 JZ-Skyloong (@JZ-Skyloong)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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/skyloong/dt40/readme.md b/keyboards/skyloong/dt40/readme.md
new file mode 100644
index 000000000000..bbb97d393287
--- /dev/null
+++ b/keyboards/skyloong/dt40/readme.md
@@ -0,0 +1,32 @@
+# DT40
+
+![DT40](https://i.imgur.com/3QemSZ0h.jpg)
+
+## The PCB features:
+* QMK & VIA compatibility
+* RGB Matrix backlight
+* Thin body & Simple keys
+
+
+The following is the QMK Firmware for the Destop 40% keylayout -  designed in Dongguan Jizhi Electronic Technology Co., Ltd
+* Keyboard Maintainer: [JZ-Skyloong](https://github.com/JZ-Skyloong)
+* Hardware Supported: DestopPCB for Skyloong keylayout 40%, STM32F103C8T6
+* Hardware Availability: http://www.skyloong.com.cn
+
+Make example for this keyboard (after setting up your build environment):
+
+    make skyloong/dt40:default
+
+Flashing example for this keyboard:
+
+    make skyloong/dt40: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/skyloong/dt40/rules.mk b/keyboards/skyloong/dt40/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/skyloong/dt40/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/smallkeyboard/info.json b/keyboards/smallkeyboard/info.json
index a19bf2959711..9fb889d28e17 100644
--- a/keyboards/smallkeyboard/info.json
+++ b/keyboards/smallkeyboard/info.json
@@ -9,7 +9,7 @@
     "device_version": "0.0.1"
   },
   "rgb_matrix": {
-    "driver": "IS31FL3731"
+    "driver": "is31fl3731"
   },
   "matrix_pins": {
     "cols": ["F7", "F6", "F5"],
diff --git a/keyboards/smithrune/iron160/iron160_h/rules.mk b/keyboards/smithrune/iron160/iron160_h/rules.mk
index 4c6ba89ef9d0..c889da168d61 100644
--- a/keyboards/smithrune/iron160/iron160_h/rules.mk
+++ b/keyboards/smithrune/iron160/iron160_h/rules.mk
@@ -16,5 +16,3 @@ LTO_ENABLE = no
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = legacy
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/smithrune/iron160/iron160_s/rules.mk b/keyboards/smithrune/iron160/iron160_s/rules.mk
index b7824fcbdf74..2c863bbe31a6 100644
--- a/keyboards/smithrune/iron160/iron160_s/rules.mk
+++ b/keyboards/smithrune/iron160/iron160_s/rules.mk
@@ -16,5 +16,3 @@ LTO_ENABLE = no
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = legacy
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/smithrune/iron165r2/f072/config.h b/keyboards/smithrune/iron165r2/f072/config.h
index 9f86b9e55c7c..e53468c2a753 100644
--- a/keyboards/smithrune/iron165r2/f072/config.h
+++ b/keyboards/smithrune/iron165r2/f072/config.h
@@ -19,16 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
-#define BACKLIGHT_PAL_MODE      1
-
-#define RGBLED_NUM 22
-#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 BACKLIGHT_PAL_MODE      1
\ No newline at end of file
diff --git a/keyboards/smithrune/iron165r2/f072/info.json b/keyboards/smithrune/iron165r2/f072/info.json
index 8ced3df7758a..209266ad1026 100644
--- a/keyboards/smithrune/iron165r2/f072/info.json
+++ b/keyboards/smithrune/iron165r2/f072/info.json
@@ -4,6 +4,21 @@
         "levels": 20,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 22,
+        "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"
     },
diff --git a/keyboards/smithrune/iron165r2/f072/rules.mk b/keyboards/smithrune/iron165r2/f072/rules.mk
index 8b584c9a42e1..b524e61f4bba 100644
--- a/keyboards/smithrune/iron165r2/f072/rules.mk
+++ b/keyboards/smithrune/iron165r2/f072/rules.mk
@@ -13,5 +13,3 @@ LTO_ENABLE = no
 ENCODER_ENABLE = no
 BACKLIGHT_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/smithrune/iron165r2/f411/config.h b/keyboards/smithrune/iron165r2/f411/config.h
index fa904fdabb94..8ed73d3ff482 100644
--- a/keyboards/smithrune/iron165r2/f411/config.h
+++ b/keyboards/smithrune/iron165r2/f411/config.h
@@ -19,19 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
-#define BACKLIGHT_PAL_MODE      2
-
-#define RGBLED_NUM 22
-#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 WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
diff --git a/keyboards/smithrune/iron165r2/f411/info.json b/keyboards/smithrune/iron165r2/f411/info.json
index 7fd45874f228..c499958255d1 100644
--- a/keyboards/smithrune/iron165r2/f411/info.json
+++ b/keyboards/smithrune/iron165r2/f411/info.json
@@ -4,6 +4,21 @@
         "levels": 20,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 22,
+        "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": "pwm"
diff --git a/keyboards/smithrune/iron165r2/f411/rules.mk b/keyboards/smithrune/iron165r2/f411/rules.mk
index 5d4fe45457b6..e38a7a71b3d6 100644
--- a/keyboards/smithrune/iron165r2/f411/rules.mk
+++ b/keyboards/smithrune/iron165r2/f411/rules.mk
@@ -14,5 +14,3 @@ ENCODER_ENABLE = no
 EEPROM_DRIVER = i2c
 BACKLIGHT_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/smithrune/iron165r2/iron165r2.c b/keyboards/smithrune/iron165r2/iron165r2.c
index 7406c0029cf0..6f1606f89d3e 100644
--- a/keyboards/smithrune/iron165r2/iron165r2.c
+++ b/keyboards/smithrune/iron165r2/iron165r2.c
@@ -28,8 +28,6 @@ void board_init(void) {
 #endif
 }
 
-#define LED_PIN_ON_STATE 1
-
 bool led_update_kb(led_t led_state) {
     bool res = led_update_user(led_state);
     if(res) writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
diff --git a/keyboards/smithrune/iron180/rules.mk b/keyboards/smithrune/iron180/rules.mk
index 837bececdc56..bfb4a63764f6 100644
--- a/keyboards/smithrune/iron180/rules.mk
+++ b/keyboards/smithrune/iron180/rules.mk
@@ -13,5 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no
 LTO_ENABLE = no
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/smk60/config.h b/keyboards/smk60/config.h
deleted file mode 100644
index 9cc3f8601e09..000000000000
--- a/keyboards/smk60/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * config.h
- *
- */
-#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
-
-//rgb light setting
-#define RGBLED_NUM      4
-#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/smk60/info.json b/keyboards/smk60/info.json
index f80f3f260b3b..535dab674132 100644
--- a/keyboards/smk60/info.json
+++ b/keyboards/smk60/info.json
@@ -8,6 +8,23 @@
         "pid": "0x6585",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 4,
+        "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": "E6"
     },
diff --git a/keyboards/sneakbox/aliceclonergb/config.h b/keyboards/sneakbox/aliceclonergb/config.h
deleted file mode 100644
index ceccc0915b85..000000000000
--- a/keyboards/sneakbox/aliceclonergb/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2021 Bryan Ong
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/sneakbox/aliceclonergb/info.json b/keyboards/sneakbox/aliceclonergb/info.json
index e16645e73587..ecf420a10c49 100644
--- a/keyboards/sneakbox/aliceclonergb/info.json
+++ b/keyboards/sneakbox/aliceclonergb/info.json
@@ -26,6 +26,23 @@
   "bootmagic": {
     "matrix": [2, 0]
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 16,
+    "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": "D5"
   },
diff --git a/keyboards/sneakbox/ava/config.h b/keyboards/sneakbox/ava/config.h
deleted file mode 100644
index a97d34f7f260..000000000000
--- a/keyboards/sneakbox/ava/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2021 Bryan Ong
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#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
\ No newline at end of file
diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json
index 693794e03106..78be99ce6caf 100644
--- a/keyboards/sneakbox/ava/info.json
+++ b/keyboards/sneakbox/ava/info.json
@@ -22,6 +22,23 @@
     "caps_lock": "D6",
     "num_lock": "D4"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 14,
+    "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": "F7"
   },
diff --git a/keyboards/snes_macropad/config.h b/keyboards/snes_macropad/config.h
new file mode 100644
index 000000000000..c5edeb55f1db
--- /dev/null
+++ b/keyboards/snes_macropad/config.h
@@ -0,0 +1,12 @@
+// Copyright 2023 John Barbero Unenge (@jbarberu)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+
+#define I2C_DRIVER I2CD1
+#define I2C1_SDA_PIN GP14
+#define I2C1_SCL_PIN GP15
diff --git a/keyboards/snes_macropad/halconf.h b/keyboards/snes_macropad/halconf.h
new file mode 100644
index 000000000000..3fcb2f4eb60a
--- /dev/null
+++ b/keyboards/snes_macropad/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 John Barbero Unenge (@jbarberu)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/snes_macropad/info.json b/keyboards/snes_macropad/info.json
new file mode 100644
index 000000000000..15e3c9ee6784
--- /dev/null
+++ b/keyboards/snes_macropad/info.json
@@ -0,0 +1,79 @@
+{
+    "manufacturer": "JBarberU's",
+    "keyboard_name": "SNES Macropad",
+    "maintainer": "jbarberu",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true,
+        "oled": true
+    },
+    "ws2812": {
+        "pin": "GP5",
+        "driver": "vendor"
+    },
+    "processor": "RP2040",
+    "matrix_size": {
+        "cols": 4,
+        "rows": 6
+    },
+    "url": "",
+    "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": [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": 5.2, "y": 0, "w": 2, "h": 0.75},
+                {"matrix": [3, 1], "x": 10.65, "y": 0, "w": 2, "h": 0.75},
+                {"matrix": [3, 2], "x": 7.9, "y": 2.5, "w": 1, "h": 0.75},
+                {"matrix": [3, 3], "x": 8.9, "y": 2.5, "w": 1, "h": 0.75},
+                {"matrix": [4, 0], "x": 6, "y": 1, "w": 0.85, "h": 0.85},
+                {"matrix": [4, 1], "x": 6, "y": 3, "w": 0.85, "h": 0.85},
+                {"matrix": [4, 2], "x": 5.2, "y": 2, "w": 0.85, "h": 0.85},
+                {"matrix": [4, 3], "x": 6.8, "y": 2, "w": 0.85, "h": 0.85},
+                {"matrix": [5, 0], "x": 11.8, "y": 2, "w": 0.85, "h": 0.85},
+                {"matrix": [5, 1], "x": 11, "y": 3, "w": 0.85, "h": 0.85},
+                {"matrix": [5, 2], "x": 11, "y": 1, "w": 0.85, "h": 0.85},
+                {"matrix": [5, 3], "x": 10.2, "y": 2, "w": 0.85, "h": 0.85}
+            ]
+        }
+    },
+    "rgblight": {
+        "led_count": 12,
+        "max_brightness": 80,
+        "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/snes_macropad/keymaps/default/keymap.c b/keyboards/snes_macropad/keymaps/default/keymap.c
new file mode 100644
index 000000000000..c4896b1f49b8
--- /dev/null
+++ b/keyboards/snes_macropad/keymaps/default/keymap.c
@@ -0,0 +1,75 @@
+// 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_RGB,
+};
+
+// 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_RGB)
+    , 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_RGB] = LAYOUT(
+      RGB_M_P,  RGB_M_B, RGB_TOG, KC_NO
+    , 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_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_RGB:
+            return "RGB Controls";
+        case L_Symbols:
+            return "Symbols";
+        default:
+            return "Undef";
+    }
+}
diff --git a/keyboards/snes_macropad/keymaps/jbarberu/keymap.c b/keyboards/snes_macropad/keymaps/jbarberu/keymap.c
new file mode 100644
index 000000000000..478d1461e257
--- /dev/null
+++ b/keyboards/snes_macropad/keymaps/jbarberu/keymap.c
@@ -0,0 +1,99 @@
+// 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/keymaps/test/keymap.c b/keyboards/snes_macropad/keymaps/test/keymap.c
new file mode 100644
index 000000000000..72be941694cf
--- /dev/null
+++ b/keyboards/snes_macropad/keymaps/test/keymap.c
@@ -0,0 +1,75 @@
+// 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_RGB
+};
+
+// 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_1,   KC_2,   KC_3,  KC_4
+    , KC_5,   KC_6,   KC_7,   KC_8
+    , KC_9,   KC_0,   KC_A,   KC_S
+
+    , 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_RGB] = LAYOUT(
+      RGB_M_P,  RGB_M_B, RGB_TOG, KC_NO
+    , 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_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_RGB:
+            return "RGB Controls";
+        case L_Symbols:
+            return "Symbols";
+        default:
+            return "Undef";
+    }
+}
diff --git a/keyboards/snes_macropad/matrix.c b/keyboards/snes_macropad/matrix.c
new file mode 100644
index 000000000000..28d036aca9ca
--- /dev/null
+++ b/keyboards/snes_macropad/matrix.c
@@ -0,0 +1,146 @@
+// Copyright 2023 John Barbero Unenge (@jbarberu)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "matrix.h"
+#include "gpio.h"
+#include "wait.h"
+#include "string.h"
+
+#define SNES_CLOCK GP0
+#define SNES_LATCH GP1
+#define SNES_D0 GP2
+#define SNES_D1 GP3
+#define SNES_IO GP4
+
+#define KBD_ROW0 GP24
+#define KBD_ROW1 GP23
+#define KBD_ROW2 GP22
+#define KBD_NUM_ROWS 3
+
+#define KBD_COL0 GP18
+#define KBD_COL1 GP19
+#define KBD_COL2 GP20
+#define KBD_COL3 GP21
+#define KBD_ROW_SETUP_DELAY_US 5
+
+// The real snes will clock 16 bits out of the controller, but only really has 12 bits of data
+#define SNES_DATA_BITS 16
+#define SNES_DATA_SETUP_DELAY_US 10
+#define SNES_CLOCK_PULSE_DURATION 10
+
+static const int kbd_pin_map[] = {
+    KBD_ROW0,
+    KBD_ROW1,
+    KBD_ROW2
+};
+
+void matrix_init_custom(void) {
+    // init snes controller
+    setPinInputHigh(SNES_D0);
+    // todo: look into protocol for other strange snes controllers that use D1 and IO
+    // setPinInputHigh(SNES_D1);
+    // setPinInputHigh(SNES_IO);
+    setPinOutput(SNES_CLOCK);
+    setPinOutput(SNES_LATCH);
+    writePinLow(SNES_CLOCK);
+    writePinLow(SNES_LATCH);
+
+    // init rows
+    setPinOutput(KBD_ROW0);
+    setPinOutput(KBD_ROW1);
+    setPinOutput(KBD_ROW2);
+    writePinHigh(KBD_ROW0);
+    writePinHigh(KBD_ROW1);
+    writePinHigh(KBD_ROW2);
+
+    // init columns
+    setPinInputHigh(KBD_COL0);
+    setPinInputHigh(KBD_COL1);
+    setPinInputHigh(KBD_COL2);
+    setPinInputHigh(KBD_COL3);
+}
+
+static matrix_row_t readRow(size_t row, int setupDelay) {
+    const int pin = kbd_pin_map[row];
+
+    // select the row
+    setPinOutput(pin);
+    writePinLow(pin);
+    wait_us(setupDelay);
+
+    // read the column data
+    const matrix_row_t ret =
+          (readPin(KBD_COL0) ? 0 : 1 << 0)
+        | (readPin(KBD_COL1) ? 0 : 1 << 1)
+        | (readPin(KBD_COL2) ? 0 : 1 << 2)
+        | (readPin(KBD_COL3) ? 0 : 1 << 3);
+
+    // deselect the row
+    setPinOutput(pin);
+    writePinHigh(pin);
+
+    return ret;
+}
+
+static void readKeyboard(matrix_row_t current_matrix[]) {
+    for (size_t row = 0; row < KBD_NUM_ROWS; ++row) {
+        current_matrix[row] = readRow(row, KBD_ROW_SETUP_DELAY_US);
+    }
+}
+
+static matrix_row_t getBits(uint16_t value, size_t bit0, size_t bit1, size_t bit2, size_t bit3) {
+    matrix_row_t ret = 0;
+    ret |= (value >> bit3) & 1;
+    ret <<= 1;
+    ret |= (value >> bit2) & 1;
+    ret <<= 1;
+    ret |= (value >> bit1) & 1;
+    ret <<= 1;
+    ret |= (value >> bit0) & 1;
+    return ret;
+}
+
+static void readSnesController(matrix_row_t current_matrix[]) {
+    uint16_t controller = 0;
+
+    writePinHigh(SNES_LATCH);
+
+    for (size_t bit = 0; bit < SNES_DATA_BITS; ++bit) {
+        // Wait for shift register to setup the data line
+        wait_us(SNES_DATA_SETUP_DELAY_US);
+
+        // Shift accumulated data and read data pin
+        controller <<= 1;
+        controller |= readPin(SNES_D0) ? 0 : 1;
+        // todo: maybe read D1 and IO here too
+
+        // Shift next bit in
+        writePinHigh(SNES_CLOCK);
+        wait_us(SNES_CLOCK_PULSE_DURATION);
+        writePinLow(SNES_CLOCK);
+    }
+
+    writePinLow(SNES_LATCH);
+
+    controller >>= 4;
+
+    // SNES button order is pretty random, and we'd like them to be a bit tidier
+    current_matrix[3] = getBits(controller, 1, 0, 8, 9);
+    current_matrix[4] = getBits(controller, 7, 6, 5, 4);
+    current_matrix[5] = getBits(controller, 3, 11, 2, 10);
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    const size_t MATRIX_ARRAY_SIZE = MATRIX_ROWS * sizeof(matrix_row_t);
+
+    // create a copy of the current_matrix, before we read hardware state
+    matrix_row_t last_value[MATRIX_ROWS];
+    memcpy(last_value, current_matrix, MATRIX_ARRAY_SIZE);
+
+    // read hardware state into current_matrix
+    readKeyboard(current_matrix);
+    readSnesController(current_matrix);
+
+    // check if anything changed
+    return memcmp(last_value, current_matrix, MATRIX_ARRAY_SIZE) != 0;
+}
diff --git a/keyboards/snes_macropad/mcuconf.h b/keyboards/snes_macropad/mcuconf.h
new file mode 100644
index 000000000000..0bbd4fef628f
--- /dev/null
+++ b/keyboards/snes_macropad/mcuconf.h
@@ -0,0 +1,18 @@
+// Copyright 2023 John Barbero Unenge (@jbarberu)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_PWM_USE_PWM0
+#define RP_PWM_USE_PWM0 TRUE
+
+#undef RP_PWM_USE_PWM4
+#define RP_PWM_USE_PWM4 TRUE
+
+#undef RP_I2C_USE_I2C0
+#define RP_I2C_USE_I2C0 FALSE
+
+#undef RP_I2C_USE_I2C1
+#define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/snes_macropad/readme.md b/keyboards/snes_macropad/readme.md
new file mode 100644
index 000000000000..9ef5e041496c
--- /dev/null
+++ b/keyboards/snes_macropad/readme.md
@@ -0,0 +1,36 @@
+# snes_macropad
+
+![Completed Build](https://i.imgur.com/WzzPJ3Yh.jpg)
+*Completed Build*
+
+![Completed Build, closer with RGB off](https://i.imgur.com/D7ki7Kkh.jpg)
+*Completed Build, closer with RGB off*
+
+![PCB and FR4 top/bottom plates](https://i.imgur.com/TgOev7lh.jpg)
+*PCB and FR4 top/bottom plates*
+
+The SNES Macropad is, as it sounds, a macropad that features a SNES connector. In addition it has a qwiic connector and a 3.5mm jack for 3.3V I2C (not audio), allowing additional expansion.
+
+This QMK implementation exposes the SNES controller as a part of the keyboard, meaning you can map the controller to do anything a qmk keyboard can. The layout is thus a 4x6 keyboard logically, split with the 3 first rows being on the macro pad and the 3 following being buttons on the snes controller.
+
+* Keyboard Maintainer: [JBarberU](https://github.com/jbarberu)
+* Hardware Supported: SNES Macropad Rev 1, with a Raspberry Pi Pico Lite (AliExpress clone of Raspberry Pico with fewer grounds and all GPIO's exposed on the headers)
+* Hardware Availability: The SNES Macro pad can be found [here](https://www.tindie.com/products/jbarberu/snes-macropad/) either as a kit, partially built or fully built.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make snes_macropad:default
+
+Flashing example for this keyboard:
+
+    make snes_macropad: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:
+
+* **Physical bootsel button**: Hold down the bootsel button on the RPi Pico while plugging in the keyboard, or while pressing the reset button
+* **Physical reset button**: Quickly double press the reset button
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/snes_macropad/rules.mk b/keyboards/snes_macropad/rules.mk
new file mode 100644
index 000000000000..52cdd84a78bd
--- /dev/null
+++ b/keyboards/snes_macropad/rules.mk
@@ -0,0 +1,4 @@
+# Enable features
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/snes_macropad/snes_macropad.c b/keyboards/snes_macropad/snes_macropad.c
new file mode 100644
index 000000000000..ba4ce44bd1e0
--- /dev/null
+++ b/keyboards/snes_macropad/snes_macropad.c
@@ -0,0 +1,130 @@
+// Copyright 2023 John Barbero Unenge (@jbarberu)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+// oled keylog rendering has been kindly borrowed from crkbd <3
+
+char     key_name = ' ';
+uint16_t last_keycode;
+uint8_t  last_row;
+uint8_t  last_col;
+
+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', '_', '-', '=', '[', ']', '\\', '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
+
+static void set_keylog(uint16_t keycode, keyrecord_t *record) {
+    last_row = record->event.key.row;
+    last_col = record->event.key.col;
+
+    key_name     = ' ';
+    last_keycode = keycode;
+    if (IS_QK_MOD_TAP(keycode)) {
+        if (record->tap.count) {
+          keycode = QK_MOD_TAP_GET_TAP_KEYCODE(keycode);
+        } else {
+          keycode = 0xE0 + biton(QK_MOD_TAP_GET_MODS(keycode) & 0xF) + biton(QK_MOD_TAP_GET_MODS(keycode) & 0x10);
+        }
+    } else if (IS_QK_LAYER_TAP(keycode) && record->tap.count) {
+        keycode = QK_LAYER_TAP_GET_TAP_KEYCODE(keycode);
+    } else if (IS_QK_MODS(keycode)) {
+        keycode = QK_MODS_GET_BASIC_KEYCODE(keycode);
+    } else if (IS_QK_ONE_SHOT_MOD(keycode)) {
+        keycode = 0xE0 + biton(QK_ONE_SHOT_MOD_GET_MODS(keycode) & 0xF) + biton(QK_ONE_SHOT_MOD_GET_MODS(keycode) & 0x10);
+    }
+    if (keycode > ARRAY_SIZE(code_to_name)) {
+        return;
+    }
+
+    // update keylog
+    key_name = pgm_read_byte(&code_to_name[keycode]);
+}
+
+static const char *depad_str(const char *depad_str, char depad_char) {
+    while (*depad_str == depad_char) {
+        ++depad_str;
+    }
+    return depad_str;
+}
+
+static void oled_render_keylog(void) {
+    oled_write_char('0' + last_row, false);
+    oled_write("x", false);
+    oled_write_char('0' + last_col, false);
+    oled_write(", k", false);
+    const char *last_keycode_str = get_u16_str(last_keycode, ' ');
+    oled_write(depad_str(last_keycode_str, ' '), false);
+    oled_write(":", false);
+    oled_write_char(key_name, false);
+}
+
+__attribute__((weak)) const char * get_layer_name_user(uint8_t layer) {
+    return get_u8_str(layer, ' ');
+}
+
+static void oled_render_layer(void) {
+    oled_write("Layer: ", false);
+    oled_write_ln(get_layer_name_user(get_highest_layer(layer_state)), false);
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+
+    oled_render_layer();
+    oled_render_keylog();
+    oled_advance_page(true);
+    return false;
+}
+
+static void setupForFlashing(void) {
+    oled_clear();
+    oled_write("                     ", false);
+    oled_write("  In flash mode...   ", false);
+    oled_write("                     ", false);
+    oled_write("                     ", false);
+
+    // QMK is clever about only rendering a certain number of chunks per frame,
+    // but since the device will go into flash mode right after this call,
+    // we want to override this behavior and force all the chunks to be sent to
+    // the display immediately.
+    const size_t numIterations = OLED_DISPLAY_WIDTH * OLED_DISPLAY_HEIGHT / OLED_UPDATE_PROCESS_LIMIT;
+    for (size_t num = 0; num < numIterations; ++num) {
+        oled_render();
+    }
+    // todo: Replace the above hack with this, once develop branch is merged at the end of November 2023
+    // oled_render_dirty(true);
+
+    // 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) {
+        LED_TYPE *led_ = (LED_TYPE *)&led[i];
+        switch (i % 2) {
+            case 0:
+                setrgb(max, 0, max, led_);
+                break;
+            case 1:
+                setrgb(0, max, max, led_);
+                break;
+        }
+    }
+    rgblight_set();
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        set_keylog(keycode, record);
+    }
+    if (keycode == QK_BOOT) {
+        setupForFlashing();
+    }
+    return process_record_user(keycode, record);
+}
+
+void keyboard_post_init_kb(void) {
+    rgblight_enable_noeeprom();
+    rgblight_sethsv_noeeprom(HSV_MAGENTA);
+    rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
+    keyboard_post_init_user();
+}
diff --git a/keyboards/soda/cherish/config.h b/keyboards/soda/cherish/config.h
index 9d07bd0dce45..f608132b5afd 100644
--- a/keyboards/soda/cherish/config.h
+++ b/keyboards/soda/cherish/config.h
@@ -37,18 +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 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 1
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/soda/cherish/info.json b/keyboards/soda/cherish/info.json
index 71ee91e6604a..1284c79ce4a9 100644
--- a/keyboards/soda/cherish/info.json
+++ b/keyboards/soda/cherish/info.json
@@ -8,6 +8,23 @@
         "pid": "0xEB52",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "A13"
     },
diff --git a/keyboards/soda/cherish/rules.mk b/keyboards/soda/cherish/rules.mk
index 4e0fe5587304..a8af2d4ebcaf 100644
--- a/keyboards/soda/cherish/rules.mk
+++ b/keyboards/soda/cherish/rules.mk
@@ -14,5 +14,3 @@ AUDIO_ENABLE = no           # Audio output
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/soda/mango/info.json b/keyboards/soda/mango/info.json
index 1524d99da3fc..9de040efba55 100644
--- a/keyboards/soda/mango/info.json
+++ b/keyboards/soda/mango/info.json
@@ -72,7 +72,7 @@
             "solid_splash": true,
             "solid_multisplash": true
         },
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 1, "matrix": [0, 0], "x": 0,   "y": 0},
             {"flags": 1, "matrix": [0, 1], "x": 75,  "y": 0},
diff --git a/keyboards/soda/pocket/config.h b/keyboards/soda/pocket/config.h
index 2387f9a000cc..ce02ad5d68dc 100644
--- a/keyboards/soda/pocket/config.h
+++ b/keyboards/soda/pocket/config.h
@@ -15,8 +15,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define LED_NUM_LOCK_PIN B15
-
 /* 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/soda/pocket/info.json b/keyboards/soda/pocket/info.json
index c1396ab3a194..9ae9f1b0de4d 100644
--- a/keyboards/soda/pocket/info.json
+++ b/keyboards/soda/pocket/info.json
@@ -9,11 +9,14 @@
         "device_version": "1.0.2",
         "force_nkro": true
     },
+    "indicators": {
+        "num_lock": "B15"
+    },
     "ws2812": {
         "pin": "C15"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["A2", "A1", "B14", "B4", "B5", "B6", "B7"],
diff --git a/keyboards/soda/pocket/rules.mk b/keyboards/soda/pocket/rules.mk
index 27092ddbc630..24a8c52e4818 100644
--- a/keyboards/soda/pocket/rules.mk
+++ b/keyboards/soda/pocket/rules.mk
@@ -9,5 +9,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/sofle/keyhive/config.h b/keyboards/sofle/keyhive/config.h
index 9e36e1588e46..1e90cbab4887 100755
--- a/keyboards/sofle/keyhive/config.h
+++ b/keyboards/sofle/keyhive/config.h
@@ -18,8 +18,6 @@
 
 #pragma once
 
-#define TAP_CODE_DELAY  10
-
 // OLED settings
 #define OLED_TIMEOUT    80000
 #define OLED_BRIGHTNESS 90
@@ -27,41 +25,3 @@
 #define SPLIT_WPM_ENABLE
 #define SPLIT_OLED_ENABLE
 #define SPLIT_TRANSPORT_MIRROR
-
-// Add RGB underglow
-// by defining in the keyboard, incompatible keymaps will fail to compile.
-#ifdef RGBLIGHT_ENABLE
-#    define RGBLED_NUM 74
-#    define RGBLED_SPLIT {37,37}
-#    define RGBLIGHT_HUE_STEP  10
-#    define RGBLIGHT_SAT_STEP  17
-#    define RGBLIGHT_VAL_STEP  17
-//#    define RGBLIGHT_LAYERS //Enable layer light indicators. Not required as updates are done in layer_state_set_user and led_update_user (+588).
-#    define RGBLIGHT_SLEEP //Turn off LEDs when computer sleeping (+72)
-
-//RGB LED Conversion macro from physical array to electric array (+146). This results in better looking animated effects.
-//First section is the LED matrix, second section is the electrical wiring order, and the third section is the desired mapping
-#    define LED_LAYOUT( \
-  L00,  L01,  L02,  L03,  L04,  L05,          L08,  L09,  L010, L011, L012, L013, \
-  L10,      L12,      L14,                              L19,      L111,     L113, \
-  L20,  L21,  L22,  L23,  L24,  L25,          L28,  L29,  L210, L211, L212, L213, \
-  L30,  L31,  L32,  L33,  L34,  L35,          L38,  L39,  L310, L311, L312, L313, \
-  L40,      L42,      L44,                              L49,      L411,     L413, \
-  L50,  L51,  L52,  L53,  L54,  L55,          L58,  L59,  L510, L511, L512, L513, \
-          L62,  L63,  L64,  L65,  L66,      L67,  L68,  L69,  L610, L611,         \
-      L71,                  L76,                  L77,                  L712     )\
-  { \
-    L14,L12,L10,L40,L42,L44,L71,L76,L66,L65,L55,L35,L25,L05,L04,L24,L34,L54,L64,L63,L53,L33,L23,L03,L02,L22,L32,L52,L62,L51,L31,L21,L01,L00,L20,L30,L50,L19,L111,L113,L413,L411,L49,L712,L77,L67,L68,L58,L38,L28,L08,L09,L29,L39,L59,L69,L610,L510,L310,L210,L010,L011,L211,L311,L511,L611,L512,L312,L212,L012,L013,L213,L313,L513, \
-  }
-//RGB LED logical order map
-#    define RGBLIGHT_LED_MAP LED_LAYOUT( \
-  5,  6,  17, 18, 29, 30,     43, 44, 55, 56, 67, 68, \
-  4,    16,   28,                     45,   57,   69, \
-  3,  7,  15, 19, 27, 31,     42, 46, 54, 58, 66, 70, \
-  2,  8,  14, 20, 26, 32,     41, 47, 53, 59, 65, 71, \
-  1,    13,   25,                     48,   60,   72, \
-  0,  9,  12, 21, 24, 33,     40, 49, 52, 61, 64, 73, \
-      11, 22, 23, 34, 35,   38, 39, 50, 51, 62,       \
-      10,       36,              37,       63        )
-
-#endif
diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/info.json
index 7a453b675e0d..1f7ae8b20983 100644
--- a/keyboards/sofle/keyhive/info.json
+++ b/keyboards/sofle/keyhive/info.json
@@ -10,7 +10,12 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 100
+        "hue_steps": 10,
+        "led_count": 74,
+        "max_brightness": 100,
+        "led_map": [28, 16, 4, 1, 13, 25, 10, 36, 35, 34, 33, 32, 31, 30, 29, 27, 26, 24, 23, 22, 21, 20, 19, 18, 17, 15, 14, 12, 11, 9, 8, 7, 6, 5, 3, 2, 0, 45, 57, 69, 72, 60, 48, 63, 37, 38, 39, 40, 41, 42, 43, 44, 46, 47, 49, 50, 51, 52, 53, 54, 55, 56, 58, 59, 61, 62, 64, 65, 66, 67, 68, 70, 71, 73],
+        "sleep": true,
+        "split_count": [37, 37]
     },
     "matrix_pins": {
         "cols": ["B6", "B2", "B3", "B1", "F7", "F6", null],
@@ -38,6 +43,9 @@
             }
         }
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/sofle/keyhive/rules.mk b/keyboards/sofle/keyhive/rules.mk
index bb1a7f3dc2bb..00719ebea0cb 100755
--- a/keyboards/sofle/keyhive/rules.mk
+++ b/keyboards/sofle/keyhive/rules.mk
@@ -14,4 +14,3 @@ ENCODER_ENABLE = yes
 LTO_ENABLE = yes
 SPLIT_KEYBOARD = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/sofle/keymaps/default/rules.mk b/keyboards/sofle/keymaps/default/rules.mk
index c21a769a2ec0..ab79c07969fc 100644
--- a/keyboards/sofle/keymaps/default/rules.mk
+++ b/keyboards/sofle/keymaps/default/rules.mk
@@ -1,6 +1,5 @@
 
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 CONSOLE_ENABLE = no
 EXTRAKEY_ENABLE = yes
diff --git a/keyboards/sofle/keymaps/devdev/rules.mk b/keyboards/sofle/keymaps/devdev/rules.mk
index 860c2122da25..0d18161a0d71 100644
--- a/keyboards/sofle/keymaps/devdev/rules.mk
+++ b/keyboards/sofle/keymaps/devdev/rules.mk
@@ -5,4 +5,3 @@ RGBLIGHT_ENABLE = yes
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/sofle/keymaps/flare576/rules.mk b/keyboards/sofle/keymaps/flare576/rules.mk
index a7505f53864b..abfcc01d94bf 100644
--- a/keyboards/sofle/keymaps/flare576/rules.mk
+++ b/keyboards/sofle/keymaps/flare576/rules.mk
@@ -3,5 +3,4 @@ ENCODER_ENABLE = yes
 EXTRAKEY_ENABLE = yes
 TAP_DANCE_ENABLE = yes
 WPM_ENABLE = yes
-OLED_DRIVER_ENABLE = yes
 SRC += graphics.c
diff --git a/keyboards/sofle/keymaps/helltm/rules.mk b/keyboards/sofle/keymaps/helltm/rules.mk
index b905bd94fcde..8cba53095957 100644
--- a/keyboards/sofle/keymaps/helltm/rules.mk
+++ b/keyboards/sofle/keymaps/helltm/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 CONSOLE_ENABLE = yes
 EXTRAKEY_ENABLE = yes
diff --git a/keyboards/sofle/keymaps/keyhive_via/encoder.c b/keyboards/sofle/keymaps/keyhive_via/encoder.c
deleted file mode 100644
index 7775cb7b86fa..000000000000
--- a/keyboards/sofle/keymaps/keyhive_via/encoder.c
+++ /dev/null
@@ -1,48 +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/>.
-  */
-
-//Setting up what encoder rotation does. If your encoder can be pressed as a button, that function can be set in Via.
-
-#ifdef ENCODER_ENABLE
-    static uint8_t encoder_state[2] = {0};
-    //Use these keymap positions to specify the encoder functions on rotate.
-    static keypos_t encoder_ccw[2] = {{6, 3}, {6, 8}};
-    static keypos_t encoder_cw[2] = {{6, 1}, {6, 6}};
-
-    void encoder_action_unregister(void) {
-        for (int index = 0; index < 2; ++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(), .type = KEY_EVENT};
-                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(), .type = KEY_EVENT};
-        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;
-    };
-#endif
diff --git a/keyboards/sofle/keymaps/keyhive_via/keymap.c b/keyboards/sofle/keymaps/keyhive_via/keymap.c
index 032c834f44c5..8af870c57419 100644
--- a/keyboards/sofle/keymaps/keyhive_via/keymap.c
+++ b/keyboards/sofle/keymaps/keyhive_via/keymap.c
@@ -18,7 +18,6 @@
 #include QMK_KEYBOARD_H
 
 #include "oled.c"
-#include "encoder.c"
 
 // Base layer is the number of layers CYCLE selects from.
 #define BASE_LAYERS 2
@@ -35,27 +34,6 @@ enum custom_layers {
     _RAISE
 };
 
-// Extra keys are added for rotary encoder support in VIA
-#define LAYOUT_via( \
-    LA1, LA2, LA3, LA4, LA5, LA6,           RA6, RA5, RA4, RA3, RA2, RA1, \
-    LB1, LB2, LB3, LB4, LB5, LB6, LB7, RB7, RB6, RB5, RB4, RB3, RB2, RB1, \
-    LC1, LC2, LC3, LC4, LC5, LC6, LE1, RE6, RC6, RC5, RC4, RC3, RC2, RC1, \
-    LD1, LD2, LD3, LD4, LD5, LD6, LD7, RD7, RD6, RD5, RD4, RD3, RD2, RD1, \
-              LE2, LE3, LE4, LE5, LE6, RE5, RE4, RE3, RE2, RE1 \
-    ) \
-    { \
-        { LA1, LA2, LA3, LA4, LA5, LA6, KC_NO }, \
-        { LB1, LB2, LB3, LB4, LB5, LB6, LB7   }, \
-        { LC1, LC2, LC3, LC4, LC5, LC6, KC_NO }, \
-        { LD1, LD2, LD3, LD4, LD5, LD6, LD7   }, \
-        { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO }, \
-        { RA1, RA2, RA3, RA4, RA5, RA6, KC_NO }, \
-        { RB1, RB2, RB3, RB4, RB5, RB6, RB7   }, \
-        { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO }, \
-        { RD1, RD2, RD3, RD4, RD5, RD6, RD7   }, \
-        { RE1, RE2, RE3, RE4, RE5, RE6, KC_NO } \
-    }
-
 //Default keymap. This can be changed in Via. Use oled.c to change beavior that Via cannot change.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /*
@@ -74,11 +52,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *            `-----------------------------------'            '------''---------------------------'
  */
 
-[_QWERTY] = LAYOUT_via(
+[_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_VOLU,       KC_PGUP, 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_MUTE,       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_VOLD,       KC_PGDN, KC_N    , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
+   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_NO,         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
 ),
 /*
@@ -97,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *            `-----------------------------------'            '------''---------------------------'
  */
 /*
-[_COLEMAK] = LAYOUT_via(
+[_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_VOLU,       KC_PGUP,  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_MUTE,       KC_NO  ,  KC_H    , KC_N   , KC_E   , KC_I   , KC_O   , KC_QUOT,
@@ -121,11 +99,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *            |      |      |      |      |/       /          \      \ |      |      |      |      |
  *            `-----------------------------------'            '------''---------------------------'
  */
-[_COLEMAK] = LAYOUT_via(
+[_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_B   , KC_VOLU,       KC_PGUP,  KC_J    , KC_L   , KC_U   , KC_Y   , KC_SCLN, KC_BSPC,
-  KC_TAB , KC_A   , KC_R   , KC_S   , KC_T   , KC_G   , KC_MUTE,       KC_NO  ,  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_VOLD,       KC_PGDN,  KC_K    , KC_H   , KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
+  KC_ESC , KC_Q   , KC_W   , KC_F   , KC_P   , KC_B   ,                          KC_J    , KC_L   , KC_U   , KC_Y   , KC_SCLN, KC_BSPC,
+  KC_TAB , 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_LGUI, KC_LALT,KC_LCTL,MO(_LOWER), KC_ENT ,           KC_SPC ,MO(_RAISE),KC_RCTL, KC_RALT, KC_RGUI
 ),
 
@@ -143,11 +121,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *            |      |      |      |      |/       /          \      \ |      |      |      |      |
  *            `-----------------------------------'            '------''---------------------------'
  */
-[_LOWER] = LAYOUT_via(
+[_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, _______,
+  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
@@ -164,11 +142,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *            |      |      |      |      |/      /           \      \ |      |      |      |      |
  *            `----------------------------------'             '------''---------------------------'
  */
-[_RAISE] = LAYOUT_via(
+[_RAISE] = LAYOUT(
     CYCLE, _______, _______, _______, _______ , _______,                       _______, _______, _______, _______, _______, _______,
-  _______, KC_INS , KC_PSCR, KC_APP , XXXXXXX , XXXXXXX, _______,    _______,  KC_PGUP, _______, KC_UP  , _______, _______, 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, _______, XXXXXXX, _______, XXXXXXX, _______,
+  _______, KC_INS , KC_PSCR, KC_APP , XXXXXXX , XXXXXXX,                       KC_PGUP, _______, KC_UP  , _______, _______, 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, _______, XXXXXXX, _______, XXXXXXX, _______,
                    _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______
 )
 };
@@ -189,3 +167,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     // this uses less memory than returning in each case.
     return keycode < SAFE_RANGE;
 };
+
+ #ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =   { ENCODER_CCW_CW(KC_BSPC, KC_DEL),  ENCODER_CCW_CW(KC_PGDN, KC_PGUP)  },
+    [1] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  },
+    [2] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  },
+    [3] =   { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)  }
+};
+#endif
diff --git a/keyboards/sofle/keymaps/keyhive_via/rules.mk b/keyboards/sofle/keymaps/keyhive_via/rules.mk
index 2875254096a9..c7fce92a4f67 100644
--- a/keyboards/sofle/keymaps/keyhive_via/rules.mk
+++ b/keyboards/sofle/keymaps/keyhive_via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 RGBLIGHT_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/sofle/keymaps/killmaster/rules.mk b/keyboards/sofle/keymaps/killmaster/rules.mk
index 38d6114506ec..95b415488c26 100644
--- a/keyboards/sofle/keymaps/killmaster/rules.mk
+++ b/keyboards/sofle/keymaps/killmaster/rules.mk
@@ -1,4 +1,4 @@
 EXTRAKEY_ENABLE = yes
 LTO_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
+RGB_MATRIX_DRIVER = ws2812
diff --git a/keyboards/sofle/keymaps/michal/rules.mk b/keyboards/sofle/keymaps/michal/rules.mk
index 8088d744cd01..06a046f0736f 100644
--- a/keyboards/sofle/keymaps/michal/rules.mk
+++ b/keyboards/sofle/keymaps/michal/rules.mk
@@ -1,7 +1,6 @@
 BOOTLOADER = atmel-dfu
 
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 # These are turned off to save space
 COMMAND_ENABLE = no
@@ -17,4 +16,4 @@ EXTRAKEY_ENABLE = yes
 MOUSEKEY_ENABLE = yes
 
 # More space-saving
-LTO_ENABLE = yes
\ No newline at end of file
+LTO_ENABLE = yes
diff --git a/keyboards/sofle/keymaps/noqmk/rules.mk b/keyboards/sofle/keymaps/noqmk/rules.mk
index 6685b8492cea..588139262295 100644
--- a/keyboards/sofle/keymaps/noqmk/rules.mk
+++ b/keyboards/sofle/keymaps/noqmk/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 CONSOLE_ENABLE = no
 EXTRAKEY_ENABLE = yes
diff --git a/keyboards/sofle/keymaps/rgb_default/rules.mk b/keyboards/sofle/keymaps/rgb_default/rules.mk
index 860c2122da25..0d18161a0d71 100644
--- a/keyboards/sofle/keymaps/rgb_default/rules.mk
+++ b/keyboards/sofle/keymaps/rgb_default/rules.mk
@@ -5,4 +5,3 @@ RGBLIGHT_ENABLE = yes
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/sofle/keymaps/via/rules.mk b/keyboards/sofle/keymaps/via/rules.mk
index b57a417092df..c8ca49919c88 100644
--- a/keyboards/sofle/keymaps/via/rules.mk
+++ b/keyboards/sofle/keymaps/via/rules.mk
@@ -1,9 +1,8 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 CONSOLE_ENABLE = no
 EXTRAKEY_ENABLE = yes
 VIA_ENABLE = yes
 LTO_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
\ No newline at end of file
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/sofle/rev1/config.h b/keyboards/sofle/rev1/config.h
deleted file mode 100644
index be6454974844..000000000000
--- a/keyboards/sofle/rev1/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#define TAPPING_TERM 100
-
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/sofle/rev1/info.json b/keyboards/sofle/rev1/info.json
index 23d411602eb4..5ab71ff1e37b 100644
--- a/keyboards/sofle/rev1/info.json
+++ b/keyboards/sofle/rev1/info.json
@@ -28,6 +28,12 @@
             }
         }
     },
+    "tapping": {
+        "term": 100
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/sofle/rev1/rev1.c b/keyboards/sofle/rev1/rev1.c
index d0197ffba55d..df0f23a26cce 100644
--- a/keyboards/sofle/rev1/rev1.c
+++ b/keyboards/sofle/rev1/rev1.c
@@ -68,14 +68,14 @@ led_config_t g_led_config = {
         {144, 10}, {144, 22}, {144, 34}, {144, 47},
     },
     {
-        LED_FLAG_NONE, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW,
+        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_NONE, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW,
+        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,
diff --git a/keyboards/sofle/rev1/rules.mk b/keyboards/sofle/rev1/rules.mk
index 46ec39ee4814..5ec06e960911 100644
--- a/keyboards/sofle/rev1/rules.mk
+++ b/keyboards/sofle/rev1/rules.mk
@@ -1,3 +1,2 @@
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/sofle_choc/info.json b/keyboards/sofle_choc/info.json
new file mode 100644
index 000000000000..b59def38b0d1
--- /dev/null
+++ b/keyboards/sofle_choc/info.json
@@ -0,0 +1,210 @@
+{
+    "manufacturer": "Brian Low",
+    "keyboard_name": "Sofle Choc",
+    "maintainer": "Brian Low <github@brianlow.com>",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            { "pin_a": "F5", "pin_b": "F4" }
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "oled": true,
+        "rgb_matrix": true,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "development_board": "promicro",
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "split_count": [29, 29],
+        "animations": {
+            "solid_color": true,
+            "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
+        },
+        "layout": [
+            { "flags": 4, "matrix": [0, 5], "x": 95, "y":  7 },
+            { "flags": 4, "matrix": [1, 5], "x": 95, "y": 21 },
+            { "flags": 4, "matrix": [2, 5], "x": 95, "y": 36 },
+            { "flags": 4, "matrix": [3, 5], "x": 95, "y": 50 },
+            { "flags": 4, "matrix": [4, 4], "x":115, "y": 64 },
+            { "flags": 4, "matrix": [4, 3], "x": 95, "y": 64 },
+            { "flags": 4, "matrix": [4, 2], "x": 76, "y": 62 },
+            { "flags": 4, "matrix": [3, 4], "x": 76, "y": 48 },
+            { "flags": 4, "matrix": [2, 4], "x": 76, "y": 33 },
+            { "flags": 4, "matrix": [1, 4], "x": 76, "y": 19 },
+            { "flags": 4, "matrix": [0, 4], "x": 76, "y":  5 },
+            { "flags": 4, "matrix": [0, 3], "x": 57, "y":  3 },
+            { "flags": 4, "matrix": [1, 3], "x": 57, "y": 17 },
+            { "flags": 4, "matrix": [2, 3], "x": 57, "y": 31 },
+            { "flags": 4, "matrix": [3, 3], "x": 57, "y": 46 },
+            { "flags": 4, "matrix": [4, 1], "x": 57, "y": 62 },
+            { "flags": 4, "matrix": [4, 0], "x": 38, "y": 64 },
+            { "flags": 4, "matrix": [3, 2], "x": 38, "y": 48 },
+            { "flags": 4, "matrix": [2, 2], "x": 38, "y": 33 },
+            { "flags": 4, "matrix": [1, 2], "x": 38, "y": 19 },
+            { "flags": 4, "matrix": [0, 2], "x": 38, "y":  5 },
+            { "flags": 4, "matrix": [0, 1], "x": 19, "y":  7 },
+            { "flags": 4, "matrix": [1, 1], "x": 19, "y": 21 },
+            { "flags": 4, "matrix": [2, 1], "x": 19, "y": 36 },
+            { "flags": 4, "matrix": [3, 1], "x": 19, "y": 50 },
+            { "flags": 4, "matrix": [3, 0], "x":  0, "y": 50 },
+            { "flags": 4, "matrix": [2, 0], "x":  0, "y": 36 },
+            { "flags": 4, "matrix": [1, 0], "x":  0, "y": 21 },
+            { "flags": 4, "matrix": [0, 0], "x":  0, "y":  7 },
+
+            { "flags": 4, "matrix": [5, 5], "x":129, "y":  7 },
+            { "flags": 4, "matrix": [6, 5], "x":129, "y": 21 },
+            { "flags": 4, "matrix": [7, 5], "x":129, "y": 36 },
+            { "flags": 4, "matrix": [8, 5], "x":129, "y": 50 },
+            { "flags": 4, "matrix": [9, 4], "x":119, "y": 64 },
+            { "flags": 4, "matrix": [9, 3], "x":129, "y": 64 },
+            { "flags": 4, "matrix": [9, 2], "x":148, "y": 62 },
+            { "flags": 4, "matrix": [8, 4], "x":148, "y": 48 },
+            { "flags": 4, "matrix": [7, 4], "x":148, "y": 33 },
+            { "flags": 4, "matrix": [6, 4], "x":148, "y": 19 },
+            { "flags": 4, "matrix": [5, 4], "x":148, "y":  5 },
+            { "flags": 4, "matrix": [5, 3], "x":167, "y":  3 },
+            { "flags": 4, "matrix": [6, 3], "x":167, "y": 17 },
+            { "flags": 4, "matrix": [7, 3], "x":167, "y": 31 },
+            { "flags": 4, "matrix": [8, 3], "x":167, "y": 46 },
+            { "flags": 4, "matrix": [9, 1], "x":167, "y": 62 },
+            { "flags": 4, "matrix": [9, 0], "x":186, "y": 64 },
+            { "flags": 4, "matrix": [8, 2], "x":186, "y": 48 },
+            { "flags": 4, "matrix": [7, 2], "x":186, "y": 33 },
+            { "flags": 4, "matrix": [6, 2], "x":186, "y": 19 },
+            { "flags": 4, "matrix": [5, 2], "x":186, "y":  5 },
+            { "flags": 4, "matrix": [5, 1], "x":209, "y":  7 },
+            { "flags": 4, "matrix": [6, 1], "x":209, "y": 21 },
+            { "flags": 4, "matrix": [7, 1], "x":209, "y": 36 },
+            { "flags": 4, "matrix": [8, 1], "x":209, "y": 50 },
+            { "flags": 4, "matrix": [8, 0], "x":224, "y": 50 },
+            { "flags": 4, "matrix": [7, 0], "x":224, "y": 36 },
+            { "flags": 4, "matrix": [6, 0], "x":224, "y": 21 },
+            { "flags": 4, "matrix": [5, 0], "x":224, "y":  7 }
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    { "pin_a": "F4", "pin_b": "F5" }
+                ]
+            }
+        }
+    },
+    "url": "https://github.com/josefadamcik/SofleKeyboard",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0287",
+        "vid": "0xFC32"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"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": 10.5, "y": 0.25},
+                {"matrix": [5, 4], "x": 11.5, "y": 0.125},
+                {"matrix": [5, 3], "x": 12.5, "y": 0},
+                {"matrix": [5, 2], "x": 13.5, "y": 0.125},
+                {"matrix": [5, 1], "x": 14.5, "y": 0.375},
+                {"matrix": [5, 0], "x": 15.5, "y": 0.5},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"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": 10.5, "y": 1.25},
+                {"matrix": [6, 4], "x": 11.5, "y": 1.125},
+                {"matrix": [6, 3], "x": 12.5, "y": 1},
+                {"matrix": [6, 2], "x": 13.5, "y": 1.125},
+                {"matrix": [6, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [6, 0], "x": 15.5, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"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": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.125},
+                {"matrix": [7, 3], "x": 12.5, "y": 2},
+                {"matrix": [7, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [7, 1], "x": 14.5, "y": 2.375},
+                {"matrix": [7, 0], "x": 15.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"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, "y": 2.75},
+                {"matrix": [9, 5], "x": 9.5, "y": 2.75},
+                {"matrix": [8, 5], "x": 10.5, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.5, "y": 3.125},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3.125},
+                {"matrix": [8, 1], "x": 14.5, "y": 3.375},
+                {"matrix": [8, 0], "x": 15.5, "y": 3.5},
+                {"matrix": [4, 0], "x": 1.5, "y": 4.375},
+                {"matrix": [4, 1], "x": 2.5, "y": 4.125},
+                {"matrix": [4, 2], "x": 3.5, "y": 4.15},
+                {"matrix": [4, 3], "x": 4.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 6, "y": 4.25, "h": 1.5},
+                {"matrix": [9, 4], "x": 9.5, "y": 4.25, "h": 1.5},
+                {"matrix": [9, 3], "x": 11, "y": 4.25},
+                {"matrix": [9, 2], "x": 12, "y": 4.15},
+                {"matrix": [9, 1], "x": 13, "y": 4.125},
+                {"matrix": [9, 0], "x": 14, "y": 4.375}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sofle_choc/keymaps/default/config.h b/keyboards/sofle_choc/keymaps/default/config.h
new file mode 100644
index 000000000000..93f173e84de3
--- /dev/null
+++ b/keyboards/sofle_choc/keymaps/default/config.h
@@ -0,0 +1,29 @@
+/* Copyright 2023 Brian Low
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+// Enabling this option changes the startup behavior to listen for an
+// active USB communication to delegate which part is master and which
+// is slave. With this option enabled and theres’s USB communication,
+// then that half assumes it is the master, otherwise it assumes it
+// is the slave.
+//
+// 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 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/default/keymap.c b/keyboards/sofle_choc/keymaps/default/keymap.c
new file mode 100644
index 000000000000..3850466f1779
--- /dev/null
+++ b/keyboards/sofle_choc/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2023 Brian Low
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along 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  |  `   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | ESC  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  | Bspc |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Tab  |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------|  Mute |    | Pause |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *            | LCTL | LGUI | LCMD | LALT | /Enter  /       \Space \  | RALT | RCMD | RGUI | RCTL |
+ *            |      |      |      |      |/       /         \      \ |      |      |      |      |
+ *            `----------------------------------'           '------''---------------------------'
+ */
+
+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_LCTL, KC_LGUI, KC_LCMD, KC_LALT, KC_ENT,    KC_SPC, KC_RALT,  KC_RCMD,  KC_RGUI, KC_RCTL
+)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
+};
+#endif
diff --git a/keyboards/sofle_choc/keymaps/default/rules.mk b/keyboards/sofle_choc/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/sofle_choc/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/sofle_choc/keymaps/via/config.h b/keyboards/sofle_choc/keymaps/via/config.h
new file mode 100644
index 000000000000..93f173e84de3
--- /dev/null
+++ b/keyboards/sofle_choc/keymaps/via/config.h
@@ -0,0 +1,29 @@
+/* Copyright 2023 Brian Low
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+// Enabling this option changes the startup behavior to listen for an
+// active USB communication to delegate which part is master and which
+// is slave. With this option enabled and theres’s USB communication,
+// then that half assumes it is the master, otherwise it assumes it
+// is the slave.
+//
+// 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 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/keymap.c b/keyboards/sofle_choc/keymaps/via/keymap.c
new file mode 100644
index 000000000000..3850466f1779
--- /dev/null
+++ b/keyboards/sofle_choc/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2023 Brian Low
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along 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  |  `   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | ESC  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  | Bspc |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Tab  |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------|  Mute |    | Pause |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *            | LCTL | LGUI | LCMD | LALT | /Enter  /       \Space \  | RALT | RCMD | RGUI | RCTL |
+ *            |      |      |      |      |/       /         \      \ |      |      |      |      |
+ *            `----------------------------------'           '------''---------------------------'
+ */
+
+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_LCTL, KC_LGUI, KC_LCMD, KC_LALT, KC_ENT,    KC_SPC, KC_RALT,  KC_RCMD,  KC_RGUI, KC_RCTL
+)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
+};
+#endif
diff --git a/keyboards/sofle_choc/keymaps/via/rules.mk b/keyboards/sofle_choc/keymaps/via/rules.mk
new file mode 100644
index 000000000000..8a52d2aa542a
--- /dev/null
+++ b/keyboards/sofle_choc/keymaps/via/rules.mk
@@ -0,0 +1,7 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
+
+# Reduce compiled size
+MOUSEKEY_ENABLE = no
+SPACE_CADET_ENABLE = no
+GRAVE_ESC_ENABLE = no
diff --git a/keyboards/sofle_choc/readme.md b/keyboards/sofle_choc/readme.md
new file mode 100644
index 000000000000..5b8f47ec5a68
--- /dev/null
+++ b/keyboards/sofle_choc/readme.md
@@ -0,0 +1,25 @@
+# Sofle Choc Keyboard
+
+![Sofle Choc Photo](https://i.imgur.com/MhSEAZYh.jpg)
+
+The Sofle Choc is 6×4+5 keys column-staggered split keyboard. Based on Lily58, Corne and Helix keyboards. The Sofle Choc variant uses low profile Kailh choc switches, hotswap sockets, per-key RGB using the easier to solder SK6812 Mini-E, and is fairly thin at 15mm from desktop to top of keycaps.
+
+More details about the keyboard and build guide: [Sofle Choc Build GUide](https://josefadamcik.github.io/SofleKeyboard/build_guide_choc.html)
+
+* Keyboard Maintainer: [Brian Low](https://github.com/brianlow/)
+* Hardware Supported: Sofle Choc PCB 2.x, ProMicro
+* Hardware Availability: [PCB & Case Data](https://github.com/josefadamcik/SofleKeyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sofle_choc:default
+
+Flashing example for this keyboard:
+
+    make sofle_choc:default:flash
+
+Press reset button twice on the keyboard when asked.
+
+Disconnect the first half, connect the second one and repeat the process.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/sofle_choc/rules.mk b/keyboards/sofle_choc/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/sofle_choc/sofle_choc.c b/keyboards/sofle_choc/sofle_choc.c
new file mode 100644
index 000000000000..64385907b9b2
--- /dev/null
+++ b/keyboards/sofle_choc/sofle_choc.c
@@ -0,0 +1,48 @@
+/* Copyright 2022 Brian Low
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You 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_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);
+}
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    if (is_keyboard_master()) {
+        return OLED_ROTATION_180;
+    }
+    return rotation;
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+
+    render_logo();
+
+    return false;
+}
+
+#endif
diff --git a/keyboards/sowbug/68keys/config.h b/keyboards/sowbug/68keys/config.h
index 04b1fced2b65..0836a67e8800 100644
--- a/keyboards/sowbug/68keys/config.h
+++ b/keyboards/sowbug/68keys/config.h
@@ -19,8 +19,7 @@
 #pragma once
 
 #define RGB_MATRIX_KEYPRESSES
-#define RGBLED_NUM 68
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 68
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/sowbug/68keys/info.json b/keyboards/sowbug/68keys/info.json
index 3b4525e9f845..641ed0aa0633 100644
--- a/keyboards/sowbug/68keys/info.json
+++ b/keyboards/sowbug/68keys/info.json
@@ -12,7 +12,7 @@
         "pin": "B9"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"],
diff --git a/keyboards/sowbug/68keys/rules.mk b/keyboards/sowbug/68keys/rules.mk
index b7807ae4185d..c49a369dd025 100644
--- a/keyboards/sowbug/68keys/rules.mk
+++ b/keyboards/sowbug/68keys/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/sowbug/ansi_tkl/config.h b/keyboards/sowbug/ansi_tkl/config.h
index 08c01e662da8..4b1538b64500 100644
--- a/keyboards/sowbug/ansi_tkl/config.h
+++ b/keyboards/sowbug/ansi_tkl/config.h
@@ -19,8 +19,7 @@
 #pragma once
 
 #define RGB_MATRIX_KEYPRESSES
-#define RGBLED_NUM 87
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT 87
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
 
diff --git a/keyboards/sowbug/ansi_tkl/info.json b/keyboards/sowbug/ansi_tkl/info.json
index 221c591738e5..39cc57a8f394 100644
--- a/keyboards/sowbug/ansi_tkl/info.json
+++ b/keyboards/sowbug/ansi_tkl/info.json
@@ -12,7 +12,7 @@
         "pin": "B9"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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/rules.mk b/keyboards/sowbug/ansi_tkl/rules.mk
index b7807ae4185d..c49a369dd025 100644
--- a/keyboards/sowbug/ansi_tkl/rules.mk
+++ b/keyboards/sowbug/ansi_tkl/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/spaceholdings/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h
index 9d044bb4c52e..3853ebcff643 100755
--- a/keyboards/spaceholdings/nebula12/config.h
+++ b/keyboards/spaceholdings/nebula12/config.h
@@ -40,21 +40,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 RGBLED_NUM 10 /* If number is smaller, buffer updates too fast causing glitches */
-  #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
-
 /* Backlight options */
 
 #define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/info.json
index aa5dbc1873a5..6638498e0c6c 100755
--- a/keyboards/spaceholdings/nebula12/info.json
+++ b/keyboards/spaceholdings/nebula12/info.json
@@ -8,6 +8,23 @@
         "pid": "0x5337",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "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"
diff --git a/keyboards/spaceholdings/nebula12b/info.json b/keyboards/spaceholdings/nebula12b/info.json
index 9cbfcd1f86b6..f7ba574efc7f 100755
--- a/keyboards/spaceholdings/nebula12b/info.json
+++ b/keyboards/spaceholdings/nebula12b/info.json
@@ -12,7 +12,7 @@
         "pin": "D5"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F4", "F5", "D7"],
diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h
index f0538478228d..43dc7b0d8682 100755
--- a/keyboards/spaceholdings/nebula68/config.h
+++ b/keyboards/spaceholdings/nebula68/config.h
@@ -23,21 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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.
 
-  #define RGBLED_NUM 10
-  #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
-
 /* Backlight options */
 
 #define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/spaceholdings/nebula68/info.json b/keyboards/spaceholdings/nebula68/info.json
index 2e1165a81076..dfc61b3a2d1b 100755
--- a/keyboards/spaceholdings/nebula68/info.json
+++ b/keyboards/spaceholdings/nebula68/info.json
@@ -13,7 +13,22 @@
         "driver": "pwm"
     },
     "rgblight": {
-        "max_brightness": 210
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "max_brightness": 210,
+        "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": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3", "A5"],
diff --git a/keyboards/spaceholdings/nebula68b/info.json b/keyboards/spaceholdings/nebula68b/info.json
index 89ee7271727e..c82e52299d3a 100755
--- a/keyboards/spaceholdings/nebula68b/info.json
+++ b/keyboards/spaceholdings/nebula68b/info.json
@@ -12,7 +12,7 @@
         "pin": "B7"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
@@ -21,7 +21,88 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "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": [2, 14], "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": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [3, 14], "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, 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": [3, 13], "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, 6], "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, 12], "x": 14.25, "y": 4},
+                {"matrix": [4, 13], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4}
+            ]
+        },
         "LAYOUT_68_ansi_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/spaceman/2_milk/config.h b/keyboards/spaceman/2_milk/config.h
deleted file mode 100644
index 6a3ec9c5c13d..000000000000
--- a/keyboards/spaceman/2_milk/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2019 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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 RGBLED_NUM 1
-#endif
diff --git a/keyboards/spaceman/2_milk/info.json b/keyboards/spaceman/2_milk/info.json
index 333bad3b87e3..a703c8f89033 100644
--- a/keyboards/spaceman/2_milk/info.json
+++ b/keyboards/spaceman/2_milk/info.json
@@ -8,6 +8,9 @@
     "pid": "0x3225",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "led_count": 1
+  },
   "ws2812": {
     "pin": "B6"
   },
diff --git a/keyboards/spaceman/2_milk/keymaps/emoji/keymap.c b/keyboards/spaceman/2_milk/keymaps/emoji/keymap.c
index 8859573ce5d9..26ac20ad5cef 100644
--- a/keyboards/spaceman/2_milk/keymaps/emoji/keymap.c
+++ b/keyboards/spaceman/2_milk/keymaps/emoji/keymap.c
@@ -11,7 +11,7 @@ void dance_key_one (tap_dance_state_t *state, void *user_data) {
         tap_code(KC_ENTER);
         reset_tap_dance (state);
     } else if (state->count == 2) {
-        cycle_unicode_input_mode(+1);
+        unicode_input_mode_step();
         reset_tap_dance (state);
     }
 }
diff --git a/keyboards/spaceman/pancake/rev1/feather/config.h b/keyboards/spaceman/pancake/rev1/feather/config.h
deleted file mode 100644
index 9ff72156da90..000000000000
--- a/keyboards/spaceman/pancake/rev1/feather/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2019 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define VIA_HAS_BROKEN_KEYCODES
diff --git a/keyboards/spaceman/pancake/rev1/feather/info.json b/keyboards/spaceman/pancake/rev1/feather/info.json
index 2d8072e7f186..85f95a011bbf 100644
--- a/keyboards/spaceman/pancake/rev1/feather/info.json
+++ b/keyboards/spaceman/pancake/rev1/feather/info.json
@@ -3,5 +3,8 @@
         "cols": ["C7", "D6", "B7", "B6", "F0", "D2", "D3", "F1", "F4", "F5", "F6", "F7"],
         "rows": ["B5", "D7", "C6", "D0"]
     },
-    "diode_direction": "COL2ROW"
+    "diode_direction": "COL2ROW",
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    }
 }
diff --git a/keyboards/spaceman/pancake/rev1/feather/rules.mk b/keyboards/spaceman/pancake/rev1/feather/rules.mk
index 822ab9971bcc..35ad61d4a175 100644
--- a/keyboards/spaceman/pancake/rev1/feather/rules.mk
+++ b/keyboards/spaceman/pancake/rev1/feather/rules.mk
@@ -14,7 +14,6 @@ BACKLIGHT_ENABLE  = no  # Custom backlighting code is used, so this should not b
 AUDIO_ENABLE  = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
 RGBLIGHT_ENABLE  = no # This can be enabled if a ws2812 strip is connected to the expansion port.
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
 
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
diff --git a/keyboards/spaceman/pancake/rev2/rules.mk b/keyboards/spaceman/pancake/rev2/rules.mk
index c085de5a4a2c..a7cc2bfee468 100644
--- a/keyboards/spaceman/pancake/rev2/rules.mk
+++ b/keyboards/spaceman/pancake/rev2/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/spacetime/keymaps/kyleterry/keymap.c b/keyboards/spacetime/keymaps/kyleterry/keymap.c
index fd91fafbd22e..5aaab878145d 100644
--- a/keyboards/spacetime/keymaps/kyleterry/keymap.c
+++ b/keyboards/spacetime/keymaps/kyleterry/keymap.c
@@ -98,22 +98,6 @@ 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) {
-  return true;
-}
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
-
 void td_common(tap_dance_state_t *state, void *user_data) {
   switch (state->count) {
     case 1:
diff --git a/keyboards/spacetime/rev2/rev2.c b/keyboards/spacetime/rev2/rev2.c
deleted file mode 100644
index 3ecef1c1d889..000000000000
--- a/keyboards/spacetime/rev2/rev2.c
+++ /dev/null
@@ -1,24 +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 "rev2.h"
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-#ifdef SSD1306OLED
-  return process_record_gfx(keycode,record) && process_record_user(keycode, record);
-#else
-  return process_record_user(keycode, record);
-#endif
-}
diff --git a/keyboards/spacetime/rev2/rules.mk b/keyboards/spacetime/rev2/rules.mk
index d34d066ded93..dd68e9d3b090 100644
--- a/keyboards/spacetime/rev2/rules.mk
+++ b/keyboards/spacetime/rev2/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/spiderisland/split78/info.json b/keyboards/spiderisland/split78/info.json
index 7b87c2b71356..e507a668b1de 100644
--- a/keyboards/spiderisland/split78/info.json
+++ b/keyboards/spiderisland/split78/info.json
@@ -15,6 +15,9 @@
     "ws2812": {
         "driver": "i2c"
     },
+    "build": {
+        "debounce_type": "sym_eager_pr"
+    },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
     "debounce": 50,
diff --git a/keyboards/spiderisland/split78/rules.mk b/keyboards/spiderisland/split78/rules.mk
index e77cf060bed3..edddf67abc80 100644
--- a/keyboards/spiderisland/split78/rules.mk
+++ b/keyboards/spiderisland/split78/rules.mk
@@ -8,7 +8,6 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-DEBOUNCE_TYPE = sym_eager_pr
 
 # custom matrix setup
 CUSTOM_MATRIX = lite
diff --git a/keyboards/spleeb/keymaps/chrishoage/rules.mk b/keyboards/spleeb/keymaps/chrishoage/rules.mk
index 117c55fd8b83..271c920da89c 100644
--- a/keyboards/spleeb/keymaps/chrishoage/rules.mk
+++ b/keyboards/spleeb/keymaps/chrishoage/rules.mk
@@ -8,4 +8,3 @@ POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c
 
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/split67/config.h b/keyboards/split67/config.h
new file mode 100644
index 000000000000..9d50d9bdd1c1
--- /dev/null
+++ b/keyboards/split67/config.h
@@ -0,0 +1,26 @@
+/*
+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
+/* 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/split67/info.json b/keyboards/split67/info.json
new file mode 100644
index 000000000000..f24eea4ce074
--- /dev/null
+++ b/keyboards/split67/info.json
@@ -0,0 +1,111 @@
+{
+    "manufacturer": "yuezp",
+    "keyboard_name": "split_67",
+    "maintainer": "qmk",
+    "build": {
+        "lto": true
+    },
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6", null, null],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "split": {
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
+                "rows": ["D4", "C6", "D7", "E6", "B4"]
+            }
+        },
+        "soft_serial_pin": "D0"
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xBBBC",
+        "vid": "0xCCCD"
+    },
+    "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": [4, 5], "x": 6, "y": 0},
+                {"matrix": [5, 0], "x": 9, "y": 0},
+                {"matrix": [5, 1], "x": 10, "y": 0},
+                {"matrix": [5, 2], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 4], "x": 13, "y": 0},
+                {"matrix": [5, 5], "x": 14, "y": 0},
+                {"matrix": [5, 6], "x": 15, "y": 0, "w": 2},
+                {"matrix": [5, 7], "x": 17.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": [6, 0], "x": 8.5, "y": 1},
+                {"matrix": [6, 1], "x": 9.5, "y": 1},
+                {"matrix": [6, 2], "x": 10.5, "y": 1},
+                {"matrix": [6, 3], "x": 11.5, "y": 1},
+                {"matrix": [6, 4], "x": 12.5, "y": 1},
+                {"matrix": [6, 5], "x": 13.5, "y": 1},
+                {"matrix": [6, 6], "x": 14.5, "y": 1},
+                {"matrix": [6, 7], "x": 15.5, "y": 1, "w": 1.5},
+                {"matrix": [7, 7], "x": 17.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": [7, 0], "x": 8.75, "y": 2},
+                {"matrix": [7, 1], "x": 9.75, "y": 2},
+                {"matrix": [7, 2], "x": 10.75, "y": 2},
+                {"matrix": [7, 3], "x": 11.75, "y": 2},
+                {"matrix": [7, 4], "x": 12.75, "y": 2},
+                {"matrix": [7, 5], "x": 13.75, "y": 2},
+                {"matrix": [7, 6], "x": 14.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": [8, 0], "x": 9.25, "y": 3},
+                {"matrix": [8, 1], "x": 10.25, "y": 3},
+                {"matrix": [8, 2], "x": 11.25, "y": 3},
+                {"matrix": [8, 3], "x": 12.25, "y": 3},
+                {"matrix": [8, 4], "x": 13.25, "y": 3},
+                {"matrix": [8, 5], "x": 14.25, "y": 3, "w": 2},
+                {"matrix": [8, 6], "x": 16.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, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 4], "x": 6, "y": 4},
+                {"matrix": [9, 0], "x": 9, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 15.25, "y": 4},
+                {"matrix": [9, 4], "x": 16.25, "y": 4},
+                {"matrix": [9, 5], "x": 17.25, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/split67/keymaps/default/keymap.c b/keyboards/split67/keymaps/default/keymap.c
new file mode 100644
index 000000000000..4e896f4aa59f
--- /dev/null
+++ b/keyboards/split67/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 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/>.
+ */
+#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_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_LSFT, KC_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_SPC, KC_RCTL, KC_RALT, 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_BSPC, 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_LGUI, KC_TRNS, KC_SPC,  KC_TRNS,                      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/split67/keymaps/via/keymap.c b/keyboards/split67/keymaps/via/keymap.c
new file mode 100644
index 000000000000..cb14ee19bf75
--- /dev/null
+++ b/keyboards/split67/keymaps/via/keymap.c
@@ -0,0 +1,60 @@
+/* Copyright 2021 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/>.
+ */
+#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| Insert |
+* |-------------------------------------|     |---------------------------------------------------|
+* |Tab   |  Q |  W |   E  | R  | T  |   |     |  Y  |  U  |  I |  O |  P |   [   |   ]   |   \    |
+* |-------------------------------------|     |---------------------------------------------------|
+* |Ctrl  |  A |  S |   D  | F  | G  |   |     |  H  |  J  |  K |  L |  ; |   '   | Return| Delete |
+* |-------------------------------------|     |---------------------------------------------------|
+* |Shift |  Z |  X |   C  | V  | B  |   |     |  N  |  M  |  , |  . |  / | Shift |  Up   |        |
+* |-------------------------------------|     |---------------------------------------------------|
+* |Ctrl  | Win| Alt| Space| Fn |    |   |     |Space| Ctrl| Alt| 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_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_LSFT, KC_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_SPC, KC_RCTL, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
+        
+
+/* Keymap Fn Layer
+* .----------------------------------------.   .---------------------------------------------------.
+* |   |  F1 |  F2 |   F3  | F4  | F5  | F6 |   |  F7  |  F8  | F9 |  F10 |  F11 |   F12   |     |  |
+* |----------------------------------------|   |---------------------------------------------------|
+* |   |     |     |       |     |     |    |   |      |      |    |      |      |         |     |  |
+* |----------------------------------------|   |---------------------------------------------------|
+* |   |     |     |       |     |     |    |   |      |      |    |      |      |         |     |  |
+* |----------------------------------------|   |---------------------------------------------------|
+* |   |     |     |       |     |     |    |   |      |      |    |      |      |         |     |  |
+* |----------------------------------------|   |---------------------------------------------------|
+* |   |     |     |       |     |     |    |   |      |      |    |      |      |         |     |  |
+* .----------------------------------------.   .---------------------------------------------------.
+*/
+[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_BSPC, 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_LGUI, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/split67/keymaps/via/rules.mk b/keyboards/split67/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/split67/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/split67/readme.md b/keyboards/split67/readme.md
new file mode 100644
index 000000000000..e42fa9f9ff69
--- /dev/null
+++ b/keyboards/split67/readme.md
@@ -0,0 +1,26 @@
+# split67
+
+![split67](https://i.imgur.com/2eC03Smh.jpg)
+
+A 65% keys split keyboard.
+
+* Keyboard Maintainer: https://github.com/LXF-YZP
+* Hardware Supported: Pro Micro, (ATmega32u4)
+
+Make example for this keyboard (after setting up your build environment):
+    
+    make split67:default
+    
+Flashing example for this keyboard:
+
+    make split67: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/split67/rules.mk b/keyboards/split67/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/split67/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/corne/rev1/info.json b/keyboards/splitkb/aurora/corne/rev1/info.json
index b6f05cfbcbd4..7d82577b00ae 100644
--- a/keyboards/splitkb/aurora/corne/rev1/info.json
+++ b/keyboards/splitkb/aurora/corne/rev1/info.json
@@ -108,7 +108,7 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 2, "x": 93, "y": 17},                    // L RGB1
             {"flags": 2, "x": 59, "y": 3},                     // L RGB2
diff --git a/keyboards/splitkb/aurora/helix/config.h b/keyboards/splitkb/aurora/helix/config.h
new file mode 100644
index 000000000000..0212d8e9affe
--- /dev/null
+++ b/keyboards/splitkb/aurora/helix/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 splitkb.com <support@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_FONT_H "keyboards/splitkb/aurora/helix/glcdfont.c"
+#endif
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/helix/glcdfont.c b/keyboards/splitkb/aurora/helix/glcdfont.c
new file mode 100644
index 000000000000..e75b1b4df6a0
--- /dev/null
+++ b/keyboards/splitkb/aurora/helix/glcdfont.c
@@ -0,0 +1,250 @@
+/* Copyright 2023 splitkb.com <support@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 "progmem.h"
+
+// NOTE: This file is a copy of `crkbd/soundmonster/glcdfont.c`
+
+// 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/splitkb/aurora/helix/helix.c b/keyboards/splitkb/aurora/helix/helix.c
new file mode 100644
index 000000000000..a6ba65aeb5ba
--- /dev/null
+++ b/keyboards/splitkb/aurora/helix/helix.c
@@ -0,0 +1,304 @@
+/* Copyright 2023 splitkb.com <support@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 "quantum.h"
+
+// The first four layers gets a name for readability, which is then used in the OLED below.
+enum layers {
+  _DEFAULT,
+  _LOWER,
+  _RAISE,
+  _ADJUST
+};
+
+#ifdef OLED_ENABLE
+// NOTE: Most of the OLED code was originally written by Soundmonster for the Corne,
+// and has been copied directly from `crkbd/soundmonster/keymap.c`
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return OLED_ROTATION_270;
+}
+
+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 aurora_logo[] = {
+        0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0xc0, 0xf8, 0xe0, 0xc0, 0xfc, 0x00, 0x7e, 0x18, 0x00, 0x80, 
+        0x00, 0x02, 0x80, 0xf0, 0x00, 0xc0, 0x80, 0xf8, 0xc0, 0xe0, 0x70, 0x60, 0x3c, 0x38, 0x3c, 0x1c, 
+        0x00, 0x3f, 0x0c, 0x0f, 0x1f, 0x03, 0x07, 0x01, 0xc3, 0x00, 0xe0, 0x80, 0x00, 0xe0, 0x80, 0xf8, 
+        0x80, 0xc0, 0xf7, 0xc7, 0x6f, 0x7b, 0x39, 0x30, 0x00, 0x80, 0x00, 0xc0, 0x00, 0xc0, 0xc2, 0xe0, 
+        0x00, 0x40, 0x38, 0x30, 0x38, 0x1e, 0x18, 0x1e, 0x0f, 0x0c, 0x07, 0x07, 0x07, 0x03, 0x03, 0x21, 
+        0x21, 0x31, 0x30, 0x18, 0x18, 0x1c, 0x08, 0x0c, 0x0e, 0x07, 0x06, 0x07, 0x03, 0xc3, 0x03, 0x01, 
+        0x4c, 0xcc, 0xc2, 0xc2, 0x41, 0x49, 0x09, 0x2b, 0x2a, 0x6a, 0x6e, 0x24, 0x24, 0x04, 0x92, 0x92, 
+        0xb1, 0xf1, 0xf1, 0xf2, 0xe6, 0xa4, 0xa4, 0x04, 0x04, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28
+    };
+    oled_write_raw_P(aurora_logo, sizeof(aurora_logo));
+    oled_set_cursor(0, 4);
+}
+
+void render_logo_text(void) {
+    oled_write_P(PSTR("helix"), false);
+}
+
+void render_kb_LED_state(void) {
+    // Host Keyboard LED Status
+    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);
+}
+
+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(_LOWER)) {
+        oled_write_P(lower_layer, false);
+    } else if(layer_state_is(_RAISE)) {
+        oled_write_P(raise_layer, false);
+    } else if(layer_state_is(_DEFAULT)) {
+        oled_write_P(default_layer, false);
+    } else {
+        oled_write_P(adjust_layer, false);
+    }
+}
+
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    if (is_keyboard_master()) {
+        // Renders the current keyboard state (layers and mods)
+        render_logo();
+        render_logo_text();
+        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());
+        render_kb_LED_state();
+    } else {
+        // clang-format off
+        static const char PROGMEM aurora_art[] = {
+            0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x08, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x40, 
+            0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 
+            0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x80, 0x00, 0xf0, 0x00, 0x00, 0xc0, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 
+            0x81, 0x00, 0xc0, 0x00, 0xfe, 0x00, 0xfc, 0x00, 0xff, 0x20, 0xff, 0xf0, 0x0f, 0xf0, 0x00, 0xff, 
+            0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0xf8, 0x00, 0x00, 0xf8, 
+            0xff, 0x10, 0xff, 0x84, 0xff, 0x60, 0xff, 0x36, 0xff, 0x0f, 0xff, 0x3f, 0x00, 0x5f, 0x00, 0x05, 
+            0x80, 0x00, 0x80, 0x00, 0xc0, 0x38, 0x00, 0xec, 0xf0, 0x00, 0xfb, 0x80, 0xff, 0xf0, 0xff, 0xef, 
+            0xff, 0xe8, 0xff, 0x03, 0xff, 0x0c, 0xff, 0x00, 0xff, 0x00, 0x03, 0x00, 0x00, 0xf8, 0x00, 0x80, 
+            0xff, 0x20, 0xff, 0xd0, 0xff, 0xe0, 0xfe, 0xf8, 0xff, 0xfc, 0xff, 0xff, 0x0f, 0xff, 0x01, 0x3f, 
+            0xff, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x03, 0x00, 0xfe, 0x80, 0xfe, 0x00, 0xc0, 0xff, 0xc4, 0xfb, 
+            0xff, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0x07, 0xff, 0x03, 0x3f, 0x00, 0x0f, 0xc0, 0x00, 
+            0x00, 0x00, 0xb8, 0x00, 0xff, 0x40, 0xbe, 0xf0, 0xff, 0xf1, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 
+            0x1f, 0xff, 0x67, 0x00, 0xef, 0x00, 0x1f, 0x00, 0x00, 0x07, 0x00, 0x00, 0xe0, 0x00, 0xff, 0xf0, 
+            0xff, 0x88, 0xff, 0xc4, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x7f, 0x0f, 0xff, 
+            0x00, 0x07, 0xfe, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xc0, 0x3f, 0xf8, 0xe7, 0xff, 
+            0xff, 0xff, 0xff, 0x1f, 0xff, 0xff, 0x1f, 0x3f, 0x01, 0xff, 0x0b, 0x00, 0xff, 0x00, 0x00, 0x05, 
+            0x00, 0x00, 0x00, 0xe0, 0x00, 0xf8, 0x60, 0x80, 0xfe, 0xe3, 0xfc, 0xff, 0x1e, 0xff, 0xff, 0x23, 
+            0xff, 0x09, 0xff, 0x20, 0x00, 0x3f, 0x02, 0x00, 0x00, 0x0f, 0x00, 0x40, 0x00, 0xc0, 0x00, 0xfc, 
+            0xe0, 0xfc, 0xf0, 0xff, 0xff, 0x7f, 0xfc, 0xff, 0x0f, 0xff, 0x07, 0x1f, 0x00, 0x01, 0x0f, 0x00, 
+            0x0f, 0x00, 0x81, 0x70, 0x0c, 0xf0, 0x80, 0x00, 0x00, 0xe4, 0xf8, 0xe6, 0x70, 0x3f, 0xcf, 0xff, 
+            0x1f, 0xff, 0x48, 0xff, 0x0f, 0x00, 0x07, 0x00, 0x00, 0x43, 0x60, 0xf8, 0xf0, 0xfe, 0x38, 0xfe, 
+            0x00, 0xfc, 0x03, 0x00, 0xc8, 0x72, 0xcf, 0xfc, 0x00, 0x03, 0x0f, 0x01, 0xe0, 0x1c, 0xe0, 0x03, 
+            0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x06, 0xf9, 0x00, 0x03, 0x00, 0x07, 
+            0xff, 0x00, 0x10, 0x12, 0xc9, 0xf0, 0xcf, 0xb4, 0x7f, 0x80, 0xe0, 0x1e, 0x01, 0x40, 0x65, 0x5e, 
+            0xe0, 0x00, 0x00, 0xf0, 0x0c, 0xf0, 0x00, 0x80, 0x7e, 0x01, 0x80, 0x93, 0xfc, 0xc0, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x89, 0x18, 0x2c, 0x46, 0x00, 0x07, 0x21, 0x10, 0x10, 0x80, 0x09, 0x13, 
+            0x31, 0xbf, 0xff, 0x00, 0x08, 0x1a, 0xf7, 0x0f, 0x00, 0x00, 0x44, 0x45, 0x34, 0xbf, 0xb8, 0x00, 
+            0x10, 0xf0, 0x08, 0xf4, 0x18, 0x11, 0xfc, 0x18, 0xfb, 0x0e, 0x10, 0xf8, 0x04, 0xf8, 0x10, 0x20, 
+            0x18, 0x09, 0xff, 0x0c, 0xea, 0x1f, 0x28, 0x60, 0x30, 0xf8, 0x20, 0xc0, 0x42, 0x33, 0x21, 0x00
+        };
+        // clang-format on
+        oled_write_raw_P(aurora_art, sizeof(aurora_art));
+    }
+    return false;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
+    // 0 is left-half encoder,
+    // 1 is right-half encoder
+    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
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/helix/info.json b/keyboards/splitkb/aurora/helix/info.json
new file mode 100644
index 000000000000..5729b0020782
--- /dev/null
+++ b/keyboards/splitkb/aurora/helix/info.json
@@ -0,0 +1,16 @@
+{
+    "manufacturer": "splitkb.com",
+    "maintainer": "splitkb",
+    "build": {
+        "lto": true
+    },
+    "development_board": "elite_c",
+    "split": {
+        "enabled": true
+    },
+    "url": "https://splitkb.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0x8D1D"
+    }
+}
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/helix/keymaps/debug/config.h b/keyboards/splitkb/aurora/helix/keymaps/debug/config.h
new file mode 100644
index 000000000000..a15def3fb913
--- /dev/null
+++ b/keyboards/splitkb/aurora/helix/keymaps/debug/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2023 splitkb.com <support@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 RGBLIGHT_EFFECT_BREATHING
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/helix/keymaps/debug/keymap.c b/keyboards/splitkb/aurora/helix/keymaps/debug/keymap.c
new file mode 100644
index 000000000000..2c99ef942988
--- /dev/null
+++ b/keyboards/splitkb/aurora/helix/keymaps/debug/keymap.c
@@ -0,0 +1,68 @@
+/* Copyright 2023 splitkb.com <support@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 {
+    _DEFAULT = 0,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_DEFAULT] = LAYOUT(
+        KC_A, KC_B, KC_C, KC_D, KC_E, KC_F,                    S(KC_F), S(KC_E), S(KC_D), S(KC_C), S(KC_B), S(KC_A),
+        KC_G, KC_H, KC_I, KC_J, KC_K, KC_L,                    S(KC_L), S(KC_K), S(KC_J), S(KC_I), S(KC_H), S(KC_G),
+        KC_M, KC_N, KC_O, KC_P, KC_Q, KC_R,                    S(KC_R), S(KC_Q), S(KC_P), S(KC_O), S(KC_N), S(KC_M),
+        KC_S, KC_T, KC_U, KC_V, KC_W, KC_X, KC_Y,     S(KC_Y), S(KC_X), S(KC_W), S(KC_V), S(KC_U), S(KC_T), S(KC_S),
+        KC_Z, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,     S(KC_6), S(KC_5), S(KC_4), S(KC_3), S(KC_2), S(KC_1), S(KC_Z)
+    )
+};
+
+#ifdef RGBLIGHT_ENABLE
+void keyboard_post_init_user(void) {
+  rgblight_enable_noeeprom(); // enables RGB, without saving settings
+  rgblight_sethsv_noeeprom(HSV_RED); // sets the color to red without saving
+  rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3); // sets mode to Fast breathing without saving
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    // 0 is left-half encoder
+    // 1 is right-half encoder
+    if (index == 0) {
+        tap_code(KC_0);
+    } else if (index == 1) {
+        tap_code(KC_1);
+    }
+
+    if (clockwise) {
+        tap_code16(KC_PLUS);
+    } else {
+        tap_code(KC_MINUS);
+    }
+
+    return false;
+}
+#endif
+
+#ifdef OLED_ENABLE
+bool oled_task_user(void) {
+    // A 128x32 OLED rotated 90 degrees is 5 characters wide and 16 characters tall
+    // This example string should fill that neatly
+    oled_write_P(PSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789!@#$%^&*()[]{}-=_+?"), false);
+    return false;
+}
+#endif
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/helix/keymaps/debug/readme.md b/keyboards/splitkb/aurora/helix/keymaps/debug/readme.md
new file mode 100644
index 000000000000..827235e447fc
--- /dev/null
+++ b/keyboards/splitkb/aurora/helix/keymaps/debug/readme.md
@@ -0,0 +1,24 @@
+# Aurora Helix's Debug Keymap
+
+To make debugging your build as easy as possible, we have provided a special debugging keymap. It is not intended to actually type on, it is just here to make sure that your hardware is working correctly.
+
+## Keys
+
+![Keys](https://raw.githubusercontent.com/splitkb/qmk_firmware/assets/aurora/keymaps/debug/keys.png)
+
+The left side uses lowercase letters, the right side uses uppercase ones.
+
+## Encoders
+
+Encoders output a number of 0 or 1, depending on the installed position.
+These correspond to the index used for custom encoder code: the left half uses index 0, the right half uses index 1.
+
+The number is followed by either a `+` or a `-`, depending on the direction turned.
+
+## LEDs
+
+Both underglow and per-key RGB should be fading between red and off.
+
+## OLEDs
+
+Both the primary and secondary side should be filled with characters.
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/helix/keymaps/debug/rules.mk b/keyboards/splitkb/aurora/helix/keymaps/debug/rules.mk
new file mode 100644
index 000000000000..9c9df9b126e7
--- /dev/null
+++ b/keyboards/splitkb/aurora/helix/keymaps/debug/rules.mk
@@ -0,0 +1,8 @@
+# NOTE: These are already enabled by default at the revision level
+#ENCODER_ENABLE = yes
+#OLED_ENABLE = yes
+
+# RGB Matrix is enabled at the revision level,
+# while we use the regular RGB underglow for testing
+RGB_MATRIX_ENABLE = no
+RGBLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/helix/keymaps/default/config.h b/keyboards/splitkb/aurora/helix/keymaps/default/config.h
new file mode 100644
index 000000000000..869e99b779d3
--- /dev/null
+++ b/keyboards/splitkb/aurora/helix/keymaps/default/config.h
@@ -0,0 +1,24 @@
+/* Copyright 2023 splitkb.com <support@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 RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_KEYPRESSES
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON 
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/helix/keymaps/default/keymap.json b/keyboards/splitkb/aurora/helix/keymaps/default/keymap.json
new file mode 100644
index 000000000000..bc818a73224a
--- /dev/null
+++ b/keyboards/splitkb/aurora/helix/keymaps/default/keymap.json
@@ -0,0 +1,52 @@
+{
+    "config": {
+        "features": {
+            "oled": true,
+            "rgb_matrix": true,
+            "rgblight": false
+        },
+        "encoder": {
+            "enabled": true
+        },
+        "rgblight": {
+            "hue_steps": 8,
+            "saturation_steps": 8,
+            "brightness_steps": 8,
+            "sleep": true
+        }
+    },
+    "keyboard": "splitkb/aurora/helix",
+    "keymap": "default",
+    "layers": [
+        [
+            "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" ,
+            "MO(3)",   "KC_ESC",  "KC_LALT", "KC_LGUI", "LALT(KC_GRV)", "MO(1)",   "KC_SPC",  "KC_SPC",  "MO(2)",   "LALT(KC_GRV)", "KC_LEFT", "KC_DOWN", "KC_UP",   "KC_RGHT"
+        ],
+        [
+            "_______", "_______", "_______", "_______", "_______", "_______",                       "_______", "_______", "_______", "_______", "_______", "_______",
+            "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_CAPS", "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_LPRN", "KC_RPRN", "KC_F12",  "_______", "_______", "KC_HOME", "KC_END",  "_______",
+            "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "MO(3)",   "_______", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MPLY"
+        ],
+        [
+            "_______", "_______", "_______", "_______", "_______", "_______",                       "_______", "_______", "_______", "_______", "_______", "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_CAPS", "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "_______", "_______", "KC_F12",  "_______", "_______", "KC_PGDN", "KC_PGUP", "_______",
+            "_______", "_______", "_______", "_______", "_______", "MO(3)",   "_______", "_______", "_______", "_______", "KC_MNXT", "KC_VOLD", "KC_VOLU", "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",
+            "_______", "QK_BOOT", "_______", "EE_CLR",  "_______", "_______",                       "_______", "_______", "_______", "_______", "_______", "KC_DEL",
+            "_______", "_______", "_______", "_______", "_______", "AG_NORM",                       "AG_SWAP", "_______", "_______", "_______", "_______", "_______",
+            "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "RGB_TOG", "RGB_HUI", "RGB_SAI", "RGB_VAI",
+            "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "RGB_MOD", "RGB_HUD", "RGB_SAD", "RGB_VAD"
+        ]
+    ],
+    "layout": "LAYOUT",
+    "version": 1
+}
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/helix/keymaps/default/readme.md b/keyboards/splitkb/aurora/helix/keymaps/default/readme.md
new file mode 100644
index 000000000000..2f0aa63ca7c7
--- /dev/null
+++ b/keyboards/splitkb/aurora/helix/keymaps/default/readme.md
@@ -0,0 +1,88 @@
+# Aurora Helix's Default Keymap
+_This keymap is a copy of the [Helix default keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/helix/rev3_5rows/keymaps/default), with slight modifications._
+
+A simple default keymap for the Aurora Helix
+=============================================
+
+Keymaps in general are quite personal, so it is difficult to come up with a default that will suit every user. We hope this keymap serves as a good starting point for your own - although it should be fairly usable out-of-the-box.
+
+What do all these layers do?
+----------------------------
+
+### Layer 0: Base layer
+
+![Layer 0](https://i.imgur.com/2E4hHxw.png)
+
+This is where your basic letters live.
+
+The homing thumb fingers are used to access the different layers.
+
+* The homing second to left thumb finger gives access to the Symbols (or lower) layer
+* The homing second to right thumb finger gives access to the Navigation (or raise) layer
+* Pressing both homing thumb fingers gives access to the Adjust layer
+
+### Layer 1: Lower
+
+![Layer 1](https://i.imgur.com/p68qrBz.png)
+
+The Lower layer gives access to the F keys, symbols and media control.
+
+### Layer 2: Raise
+
+![Layer 2](https://i.imgur.com/7T4KSW6.png)
+
+The Raise layer gives access to additional numbers keys, F keys.
+
+### Layer 3: Adjust
+
+![Layer 3](https://i.imgur.com/YbbwHSD.png)
+
+The Adjust layer exposes RGB adjustment keys on the right hand and additional configuration keys.
+
+Where is the keymap.c?
+----------------------
+
+The keymap.c file is not published to the repository. It is generated from `keymap.json` by the build system.
+
+This avoids duplicating information and allow users to edit their keymap from the QMK Configurator web interface.
+
+How do I edit and update the keymap?
+------------------------------------
+
+The `keymap.json` file is generated from the QMK Configurator interface and formatted for better readability in the context of the Ferris keyboard.
+
+To edit it, you may:
+* Edit it directly from a text editor.
+* Edit it from the QMK Configurator.
+
+If you decide to use the latter workflow, here are the steps to follow:
+
+* From the [QMK Configurator](https://config.qmk.fm/#/splitkb/aurora/helix/rev1/LAYOUT), hit the "import QMK keymap json file" button (it has a drawing with an up arrow on it).
+* Browse to the location of your keymap (for example, `<your qmk repo>/keyboards/splitkb/aurora/helix/keymaps/default/keymap.json`)
+* Perform any modification to the keymap in the web UI
+* Export the keymap to your downloads folder, by hitting the "Export QMK keymap json file" button (it has a drawing with a down arrow on it)
+* Replace your original keymap with the one you just downloaded
+
+_**Note:** At the time of writing (the 24th of October 2022), not every feature used in the default keymap is supported by the QMK Configurator. You cannot yet upload the default `keymap.json` due to a file format mismatch - use the "Load Default" button to load the default keymap instead. Additionally, custom configuration options are still being worked on: if your keymap depends on them, please compile your firmware offline for now._
+
+I want to do more than the JSON format supports!
+-------------------------------------------------
+
+While the `json` format is easy to use, it does lack certain functionality - most notably custom OLED or encoder behaviour.
+
+To add this, you need to convert it to the `c` format. Do keep in mind that this is generally a one-way operation.
+
+First, from the root of your qmk repo, move to your keymap folder
+
+```bash
+cd ./keyboards/splitkb/aurora/helix/keymaps/my_personal_keymap
+```
+
+Next, convert your `keymap.json` to a `keymap.c`
+
+```bash
+qmk json2c -o keymap.c keymap.json
+```
+
+You can add custom C code to the newly generated `keymap.c` file. Do note that you have to use **either** a C file **or** a JSON file - you cannot do both!  
+**If a JSON file is present, the C file is ignored.**
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/helix/readme.md b/keyboards/splitkb/aurora/helix/readme.md
new file mode 100644
index 000000000000..fc7727f14505
--- /dev/null
+++ b/keyboards/splitkb/aurora/helix/readme.md
@@ -0,0 +1,48 @@
+![Aurora Helix](https://i.imgur.com/zzzW8Tu.jpg)
+
+# Aurora Helix
+The Aurora Helix is a redesign by splitkb.com of the popular Helix by Yushakobo.
+
+Keyboard Maintainer: [splitkb.com](https://github.com/splitkb)  
+Hardware Supported: Pro Micro 5V/16MHz and compatible.  
+Hardware Availability: [splitkb.com](https://splitkb.com).
+
+Make example for this keyboard (after setting up your build environment):
+
+    make splitkb/aurora/helix/rev1:default
+
+Example of flashing this keyboard:
+
+    make splitkb/aurora/helix/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
+You can enter the bootloader in 3 ways:
+
+* **Physical reset button**: Briefly press the button on the side of the PCB, next to the TRRS socket.
+* **Bootmagic reset**: Hold down the bootmagic key and plug in the keyboard. For the left half, this is the top-left button. For the right half, this is the top-right button.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
+
+# Assembly
+A build guide for the entire Aurora series is available at [https://splitkb.com/aurora-build](https://splitkb.com/aurora-build).
+
+# Features
+The Aurora Helix supports the following features:
+
+- Support for MX or Kailh Choc switches;
+- Top mounted controllers for a lower profile;
+- Up to two 128×32 pixel OLED displays;
+- Up to one EC11 rotary encoder per half in one of three possible positions;
+- Per-key RGB backlight by individual RGB LEDs;
+- Underglow by individual RGB LEDs;
+- Support for a power switch for wireless controllers;
+- Support for the splitkb.com tenting puck.
+
+# What is the Aurora Series?
+
+The Aurora series were designed as a homage to open source keyboard kits that have carved their space into the community. Kits that provided something new and unique, kits that resonated with the community and that have both received and have given a lot of love in return.
+
+With the Aurora series, we aim to make these kits available to the community in a way that both honors the original, while also offering the best possible feature set and a consistent, well-documented build experience.
+
+For each kit sold, we give back to the community by donating €1 across [the firmware projects we support](https://opencollective.com/splitkb). This way we support open source projects and benefit everyone using keyboards, whether they use our kits or their own.
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/helix/rev1/config.h b/keyboards/splitkb/aurora/helix/rev1/config.h
new file mode 100644
index 000000000000..bbf6c5007353
--- /dev/null
+++ b/keyboards/splitkb/aurora/helix/rev1/config.h
@@ -0,0 +1,24 @@
+/* Copyright 2023 splitkb.com <support@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 SPLIT_HAND_PIN D3
+
+#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/helix/rev1/info.json b/keyboards/splitkb/aurora/helix/rev1/info.json
new file mode 100644
index 000000000000..7c6acf007016
--- /dev/null
+++ b/keyboards/splitkb/aurora/helix/rev1/info.json
@@ -0,0 +1,206 @@
+{
+    "keyboard_name": "Aurora Helix rev1",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "E6", "pin_b": "B4"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "oled": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "B5"],
+        "rows": ["F4", "F5", "D4", "C6", "D7"]
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "layout": [
+            {"x": 72, "y": 16, "flags": 2},
+            {"x": 40, "y": 16, "flags": 2},
+            {"x": 8, "y": 16, "flags": 2},
+            {"x": 8, "y": 48, "flags": 2},
+            {"x": 40, "y": 48, "flags": 2},
+            {"x": 72, "y": 48, "flags": 2},
+            {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4},
+            {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4},
+            {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4},
+            {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4},
+            {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
+            {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4},
+            {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4},
+            {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 32, "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, 1], "x": 16, "y": 48, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4},
+            {"matrix": [4, 6], "x": 96, "y": 64, "flags": 4},
+            {"matrix": [4, 5], "x": 80, "y": 64, "flags": 4},
+            {"matrix": [4, 4], "x": 64, "y": 64, "flags": 4},
+            {"matrix": [4, 3], "x": 48, "y": 64, "flags": 4},
+            {"matrix": [4, 2], "x": 32, "y": 64, "flags": 4},
+            {"matrix": [4, 1], "x": 16, "y": 64, "flags": 4},
+            {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
+            {"x": 152, "y": 16, "flags": 2},
+            {"x": 184, "y": 16, "flags": 2},
+            {"x": 216, "y": 16, "flags": 2},
+            {"x": 216, "y": 48, "flags": 2},
+            {"x": 184, "y": 48, "flags": 2},
+            {"x": 152, "y": 48, "flags": 2},
+            {"matrix": [5, 5], "x": 144, "y": 0, "flags": 4},
+            {"matrix": [5, 4], "x": 160, "y": 0, "flags": 4},
+            {"matrix": [5, 3], "x": 176, "y": 0, "flags": 4},
+            {"matrix": [5, 2], "x": 192, "y": 0, "flags": 4},
+            {"matrix": [5, 1], "x": 208, "y": 0, "flags": 4},
+            {"matrix": [5, 0], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [6, 5], "x": 144, "y": 16, "flags": 4},
+            {"matrix": [6, 4], "x": 160, "y": 16, "flags": 4},
+            {"matrix": [6, 3], "x": 176, "y": 16, "flags": 4},
+            {"matrix": [6, 2], "x": 192, "y": 16, "flags": 4},
+            {"matrix": [6, 1], "x": 208, "y": 16, "flags": 4},
+            {"matrix": [6, 0], "x": 224, "y": 16, "flags": 4},
+            {"matrix": [7, 5], "x": 144, "y": 32, "flags": 4},
+            {"matrix": [7, 4], "x": 160, "y": 32, "flags": 4},
+            {"matrix": [7, 3], "x": 176, "y": 32, "flags": 4},
+            {"matrix": [7, 2], "x": 192, "y": 32, "flags": 4},
+            {"matrix": [7, 1], "x": 208, "y": 32, "flags": 4},
+            {"matrix": [7, 0], "x": 224, "y": 32, "flags": 4},
+            {"matrix": [8, 6], "x": 128, "y": 48, "flags": 4},
+            {"matrix": [8, 5], "x": 144, "y": 48, "flags": 4},
+            {"matrix": [8, 4], "x": 160, "y": 48, "flags": 4},
+            {"matrix": [8, 3], "x": 176, "y": 48, "flags": 4},
+            {"matrix": [8, 2], "x": 192, "y": 48, "flags": 4},
+            {"matrix": [8, 1], "x": 208, "y": 48, "flags": 4},
+            {"matrix": [8, 0], "x": 224, "y": 48, "flags": 4},
+            {"matrix": [9, 6], "x": 128, "y": 64, "flags": 4},
+            {"matrix": [9, 5], "x": 144, "y": 64, "flags": 4},
+            {"matrix": [9, 4], "x": 160, "y": 64, "flags": 4},
+            {"matrix": [9, 3], "x": 176, "y": 64, "flags": 4},
+            {"matrix": [9, 2], "x": 192, "y": 64, "flags": 4},
+            {"matrix": [9, 1], "x": 208, "y": 64, "flags": 4},
+            {"matrix": [9, 0], "x": 224, "y": 64, "flags": 4}
+        ],
+        "max_brightness": 128,
+        "split_count": [38, 38]
+    },
+    "rgblight": {
+        "led_count": 76,
+        "max_brightness": 128,
+        "split": true,
+        "split_count": [38, 38]
+    },
+    "split": {
+        "bootmagic": {
+            "matrix": [7, 0]
+        },
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "B2", "pin_b": "B3"}
+                ]
+            }
+        },
+        "main": "matrix_grid",
+        "matrix_pins": {
+            "right": {
+                "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6"],
+                "rows": ["F4", "F5", "F6", "F7", "B1"]
+            }
+        },
+        "soft_serial_pin": "D2"
+    },
+    "usb": {
+        "pid": "0xB4C4"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "L01", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "L02", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "L03", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "L04", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "L05", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "L06", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "R06", "matrix": [5, 5], "x": 9, "y": 0},
+                {"label": "R05", "matrix": [5, 4], "x": 10, "y": 0},
+                {"label": "R04", "matrix": [5, 3], "x": 11, "y": 0},
+                {"label": "R03", "matrix": [5, 2], "x": 12, "y": 0},
+                {"label": "R02", "matrix": [5, 1], "x": 13, "y": 0},
+                {"label": "R01", "matrix": [5, 0], "x": 14, "y": 0},
+                {"label": "L07", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "L08", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "L09", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "L10", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "L11", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "L12", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "R12", "matrix": [6, 5], "x": 9, "y": 1},
+                {"label": "R11", "matrix": [6, 4], "x": 10, "y": 1},
+                {"label": "R10", "matrix": [6, 3], "x": 11, "y": 1},
+                {"label": "R09", "matrix": [6, 2], "x": 12, "y": 1},
+                {"label": "R08", "matrix": [6, 1], "x": 13, "y": 1},
+                {"label": "R07", "matrix": [6, 0], "x": 14, "y": 1},
+                {"label": "L13", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "L14", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "L15", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "L16", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "L17", "matrix": [2, 4], "x": 4, "y": 2},
+                {"label": "L18", "matrix": [2, 5], "x": 5, "y": 2},
+                {"label": "R18", "matrix": [7, 5], "x": 9, "y": 2},
+                {"label": "R17", "matrix": [7, 4], "x": 10, "y": 2},
+                {"label": "R16", "matrix": [7, 3], "x": 11, "y": 2},
+                {"label": "R15", "matrix": [7, 2], "x": 12, "y": 2},
+                {"label": "R14", "matrix": [7, 1], "x": 13, "y": 2},
+                {"label": "R13", "matrix": [7, 0], "x": 14, "y": 2},
+                {"label": "L19", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "L20", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "L21", "matrix": [3, 2], "x": 2, "y": 3},
+                {"label": "L22", "matrix": [3, 3], "x": 3, "y": 3},
+                {"label": "L23", "matrix": [3, 4], "x": 4, "y": 3},
+                {"label": "L24", "matrix": [3, 5], "x": 5, "y": 3},
+                {"label": "L25", "matrix": [3, 6], "x": 6, "y": 3},
+                {"label": "R25", "matrix": [8, 6], "x": 8, "y": 3},
+                {"label": "R24", "matrix": [8, 5], "x": 9, "y": 3},
+                {"label": "R23", "matrix": [8, 4], "x": 10, "y": 3},
+                {"label": "R22", "matrix": [8, 3], "x": 11, "y": 3},
+                {"label": "R21", "matrix": [8, 2], "x": 12, "y": 3},
+                {"label": "R20", "matrix": [8, 1], "x": 13, "y": 3},
+                {"label": "R19", "matrix": [8, 0], "x": 14, "y": 3},
+                {"label": "L26", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "L27", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "L28", "matrix": [4, 2], "x": 2, "y": 4},
+                {"label": "L29", "matrix": [4, 3], "x": 3, "y": 4},
+                {"label": "L30", "matrix": [4, 4], "x": 4, "y": 4},
+                {"label": "L31", "matrix": [4, 5], "x": 5, "y": 4},
+                {"label": "L32", "matrix": [4, 6], "x": 6, "y": 4},
+                {"label": "R32", "matrix": [9, 6], "x": 8, "y": 4},
+                {"label": "R31", "matrix": [9, 5], "x": 9, "y": 4},
+                {"label": "R30", "matrix": [9, 4], "x": 10, "y": 4},
+                {"label": "R29", "matrix": [9, 3], "x": 11, "y": 4},
+                {"label": "R28", "matrix": [9, 2], "x": 12, "y": 4},
+                {"label": "R27", "matrix": [9, 1], "x": 13, "y": 4},
+                {"label": "R26", "matrix": [9, 0], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/helix/rev1/rev1.c b/keyboards/splitkb/aurora/helix/rev1/rev1.c
new file mode 100644
index 000000000000..da24934eef7f
--- /dev/null
+++ b/keyboards/splitkb/aurora/helix/rev1/rev1.c
@@ -0,0 +1,56 @@
+/* Copyright 2023 splitkb.com <support@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
+
+//  Overriding is_keyboard_left() in qmk_firmware/quantum/split_common/split_util.c to limit the handedness check only once.
+//  reason: SPLIT_HAND_PIN is shared with the RGB pin so we don't want to keep reusing the pin for handedness checks.
+bool is_keyboard_left(void) {
+static enum { UNKNOWN, LEFT, RIGHT } hand_side = UNKNOWN;
+    // only check once, as this is called often
+    if (hand_side == UNKNOWN) {
+        #if defined(SPLIT_HAND_PIN)
+            // Test pin SPLIT_HAND_PIN for High/Low, if low it's right hand
+            setPinInput(SPLIT_HAND_PIN);
+            hand_side = readPin(SPLIT_HAND_PIN) ? LEFT : RIGHT;
+            return (hand_side == LEFT);
+        #endif
+        hand_side = is_keyboard_master() ? LEFT : RIGHT;
+        return (hand_side == LEFT);
+    } else {
+        return (hand_side == LEFT);
+    }
+}
+
+#ifdef SWAP_HANDS_ENABLE
+// clang-format off
+    __attribute__ ((weak)) const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+        {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}, {6, 5}},
+        {{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6}, {6, 6}},
+        {{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7}, {6, 7}},
+        {{0, 8}, {1, 8}, {2, 8}, {3, 8}, {4, 8}, {5, 8}, {6, 8}},
+        {{0, 9}, {1, 9}, {2, 9}, {3, 9}, {4, 9}, {5, 9}, {6, 9}},
+        {{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {6, 0}},
+        {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}, {6, 1}},
+        {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2}, {6, 2}},
+        {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}, {6, 3}},
+        {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}, {6, 4}}
+    };
+// clang-format on
+#    ifdef ENCODER_MAP_ENABLE
+        const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {1,0};
+#    endif
+#endif
diff --git a/keyboards/splitkb/aurora/helix/rev1/rules.mk b/keyboards/splitkb/aurora/helix/rev1/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/splitkb/aurora/helix/rules.mk b/keyboards/splitkb/aurora/helix/rules.mk
new file mode 100644
index 000000000000..8130273c1f9c
--- /dev/null
+++ b/keyboards/splitkb/aurora/helix/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = splitkb/aurora/helix/rev1
\ 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 57a420d49c7a..1356c62ea179 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/config.h
+++ b/keyboards/splitkb/aurora/lily58/rev1/config.h
@@ -28,7 +28,7 @@
 
 // Not yet available in `info.json`
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    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 76b0edc116cf..2d251b96b22e 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/info.json
+++ b/keyboards/splitkb/aurora/lily58/rev1/info.json
@@ -119,7 +119,7 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 2, "x": 51, "y": 13},                    // L RGB1
             {"flags": 2, "x": 22, "y": 18},                    // L RGB2
diff --git a/keyboards/splitkb/aurora/sofle_v2/rev1/info.json b/keyboards/splitkb/aurora/sofle_v2/rev1/info.json
index ab0d9c514c02..b9b8b9da6b23 100644
--- a/keyboards/splitkb/aurora/sofle_v2/rev1/info.json
+++ b/keyboards/splitkb/aurora/sofle_v2/rev1/info.json
@@ -19,7 +19,7 @@
         "rows": ["F5", "B1", "F7", "F6", "B3"]
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"x": 67, "y": 18, "flags": 2},
             {"x": 24, "y": 16, "flags": 2},
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/rules.mk b/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/rules.mk
index b1c72a8aaffa..585c589d3aab 100644
--- a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/rules.mk
+++ b/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/rules.mk
@@ -7,7 +7,6 @@ SRC += features/leader.c
 SRC += oled/oled.c
 
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 MOUSEKEY_ENABLE = yes
 AUTO_SHIFT_ENABLE = yes
diff --git a/keyboards/splitkb/aurora/sweep/rev1/config.h b/keyboards/splitkb/aurora/sweep/rev1/config.h
index aa5bd24fdee3..a3b2cc893e1e 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/config.h
+++ b/keyboards/splitkb/aurora/sweep/rev1/config.h
@@ -28,7 +28,7 @@
 
 // Not yet available in `info.json`
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    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 ec85447084cc..7d7fec921f4e 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/info.json
+++ b/keyboards/splitkb/aurora/sweep/rev1/info.json
@@ -105,7 +105,7 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 2, "x": 71, "y": 15},
             {"flags": 2, "x": 51, "y": 8},
diff --git a/keyboards/splitkb/kyria/keymaps/asapjockey/rules.mk b/keyboards/splitkb/kyria/keymaps/asapjockey/rules.mk
index 65b44a2982e9..a64a9f4e15f3 100644
--- a/keyboards/splitkb/kyria/keymaps/asapjockey/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/asapjockey/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 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
diff --git a/keyboards/splitkb/kyria/keymaps/benji/rules.mk b/keyboards/splitkb/kyria/keymaps/benji/rules.mk
index 35f8ec90c6f7..7b3d2303508a 100644
--- a/keyboards/splitkb/kyria/keymaps/benji/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/benji/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 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/cameronjlarsen/rules.mk b/keyboards/splitkb/kyria/keymaps/cameronjlarsen/rules.mk
index e7146a164072..c58bda2c50a9 100644
--- a/keyboards/splitkb/kyria/keymaps/cameronjlarsen/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/cameronjlarsen/rules.mk
@@ -1,7 +1,6 @@
 BOOTMAGIC_ENABLE = no
 BOOTLOADER = atmel-dfu
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = no      # Enable keyboard RGB underglow
 COMMAND_ENABLE = no # Disables the command feature
@@ -11,4 +10,3 @@ CONSOLE_ENABLE = no
 AUDIO_ENABLE = no
 CAPS_WORD_ENABLE = yes
 CUSTOM_ONESHOT_ENABLE = yes
-
diff --git a/keyboards/splitkb/kyria/keymaps/cjuniet/rules.mk b/keyboards/splitkb/kyria/keymaps/cjuniet/rules.mk
index 71feb286dac4..968012ece1c0 100644
--- a/keyboards/splitkb/kyria/keymaps/cjuniet/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/cjuniet/rules.mk
@@ -3,5 +3,4 @@ EXTRAKEY_ENABLE    = yes
 LEADER_ENABLE      = yes
 MOUSEKEY_ENABLE    = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 RGBLIGHT_ENABLE    = no
diff --git a/keyboards/splitkb/kyria/keymaps/corodiak/rules.mk b/keyboards/splitkb/kyria/keymaps/corodiak/rules.mk
index 59e2da986bbd..2ed0ad91c795 100644
--- a/keyboards/splitkb/kyria/keymaps/corodiak/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/corodiak/rules.mk
@@ -1,5 +1,4 @@
 # OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 # 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/cwebster2/keymap.c b/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c
index 3a5aa429d5b5..e93857f4ccee 100644
--- a/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c
@@ -384,10 +384,10 @@ static void render_status(void) {
     oled_write_P(PSTR("\n"), false);
 
     // Host Keyboard LED Status
-    uint8_t led_usb_state = host_keyboard_leds();
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR("       "), false);
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR("       "), false);
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR("       "), false);
+    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);
 
 }
 
diff --git a/keyboards/splitkb/kyria/keymaps/cwebster2/rules.mk b/keyboards/splitkb/kyria/keymaps/cwebster2/rules.mk
index e2e6a3268903..442170ccd664 100644
--- a/keyboards/splitkb/kyria/keymaps/cwebster2/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/cwebster2/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 RAW_ENABLE = no
 WPM_ENABLE = no
diff --git a/keyboards/splitkb/kyria/keymaps/default/rules.mk b/keyboards/splitkb/kyria/keymaps/default/rules.mk
index 830107351108..36a9c313733e 100644
--- a/keyboards/splitkb/kyria/keymaps/default/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/default/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306      # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGB_MATRIX_ENABLE = no     # Disable keyboard RGB matrix, as it is enabled by default on rev3
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
diff --git a/keyboards/splitkb/kyria/keymaps/ghidalgo93/rules.mk b/keyboards/splitkb/kyria/keymaps/ghidalgo93/rules.mk
index d5d64865bb54..d1f3f0f9f47e 100644
--- a/keyboards/splitkb/kyria/keymaps/ghidalgo93/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/ghidalgo93/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 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/rules.mk b/keyboards/splitkb/kyria/keymaps/gotham/rules.mk
index be3789ce9b0e..eff9494ff159 100644
--- a/keyboards/splitkb/kyria/keymaps/gotham/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/gotham/rules.mk
@@ -3,7 +3,6 @@ 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
-OLED_DRIVER = SSD1306  # Enables the use of OLED displays
 THUMBSTICK_ENABLE  = yes  # Enables analog thumbstick code
 
 ifeq ($(strip $(ENCODER_ENABLE)), yes)
diff --git a/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk b/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk
index 453d19ab3b40..7bcef000f3ab 100644
--- a/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/j-inc/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 WPM_ENABLE = yes
diff --git a/keyboards/splitkb/kyria/keymaps/jhelvy/rules.mk b/keyboards/splitkb/kyria/keymaps/jhelvy/rules.mk
index a987a4ded23b..21b26a04a4bc 100644
--- a/keyboards/splitkb/kyria/keymaps/jhelvy/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/jhelvy/rules.mk
@@ -1,6 +1,5 @@
 AUTO_SHIFT_ENABLE = yes # Autoshift by holding down a key
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 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
diff --git a/keyboards/splitkb/kyria/keymaps/jimmysjolund/rules.mk b/keyboards/splitkb/kyria/keymaps/jimmysjolund/rules.mk
index 35f8ec90c6f7..7b3d2303508a 100644
--- a/keyboards/splitkb/kyria/keymaps/jimmysjolund/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/jimmysjolund/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 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/rules.mk b/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk
index 87026b87564f..802e7a0f8a95 100644
--- a/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes          # Enables the use of OLED displays
-OLED_DRIVER = SSD1306
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 NKRO_ENABLE = yes          # Enable N-Key Rollover
 ENCODER_ENABLE = no        # Disable Rotary Encoder
diff --git a/keyboards/splitkb/kyria/keymaps/lms_ace01/rules.mk b/keyboards/splitkb/kyria/keymaps/lms_ace01/rules.mk
index 329b41e4e5dd..61577a39a526 100644
--- a/keyboards/splitkb/kyria/keymaps/lms_ace01/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/lms_ace01/rules.mk
@@ -2,7 +2,6 @@ BOOTLOADER         = caterina  # Pro Micro bootloader
 
 TAP_DANCE_ENABLE   = yes       # Enable Tap Dance
 
-OLED_DRIVER_ENABLE = yes       # Enables the use of OLED displays
 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/lw/keymap.c b/keyboards/splitkb/kyria/keymaps/lw/keymap.c
index 1ff1f54d0582..8cc29c84631c 100644
--- a/keyboards/splitkb/kyria/keymaps/lw/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/lw/keymap.c
@@ -52,8 +52,6 @@ const uint32_t unicode_map[] PROGMEM = {
     [SECTION]       = 0x00A7, // §
     [DEGREE]        = 0x00B0, // °
 };
-// usage: X(ACUTE), XP(CEDIL,CEDIL_MAJ)
-
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -74,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
     [_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, XP(APOST,QUOTE), KC_BSPC, //  XP(APOST,QUOTE) or KC_QUOT
+  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
     ),
@@ -138,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_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, XP(CEDIL,CEDIL_MAJ), XP(SECTION,DEGREE), _______, LCTL(KC_S),  KC_INS,
+ 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)
     ),
 
diff --git a/keyboards/splitkb/kyria/keymaps/lw/rules.mk b/keyboards/splitkb/kyria/keymaps/lw/rules.mk
index 41156dd41c8a..36553b7b25c6 100644
--- a/keyboards/splitkb/kyria/keymaps/lw/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/lw/rules.mk
@@ -1,6 +1,5 @@
 OLED_ENABLE = no 
-OLED_DRIVER = SSD1306	# Enables the use of OLED displays
 ENCODER_ENABLE = no     # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = no    # Enable keyboard RGB underglow
 
-UNICODEMAP_ENABLE = yes	# Enable unicode 
\ No newline at end of file
+UNICODEMAP_ENABLE = yes	# Enable unicode 
diff --git a/keyboards/splitkb/kyria/keymaps/maherma-adg/rules.mk b/keyboards/splitkb/kyria/keymaps/maherma-adg/rules.mk
index f37eabe3d544..2f8de3561ef1 100644
--- a/keyboards/splitkb/kyria/keymaps/maherma-adg/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/maherma-adg/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = no       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-MOUSEKEY_ENABLE = yes	 # Enable mouse movements
\ No newline at end of file
+MOUSEKEY_ENABLE = yes	 # Enable mouse movements
diff --git a/keyboards/splitkb/kyria/keymaps/mattir/rules.mk b/keyboards/splitkb/kyria/keymaps/mattir/rules.mk
index 9d1a91831e29..2a9ca4aff97a 100644
--- a/keyboards/splitkb/kyria/keymaps/mattir/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/mattir/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 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/ninjonas/rules.mk b/keyboards/splitkb/kyria/keymaps/ninjonas/rules.mk
index 1931861cafad..9d1a8a631ec2 100644
--- a/keyboards/splitkb/kyria/keymaps/ninjonas/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/ninjonas/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 LTO_ENABLE = yes
diff --git a/keyboards/splitkb/kyria/keymaps/plattfot/rules.mk b/keyboards/splitkb/kyria/keymaps/plattfot/rules.mk
index 4d148481ca7a..f35aee8683db 100644
--- a/keyboards/splitkb/kyria/keymaps/plattfot/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/plattfot/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 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
diff --git a/keyboards/splitkb/kyria/keymaps/rmw/keymap.c b/keyboards/splitkb/kyria/keymaps/rmw/keymap.c
index be7bfe4c7ac4..59b18de418d0 100644
--- a/keyboards/splitkb/kyria/keymaps/rmw/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/rmw/keymap.c
@@ -18,100 +18,60 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [QWERTY] = LAYOUT_stack(
-        KC_TAB   , KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,
-        OSL(EDIT), KC_A, LT(NUMPAD,KC_S), KC_D, LT(FSYM,KC_F), KC_G,
-        TD(FRBK2)  , KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,  TO(EDIT), KC_ESCAPE,
-                            TO(ADJUST), TD(SGCA), TD(AGC), KC_BSPC, TD(SHNTC),
-
-                                KC_Y,    KC_U,       KC_I, KC_O,      KC_P,        KC_BSLS,
-                                KC_H, LT(JSYM,KC_J), KC_K, KC_L, LT(EDIT,KC_SCLN), KC_QUOT,
-            KC_DEL, TO(NUMPAD),  KC_N, KC_M,     KC_COMM, KC_DOT, LT(MEDIA,KC_SLSH), KC_MS_BTN1,
-            SFTENT,  KC_SPC,   TD(GCA), TD(CTLALL), KC_CAPS
+    [QWERTY] = LAYOUT_split_3x6_5(
+        KC_TAB   , KC_Q,   KC_W,   KC_E,   KC_R,   KC_T, KC_Y,    KC_U,       KC_I, KC_O,      KC_P,        KC_BSLS,
+        OSL(EDIT), KC_A, LT(NUMPAD,KC_S), KC_D, LT(FSYM,KC_F), KC_G, KC_H, LT(JSYM,KC_J), KC_K, KC_L, LT(EDIT,KC_SCLN), KC_QUOT,
+        TD(FRBK2)  , KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,  TO(EDIT), KC_ESCAPE, KC_DEL, TO(NUMPAD),  KC_N, KC_M,     KC_COMM, KC_DOT, LT(MEDIA,KC_SLSH), KC_MS_BTN1,
+                            TO(ADJUST), TD(SGCA), TD(AGC), KC_BSPC, TD(SHNTC), SFTENT,  KC_SPC,   TD(GCA), TD(CTLALL), KC_CAPS
     ),
 
-    [MINIMAK4] = LAYOUT_stack(
-        KC_TAB   , KC_Q,   KC_W,   KC_D,   KC_R,   KC_K,
-        OSL(EDIT), KC_A, LT(NUMPAD,KC_S), KC_T, LT(FSYM,KC_F), KC_G,
-        OSM(MOD_LSFT)  , KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,  TO(EDIT), KC_ESCAPE,
-                                _______, TO(ADJUST), TD(SGCA), KC_BSPC, TD(SHNTC),
-
-                                KC_Y,    KC_U,       KC_I, KC_O,      KC_P,        KC_PIPE,
-                                KC_H, LT(JSYM,KC_J), KC_E, KC_L, LT(EDIT,KC_SCLN), KC_QUOT,
-                KC_DEL, TO(NUMPAD),   KC_N, KC_M,     KC_COMM, KC_DOT, LT(MEDIA,KC_SLSH), KC_MINS,
-                SFTENT,  KC_SPC,   TD(GCA), TD(CTLALL), _______
+    [MINIMAK4] = LAYOUT_split_3x6_5(
+        KC_TAB   , KC_Q,   KC_W,   KC_D,   KC_R,   KC_K, KC_Y,    KC_U,       KC_I, KC_O,      KC_P,        KC_PIPE,
+        OSL(EDIT), KC_A, LT(NUMPAD,KC_S), KC_T, LT(FSYM,KC_F), KC_G, KC_H, LT(JSYM,KC_J), KC_E, KC_L, LT(EDIT,KC_SCLN), KC_QUOT,
+        OSM(MOD_LSFT)  , KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,  TO(EDIT), KC_ESCAPE, KC_DEL, TO(NUMPAD),   KC_N, KC_M,     KC_COMM, KC_DOT, LT(MEDIA,KC_SLSH), KC_MINS,
+                                _______, TO(ADJUST), TD(SGCA), KC_BSPC, TD(SHNTC), SFTENT,  KC_SPC,   TD(GCA), TD(CTLALL), _______
     ),
 
-    [NUMPAD] = LAYOUT_stack(
-        _______, _______, _______,  _______, _______, _______,
-        _______, _______, _______,  _______, _______, _______,
-        _______, _______, _______,  _______, _______, _______, TO(QWERTY), _______,
-                                    _______, _______, _______,  _______  , _______,
-
-                                    _______, KC_7,     KC_8,    KC_9,  KC_KP_MINUS, _______,
-                                    _______, KC_4,     KC_5,    KC_6,  KC_KP_PLUS , _______,
-                _______, TO(EDIT), _______, KC_1,  KC_2,  KC_3, KC_KP_SLASH, LCTL(KC_RIGHT),
-                _______,  _______, KC_0, KC_DOT, _______
+    [NUMPAD] = LAYOUT_split_3x6_5(
+        _______, _______, _______,  _______, _______, _______, _______, KC_7,     KC_8,    KC_9,  KC_KP_MINUS, _______,
+        _______, _______, _______,  _______, _______, _______, _______, KC_4,     KC_5,    KC_6,  KC_KP_PLUS , _______,
+        _______, _______, _______,  _______, _______, _______, TO(QWERTY), _______, _______, TO(EDIT), _______, KC_1,  KC_2,  KC_3, KC_KP_SLASH, LCTL(KC_RIGHT),
+                                    _______, _______, _______,  _______  , _______, _______,  _______, KC_0, KC_DOT, _______
     ),
 
-    [EDIT] = LAYOUT_stack(
-        _______, TASK_MAN, _______, SELW_LEFT, SELW_RIGHT, _______,
-        _______, _______ , LGUI(KC_GRV), MVW_LEFT,  MVW_RIGHT , _______,
-        LCTL(KC_LEFT), R_UNDO, R_CUT  , R_COPY , R_PASTE, R_REDO , TO(NUMPAD), FORM_GET,
-                                            _______, _______, _______, DEL_WRD, _______,
-
-                                    NEW_TAB , KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, _______,
-                                    R_HOME  , KC_LEFT, KC_DOWN, KC_RIGHT, R_END, _______,
-                FORM_PUT, TO(QWERTY), SEL_HOME, S(KC_LEFT), S(KC_DOWN), S(KC_RIGHT), SEL_END, _______,
-                _______, _______, _______, _______, _______
+    [EDIT] = LAYOUT_split_3x6_5(
+        _______, TASK_MAN, _______, SELW_LEFT, SELW_RIGHT, _______, NEW_TAB , KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, _______,
+        _______, _______ , LGUI(KC_GRV), MVW_LEFT,  MVW_RIGHT , _______, R_HOME  , KC_LEFT, KC_DOWN, KC_RIGHT, R_END, _______,
+        LCTL(KC_LEFT), R_UNDO, R_CUT  , R_COPY , R_PASTE, R_REDO , TO(NUMPAD), FORM_GET, FORM_PUT, TO(QWERTY), SEL_HOME, S(KC_LEFT), S(KC_DOWN), S(KC_RIGHT), SEL_END, _______,
+                                            _______, _______, _______, DEL_WRD, _______, _______, _______, _______, _______, _______
     ),
 
-    [ADJUST] = LAYOUT_stack(
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  KC_F6,
-        TO(QWERTY), TO(EDIT), TO(NUMPAD), TO(JSYM), TO(FSYM), TO(MEDIA),
-        DF(MINIMAK4), DF(QWERTY), RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD,_______, _______,
-                                           _______, _______, _______, _______, _______,
-
-                                KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12,
-                                _______, _______, _______, _______, _______,  _______,
-                _______, _______, _______, _______, _______, _______, _______, _______,
-                _______, _______, _______, _______, _______
+    [ADJUST] = LAYOUT_split_3x6_5(
+        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(QWERTY), TO(EDIT), TO(NUMPAD), TO(JSYM), TO(FSYM), TO(MEDIA), _______, _______, _______, _______, _______,  _______,
+        DF(MINIMAK4), DF(QWERTY), RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                                           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
-    [FSYM] = LAYOUT_stack(
-        _______, _______, _______, _______, _______, _______,
-        _______, _______, KC_TILD, KC_EXLM, _______, _______,
-        LCTL(KC_RIGHT), _______, TO(QWERTY), _______, _______, _______, _______, _______,
-                                            _______, _______, _______, _______, _______,
-
-                                KC_CIRC,  KC_AMPR , KC_ASTR, KC_GRV ,  _______, _______,
-                                KC_EQUAL, KC_MINUS, KC_UNDS, KC_PIPE, KC_COLON, KC_DQT,
-                _______, _______, _______, KC_PLUS,  KC_BSLS, KC_SLSH, _______, _______,
-                _______, _______, _______, _______, _______
+    [FSYM] = LAYOUT_split_3x6_5(
+        _______, _______, _______, _______, _______, _______, KC_CIRC,  KC_AMPR , KC_ASTR, KC_GRV ,  _______, _______,
+        _______, _______, KC_TILD, KC_EXLM, _______, _______, KC_EQUAL, KC_MINUS, KC_UNDS, KC_PIPE, KC_COLON, KC_DQT,
+        LCTL(KC_RIGHT), _______, TO(QWERTY), _______, _______, _______, _______, _______, _______, _______, _______, KC_PLUS,  KC_BSLS, KC_SLSH, _______, _______,
+                                            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
-    [JSYM] = LAYOUT_stack(
-        _______, KC_GRV,  KC_AT  , KC_LCBR,     KC_RCBR,     _______,
-        _______, KC_HASH, KC_DLR , KC_LPRN,     KC_RPRN,     KC_LEFT,
-        _______, KC_PERC, KC_CIRC, KC_LBRC,     KC_RBRC, _______, _______, _______,
-                                                _______, _______, _______, _______, _______,
-
-                                _______, _______, _______, _______,  _______, _______,
-                                _______, _______, KC_QUES, KC_SLSH, KC_COLON, _______,
-                _______, _______, _______, _______, _______, TO(QWERTY), _______, LCTL(KC_LEFT),
-                _______, _______, _______, _______, _______
+    [JSYM] = LAYOUT_split_3x6_5(
+        _______, KC_GRV,  KC_AT  , KC_LCBR,     KC_RCBR,     _______, _______, _______, _______, _______,  _______, _______,
+        _______, KC_HASH, KC_DLR , KC_LPRN,     KC_RPRN,     KC_LEFT, _______, _______, KC_QUES, KC_SLSH, KC_COLON, _______,
+        _______, KC_PERC, KC_CIRC, KC_LBRC,     KC_RBRC, _______, _______, _______, _______, _______, _______, _______, _______, TO(QWERTY), _______, LCTL(KC_LEFT),
+                                                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
-    [MEDIA] = LAYOUT_stack(
-        _______, KC_WH_U, KC_WH_L, KC_MS_UP, KC_WH_R, _______,
-        _______, KC_WH_D, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______,
-        _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______,
-                                                _______, _______, _______, _______, _______,
-
-                                _______, _______, _______, _______,  _______, _______,
-                                _______, _______, _______, _______, _______, _______,
-                _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______,
-                KC_MS_BTN1, KC_MEDIA_PLAY_PAUSE, KC_MRWD, KC_MFFD, _______
+    [MEDIA] = LAYOUT_split_3x6_5(
+        _______, KC_WH_U, KC_WH_L, KC_MS_UP, KC_WH_R, _______, _______, _______, _______, _______,  _______, _______,
+        _______, KC_WH_D, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______,
+                                                _______, _______, _______, _______, _______, KC_MS_BTN1, KC_MEDIA_PLAY_PAUSE, KC_MRWD, KC_MFFD, _______
     )
 };
 
diff --git a/keyboards/splitkb/kyria/keymaps/shinze/keymap.c b/keyboards/splitkb/kyria/keymaps/shinze/keymap.c
index 3483410525f0..ecc70055b2cf 100644
--- a/keyboards/splitkb/kyria/keymaps/shinze/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/shinze/keymap.c
@@ -210,10 +210,10 @@ static void render_status(void) {
     }
 
     // Host Keyboard LED Status
-    uint8_t led_usb_state = host_keyboard_leds();
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR("       "), false);
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR("       "), false);
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR("       "), false);
+    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) {
diff --git a/keyboards/splitkb/kyria/keymaps/shinze/rules.mk b/keyboards/splitkb/kyria/keymaps/shinze/rules.mk
index 35f8ec90c6f7..7b3d2303508a 100644
--- a/keyboards/splitkb/kyria/keymaps/shinze/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/shinze/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 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
new file mode 100755
index 000000000000..5ed5c847939c
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/squigglybob/config.h
@@ -0,0 +1,35 @@
+/* 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
new file mode 100755
index 000000000000..2b5df2a8f5a6
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/squigglybob/keymap.c
@@ -0,0 +1,315 @@
+/* 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
new file mode 100755
index 000000000000..7de296873afb
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/squigglybob/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_ENABLE = no
+RGBLIGHT_ENABLE = yes
diff --git a/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c b/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c
index 6720a6b35c83..87f51c4cd350 100644
--- a/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c
@@ -225,10 +225,10 @@ static void render_status(void) {
     }
 
     // Host Keyboard LED Status
-    uint8_t led_usb_state = host_keyboard_leds();
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK)    ? PSTR("NUMLCK ") : PSTR("       "), false);
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK)   ? PSTR("CAPLCK ") : PSTR("       "), false);
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR("       "), false);
+    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) {
diff --git a/keyboards/splitkb/kyria/keymaps/tessachka/rules.mk b/keyboards/splitkb/kyria/keymaps/tessachka/rules.mk
index e79a5604e046..7fe734fb7246 100644
--- a/keyboards/splitkb/kyria/keymaps/tessachka/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/tessachka/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 MOUSEKEY_ENABLE = yes
diff --git a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
index 3ed7dbee6e5c..14ce1b1a6e10 100644
--- a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
@@ -286,10 +286,10 @@ static void render_status(void) {
     }
 
     // Host Keyboard LED Status
-    uint8_t led_usb_state = host_keyboard_leds();
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK)    ? PSTR("NUMLCK ") : PSTR("       "), false);
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK)   ? PSTR("CAPLCK ") : PSTR("       "), false);
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR("       "), false);
+    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) {
diff --git a/keyboards/splitkb/kyria/keymaps/thomasbaart/rules.mk b/keyboards/splitkb/kyria/keymaps/thomasbaart/rules.mk
index 65b44a2982e9..a64a9f4e15f3 100644
--- a/keyboards/splitkb/kyria/keymaps/thomasbaart/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/thomasbaart/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 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
diff --git a/keyboards/splitkb/kyria/keymaps/travishi/rules.mk b/keyboards/splitkb/kyria/keymaps/travishi/rules.mk
index a1564cfe4ba7..398b5debfa7a 100644
--- a/keyboards/splitkb/kyria/keymaps/travishi/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/travishi/rules.mk
@@ -2,11 +2,10 @@
 LEADER_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 
 WPM_ENABLE = yes
 
 
 # Disabled features
 ENCODER_ENABLE = no       # Enables the use of one or more encoders
-MOUSEKEY_ENABLE = no
\ No newline at end of file
+MOUSEKEY_ENABLE = no
diff --git a/keyboards/splitkb/kyria/keymaps/uqs/keymap.c b/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
index 9d3d6d1f668a..398b167e7251 100644
--- a/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
@@ -22,16 +22,11 @@
          R45, R46, R47,           \
          R32, R33                 \
 )                                 \
-LAYOUT_stack(                     \
-    L00, L01, L02, L03, L04, L05,                   \
-    L12, L13, L14, L15, L16, L17,                   \
-    L24, L25, L26, L27, L28, L29, L30, L31,         \
-                   L40, L41, L42, L43, L44,         \
-                                                    \
-                  R06, R07, R08, R09, R10, R11,     \
-                  R18, R19, R20, R21, R22, R23,     \
-        R32, R33, R34, R35, R36, R37, R38, R39,     \
-        R45, R46, R47, R48, R49                     \
+LAYOUT_split_3x6_5(                     \
+    L00, L01, L02, L03, L04, L05,                          R06, R07, R08, R09, R10, R11, \
+    L12, L13, L14, L15, L16, L17,                          R18, R19, R20, R21, R22, R23, \
+    L24, L25, L26, L27, L28, L29, L30, L31,      R32, R33, R34, R35, R36, R37, R38, R39, \
+                   L40, L41, L42, L43, L44,      R45, R46, R47, R48, R49 \
 )
 
 // clang-format off
diff --git a/keyboards/splitkb/kyria/keymaps/via/rules.mk b/keyboards/splitkb/kyria/keymaps/via/rules.mk
index 0f12ae88e1cf..351b07402799 100644
--- a/keyboards/splitkb/kyria/keymaps/via/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/via/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 VIA_ENABLE = yes
 NKRO_ENABLE = yes
diff --git a/keyboards/splitkb/kyria/keymaps/winternebs/rules.mk b/keyboards/splitkb/kyria/keymaps/winternebs/rules.mk
index 47a3988e6e27..c09579035c17 100755
--- a/keyboards/splitkb/kyria/keymaps/winternebs/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/winternebs/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # Enables the use of one or more
 NKRO_ENABLE = yes
 WPM_ENABLE = yes
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h
index 3f7655d43165..6c21b12a849e 100644
--- a/keyboards/splitkb/kyria/rev1/config.h
+++ b/keyboards/splitkb/kyria/rev1/config.h
@@ -41,10 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define SOFT_SERIAL_PIN D2
 #endif
 
-#define RGBLED_SPLIT \
-    { 10, 10 }
-#define RGBLED_NUM 20
-
 #ifdef OLED_ENABLE
 #    define OLED_DISPLAY_128X64
 #    define SPLIT_OLED_ENABLE
@@ -53,7 +49,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RGB matrix support */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM // Number of LEDs
+#    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
diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json
index 2e380145a082..aa38a7dd0c68 100644
--- a/keyboards/splitkb/kyria/rev1/info.json
+++ b/keyboards/splitkb/kyria/rev1/info.json
@@ -4,8 +4,12 @@
         "pid": "0x9D9D",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 20,
+        "split_count": [10, 10]
+    },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
@@ -90,67 +94,6 @@
                 {"matrix": [7, 3], "x": 12, "y": 3.25},
                 {"matrix": [7, 4], "x": 13, "y": 3.25}
             ]
-        },
-        "LAYOUT_stack": {
-            "layout": [
-                {"matrix": [0, 7], "x": 0, "y": 0},
-                {"matrix": [0, 6], "x": 1, "y": 0},
-                {"matrix": [0, 5], "x": 2, "y": 0},
-                {"matrix": [0, 4], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 2], "x": 5, "y": 0},
-
-                {"matrix": [1, 7], "x": 6, "y": 0},
-                {"matrix": [1, 6], "x": 7, "y": 0},
-                {"matrix": [1, 5], "x": 8, "y": 0},
-                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"matrix": [1, 3], "x": 10, "y": 0},
-                {"matrix": [1, 2], "x": 11, "y": 0},
-
-                {"matrix": [2, 7], "x": 12, "y": 0},
-                {"matrix": [2, 6], "x": 13, "y": 0},
-                {"matrix": [2, 5], "x": 14, "y": 0},
-                {"matrix": [2, 4], "x": 15, "y": 0},
-                {"matrix": [2, 3], "x": 16, "y": 0},
-                {"matrix": [2, 2], "x": 17, "y": 0},
-                {"matrix": [2, 1], "x": 18, "y": 0},
-                {"matrix": [2, 0], "x": 19, "y": 0},
-
-                {"matrix": [3, 4], "x": 20, "y": 0},
-                {"matrix": [3, 3], "x": 21, "y": 0},
-                {"matrix": [3, 2], "x": 22, "y": 0},
-                {"matrix": [3, 1], "x": 23, "y": 0},
-                {"matrix": [3, 0], "x": 24, "y": 0},
-
-                {"matrix": [4, 2], "x": 25, "y": 0},
-                {"matrix": [4, 3], "x": 26, "y": 0},
-                {"matrix": [4, 4], "x": 27, "y": 0},
-                {"matrix": [4, 5], "x": 28, "y": 0},
-                {"matrix": [4, 6], "x": 29, "y": 0},
-                {"matrix": [4, 7], "x": 30, "y": 0},
-
-                {"matrix": [5, 2], "x": 31, "y": 0},
-                {"matrix": [5, 3], "x": 32, "y": 0},
-                {"matrix": [5, 4], "x": 33, "y": 0},
-                {"matrix": [5, 5], "x": 34, "y": 0},
-                {"matrix": [5, 6], "x": 35, "y": 0},
-                {"matrix": [5, 7], "x": 36, "y": 0},
-
-                {"matrix": [6, 0], "x": 37, "y": 0},
-                {"matrix": [6, 1], "x": 38, "y": 0},
-                {"matrix": [6, 2], "x": 39, "y": 0},
-                {"matrix": [6, 3], "x": 40, "y": 0},
-                {"matrix": [6, 4], "x": 41, "y": 0},
-                {"matrix": [6, 5], "x": 42, "y": 0},
-                {"matrix": [6, 6], "x": 43, "y": 0},
-                {"matrix": [6, 7], "x": 44, "y": 0},
-
-                {"matrix": [7, 0], "x": 45, "y": 0},
-                {"matrix": [7, 1], "x": 46, "y": 0},
-                {"matrix": [7, 2], "x": 47, "y": 0},
-                {"matrix": [7, 3], "x": 48, "y": 0},
-                {"matrix": [7, 4], "x": 49, "y": 0}
-            ]
         }
     }
 }
diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h
index 1e8dd0272798..198688772be3 100644
--- a/keyboards/splitkb/kyria/rev2/config.h
+++ b/keyboards/splitkb/kyria/rev2/config.h
@@ -47,10 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define SOFT_SERIAL_PIN D2
 #endif
 
-#define RGBLED_SPLIT \
-    { 10, 10 }
-#define RGBLED_NUM 20
-
 #ifdef OLED_ENABLE
 #    define OLED_DISPLAY_128X64
 #    define SPLIT_OLED_ENABLE
@@ -59,7 +55,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RGB matrix support */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM // Number of LEDs
+#    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
diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json
index 9b745dc906f2..6e362d954839 100644
--- a/keyboards/splitkb/kyria/rev2/info.json
+++ b/keyboards/splitkb/kyria/rev2/info.json
@@ -4,8 +4,12 @@
         "pid": "0x9D9D",
         "device_version": "0.0.2"
     },
+    "rgblight": {
+        "led_count": 20,
+        "split_count": [10, 10]
+    },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"],
@@ -33,10 +37,10 @@
         }
     },
     "layout_aliases": {
-        "LAYOUT_split_3x6_5": "LAYOUT"
+        "LAYOUT": "LAYOUT_split_3x6_5"
     },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_split_3x6_5": {
             "layout": [
                 {"matrix": [0, 7], "x": 0, "y": 0.75},
                 {"matrix": [0, 6], "x": 1, "y": 0.75},
@@ -96,67 +100,6 @@
                 {"matrix": [7, 3], "x": 12, "y": 3.25},
                 {"matrix": [7, 5], "x": 13, "y": 3.25}
             ]
-        },
-        "LAYOUT_stack": {
-            "layout": [
-                {"matrix": [0, 7], "x": 0, "y": 0},
-                {"matrix": [0, 6], "x": 1, "y": 0},
-                {"matrix": [0, 5], "x": 2, "y": 0},
-                {"matrix": [0, 4], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 2], "x": 5, "y": 0},
-
-                {"matrix": [1, 7], "x": 6, "y": 0},
-                {"matrix": [1, 6], "x": 7, "y": 0},
-                {"matrix": [1, 5], "x": 8, "y": 0},
-                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"matrix": [1, 3], "x": 10, "y": 0},
-                {"matrix": [1, 2], "x": 11, "y": 0},
-
-                {"matrix": [2, 7], "x": 12, "y": 0},
-                {"matrix": [2, 6], "x": 13, "y": 0},
-                {"matrix": [2, 5], "x": 14, "y": 0},
-                {"matrix": [2, 4], "x": 15, "y": 0},
-                {"matrix": [2, 3], "x": 16, "y": 0},
-                {"matrix": [2, 2], "x": 17, "y": 0},
-                {"matrix": [2, 1], "x": 18, "y": 0},
-                {"matrix": [2, 0], "x": 19, "y": 0},
-
-                {"matrix": [3, 5], "x": 20, "y": 0},
-                {"matrix": [3, 3], "x": 21, "y": 0},
-                {"matrix": [3, 2], "x": 22, "y": 0},
-                {"matrix": [3, 1], "x": 23, "y": 0},
-                {"matrix": [3, 0], "x": 24, "y": 0},
-
-                {"matrix": [4, 2], "x": 25, "y": 0},
-                {"matrix": [4, 3], "x": 26, "y": 0},
-                {"matrix": [4, 4], "x": 27, "y": 0},
-                {"matrix": [4, 5], "x": 28, "y": 0},
-                {"matrix": [4, 6], "x": 29, "y": 0},
-                {"matrix": [4, 7], "x": 30, "y": 0},
-
-                {"matrix": [5, 2], "x": 31, "y": 0},
-                {"matrix": [5, 3], "x": 32, "y": 0},
-                {"matrix": [5, 4], "x": 33, "y": 0},
-                {"matrix": [5, 5], "x": 34, "y": 0},
-                {"matrix": [5, 6], "x": 35, "y": 0},
-                {"matrix": [5, 7], "x": 36, "y": 0},
-
-                {"matrix": [6, 0], "x": 37, "y": 0},
-                {"matrix": [6, 1], "x": 38, "y": 0},
-                {"matrix": [6, 2], "x": 39, "y": 0},
-                {"matrix": [6, 3], "x": 40, "y": 0},
-                {"matrix": [6, 4], "x": 41, "y": 0},
-                {"matrix": [6, 5], "x": 42, "y": 0},
-                {"matrix": [6, 6], "x": 43, "y": 0},
-                {"matrix": [6, 7], "x": 44, "y": 0},
-
-                {"matrix": [7, 0], "x": 45, "y": 0},
-                {"matrix": [7, 1], "x": 46, "y": 0},
-                {"matrix": [7, 2], "x": 47, "y": 0},
-                {"matrix": [7, 3], "x": 48, "y": 0},
-                {"matrix": [7, 5], "x": 49, "y": 0}
-            ]
         }
     }
 }
diff --git a/keyboards/splitkb/kyria/rev3/config.h b/keyboards/splitkb/kyria/rev3/config.h
index 3c620d901977..5168e8678e5e 100644
--- a/keyboards/splitkb/kyria/rev3/config.h
+++ b/keyboards/splitkb/kyria/rev3/config.h
@@ -28,7 +28,7 @@
 
 // Not yet available in `info.json`
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    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 97b953534d0b..29bea953230d 100644
--- a/keyboards/splitkb/kyria/rev3/info.json
+++ b/keyboards/splitkb/kyria/rev3/info.json
@@ -16,8 +16,11 @@
         "oled": true,
         "rgb_matrix": true
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x6_5"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_split_3x6_5": {
             "layout": [
                 {"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75},
                 {"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75},
@@ -25,6 +28,7 @@
                 {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
                 {"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25},
                 {"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5},
+
                 {"label": "R01", "matrix": [4, 1], "x": 10.5, "y": 0.5},
                 {"label": "R02", "matrix": [4, 2], "x": 11.5, "y": 0.25},
                 {"label": "R03", "matrix": [4, 3], "x": 12.5, "y": 0},
@@ -38,6 +42,7 @@
                 {"label": "L09", "matrix": [1, 3], "x": 3, "y": 1},
                 {"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25},
                 {"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5},
+
                 {"label": "R07", "matrix": [5, 1], "x": 10.5, "y": 1.5},
                 {"label": "R08", "matrix": [5, 2], "x": 11.5, "y": 1.25},
                 {"label": "R09", "matrix": [5, 3], "x": 12.5, "y": 1},
@@ -53,6 +58,7 @@
                 {"label": "L15", "matrix": [2, 1], "x": 5, "y": 2.5},
                 {"label": "L14", "matrix": [3, 3], "x": 6, "y": 3},
                 {"label": "L13", "matrix": [2, 0], "x": 7, "y": 3.25},
+
                 {"label": "R13", "matrix": [6, 0], "x": 8.5, "y": 3.25},
                 {"label": "R14", "matrix": [7, 3], "x": 9.5, "y": 3},
                 {"label": "R15", "matrix": [6, 1], "x": 10.5, "y": 2.5},
@@ -67,66 +73,6 @@
                 {"label": "L23", "matrix": [3, 1], "x": 4.5, "y": 3.5},
                 {"label": "L22", "matrix": [3, 5], "x": 5.5, "y": 4},
                 {"label": "L21", "matrix": [3, 0], "x": 6.5, "y": 4.25},
-                {"label": "R21", "matrix": [7, 0], "x": 9, "y": 4.25},
-                {"label": "R22", "matrix": [7, 5], "x": 10, "y": 4},
-                {"label": "R23", "matrix": [7, 1], "x": 11, "y": 3.5},
-                {"label": "R24", "matrix": [7, 2], "x": 12, "y": 3.25},
-                {"label": "R25", "matrix": [7, 4], "x": 13, "y": 3.25}
-            ]
-        },
-        "LAYOUT_stack": {
-            "layout": [
-                {"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75},
-                {"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75},
-                {"label": "L04", "matrix": [0, 4], "x": 2, "y": 0.25},
-                {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25},
-                {"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5},
-
-                {"label": "L12", "matrix": [1, 6], "x": 0, "y": 1.75},
-                {"label": "L11", "matrix": [1, 5], "x": 1, "y": 1.75},
-                {"label": "L10", "matrix": [1, 4], "x": 2, "y": 1.25},
-                {"label": "L09", "matrix": [1, 3], "x": 3, "y": 1},
-                {"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25},
-                {"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5},
-
-                {"label": "L20", "matrix": [2, 6], "x": 0, "y": 2.75},
-                {"label": "L19", "matrix": [2, 5], "x": 1, "y": 2.75},
-                {"label": "L18", "matrix": [2, 4], "x": 2, "y": 2.25},
-                {"label": "L17", "matrix": [2, 3], "x": 3, "y": 2},
-                {"label": "L16", "matrix": [2, 2], "x": 4, "y": 2.25},
-                {"label": "L15", "matrix": [2, 1], "x": 5, "y": 2.5},
-                {"label": "L14", "matrix": [3, 3], "x": 6, "y": 3},
-                {"label": "L13", "matrix": [2, 0], "x": 7, "y": 3.25},
-
-                {"label": "L25", "matrix": [3, 4], "x": 2.5, "y": 3.25},
-                {"label": "L24", "matrix": [3, 2], "x": 3.5, "y": 3.25},
-                {"label": "L23", "matrix": [3, 1], "x": 4.5, "y": 3.5},
-                {"label": "L22", "matrix": [3, 5], "x": 5.5, "y": 4},
-                {"label": "L21", "matrix": [3, 0], "x": 6.5, "y": 4.25},
-
-                {"label": "R01", "matrix": [4, 1], "x": 10.5, "y": 0.5},
-                {"label": "R02", "matrix": [4, 2], "x": 11.5, "y": 0.25},
-                {"label": "R03", "matrix": [4, 3], "x": 12.5, "y": 0},
-                {"label": "R04", "matrix": [4, 4], "x": 13.5, "y": 0.25},
-                {"label": "R05", "matrix": [4, 5], "x": 14.5, "y": 0.75},
-                {"label": "R06", "matrix": [4, 6], "x": 15.5, "y": 0.75},
-
-                {"label": "R07", "matrix": [5, 1], "x": 10.5, "y": 1.5},
-                {"label": "R08", "matrix": [5, 2], "x": 11.5, "y": 1.25},
-                {"label": "R09", "matrix": [5, 3], "x": 12.5, "y": 1},
-                {"label": "R10", "matrix": [5, 4], "x": 13.5, "y": 1.25},
-                {"label": "R11", "matrix": [5, 5], "x": 14.5, "y": 1.75},
-                {"label": "R12", "matrix": [5, 6], "x": 15.5, "y": 1.75},
-
-                {"label": "R13", "matrix": [6, 0], "x": 8.5, "y": 3.25},
-                {"label": "R14", "matrix": [7, 3], "x": 9.5, "y": 3},
-                {"label": "R15", "matrix": [6, 1], "x": 10.5, "y": 2.5},
-                {"label": "R16", "matrix": [6, 2], "x": 11.5, "y": 2.25},
-                {"label": "R17", "matrix": [6, 3], "x": 12.5, "y": 2},
-                {"label": "R18", "matrix": [6, 4], "x": 13.5, "y": 2.25},
-                {"label": "R19", "matrix": [6, 5], "x": 14.5, "y": 2.75},
-                {"label": "R20", "matrix": [6, 6], "x": 15.5, "y": 2.75},
 
                 {"label": "R21", "matrix": [7, 0], "x": 9, "y": 4.25},
                 {"label": "R22", "matrix": [7, 5], "x": 10, "y": 4},
@@ -177,7 +123,7 @@
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 2, "x": 75, "y": 2},                     // L RGB1
             {"flags": 2, "x": 50, "y": 1},                     // L RGB2
diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h
index fca70ae030ca..ec6e8f3171d3 100644
--- a/keyboards/splitkb/zima/config.h
+++ b/keyboards/splitkb/zima/config.h
@@ -21,24 +21,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define AUDIO_CLICKY
 #define NO_MUSIC_MODE
 
-#define RGBLED_NUM         5
-#define RGBLIGHT_HUE_STEP  8
-#define RGBLIGHT_SAT_STEP  8
-#define RGBLIGHT_VAL_STEP  8
-#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_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_TWINKLE
-
-#define FB_ERM_LRA         0
-#define FB_BRAKEFACTOR     3 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
-#define FB_LOOPGAIN        1 /* For  Low:0, Medium:1, High:2, Very High:3 */
+#define DRV2605L_FB_ERM_LRA         0
+#define DRV2605L_FB_BRAKEFACTOR     3 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
+#define DRV2605L_FB_LOOPGAIN        1 /* For  Low:0, Medium:1, High:2, Very High:3 */
 
 /* Please refer to your datasheet for the optimal setting for your specific motor. */
-#define RATED_VOLTAGE      3
-#define V_PEAK             5
+#define DRV2605L_RATED_VOLTAGE      3
+#define DRV2605L_V_PEAK             5
 
-#define DRV_GREETING       alert_750ms
-#define DRV_MODE_DEFAULT   buzz
+#define DRV2605L_GREETING       DRV2605L_EFFECT_750_MS_ALERT_100
+#define DRV2605L_DEFAULT_MODE   DRV2605L_EFFECT_BUZZ_1_100
diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json
index 6cb53f372fbf..0c6a104c5286 100644
--- a/keyboards/splitkb/zima/info.json
+++ b/keyboards/splitkb/zima/info.json
@@ -8,6 +8,19 @@
         "pid": "0xF75B",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 5,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
         "pin": "B5"
     },
diff --git a/keyboards/splitkb/zima/rules.mk b/keyboards/splitkb/zima/rules.mk
index fb9a5856566d..3bcfccdd7bda 100644
--- a/keyboards/splitkb/zima/rules.mk
+++ b/keyboards/splitkb/zima/rules.mk
@@ -13,8 +13,7 @@ AUDIO_ENABLE = yes         # Audio output
 
 ENCODER_ENABLE = yes       # ENables the use of one or more encoders
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306      # Enables the use of OLED displays
 HAPTIC_ENABLE = yes        # Supported but not included by defaut
-HAPTIC_DRIVER = DRV2605L
+HAPTIC_DRIVER = drv2605l
 
 LTO_ENABLE = yes
diff --git a/keyboards/star75/config.h b/keyboards/star75/config.h
index 980009fe0bd2..056ee84a8f3b 100644
--- a/keyboards/star75/config.h
+++ b/keyboards/star75/config.h
@@ -9,20 +9,5 @@ SPDX-License-Identifier: GPL-2.0-or-later */
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 1
 #define RGBLIGHT_LAYERS
-#define RGBLIGHT_LED_MAP { 0, 1 }
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/star75/info.json b/keyboards/star75/info.json
index c6368ca5682b..b42341ad30cf 100644
--- a/keyboards/star75/info.json
+++ b/keyboards/star75/info.json
@@ -12,7 +12,22 @@
         "pin": "B3"
     },
     "rgblight": {
-        "max_brightness": 180
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 1,
+        "max_brightness": 180,
+        "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": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
diff --git a/keyboards/stello65/beta/beta.c b/keyboards/stello65/beta/beta.c
deleted file mode 100644
index fa191358149c..000000000000
--- a/keyboards/stello65/beta/beta.c
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2021 @wekey (@@wekey)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "quantum.h"
-
-#if defined(ENCODER_ENABLE)
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/stello65/beta/info.json b/keyboards/stello65/beta/info.json
index 0eee3caad325..9236d322b9fb 100644
--- a/keyboards/stello65/beta/info.json
+++ b/keyboards/stello65/beta/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
     "matrix_pins": {
         "cols": ["C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"],
         "rows": ["F0", "E6", "D0", "D1", "C6", "F7", "F6", "F5", "F4", "F1"]
diff --git a/keyboards/stello65/beta/rules.mk b/keyboards/stello65/beta/rules.mk
index 0e8233e5dab2..131aa72aeb5d 100644
--- a/keyboards/stello65/beta/rules.mk
+++ b/keyboards/stello65/beta/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
-DEBOUNCE_TYPE	  = sym_defer_pk
diff --git a/keyboards/stello65/hs_rev1/config.h b/keyboards/stello65/hs_rev1/config.h
index 88bc32e8ae65..81fc04139c7f 100644
--- a/keyboards/stello65/hs_rev1/config.h
+++ b/keyboards/stello65/hs_rev1/config.h
@@ -3,23 +3,6 @@
 
 #pragma once
 
-#    define RGBLED_NUM 4
-//#    define RGBLIGHT_HUE_STEP 8
-//#    define RGBLIGHT_SAT_STEP 8
-//#    define RGBLIGHT_VAL_STEP 8
-//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations 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
-
 /* 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/stello65/hs_rev1/info.json b/keyboards/stello65/hs_rev1/info.json
index 5b426cfa090c..cccaf7ccee32 100644
--- a/keyboards/stello65/hs_rev1/info.json
+++ b/keyboards/stello65/hs_rev1/info.json
@@ -8,6 +8,21 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 4,
+        "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": "D0"
     },
diff --git a/keyboards/stello65/sl_rev1/config.h b/keyboards/stello65/sl_rev1/config.h
index 88bc32e8ae65..81fc04139c7f 100644
--- a/keyboards/stello65/sl_rev1/config.h
+++ b/keyboards/stello65/sl_rev1/config.h
@@ -3,23 +3,6 @@
 
 #pragma once
 
-#    define RGBLED_NUM 4
-//#    define RGBLIGHT_HUE_STEP 8
-//#    define RGBLIGHT_SAT_STEP 8
-//#    define RGBLIGHT_VAL_STEP 8
-//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations 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
-
 /* 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/stello65/sl_rev1/info.json b/keyboards/stello65/sl_rev1/info.json
index 36ae91917167..e89c5a5bdf2c 100644
--- a/keyboards/stello65/sl_rev1/info.json
+++ b/keyboards/stello65/sl_rev1/info.json
@@ -8,6 +8,21 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 4,
+        "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"
     },
diff --git a/keyboards/stratos/config.h b/keyboards/stratos/config.h
deleted file mode 100644
index 0dfaee1d903b..000000000000
--- a/keyboards/stratos/config.h
+++ /dev/null
@@ -1,37 +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
-
-/* RGB LEDs */
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
-#endif
diff --git a/keyboards/stratos/info.json b/keyboards/stratos/info.json
index c44e46a1f90a..e4f6c808fd5d 100644
--- a/keyboards/stratos/info.json
+++ b/keyboards/stratos/info.json
@@ -12,7 +12,23 @@
         "pin": "D2"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "max_brightness": 200,
+        "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": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
diff --git a/keyboards/strech/soulstone/config.h b/keyboards/strech/soulstone/config.h
new file mode 100644
index 000000000000..425546d77eb9
--- /dev/null
+++ b/keyboards/strech/soulstone/config.h
@@ -0,0 +1,24 @@
+/* Copyright 2023 Strech
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should 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 LAYER_INDICATOR_LED_PIN B3
diff --git a/keyboards/strech/soulstone/info.json b/keyboards/strech/soulstone/info.json
new file mode 100644
index 000000000000..53037d1460fb
--- /dev/null
+++ b/keyboards/strech/soulstone/info.json
@@ -0,0 +1,84 @@
+{
+    "keyboard_name": "Soulstone",
+    "maintainer": "Strech",
+    "manufacturer": "Strech",
+    "usb": {
+        "vid": "0xB030",
+        "pid": "0x0001",
+        "device_version": "1.0.0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["B7", "F1", "B0", "F4", "E6", "F0", "D5", "D3", "D2", "D1", "B4", "D7", "D6"],
+        "rows": ["D0", "D4", "B5", "F5"]
+    },
+    "indicators": {
+        "caps_lock": "B1",
+        "num_lock": "B2"
+    },
+    "dynamic_keymap": {
+        "layer_count": 6
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "label": "Esc"},
+                {"matrix": [0, 1], "x": 1, "y": 0, "label": "Q"},
+                {"matrix": [0, 2], "x": 2, "y": 0, "label": "W"},
+                {"matrix": [0, 3], "x": 3, "y": 0, "label": "E"},
+                {"matrix": [0, 4], "x": 4, "y": 0, "label": "R"},
+                {"matrix": [0, 5], "x": 5, "y": 0, "label": "T"},
+                {"matrix": [0, 6], "x": 7, "y": 0, "label": "Y"},
+                {"matrix": [0, 7], "x": 8, "y": 0, "label": "U"},
+                {"matrix": [0, 8], "x": 9, "y": 0, "label": "I"},
+                {"matrix": [0, 9], "x": 10, "y": 0, "label": "O"},
+                {"matrix": [0, 10], "x": 11, "y": 0, "label": "P"},
+                {"matrix": [0, 11], "x": 12, "y": 0, "label": "Del"},
+                {"matrix": [0, 12], "x": 13, "y": 0, "label": "Bspc"},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25, "label": "Tab"},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "label": "A"},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "label": "S"},
+                {"matrix": [1, 3], "x": 3.25, "y": 1, "label": "D"},
+                {"matrix": [1, 4], "x": 4.25, "y": 1, "label": "F"},
+                {"matrix": [1, 5], "x": 5.25, "y": 1, "label": "G"},
+                {"matrix": [1, 6], "x": 7.25, "y": 1, "label": "H"},
+                {"matrix": [1, 7], "x": 8.25, "y": 1, "label": "J"},
+                {"matrix": [1, 8], "x": 9.25, "y": 1, "label": "K"},
+                {"matrix": [1, 9], "x": 10.25, "y": 1, "label": "L"},
+                {"matrix": [1, 10], "x": 11.25, "y": 1, "label": ";"},
+                {"matrix": [1, 12], "x": 12.25, "y": 1, "w": 1.5, "label": "Enter"},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75, "label": "L Shift"},
+                {"matrix": [2, 1], "x": 1.75, "y": 2, "label": "Z"},
+                {"matrix": [2, 2], "x": 2.75, "y": 2, "label": "X"},
+                {"matrix": [2, 3], "x": 3.75, "y": 2, "label": "C"},
+                {"matrix": [2, 4], "x": 4.75, "y": 2, "label": "V"},
+                {"matrix": [2, 5], "x": 5.75, "y": 2, "label": "B"},
+                {"matrix": [2, 6], "x": 6.75, "y": 2, "label": "MO(3)"},
+                {"matrix": [2, 7], "x": 7.75, "y": 2, "label": "N"},
+                {"matrix": [2, 8], "x": 8.75, "y": 2, "label": "M"},
+                {"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, "w": 1.25, "label": "R Shift"},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25, "label": "L Ctrl"},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25, "label": "L Alt"},
+                {"matrix": [3, 3], "x": 3.50, "y": 3, "w": 1.25, "label": "MO(2)"},
+                {"matrix": [3, 4], "x": 4.75, "y": 3, "w": 2, "label": "MO(1)"},
+                {"matrix": [3, 6], "x": 6.75, "y": 3, "w": 2.25, "label": "Space"},
+                {"matrix": [3, 8], "x": 9, "y": 3, "w": 1.25, "label": "R Alt"},
+                {"matrix": [3, 11], "x": 11.50, "y": 3, "w": 1.25, "label": "R GUI"},
+                {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.25, "label": "R Ctrl"}
+            ]
+        }
+    }
+}
diff --git a/keyboards/strech/soulstone/keymaps/default/keymap.c b/keyboards/strech/soulstone/keymaps/default/keymap.c
new file mode 100644
index 000000000000..7dc655b61932
--- /dev/null
+++ b/keyboards/strech/soulstone/keymaps/default/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2023 Strech
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,             KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_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,             MO(3),    KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
+        KC_LCTL,  KC_LALT,                      MO(2),    MO(1),            KC_SPC,   KC_RALT,                                KC_RGUI,  KC_RCTL
+    ),
+    [1] = LAYOUT(
+        KC_GRV,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_MUTE,  KC_VOLD,  KC_VOLU,
+        KC_CAPS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_SCLN,  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_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_TRNS,                                KC_TRNS,  KC_TRNS
+    ),
+    [2] = LAYOUT(
+        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_LNUM,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_P4,    KC_P5,    KC_P6,    KC_LBRC,  KC_RBRC,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_P1,    KC_P2,    KC_P3,    KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,          KC_PENT,  KC_PDOT,                                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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_TRNS,  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/strech/soulstone/keymaps/via/keymap.c b/keyboards/strech/soulstone/keymaps/via/keymap.c
new file mode 100644
index 000000000000..7dc655b61932
--- /dev/null
+++ b/keyboards/strech/soulstone/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2023 Strech
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,             KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_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,             MO(3),    KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
+        KC_LCTL,  KC_LALT,                      MO(2),    MO(1),            KC_SPC,   KC_RALT,                                KC_RGUI,  KC_RCTL
+    ),
+    [1] = LAYOUT(
+        KC_GRV,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_MUTE,  KC_VOLD,  KC_VOLU,
+        KC_CAPS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_SCLN,  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_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_TRNS,                                KC_TRNS,  KC_TRNS
+    ),
+    [2] = LAYOUT(
+        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_LNUM,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_P4,    KC_P5,    KC_P6,    KC_LBRC,  KC_RBRC,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_P1,    KC_P2,    KC_P3,    KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,          KC_PENT,  KC_PDOT,                                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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_TRNS,  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/strech/soulstone/keymaps/via/rules.mk b/keyboards/strech/soulstone/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/strech/soulstone/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/strech/soulstone/readme.md b/keyboards/strech/soulstone/readme.md
new file mode 100644
index 000000000000..07c792f0eb57
--- /dev/null
+++ b/keyboards/strech/soulstone/readme.md
@@ -0,0 +1,30 @@
+# Soulstone
+
+![Soulstone](https://i.imgur.com/aQBsgZ9h.jpg)
+
+A hotswap PCB inspired by an elegant [prime_e](https://www.primekb.com/products/prime_e-rev-2-pcb),
+45% ergo keyboard. It is compatible with `rev2` (RGB and non-RGB) which makes it
+fit to any `rev2` compatible case.
+
+* Keyboard Maintainer: [Strech](https://github.com/Strech)
+* Hardware Supported: Soulstone
+* Hardware Availability: Coming soon
+
+Make example for this keyboard (after setting up your build environment):
+
+    make strech/soulstone:default
+
+Flashing example for this keyboard:
+
+    make strech/soulstone: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 using one of the following methods:
+
+* Tap the Reset switch mounted on the PCB
+* 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/strech/soulstone/rules.mk b/keyboards/strech/soulstone/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/strech/soulstone/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/strech/soulstone/soulstone.c b/keyboards/strech/soulstone/soulstone.c
new file mode 100644
index 000000000000..4a951aff9d26
--- /dev/null
+++ b/keyboards/strech/soulstone/soulstone.c
@@ -0,0 +1,30 @@
+/* Copyright 2023 Strech
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You 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"
+
+// Prepare layer indicator LED
+void keyboard_post_init_kb(void) {
+    setPinOutput(LAYER_INDICATOR_LED_PIN);
+    writePinLow(LAYER_INDICATOR_LED_PIN);
+    keyboard_post_init_user();
+}
+
+// Function for layer indicator LED
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    writePin(LAYER_INDICATOR_LED_PIN, !layer_state_cmp(state, 0));
+    return layer_state_set_user(state);
+}
diff --git a/keyboards/stront/info.json b/keyboards/stront/info.json
index 97df3477af32..c3435b1f5d5e 100644
--- a/keyboards/stront/info.json
+++ b/keyboards/stront/info.json
@@ -94,7 +94,7 @@
         "split_count": [19, 19]
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "led_count": 38,
         "split_count": [19, 19],
         "layout": [
diff --git a/keyboards/studiokestra/bourgeau/config.h b/keyboards/studiokestra/bourgeau/config.h
index 04f426d913f9..91e152a0981e 100644
--- a/keyboards/studiokestra/bourgeau/config.h
+++ b/keyboards/studiokestra/bourgeau/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 24
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations 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
-
 /* 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/studiokestra/bourgeau/info.json b/keyboards/studiokestra/bourgeau/info.json
index 835b0e60a86f..e14cfc9fc4fa 100644
--- a/keyboards/studiokestra/bourgeau/info.json
+++ b/keyboards/studiokestra/bourgeau/info.json
@@ -8,6 +8,24 @@
         "pid": "0x7501",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 24,
+        "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"
     },
diff --git a/keyboards/studiokestra/cascade/config.h b/keyboards/studiokestra/cascade/config.h
index 12337a485d5a..91e152a0981e 100644
--- a/keyboards/studiokestra/cascade/config.h
+++ b/keyboards/studiokestra/cascade/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 16
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/studiokestra/cascade/info.json b/keyboards/studiokestra/cascade/info.json
index 3f48e07c1f6d..823eebad6e9a 100644
--- a/keyboards/studiokestra/cascade/info.json
+++ b/keyboards/studiokestra/cascade/info.json
@@ -8,6 +8,24 @@
         "pid": "0x6001",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "B0"
     },
diff --git a/keyboards/studiokestra/frl84/config.h b/keyboards/studiokestra/frl84/config.h
index df0bf3307b76..70ff15e35cfb 100644
--- a/keyboards/studiokestra/frl84/config.h
+++ b/keyboards/studiokestra/frl84/config.h
@@ -3,21 +3,6 @@
 
 #pragma once
 
-#define RGBLED_NUM 18
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
-
 /* 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/studiokestra/frl84/info.json b/keyboards/studiokestra/frl84/info.json
index af0e34078389..c0b05dec46de 100644
--- a/keyboards/studiokestra/frl84/info.json
+++ b/keyboards/studiokestra/frl84/info.json
@@ -21,7 +21,22 @@
         "pin": "B0"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "max_brightness": 200,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "url": "",
diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json
index 7b29ba6ae9a0..5c1363f750c5 100644
--- a/keyboards/studiokestra/galatea/rev2/info.json
+++ b/keyboards/studiokestra/galatea/rev2/info.json
@@ -49,7 +49,7 @@
             "snake": true,
             "static_gradient": true,
             "twinkle": true
-            }
+        }
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/studiokestra/line_tkl/config.h b/keyboards/studiokestra/line_tkl/config.h
new file mode 100644
index 000000000000..c37d8a5ad28d
--- /dev/null
+++ b/keyboards/studiokestra/line_tkl/config.h
@@ -0,0 +1,9 @@
+// Copyright 2023 studiokestra (@studiokestra)
+// 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
diff --git a/keyboards/studiokestra/line_tkl/info.json b/keyboards/studiokestra/line_tkl/info.json
new file mode 100644
index 000000000000..ba6601a3304d
--- /dev/null
+++ b/keyboards/studiokestra/line_tkl/info.json
@@ -0,0 +1,216 @@
+{
+    "manufacturer": "Studio Kestra",
+    "keyboard_name": "Line TKL",
+    "maintainer": "studiokestra",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 1,
+        "scroll_lock": "D2"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B5", "D5", "D3"],
+        "rows": ["D0", "D1", "B0", "B7", "B3", "E6", "C7", "C6", "B4", "D7", "D6", "D4"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://minokeys.com/collections/line-friends",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x8704",
+        "vid": "0x7C10"
+    },
+    "community_layouts": ["tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift"],
+    "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": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 4], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+                {"matrix": [0, 5], "x": 9.5, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [9, 8], "x": 16.25, "y": 4.25},
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 0], "x": 1.5, "y": 5.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25},
+                {"matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "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": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 4], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+                {"matrix": [0, 5], "x": 9.5, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 6], "x": 14, "y": 4.25},
+                {"matrix": [9, 8], "x": 16.25, "y": 4.25},
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 0], "x": 1.5, "y": 5.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25},
+                {"matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/studiokestra/line_tkl/keymaps/default/keymap.c b/keyboards/studiokestra/line_tkl/keymaps/default/keymap.c
new file mode 100644
index 000000000000..a8dc54ee8706
--- /dev/null
+++ b/keyboards/studiokestra/line_tkl/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+// Copyright 2023 studiokestra (@studiokestra)
+// 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 │ - │ = │ Bcksp │ │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 │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐
+     * │Ctrl │GUI│Alt  │                           │  Alt│GUI│ Ctrl│ │ ← │ ↓ │ → │
+     * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
+     */
+
+    [0] = LAYOUT_tkl_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_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,                        KC_LEFT, KC_DOWN, KC_RIGHT ),
+
+    [1] = LAYOUT_tkl_ansi_tsangan(
+    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 ),
+};
diff --git a/keyboards/studiokestra/line_tkl/keymaps/split_bs_rshift/keymap.c b/keyboards/studiokestra/line_tkl/keymaps/split_bs_rshift/keymap.c
new file mode 100644
index 000000000000..595ed5d03cc5
--- /dev/null
+++ b/keyboards/studiokestra/line_tkl/keymaps/split_bs_rshift/keymap.c
@@ -0,0 +1,39 @@
+// Copyright 2023 studiokestra (@studiokestra)
+// 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 │ - │ = │LBk│RBk│ │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 │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Mo1│     │ ↑ │
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐
+     * │Ctrl │GUI│Alt  │                           │  Alt│GUI│ Ctrl│ │ ← │ ↓ │ → │
+     * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
+     */
+
+    [0] = LAYOUT_tkl_ansi_tsangan_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_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_RIGHT ),
+
+    [1] = LAYOUT_tkl_ansi_tsangan_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                       
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/studiokestra/line_tkl/keymaps/via/keymap.c b/keyboards/studiokestra/line_tkl/keymaps/via/keymap.c
new file mode 100644
index 000000000000..595ed5d03cc5
--- /dev/null
+++ b/keyboards/studiokestra/line_tkl/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+// Copyright 2023 studiokestra (@studiokestra)
+// 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 │ - │ = │LBk│RBk│ │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 │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Mo1│     │ ↑ │
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐
+     * │Ctrl │GUI│Alt  │                           │  Alt│GUI│ Ctrl│ │ ← │ ↓ │ → │
+     * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
+     */
+
+    [0] = LAYOUT_tkl_ansi_tsangan_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_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_RIGHT ),
+
+    [1] = LAYOUT_tkl_ansi_tsangan_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                       
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/studiokestra/line_tkl/keymaps/via/rules.mk b/keyboards/studiokestra/line_tkl/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/studiokestra/line_tkl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/studiokestra/line_tkl/readme.md b/keyboards/studiokestra/line_tkl/readme.md
new file mode 100644
index 000000000000..a5d7ae0c4143
--- /dev/null
+++ b/keyboards/studiokestra/line_tkl/readme.md
@@ -0,0 +1,27 @@
+# studiokestra/line_tkl
+
+![studiokestra/line_tkl](https://i.imgur.com/3MmRQkh.png)
+
+PCB developed for Mino Keys in collaboration with Line Friends (C).
+
+* Keyboard Maintainer: [Studio Kestra](https://github.com/studiokestra/)
+* Hardware Supported: Line TKL
+* Hardware Availability: https://minokeys.com/collections/line-friends
+
+Make example for this keyboard (after setting up your build environment):
+
+    make studiokestra/line_tkl:default
+
+Flashing example for this keyboard:
+
+    make studiokestra/line_tkl: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/studiokestra/line_tkl/rules.mk b/keyboards/studiokestra/line_tkl/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/studiokestra/line_tkl/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/suavity/ehan/rules.mk b/keyboards/suavity/ehan/rules.mk
index e7b278b4b23a..5a44d1732f83 100644
--- a/keyboards/suavity/ehan/rules.mk
+++ b/keyboards/suavity/ehan/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 
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/subrezon/la_nc/keymaps/default/rules.mk b/keyboards/subrezon/la_nc/keymaps/default/rules.mk
index b7c57d87b9ed..9f00574d5d01 100644
--- a/keyboards/subrezon/la_nc/keymaps/default/rules.mk
+++ b/keyboards/subrezon/la_nc/keymaps/default/rules.mk
@@ -1,3 +1,2 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 LTO_ENABLE = yes
diff --git a/keyboards/subrezon/lancer/info.json b/keyboards/subrezon/lancer/info.json
new file mode 100644
index 000000000000..cf678c84bc35
--- /dev/null
+++ b/keyboards/subrezon/lancer/info.json
@@ -0,0 +1,65 @@
+{
+    "keyboard_name": "lancer",
+    "url": "https://github.com/subrezon/lancer",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1A7D",
+        "device_version": "1.0.0"
+    },
+    "development_board": "promicro",
+    "matrix_pins": { 
+        "rows": ["F5", "D4", "B3", "B6", "B5"],
+        "cols": ["F4", "F6", "F7", "B1", "B2", "B4", "E6", "D7", "C6", "D2"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": 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": [1, 5], "x": 6,   "y": 0},
+                { "label": "U",     "matrix": [1, 6], "x": 7,   "y": 0},
+                { "label": "I",     "matrix": [1, 7], "x": 8,   "y": 0},
+                { "label": "O",     "matrix": [1, 8], "x": 9,   "y": 0},
+                { "label": "P",     "matrix": [1, 9], "x": 10,  "y": 0},
+                { "label": "A",     "matrix": [2, 0], "x": 0,   "y": 1},
+                { "label": "S",     "matrix": [2, 1], "x": 1,   "y": 1},
+                { "label": "D",     "matrix": [2, 2], "x": 2,   "y": 1},
+                { "label": "F",     "matrix": [2, 3], "x": 3,   "y": 1},
+                { "label": "G",     "matrix": [2, 4], "x": 4,   "y": 1},
+                { "label": "H",     "matrix": [2, 5], "x": 6,   "y": 1},
+                { "label": "J",     "matrix": [2, 6], "x": 7,   "y": 1},
+                { "label": "K",     "matrix": [2, 7], "x": 8,   "y": 1},
+                { "label": "L",     "matrix": [2, 8], "x": 9,   "y": 1},
+                { "label": ";",     "matrix": [2, 9], "x": 10,  "y": 1},
+                { "label": "Z",     "matrix": [3, 0], "x": 0,   "y": 2},
+                { "label": "X",     "matrix": [3, 1], "x": 1,   "y": 2},
+                { "label": "C",     "matrix": [3, 2], "x": 2,   "y": 2},
+                { "label": "V",     "matrix": [3, 3], "x": 3,   "y": 2},
+                { "label": "B",     "matrix": [3, 4], "x": 4,   "y": 2},
+                { "label": "N",     "matrix": [3, 5], "x": 6,   "y": 2},
+                { "label": "M",     "matrix": [3, 6], "x": 7,   "y": 2},
+                { "label": ",",     "matrix": [3, 7], "x": 8,   "y": 2},
+                { "label": ".",     "matrix": [3, 8], "x": 9,   "y": 2},
+                { "label": "Enter", "matrix": [3, 9], "x": 10,  "y": 2},
+                { "label": "Ctrl",  "matrix": [4, 2], "x": 2.5, "y": 3},
+                { "label": "Lower", "matrix": [4, 3], "x": 3.5, "y": 3},
+                { "label": "",      "matrix": [4, 4], "x": 4.5, "y": 3},
+                { "label": "Bksp",  "matrix": [4, 5], "x": 5.5, "y": 3},
+                { "label": "Shift", "matrix": [4, 6], "x": 6.5, "y": 3},
+                { "label": "Raise", "matrix": [4, 7], "x": 7.5, "y": 3}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/subrezon/lancer/keymaps/default/keymap.json b/keyboards/subrezon/lancer/keymaps/default/keymap.json
new file mode 100644
index 000000000000..b25e81d53830
--- /dev/null
+++ b/keyboards/subrezon/lancer/keymaps/default/keymap.json
@@ -0,0 +1,33 @@
+{
+    "version": 1,
+    "notes": "default keymap",
+    "keyboard": "subrezon/lancer",
+    "keymap": "default",
+    "layout": "LAYOUT",
+    "layers": [
+        [
+               "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_ENT",
+                                  "KC_LCTL",   "MO(1)",  "KC_SPC", "KC_BSPC", "KC_LSFT",   "MO(2)"
+        ],
+        [
+             "KC_TAB",    "KC_7",    "KC_8",    "KC_9",  "KC_GRV", "KC_MPRV", "KC_PGUP",   "KC_UP", "KC_PGDN", "KC_DEL",
+             "KC_ESC",    "KC_4",    "KC_5",    "KC_6",    "KC_0", "KC_MPLY", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_RSFT",
+            "KC_LALT",    "KC_1",    "KC_2",    "KC_3", "KC_TILD", "KC_MNXT", "KC_HOME",  "KC_INS",  "KC_END", "KC_RALT",
+                                  "KC_LCTL", "_______",  "KC_SPC", "KC_BSPC", "KC_LGUI",   "MO(3)"
+        ],
+        [
+             "KC_TAB", "KC_AMPR", "KC_ASTR", "KC_BSLS", "KC_LBRC", "KC_RBRC", "KC_UNDS", "KC_PLUS", "KC_DQUO",  "KC_DEL",
+             "KC_ESC",  "KC_DLR", "KC_PERC", "KC_CIRC", "KC_LPRN", "KC_RPRN", "KC_MINS", "KC_EQL",  "KC_QUOT", "KC_SLSH",
+            "KC_LALT", "KC_EXLM",   "KC_AT", "KC_HASH", "KC_LCBR", "KC_RCBR", "KC_PIPE", "KC_SCLN", "KC_COLN", "KC_QUES",
+                                  "KC_LCTL",   "MO(3)",  "KC_SPC", "KC_BSPC", "KC_LSFT", "_______"
+        ],
+        [
+            "QK_BOOT",   "KC_F7",   "KC_F8",   "KC_F9",  "KC_F12", "KC_PSCR", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",
+            "KC_CAPS",   "KC_F4",   "KC_F5",   "KC_F6",  "KC_F11", "KC_SCRL", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",
+            "XXXXXXX",   "KC_F1",   "KC_F2",   "KC_F3",  "KC_F10", "KC_PAUS", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",
+                                  "XXXXXXX", "_______", "XXXXXXX", "XXXXXXX", "XXXXXXX", "_______"
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/keyboards/subrezon/lancer/readme.md b/keyboards/subrezon/lancer/readme.md
new file mode 100644
index 000000000000..99bf79b38b15
--- /dev/null
+++ b/keyboards/subrezon/lancer/readme.md
@@ -0,0 +1,27 @@
+# subrezon/lancer
+
+The [Lancer](https://github.com/subrezon/lancer) is a 36-key ortholinear keyboard with a light split and a focus on compact footprint and portability. It is a direct successor to [la_nc](https://github.com/subrezon/la_nc), and is very much inspired by other keyboards like Planck, Lumberjack and Lesovoz. Powered by a Pro Micro compatible MCU board and featuring battery and nice!view support, it offers a simple and productive typing experience, both with and without the wire.
+
+![subrezon/lancer](https://i.imgur.com/W41Vx4rh.jpg)
+
+* Keyboard Maintainer: [Daniel Osipishin](https://github.com/subrezon)
+* Hardware Supported: Lancer PCB, with a ProMicro or other compatible MCU board
+* Hardware Availability: https://github.com/subrezon/lancer
+
+Make example for this keyboard (after setting up your build environment):
+
+    make subrezon/lancer:default
+
+Flashing example for this keyboard:
+
+    make subrezon/lancer: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/subrezon/lancer/rules.mk b/keyboards/subrezon/lancer/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/subrezon/lancer/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/swiftrax/retropad/config.h b/keyboards/swiftrax/retropad/config.h
index b737022959db..092f2ba0e990 100644
--- a/keyboards/swiftrax/retropad/config.h
+++ b/keyboards/swiftrax/retropad/config.h
@@ -17,20 +17,5 @@ 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 RGBLED_NUM 6
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /*EEPROM for via*/
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json
index 57ce8bd79e47..8d6431fdde02 100644
--- a/keyboards/swiftrax/retropad/info.json
+++ b/keyboards/swiftrax/retropad/info.json
@@ -21,6 +21,23 @@
     "bootmagic": {
         "matrix": [1, 0]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "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"
     },
diff --git a/keyboards/switchplate/southpaw_65/config.h b/keyboards/switchplate/southpaw_65/config.h
index 790d70d9c814..8fe96fc5dd33 100644
--- a/keyboards/switchplate/southpaw_65/config.h
+++ b/keyboards/switchplate/southpaw_65/config.h
@@ -21,18 +21,6 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 19
 
-#define RGBLED_NUM 9
-#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
-
 /* 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/switchplate/southpaw_65/info.json b/keyboards/switchplate/southpaw_65/info.json
index 245b3ab02a74..19d08ee61a5d 100644
--- a/keyboards/switchplate/southpaw_65/info.json
+++ b/keyboards/switchplate/southpaw_65/info.json
@@ -12,6 +12,21 @@
         "pin": "B5",
         "levels": 10
     },
+    "rgblight": {
+        "led_count": 9,
+        "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": "C7"
     },
diff --git a/keyboards/syenakeyboards/aswagata/info.json b/keyboards/syenakeyboards/aswagata/info.json
new file mode 100644
index 000000000000..1f2cf798bb7b
--- /dev/null
+++ b/keyboards/syenakeyboards/aswagata/info.json
@@ -0,0 +1,36 @@
+{
+    "manufacturer": "Syenasweta",
+    "keyboard_name": "SyenaKeyboards Aswagata",
+    "maintainer": "syenasweta",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP20", "GP21"],
+        "rows": ["GP10", "GP11"]
+    },
+    "processor": "RP2040",
+    "url": "https://github.com/syenasweta/syenakeyboards",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x4173",
+        "vid": "0x5373"
+    }
+    "layouts": {
+        "LAYOUT_ortho_2x2": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/syenakeyboards/aswagata/keymaps/default/keymap.c b/keyboards/syenakeyboards/aswagata/keymaps/default/keymap.c
new file mode 100644
index 000000000000..48bdb8ffb4fb
--- /dev/null
+++ b/keyboards/syenakeyboards/aswagata/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_ortho_2x2(
+        KC_COPY,    KC_PASTE,
+        KC_SELECT,  KC_CUT
+    )
+};
diff --git a/keyboards/syenakeyboards/aswagata/keymaps/via/keymap.c b/keyboards/syenakeyboards/aswagata/keymaps/via/keymap.c
new file mode 100644
index 000000000000..4dd47067440b
--- /dev/null
+++ b/keyboards/syenakeyboards/aswagata/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_ortho_2x2(
+        KC_COPY,    KC_PASTE,
+        KC_SELECT,  KC_CUT
+    )
+};
\ No newline at end of file
diff --git a/keyboards/syenakeyboards/aswagata/keymaps/via/rules.mk b/keyboards/syenakeyboards/aswagata/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/syenakeyboards/aswagata/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/syenakeyboards/aswagata/readme.md b/keyboards/syenakeyboards/aswagata/readme.md
new file mode 100644
index 000000000000..5b9673d96f31
--- /dev/null
+++ b/keyboards/syenakeyboards/aswagata/readme.md
@@ -0,0 +1,25 @@
+# SyenaKeyboards Aswagata
+
+![SyenaKeyboards Aswagata](https://i.imgur.com/JMiFegah.jpg)
+
+Aswagata is a macropad with four buttons. The default functions are `copy`, `paste`, `cut`, and `select` for Linux, but can be customized.
+
+* Keyboard Maintainer: [Syenasweta](https://github.com/syenasweta)
+* Hardware Supported: RP2040
+* Hardware Availability: [Tokopedia (Syenasweta)](https://tokopedia.link/gDJ6Rgp4xDb)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make syenakeyboards/aswagata:default
+
+Flashing example for this keyboard:
+
+    make syenakeyboards/aswagata: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 ways:
+
+* **Bootmagic reset**: Hold down the top left key (assigned to `copy` by default) and plug in the keyboard.
diff --git a/keyboards/syenakeyboards/aswagata/rules.mk b/keyboards/syenakeyboards/aswagata/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/syenakeyboards/aswagata/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/synthlabs/060/config.h b/keyboards/synthlabs/060/config.h
index 1870286c810c..4a475316edea 100644
--- a/keyboards/synthlabs/060/config.h
+++ b/keyboards/synthlabs/060/config.h
@@ -31,8 +31,8 @@
 #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
+// #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
diff --git a/keyboards/synthlabs/060/info.json b/keyboards/synthlabs/060/info.json
index 1953af10e7bd..b816b18027b9 100644
--- a/keyboards/synthlabs/060/info.json
+++ b/keyboards/synthlabs/060/info.json
@@ -30,7 +30,7 @@
     "force_nkro": true
   },
   "rgb_matrix": {
-    "driver": "WS2812",
+    "driver": "ws2812",
     "layout": [
         {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
         {"flags": 4, "matrix": [0, 1], "x": 16, "y": 0},
diff --git a/keyboards/synthlabs/solo/config.h b/keyboards/synthlabs/solo/config.h
index 71170a12cea6..779b85a7c334 100644
--- a/keyboards/synthlabs/solo/config.h
+++ b/keyboards/synthlabs/solo/config.h
@@ -3,9 +3,6 @@
 
 #pragma once
 
-#define ENCODERS_CW_KEY { { 2, 1 } }
-#define ENCODERS_CCW_KEY { { 0, 1 } }
-
 #define JOYSTICK_BUTTON_COUNT 13
 #define JOYSTICK_AXIS_COUNT 1
 #define JOYSTICK_AXIS_RESOLUTION 16
diff --git a/keyboards/synthlabs/solo/info.json b/keyboards/synthlabs/solo/info.json
index 168d2d06dc22..613ace72657e 100644
--- a/keyboards/synthlabs/solo/info.json
+++ b/keyboards/synthlabs/solo/info.json
@@ -29,41 +29,33 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label": "P2 1", "x": 3, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 0]},
-                {"label": "P1 2", "x": 3.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 1]},
-                {"label": "P2 3", "x": 4, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 2]},
-                {"label": "P1 4", "x": 4.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 3]},
-                {"label": "P2 5", "x": 5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 4]},
-                {"label": "P1 6", "x": 5.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 5]},
-                {"label": "P2 7", "x": 6, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 6]},
-
-                {"label": "Knob CCW", "x": 0, "y": 1.25, "w": 0.5, "matrix": [1, 0]},
-                {"label": "Knob Press", "x": 0.5, "y": 1, "w": 1.5, "h": 1.5, "matrix": [1, 1]},
-                {"label": "Knob CW", "x": 2, "y": 1.25, "w": 0.5, "matrix": [1, 2]},
-
-                {"label": "P1 1", "x": 3, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 0]},
-                {"label": "P2 2", "x": 3.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 1]},
-                {"label": "P1 3", "x": 4, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 2]},
-                {"label": "P2 4", "x": 4.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 3]},
-                {"label": "P1 5", "x": 5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 4]},
-                {"label": "P2 6", "x": 5.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 5]},
-                {"label": "P1 7", "x": 6, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 6]}
+                {"label": "P2 1", "x": 2.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 0]},
+                {"label": "P1 2", "x": 3, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 1]},
+                {"label": "P2 3", "x": 3.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 2]},
+                {"label": "P1 4", "x": 4, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 3]},
+                {"label": "P2 5", "x": 4.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 4]},
+                {"label": "P1 6", "x": 5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 5]},
+                {"label": "P2 7", "x": 5.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 6]},
+                {"label":"Knob Press", "x":0, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]},
+                {"label": "P1 1", "x": 2.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 0]},
+                {"label": "P2 2", "x": 3, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 1]},
+                {"label": "P1 3", "x": 3.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 2]},
+                {"label": "P2 4", "x": 4, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 3]},
+                {"label": "P1 5", "x": 4.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 4]},
+                {"label": "P2 6", "x": 5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 5]},
+                {"label": "P1 7", "x": 5.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 6]}
             ]
         },
         "LAYOUT_left": {
             "layout": [
-                {"label": "P1 2", "x": 3.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 1]},
-                {"label": "P1 4", "x": 4.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 3]},
-                {"label": "P1 6", "x": 5.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 5]},
-
-                {"label": "Knob CCW", "x": 0, "y": 1.25, "w": 0.5, "matrix": [1, 0]},
-                {"label": "Knob Press", "x": 0.5, "y": 1, "w": 1.5, "h": 1.5, "matrix": [1, 1]},
-                {"label": "Knob CW", "x": 2, "y": 1.25, "w": 0.5, "matrix": [1, 2]},
-
-                {"label": "P1 1", "x": 3, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 0]},
-                {"label": "P1 3", "x": 4, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 2]},
-                {"label": "P1 5", "x": 5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 4]},
-                {"label": "P1 7", "x": 6, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 6]}
+                {"label": "P1 2", "x": 3, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 1]},
+                {"label": "P1 4", "x": 4, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 3]},
+                {"label": "P1 6", "x": 5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 5]},
+                {"label":"Knob Press", "x":0, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]},
+                {"label": "P1 1", "x": 2.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 0]},
+                {"label": "P1 3", "x": 3.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 2]},
+                {"label": "P1 5", "x": 4.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 4]},
+                {"label": "P1 7", "x": 5.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 6]}
             ]
         },
         "LAYOUT_right": {
@@ -71,11 +63,7 @@
                 {"label": "P2 6", "x": 0.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [2, 5]},
                 {"label": "P2 4", "x": 1.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [2, 3]},
                 {"label": "P2 2", "x": 2.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [2, 1]},
-
-                {"label": "Knob CCW", "x": 4, "y": 1.25, "w": 0.5, "matrix": [1, 0]},
-                {"label": "Knob Press", "x": 4.5, "y": 1, "w": 1.5, "h": 1.5, "matrix": [1, 1]},
-                {"label": "Knob CW", "x": 6, "y": 1.25, "w": 0.5, "matrix": [1, 2]},
-
+                {"label":"Knob Press", "x":4.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]},
                 {"label": "P2 7", "x": 0, "y": 2, "w": 0.5, "h": 1.5, "matrix": [0, 6]},
                 {"label": "P2 5", "x": 1, "y": 2, "w": 0.5, "h": 1.5, "matrix": [0, 4]},
                 {"label": "P2 3", "x": 2, "y": 2, "w": 0.5, "h": 1.5, "matrix": [0, 2]},
diff --git a/keyboards/synthlabs/solo/keymaps/default/keymap.c b/keyboards/synthlabs/solo/keymaps/default/keymap.c
index fa54111fe86b..2d7313b77e06 100644
--- a/keyboards/synthlabs/solo/keymaps/default/keymap.c
+++ b/keyboards/synthlabs/solo/keymaps/default/keymap.c
@@ -6,7 +6,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
                                        KC_J,    KC_U,    KC_K,    KC_I,    KC_L,    KC_O, KC_SCLN,
-        _______, KC_MUTE, _______,
+        KC_MUTE,
                                        KC_J,    KC_U,    KC_K,    KC_I,    KC_L,    KC_O, KC_SCLN
     )
 };
diff --git a/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c b/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
index f450769b432b..7bafe6b191c7 100644
--- a/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
+++ b/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
@@ -6,7 +6,7 @@
 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,
-          KC_NO,   JS_7,  KC_NO,
+        JS_7,
                                     JS_0,JS_1,JS_2,JS_3,JS_4,JS_5,JS_6
     )
 };
diff --git a/keyboards/synthlabs/solo/keymaps/via/keymap.c b/keyboards/synthlabs/solo/keymaps/via/keymap.c
index 84f99df9abbd..8f107f8a1046 100644
--- a/keyboards/synthlabs/solo/keymaps/via/keymap.c
+++ b/keyboards/synthlabs/solo/keymaps/via/keymap.c
@@ -6,64 +6,31 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
                                        KC_J,    KC_U,    KC_K,    KC_I,    KC_L,    KC_O, KC_SCLN,
-        KC_VOLD, KC_MUTE, KC_VOLU,
+        KC_MUTE,
                                        KC_J,    KC_U,    KC_K,    KC_I,    KC_L,    KC_O, KC_SCLN
     ),
     [1] = LAYOUT_all(
                                     _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,
+        _______,
                                     _______, _______, _______, _______, _______, _______, _______
     ),
     [2] = LAYOUT_all(
                                     _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,
+        _______,
                                     _______, _______, _______, _______, _______, _______, _______
     ),
     [3] = LAYOUT_all(
                                     _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,
+        _______,
                                     _______, _______, _______, _______, _______, _______, _______
     )
 };
 
-#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
-static uint8_t encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    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] = {
+    [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/synthlabs/solo/keymaps/via/rules.mk b/keyboards/synthlabs/solo/keymaps/via/rules.mk
index 1e5b99807cb7..f1adcab005e8 100644
--- a/keyboards/synthlabs/solo/keymaps/via/rules.mk
+++ b/keyboards/synthlabs/solo/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/synthlabs/solo/solo.c b/keyboards/synthlabs/solo/solo.c
deleted file mode 100644
index aca82c9ea389..000000000000
--- a/keyboards/synthlabs/solo/solo.c
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2022 Aaron Hong (@hongaaronc)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "quantum.h"
-
-#if !defined(VIA_ENABLE) && !defined(JOYSTICK_ENABLE) && defined(ENCODER_ENABLE)
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json
index 21a8c1fbd937..eba3a115b8bd 100644
--- a/keyboards/system76/launch_1/info.json
+++ b/keyboards/system76/launch_1/info.json
@@ -11,7 +11,7 @@
         "pin": "E2"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["D7", "C7", "C6", "B6", "B5", "B4", "D6", "D4", "E6", "D5", "D3", "D2", "B7", "B0"],
diff --git a/keyboards/system76/launch_1/rgb_matrix_kb.inc b/keyboards/system76/launch_1/rgb_matrix_kb.inc
index 02de10ed500e..f29183dde0e2 100644
--- a/keyboards/system76/launch_1/rgb_matrix_kb.inc
+++ b/keyboards/system76/launch_1/rgb_matrix_kb.inc
@@ -22,6 +22,7 @@ RGB_MATRIX_EFFECT(unlocked)
 #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
 #include "dynamic_keymap.h"
+#include "action_layer.h"
 
 static bool active_keys_initialized = false;
 static uint8_t active_keys_table[RGB_MATRIX_LED_COUNT] = {0};
diff --git a/keyboards/system76/system76_ec.c b/keyboards/system76/system76_ec.c
index 63016590723f..1b7955e19bf4 100644
--- a/keyboards/system76/system76_ec.c
+++ b/keyboards/system76/system76_ec.c
@@ -22,6 +22,12 @@
 #include "raw_hid.h"
 #include "rgb_matrix.h"
 #include "version.h"
+#include "keyboard.h"
+#include "eeprom.h"
+#include "matrix.h"
+#include "action_layer.h"
+#include "bootloader.h"
+#include "wait.h"
 
 enum Command {
     CMD_PROBE         = 1,   // Probe for System76 EC protocol
diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h
index 83952009e564..7b4e38bd9643 100644
--- a/keyboards/takashicompany/center_enter/config.h
+++ b/keyboards/takashicompany/center_enter/config.h
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 6
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/takashicompany/center_enter/info.json b/keyboards/takashicompany/center_enter/info.json
index 3521b2421816..77c9410723ef 100644
--- a/keyboards/takashicompany/center_enter/info.json
+++ b/keyboards/takashicompany/center_enter/info.json
@@ -8,6 +8,23 @@
         "pid": "0x0012",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h
index 07287712f3b6..7b4e38bd9643 100644
--- a/keyboards/takashicompany/compacx/config.h
+++ b/keyboards/takashicompany/compacx/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 12
-#    define RGBLED_SPLIT {6, 6}
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json
index 2e7ef2f7a643..ba90f9fdd7d0 100644
--- a/keyboards/takashicompany/compacx/info.json
+++ b/keyboards/takashicompany/compacx/info.json
@@ -8,6 +8,25 @@
         "pid": "0x0014",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "sleep": true,
+        "split_count": [6, 6],
+        "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": "D3"
     },
diff --git a/keyboards/takashicompany/dogtag/dogtag.c b/keyboards/takashicompany/dogtag/dogtag.c
deleted file mode 100644
index 0ca5f7c3e897..000000000000
--- a/keyboards/takashicompany/dogtag/dogtag.c
+++ /dev/null
@@ -1,48 +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 "quantum.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    keypos_t key;
-    if (index == 0) {
-        if (clockwise) {
-            key.row = 2;
-            key.col = 1;
-        } else {
-            key.row = 2;
-            key.col = 0;
-        }
-        uint8_t layer = layer_switch_get_layer(key);
-        uint16_t keycode = keymap_key_to_keycode(layer, key);
-
-        tap_code16(keycode);
-    } else {
-        if (clockwise) {
-            key.row = 5;
-            key.col = 0;
-        } else {
-            key.row = 5;
-            key.col = 1;
-        }
-        uint8_t  layer   = layer_switch_get_layer(key);
-        uint16_t keycode = keymap_key_to_keycode(layer, key);
-
-        tap_code16(keycode);
-    }
-
-    return true;
-}
diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/info.json
index 6827375d8401..d65092ecca2b 100644
--- a/keyboards/takashicompany/dogtag/info.json
+++ b/keyboards/takashicompany/dogtag/info.json
@@ -80,13 +80,7 @@
                 {"matrix": [4, 1], "x": 8, "y": 1},
                 {"matrix": [4, 2], "x": 9, "y": 1},
                 {"matrix": [4, 3], "x": 10, "y": 1},
-                {"matrix": [4, 4], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 3.5, "y": 3.25},
-                {"matrix": [2, 1], "x": 4.5, "y": 3.25},
-
-                {"matrix": [5, 0], "x": 6.5, "y": 3.25},
-                {"matrix": [5, 1], "x": 7.5, "y": 3.25}
+                {"matrix": [4, 4], "x": 11, "y": 1}
             ]
         }
     }
diff --git a/keyboards/takashicompany/dogtag/keymaps/default/keymap.c b/keyboards/takashicompany/dogtag/keymaps/default/keymap.c
index 865e6a2290cc..8eb6b433b3a9 100644
--- a/keyboards/takashicompany/dogtag/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/dogtag/keymaps/default/keymap.c
@@ -16,15 +16,20 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    LAYOUT(
+    [0] = LAYOUT(
         LT(1, KC_ESC), KC_Q, KC_W, KC_E,                 KC_Y, KC_U, KC_I, KC_O,
-        KC_LSFT,       KC_A, KC_S, KC_D, KC_SPC, KC_TAB, KC_H, KC_J, KC_K, KC_L,
-        KC_WH_U, KC_WH_D, KC_WH_U, KC_WH_D
+        KC_LSFT,       KC_A, KC_S, KC_D, KC_SPC, KC_TAB, KC_H, KC_J, KC_K, KC_L
     ),
 
-    LAYOUT(
+    [1] = LAYOUT(
         KC_TRNS, RGB_MOD, RGB_HUI, RGB_SAI,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_M_P, RGB_M_K, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_WH_L, KC_WH_R, KC_WH_L, KC_WH_R
+        KC_TRNS, RGB_M_P, RGB_M_K, RGB_TOG, 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_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
+#endif
diff --git a/keyboards/takashicompany/dogtag/keymaps/default/rules.mk b/keyboards/takashicompany/dogtag/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/takashicompany/dogtag/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/takashicompany/dogtag/keymaps/via/keymap.c b/keyboards/takashicompany/dogtag/keymaps/via/keymap.c
index 865e6a2290cc..969aec92a596 100644
--- a/keyboards/takashicompany/dogtag/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/dogtag/keymaps/via/keymap.c
@@ -18,13 +18,18 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     LAYOUT(
         LT(1, KC_ESC), KC_Q, KC_W, KC_E,                 KC_Y, KC_U, KC_I, KC_O,
-        KC_LSFT,       KC_A, KC_S, KC_D, KC_SPC, KC_TAB, KC_H, KC_J, KC_K, KC_L,
-        KC_WH_U, KC_WH_D, KC_WH_U, KC_WH_D
+        KC_LSFT,       KC_A, KC_S, KC_D, KC_SPC, KC_TAB, KC_H, KC_J, KC_K, KC_L
     ),
 
     LAYOUT(
         KC_TRNS, RGB_MOD, RGB_HUI, RGB_SAI,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_M_P, RGB_M_K, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_WH_L, KC_WH_R, KC_WH_L, KC_WH_R
+        KC_TRNS, RGB_M_P, RGB_M_K, RGB_TOG, 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_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
+#endif
diff --git a/keyboards/takashicompany/dogtag/keymaps/via/rules.mk b/keyboards/takashicompany/dogtag/keymaps/via/rules.mk
index 36b7ba9cbc98..1189f4ad1927 100644
--- a/keyboards/takashicompany/dogtag/keymaps/via/rules.mk
+++ b/keyboards/takashicompany/dogtag/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/takashicompany/endzone34/config.h b/keyboards/takashicompany/endzone34/config.h
index ccd72051a7fc..7b4e38bd9643 100644
--- a/keyboards/takashicompany/endzone34/config.h
+++ b/keyboards/takashicompany/endzone34/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-    #define RGBLED_NUM 9
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations 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
-
 /* 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/takashicompany/endzone34/info.json b/keyboards/takashicompany/endzone34/info.json
index 8eb5b4dd5710..8e6f6c29e430 100644
--- a/keyboards/takashicompany/endzone34/info.json
+++ b/keyboards/takashicompany/endzone34/info.json
@@ -8,6 +8,24 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 9,
+        "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": "D3"
     },
diff --git a/keyboards/takashicompany/endzone34/rules.mk b/keyboards/takashicompany/endzone34/rules.mk
index f8fbdec9bda3..e6ed3b4b034b 100644
--- a/keyboards/takashicompany/endzone34/rules.mk
+++ b/keyboards/takashicompany/endzone34/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/takashicompany/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h
index df15f55f728a..c7f1d860ee63 100644
--- a/keyboards/takashicompany/heavy_left/config.h
+++ b/keyboards/takashicompany/heavy_left/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 6 * 2
-#    define RGBLED_SPLIT {6, 6}
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/info.json
index 1afa2b1280f5..a13f15cb4a41 100644
--- a/keyboards/takashicompany/heavy_left/info.json
+++ b/keyboards/takashicompany/heavy_left/info.json
@@ -8,6 +8,25 @@
         "pid": "0x0015",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "sleep": true,
+        "split_count": [6, 6],
+        "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": "D3"
     },
diff --git a/keyboards/takashicompany/minizone/config.h b/keyboards/takashicompany/minizone/config.h
index 2c494ea329fd..5665732b0429 100644
--- a/keyboards/takashicompany/minizone/config.h
+++ b/keyboards/takashicompany/minizone/config.h
@@ -3,21 +3,6 @@
 
 #pragma once
 
-#    define RGBLED_NUM 11
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/info.json
index 806a255bcb4a..911b924cfc58 100644
--- a/keyboards/takashicompany/minizone/info.json
+++ b/keyboards/takashicompany/minizone/info.json
@@ -8,6 +8,21 @@
         "pid": "0x0021",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 11,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/takashicompany/minizone/rules.mk b/keyboards/takashicompany/minizone/rules.mk
index 60c7bb59b5e0..e6ed3b4b034b 100644
--- a/keyboards/takashicompany/minizone/rules.mk
+++ b/keyboards/takashicompany/minizone/rules.mk
@@ -10,6 +10,4 @@ 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
-OLED_DRIVER = SSD1306
\ No newline at end of file
diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h
index 83952009e564..7b4e38bd9643 100644
--- a/keyboards/takashicompany/qoolee/config.h
+++ b/keyboards/takashicompany/qoolee/config.h
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 6
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/takashicompany/qoolee/info.json b/keyboards/takashicompany/qoolee/info.json
index c9aacaabc2b5..d4068189b3c7 100644
--- a/keyboards/takashicompany/qoolee/info.json
+++ b/keyboards/takashicompany/qoolee/info.json
@@ -8,6 +8,23 @@
         "pid": "0x0013",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h
index 34ab4a1239c9..7b4e38bd9643 100644
--- a/keyboards/takashicompany/radialex/config.h
+++ b/keyboards/takashicompany/radialex/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 12
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/takashicompany/radialex/info.json b/keyboards/takashicompany/radialex/info.json
index d6852033b1f7..e334d2c16ca2 100644
--- a/keyboards/takashicompany/radialex/info.json
+++ b/keyboards/takashicompany/radialex/info.json
@@ -8,6 +8,24 @@
         "pid": "0x0019",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "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": "D3"
     },
diff --git a/keyboards/takashicompany/spreadwriter/info.json b/keyboards/takashicompany/spreadwriter/info.json
index 1ab624ebcd27..da5a95b89573 100644
--- a/keyboards/takashicompany/spreadwriter/info.json
+++ b/keyboards/takashicompany/spreadwriter/info.json
@@ -105,9 +105,7 @@
                 {"matrix": [7, 3], "x": 12, "y": 3},
                 {"matrix": [7, 4], "x": 13, "y": 3.25},
                 {"matrix": [7, 5], "x": 14, "y": 3.5},
-                {"matrix": [7, 6], "x": 15, "y": 3.5},
-                {"matrix": [0, 6], "x": 7, "y": 4.25},
-                {"matrix": [4, 0], "x": 8, "y": 4.25}
+                {"matrix": [7, 6], "x": 15, "y": 3.5}
             ]
         }
     }
diff --git a/keyboards/takashicompany/spreadwriter/keymaps/default/keymap.c b/keyboards/takashicompany/spreadwriter/keymaps/default/keymap.c
index f0ac6aa00b42..fb74b6ee307e 100644
--- a/keyboards/takashicompany/spreadwriter/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/spreadwriter/keymaps/default/keymap.c
@@ -13,56 +13,49 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC, LT(2, 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, LT(2, KC_D), KC_F, KC_G, SPREADWRITER, KC_H, KC_J, LT(2, KC_K), KC_L, KC_ENT, KC_ENT,
         KC_LSFT, SFT_T(KC_Z), GUI_T(KC_X), KC_C, KC_V, KC_B, MEH(KC_4), LSA(KC_5),  KC_N, KC_M, KC_COMM, CTL_T(KC_DOT), KC_BSPC, KC_DEL,
-        KC_LCTL, KC_LGUI, KC_LALT, MO(5), MO(4), ALT_T(KC_LNG2), SFT_T(KC_TAB), WEB, LT(6, KC_SPC), LT(1, KC_LNG1), KC_RALT, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
-        KC_WH_U, KC_WH_D
+        KC_LCTL, KC_LGUI, KC_LALT, MO(5), MO(4), ALT_T(KC_LNG2), SFT_T(KC_TAB), WEB, LT(6, KC_SPC), LT(1, KC_LNG1), KC_RALT, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT
     ),
 
     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_LCTL, CTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_TRNS, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, 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_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_NO,
         KC_TRNS, KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_TRNS, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, 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, MO(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,
-        KC_BSPC, KC_SPC
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
     LAYOUT(
         RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
         KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
-        KC_TRNS, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_M_T, KC_TRNS, QK_BOOT, KC_F11, KC_F12, KC_CAPS, 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, 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, QK_BOOT, KC_F11, KC_F12, KC_CAPS, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
     LAYOUT(
         KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_INT3, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_6, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_NUHS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_P0, KC_COMM, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_TRNS,
-        KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_P0, KC_COMM, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_TRNS
     ),
 
     LAYOUT(
         KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_TRNS, KC_TRNS, S(KC_MINS), S(KC_EQL), S(KC_INT3), KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_6, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_LBRC), S(KC_RBRC), KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_SCLN), S(KC_QUOT), S(KC_NUHS), KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_P0, KC_COMM, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_INT1), KC_TRNS,
-        KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_P0, KC_COMM, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_INT1), KC_TRNS
     ),
 
     LAYOUT(
         KC_TRNS, 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), G(KC_INT3), KC_TRNS,
         KC_LCTL, S(KC_EQL), S(KC_LBRC), S(KC_SLSH), S(KC_MINS), S(KC_INT1), KC_TRNS, S(KC_SCLN), S(KC_QUOT), S(KC_RBRC), S(KC_NUHS), S(KC_INT3), KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
 
@@ -81,7 +74,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
             return false;
     }
-    
+
     return true;
 }
 
@@ -92,6 +85,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     } else {
         tap_code(KC_MS_WH_UP);
     }
-
-    return true;
-}
\ No newline at end of file
+    return false;
+}
diff --git a/keyboards/takashicompany/spreadwriter/keymaps/via/config.h b/keyboards/takashicompany/spreadwriter/keymaps/via/config.h
index 9587fd7b6b88..b0e0cc3ee77a 100644
--- a/keyboards/takashicompany/spreadwriter/keymaps/via/config.h
+++ b/keyboards/takashicompany/spreadwriter/keymaps/via/config.h
@@ -4,14 +4,3 @@
 #pragma once
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 7
-
-//------------------------------------------------------------------------------
-// Rotary Encoder
-//------------------------------------------------------------------------------
-// Encoder triggers specific key matrix position,
-// when turn knob clockwise or counterclockwise.
-// This is handy to assign key codes by VIA.
-
-// Mappings of encoder rotation to key position in key matrix.
-#define ENCODERS_CW_KEY  { { 0, 4 }}
-#define ENCODERS_CCW_KEY { { 6, 0 }}
\ No newline at end of file
diff --git a/keyboards/takashicompany/spreadwriter/keymaps/via/keymap.c b/keyboards/takashicompany/spreadwriter/keymaps/via/keymap.c
index c0d4a0003d95..cf031394f130 100644
--- a/keyboards/takashicompany/spreadwriter/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/spreadwriter/keymaps/via/keymap.c
@@ -13,56 +13,49 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC, LT(2, 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, LT(2, KC_D), KC_F, KC_G, SPREADWRITER, KC_H, KC_J, LT(2, KC_K), KC_L, KC_ENT, KC_ENT,
         KC_LSFT, SFT_T(KC_Z), GUI_T(KC_X), KC_C, KC_V, KC_B, MEH(KC_4), LSA(KC_5),  KC_N, KC_M, KC_COMM, CTL_T(KC_DOT), KC_BSPC, KC_DEL,
-        KC_LCTL, KC_LGUI, KC_LALT, MO(5), MO(4), ALT_T(KC_LNG2), SFT_T(KC_TAB), WEB, LT(6, KC_SPC), LT(1, KC_LNG1), KC_RALT, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
-        KC_WH_U, KC_WH_D
+        KC_LCTL, KC_LGUI, KC_LALT, MO(5), MO(4), ALT_T(KC_LNG2), SFT_T(KC_TAB), WEB, LT(6, KC_SPC), LT(1, KC_LNG1), KC_RALT, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT
     ),
 
     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_LCTL, CTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_TRNS, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, 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_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_NO,
         KC_TRNS, KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_TRNS, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, 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, MO(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,
-        KC_BSPC, KC_SPC
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
     LAYOUT(
         RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
         KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
-        KC_TRNS, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_M_T, KC_TRNS, QK_BOOT, KC_F11, KC_F12, KC_CAPS, 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, 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, QK_BOOT, KC_F11, KC_F12, KC_CAPS, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
     LAYOUT(
         KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_INT3, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_6, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_NUHS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_P0, KC_COMM, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_TRNS,
-        KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_P0, KC_COMM, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_TRNS
     ),
 
     LAYOUT(
         KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_TRNS, KC_TRNS, S(KC_MINS), S(KC_EQL), S(KC_INT3), KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_6, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_LBRC), S(KC_RBRC), KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_SCLN), S(KC_QUOT), S(KC_NUHS), KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_P0, KC_COMM, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_INT1), KC_TRNS,
-        KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_P0, KC_COMM, KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_COMM), S(KC_DOT), S(KC_SLSH), S(KC_INT1), KC_TRNS
     ),
 
     LAYOUT(
         KC_TRNS, 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), G(KC_INT3), KC_TRNS,
         KC_LCTL, S(KC_EQL), S(KC_LBRC), S(KC_SLSH), S(KC_MINS), S(KC_INT1), KC_TRNS, S(KC_SCLN), S(KC_QUOT), S(KC_RBRC), S(KC_NUHS), S(KC_INT3), KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
 
@@ -81,49 +74,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
             return false;
     }
-    
-    return true;
-}
-
-//------------------------------------------------------------------------------
-// Rotary Encoder
-//------------------------------------------------------------------------------
-static uint8_t  encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS]    = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS]   = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
 
-void matrix_scan_kb(void) {
-    encoder_action_unregister();
-    matrix_scan_user();
+    return true;
 }
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    encoder_action_register(index, clockwise);
-    return true;
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =       { ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
+    [1 ... 6] = { ENCODER_CCW_CW(_______, _______) },
 };
+#endif
diff --git a/keyboards/takashicompany/spreadwriter/keymaps/via/rules.mk b/keyboards/takashicompany/spreadwriter/keymaps/via/rules.mk
index 036bd6d1c3ec..f1adcab005e8 100644
--- a/keyboards/takashicompany/spreadwriter/keymaps/via/rules.mk
+++ b/keyboards/takashicompany/spreadwriter/keymaps/via/rules.mk
@@ -1 +1,2 @@
-VIA_ENABLE = yes
\ No newline at end of file
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h
index ac6c077f6b22..1c14611b2b9a 100644
--- a/keyboards/takashiski/hecomi/alpha/config.h
+++ b/keyboards/takashiski/hecomi/alpha/config.h
@@ -19,21 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //#define USE_I2C
 
-   #define RGBLED_NUM 16 
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
- /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -60,4 +45,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MASTER_LEFT
 #define EEHANDS
 */
-#define RGBLED_SPLIT {8,8}
diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/info.json
index 19a1f0576043..a7b470ce8807 100644
--- a/keyboards/takashiski/hecomi/alpha/info.json
+++ b/keyboards/takashiski/hecomi/alpha/info.json
@@ -16,6 +16,12 @@
   "split": {
     "soft_serial_pin": "D1"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 16,
+    "split_count": [8, 8]
+  },
   "ws2812": {
     "pin": "D4"
   },
diff --git a/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c b/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
index fb61d8ed62aa..df1b1195bc0a 100644
--- a/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
+++ b/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
@@ -50,19 +50,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             KC_LGUI,KC_NO,KC_LALT,KC_INT5,KC_NO,KC_SPC,             KC_0,KC_NO,KC_HOME,KC_PGUP,KC_PGDN,KC_END
             ),
 };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void keyboard_post_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/takashiski/namecard2x4/keymaps/brainfuck/keymap.c b/keyboards/takashiski/namecard2x4/keymaps/brainfuck/keymap.c
index a60408366dde..4b35b0841875 100644
--- a/keyboards/takashiski/namecard2x4/keymaps/brainfuck/keymap.c
+++ b/keyboards/takashiski/namecard2x4/keymaps/brainfuck/keymap.c
@@ -40,20 +40,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		)
 
 };
-
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/takashiski/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h
index c4a349580c6a..8ecec41e2a90 100644
--- a/keyboards/takashiski/namecard2x4/rev1/config.h
+++ b/keyboards/takashiski/namecard2x4/rev1/config.h
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 4
-#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 10
-#define RGBLIGHT_VAL_STEP 10
-
 /* 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/takashiski/namecard2x4/rev1/info.json b/keyboards/takashiski/namecard2x4/rev1/info.json
index 28781bcd0a69..aaab760be3bb 100644
--- a/keyboards/takashiski/namecard2x4/rev1/info.json
+++ b/keyboards/takashiski/namecard2x4/rev1/info.json
@@ -1,4 +1,22 @@
 {
+    "rgblight": {
+        "hue_steps": 10,
+        "saturation_steps": 10,
+        "brightness_steps": 10,
+        "led_count": 4,
+        "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": "F4"
     },
diff --git a/keyboards/takashiski/namecard2x4/rev2/config.h b/keyboards/takashiski/namecard2x4/rev2/config.h
index f90b4e073c88..8ecec41e2a90 100644
--- a/keyboards/takashiski/namecard2x4/rev2/config.h
+++ b/keyboards/takashiski/namecard2x4/rev2/config.h
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#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 10
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
-
 /* 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/takashiski/namecard2x4/rev2/info.json b/keyboards/takashiski/namecard2x4/rev2/info.json
index 51fe26c555ca..edef6a31b418 100644
--- a/keyboards/takashiski/namecard2x4/rev2/info.json
+++ b/keyboards/takashiski/namecard2x4/rev2/info.json
@@ -1,4 +1,22 @@
 {
+    "rgblight": {
+        "hue_steps": 10,
+        "saturation_steps": 10,
+        "brightness_steps": 10,
+        "led_count": 8,
+        "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": "D4"
     },
diff --git a/keyboards/taleguers/taleguers75/config.h b/keyboards/taleguers/taleguers75/config.h
index b62209abaad4..6b1277af2ce7 100644
--- a/keyboards/taleguers/taleguers75/config.h
+++ b/keyboards/taleguers/taleguers75/config.h
@@ -21,20 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 6
-#define RGBLIGHT_LED_MAP { 5, 4, 3, 2, 1, 0 }
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/taleguers/taleguers75/info.json b/keyboards/taleguers/taleguers75/info.json
index 229894fa9d05..7ebd8707b7ce 100644
--- a/keyboards/taleguers/taleguers75/info.json
+++ b/keyboards/taleguers/taleguers75/info.json
@@ -18,6 +18,25 @@
             {"pin_a": "B6", "pin_b": "B5"}
         ]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "sleep": true,
+        "led_map": [5, 4, 3, 2, 1, 0],
+        "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": "D3"
     },
diff --git a/keyboards/tanuki/config.h b/keyboards/tanuki/config.h
index 305eacfd35d9..4b007cf387ee 100644
--- a/keyboards/tanuki/config.h
+++ b/keyboards/tanuki/config.h
@@ -22,23 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 5
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-#define RGBLIGHT_SLEEP
-
-#define TAPPING_TERM 200
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/tanuki/info.json b/keyboards/tanuki/info.json
index 8a858cf4f0cc..e7bb9aa8985a 100644
--- a/keyboards/tanuki/info.json
+++ b/keyboards/tanuki/info.json
@@ -8,6 +8,23 @@
     "pid": "0x6464",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "hue_steps": 10,
+    "led_count": 5,
+    "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": "D1"
   },
diff --git a/keyboards/tau4/rules.mk b/keyboards/tau4/rules.mk
index f27ee2a28eef..0001ae06b81f 100644
--- a/keyboards/tau4/rules.mk
+++ b/keyboards/tau4/rules.mk
@@ -1,7 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-
-OLED_DRIVER = SSD1306    # OLED display support
 # EEPROM_DRIVER ?= i2c        # Driver for external EEPROM chip
 # This is currently not working due to QMK not officially supporting the chip used on the Tau4, I am working on a fix.
diff --git a/keyboards/teahouse/ayleen/config.h b/keyboards/teahouse/ayleen/config.h
index 84559bb7bd6c..6ff56589b3fc 100644
--- a/keyboards/teahouse/ayleen/config.h
+++ b/keyboards/teahouse/ayleen/config.h
@@ -3,13 +3,8 @@
 
 #pragma once
 
-    #define RGBLED_NUM 2
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
     #define RGBLIGHT_LAYERS 2
     #define RGBLIGHT_LAYER_BLINK
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 
 // generated by KBFirmware JSON to QMK Parser
 // https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json
index e979b07e8961..04baad7d00b8 100644
--- a/keyboards/teahouse/ayleen/info.json
+++ b/keyboards/teahouse/ayleen/info.json
@@ -19,6 +19,12 @@
       "rows": ["F0", "F1", "F4", "F5", "D4", "B0", "B1", "B2", "F7", "D5", "D3"],
       "cols": ["F6", "D0", "D1", "D2", "D6", "D7", "B4", "B5", "B6"]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 2,
+        "sleep": true
+    },
     "ws2812": {
         "pin": "C7"
     },
diff --git a/keyboards/team0110/p1800fl/config.h b/keyboards/team0110/p1800fl/config.h
index 99f4d6ce2c79..effb62971cda 100644
--- a/keyboards/team0110/p1800fl/config.h
+++ b/keyboards/team0110/p1800fl/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB Lighting */
-#    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
-#    define RGBLIGHT_SLEEP
-
 /* 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/team0110/p1800fl/info.json b/keyboards/team0110/p1800fl/info.json
index 2509fcdd8e93..d329c6de2934 100644
--- a/keyboards/team0110/p1800fl/info.json
+++ b/keyboards/team0110/p1800fl/info.json
@@ -18,6 +18,24 @@
         "levels": 5,
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "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": "C6"
     },
diff --git a/keyboards/technika/config.h b/keyboards/technika/config.h
index fb143fc76acb..f608132b5afd 100644
--- a/keyboards/technika/config.h
+++ b/keyboards/technika/config.h
@@ -22,19 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 16
-#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
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/technika/info.json b/keyboards/technika/info.json
index 31c0ab96b43e..1b99728481e6 100644
--- a/keyboards/technika/info.json
+++ b/keyboards/technika/info.json
@@ -22,7 +22,21 @@
         "pin": "B15"
     },
     "rgblight": {
-        "max_brightness": 200
+        "led_count": 16,
+        "max_brightness": 200,
+        "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
+        }
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/technika/rules.mk b/keyboards/technika/rules.mk
index 98fc7315de02..4d4628146af1 100644
--- a/keyboards/technika/rules.mk
+++ b/keyboards/technika/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/teleport/native/ansi/keymaps/perfmode/config.h b/keyboards/teleport/native/ansi/keymaps/perfmode/config.h
index a99590cd1c59..896166db12b2 100644
--- a/keyboards/teleport/native/ansi/keymaps/perfmode/config.h
+++ b/keyboards/teleport/native/ansi/keymaps/perfmode/config.h
@@ -20,4 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Increase eeprom size to allow for 5 layers */
 #define WEAR_LEVELING_BACKING_SIZE 16384
-#define WEAR_LEVELING_LOGICAL_SIZE 4096
\ No newline at end of file
+#define WEAR_LEVELING_LOGICAL_SIZE 4096
+
+/* Increase debounce, as asym eager seems to lead to chatter with the fast polling rate in some cases */
+#define DEBOUNCE 7
\ No newline at end of file
diff --git a/keyboards/teleport/native/ansi/keymaps/perfmode/keymap.c b/keyboards/teleport/native/ansi/keymaps/perfmode/keymap.c
index 1a7852a062e7..abe6188ccfd0 100644
--- a/keyboards/teleport/native/ansi/keymaps/perfmode/keymap.c
+++ b/keyboards/teleport/native/ansi/keymaps/perfmode/keymap.c
@@ -15,6 +15,9 @@
  */
 #include QMK_KEYBOARD_H
 
+// tested and working
+void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
+
 enum layers{
     BASE,
     GAME,
diff --git a/keyboards/teleport/native/ansi/keymaps/perfmode/rules.mk b/keyboards/teleport/native/ansi/keymaps/perfmode/rules.mk
index b735c48f20fc..d6c9b615e02b 100644
--- a/keyboards/teleport/native/ansi/keymaps/perfmode/rules.mk
+++ b/keyboards/teleport/native/ansi/keymaps/perfmode/rules.mk
@@ -1,4 +1,5 @@
 DEBOUNCE_TYPE = asym_eager_defer_pk 
+OPT = 2
 
 VIA_ENABLE = yes
  
\ No newline at end of file
diff --git a/keyboards/teleport/native/info.json b/keyboards/teleport/native/info.json
index 9b27514e7d63..87b97e5b2d1c 100644
--- a/keyboards/teleport/native/info.json
+++ b/keyboards/teleport/native/info.json
@@ -11,7 +11,7 @@
         "force_nkro": true
     },
     "rgb_matrix": {
-        "driver": "IS31FL3733"
+        "driver": "is31fl3733"
     },
     "features": {
         "bootmagic": true,
@@ -19,7 +19,8 @@
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true
+        "nkro": true,
+        "lto": true
     },
     "diode_direction": "ROW2COL",
     "matrix_pins": {
diff --git a/keyboards/teleport/native/iso/keymaps/perfmode/config.h b/keyboards/teleport/native/iso/keymaps/perfmode/config.h
index a99590cd1c59..896166db12b2 100644
--- a/keyboards/teleport/native/iso/keymaps/perfmode/config.h
+++ b/keyboards/teleport/native/iso/keymaps/perfmode/config.h
@@ -20,4 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Increase eeprom size to allow for 5 layers */
 #define WEAR_LEVELING_BACKING_SIZE 16384
-#define WEAR_LEVELING_LOGICAL_SIZE 4096
\ No newline at end of file
+#define WEAR_LEVELING_LOGICAL_SIZE 4096
+
+/* Increase debounce, as asym eager seems to lead to chatter with the fast polling rate in some cases */
+#define DEBOUNCE 7
\ No newline at end of file
diff --git a/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c b/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c
index 3be8eec3ddf9..96e9925fd5ae 100644
--- a/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c
+++ b/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c
@@ -15,6 +15,9 @@
  */
 #include QMK_KEYBOARD_H
 
+// tested and working
+void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
+
 enum layers{
     BASE,
     GAME,
diff --git a/keyboards/teleport/native/iso/keymaps/perfmode/rules.mk b/keyboards/teleport/native/iso/keymaps/perfmode/rules.mk
index b735c48f20fc..d6c9b615e02b 100644
--- a/keyboards/teleport/native/iso/keymaps/perfmode/rules.mk
+++ b/keyboards/teleport/native/iso/keymaps/perfmode/rules.mk
@@ -1,4 +1,5 @@
 DEBOUNCE_TYPE = asym_eager_defer_pk 
+OPT = 2
 
 VIA_ENABLE = yes
  
\ No newline at end of file
diff --git a/keyboards/teleport/native/native.c b/keyboards/teleport/native/native.c
index 042e2bfa95ea..c3cac80c2211 100644
--- a/keyboards/teleport/native/native.c
+++ b/keyboards/teleport/native/native.c
@@ -17,9 +17,11 @@
 #include "quantum.h"
 
 /* This board has !SDB of the is31 wired to D2. Set high to enable */
-void keyboard_post_init_user(void) {
+void keyboard_post_init_kb(void) {
     setPinOutput(B9);
     writePinHigh(B9);
+    
+    keyboard_post_init_user();
 }
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/tender/macrowo_pad/keymaps/default/rules.mk b/keyboards/tender/macrowo_pad/keymaps/default/rules.mk
index fd3d5d7e560f..dd68e9d3b090 100644
--- a/keyboards/tender/macrowo_pad/keymaps/default/rules.mk
+++ b/keyboards/tender/macrowo_pad/keymaps/default/rules.mk
@@ -1,2 +1 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
diff --git a/keyboards/tender/macrowo_pad/keymaps/via/rules.mk b/keyboards/tender/macrowo_pad/keymaps/via/rules.mk
index d3ac2585b9ea..ab9d5c6ac2f8 100644
--- a/keyboards/tender/macrowo_pad/keymaps/via/rules.mk
+++ b/keyboards/tender/macrowo_pad/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306    # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
diff --git a/keyboards/tenki/config.h b/keyboards/tenki/config.h
index 2b7b6435ec31..5f360813239b 100644
--- a/keyboards/tenki/config.h
+++ b/keyboards/tenki/config.h
@@ -5,21 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-
-/* ws2812 RGB LED */
-#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 3   // Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/tenki/info.json b/keyboards/tenki/info.json
index 8acbd24f8b0a..10e5a88d1c07 100644
--- a/keyboards/tenki/info.json
+++ b/keyboards/tenki/info.json
@@ -8,6 +8,25 @@
         "pid": "0x5445",
         "device_version": "10.0.1"
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "saturation_steps": 10,
+        "brightness_steps": 10,
+        "led_count": 3,
+        "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": "D1"
     },
diff --git a/keyboards/terrazzo/info.json b/keyboards/terrazzo/info.json
index 6e099c6e4614..279c0f33242c 100644
--- a/keyboards/terrazzo/info.json
+++ b/keyboards/terrazzo/info.json
@@ -21,7 +21,7 @@
         ]
     },
     "led_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/tetris/config.h b/keyboards/tetris/config.h
index 3f0378e73c92..bc2273d54781 100755
--- a/keyboards/tetris/config.h
+++ b/keyboards/tetris/config.h
@@ -12,19 +12,4 @@
   #define NO_MUSIC_MODE
 #endif
 
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLIGHT_SLEEP
-#define RGBLED_NUM 47
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_EFFECT_KNIGHT_LED_NUM 12
diff --git a/keyboards/tetris/info.json b/keyboards/tetris/info.json
index c7d90ef1489d..16e9369996d6 100644
--- a/keyboards/tetris/info.json
+++ b/keyboards/tetris/info.json
@@ -8,6 +8,24 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 47,
+    "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": "F5"
   },
diff --git a/keyboards/tg4x/config.h b/keyboards/tg4x/config.h
index 20a2c414b312..b5b661bef2ab 100644
--- a/keyboards/tg4x/config.h
+++ b/keyboards/tg4x/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 7
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/tg4x/info.json b/keyboards/tg4x/info.json
index a3e464a11091..6931f3565f4b 100644
--- a/keyboards/tg4x/info.json
+++ b/keyboards/tg4x/info.json
@@ -8,6 +8,24 @@
         "pid": "0x0458",
         "device_version": "0.2.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 7,
+        "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": "D2"
     },
diff --git a/keyboards/tgr/910/config.h b/keyboards/tgr/910/config.h
deleted file mode 100644
index 2021d94bb467..000000000000
--- a/keyboards/tgr/910/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2020 halfenergized
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define RGBLED_NUM 19
-
-#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/tgr/910/info.json b/keyboards/tgr/910/info.json
index ae6ffb5a245d..28ea383f0d24 100644
--- a/keyboards/tgr/910/info.json
+++ b/keyboards/tgr/910/info.json
@@ -16,6 +16,21 @@
     "backlight": {
         "pin": "D4"
     },
+    "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
+        }
+    },
     "ws2812": {
         "driver": "i2c"
     },
diff --git a/keyboards/tgr/910ce/config.h b/keyboards/tgr/910ce/config.h
deleted file mode 100644
index 44fff35e61f2..000000000000
--- a/keyboards/tgr/910ce/config.h
+++ /dev/null
@@ -1,32 +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 RGBLED_NUM 18
-
-#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/tgr/910ce/info.json b/keyboards/tgr/910ce/info.json
index c58438887ae4..63bb727570d6 100644
--- a/keyboards/tgr/910ce/info.json
+++ b/keyboards/tgr/910ce/info.json
@@ -16,6 +16,21 @@
     "backlight": {
         "pin": "D4"
     },
+    "rgblight": {
+        "led_count": 18,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/tgr/alice/config.h b/keyboards/tgr/alice/config.h
deleted file mode 100644
index cf8aa330451b..000000000000
--- a/keyboards/tgr/alice/config.h
+++ /dev/null
@@ -1,30 +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
-
-#define RGBLED_NUM 18
-#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/tgr/alice/info.json b/keyboards/tgr/alice/info.json
index 7d6a0fbc146d..722de6251ab6 100644
--- a/keyboards/tgr/alice/info.json
+++ b/keyboards/tgr/alice/info.json
@@ -16,6 +16,21 @@
   "backlight": {
     "pin": "D4"
   },
+  "rgblight": {
+    "led_count": 18,
+    "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": {
     "driver": "i2c"
   },
@@ -26,11 +41,90 @@
   },
   "processor": "atmega32a",
   "bootloader": "bootloadhid",
-  "community_layouts": ["alice_split_bs"],
+  "community_layouts": ["alice", "alice_split_bs"],
   "layout_aliases": {
     "LAYOUT": "LAYOUT_alice_split_bs"
   },
   "layouts": {
+    "LAYOUT_alice": {
+      "layout": [
+        {"matrix": [5, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 7], "x": 10.25, "y": 0},
+        {"matrix": [0, 8], "x": 11.25, "y": 0},
+        {"matrix": [0, 9], "x": 12.25, "y": 0},
+        {"matrix": [0, 10], "x": 13.25, "y": 0},
+        {"matrix": [0, 11], "x": 14.25, "y": 0},
+        {"matrix": [0, 12], "x": 15.25, "y": 0},
+        {"matrix": [0, 13], "x": 16.25, "y": 0, "w": 2},
+
+        {"matrix": [5, 1], "x": 0, "y": 1},
+
+        {"matrix": [1, 0], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 2.75, "y": 1},
+        {"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": 9.75, "y": 1},
+        {"matrix": [1, 7], "x": 10.75, "y": 1},
+        {"matrix": [1, 8], "x": 11.75, "y": 1},
+        {"matrix": [1, 9], "x": 12.75, "y": 1},
+        {"matrix": [1, 10], "x": 13.75, "y": 1},
+        {"matrix": [1, 11], "x": 14.75, "y": 1},
+        {"matrix": [1, 12], "x": 15.75, "y": 1},
+        {"matrix": [1, 13], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [5, 2], "x": 0, "y": 2},
+        {"matrix": [2, 0], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 3, "y": 2},
+        {"matrix": [2, 2], "x": 4, "y": 2},
+        {"matrix": [2, 3], "x": 5, "y": 2},
+        {"matrix": [2, 4], "x": 6, "y": 2},
+        {"matrix": [2, 5], "x": 7, "y": 2},
+
+        {"matrix": [2, 6], "x": 10, "y": 2},
+        {"matrix": [2, 7], "x": 11, "y": 2},
+        {"matrix": [2, 8], "x": 12, "y": 2},
+        {"matrix": [2, 9], "x": 13, "y": 2},
+        {"matrix": [2, 10], "x": 14, "y": 2},
+        {"matrix": [2, 11], "x": 15, "y": 2},
+        {"matrix": [2, 12], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 3.5, "y": 3},
+        {"matrix": [3, 2], "x": 4.5, "y": 3},
+        {"matrix": [3, 3], "x": 5.5, "y": 3},
+        {"matrix": [3, 4], "x": 6.5, "y": 3},
+        {"matrix": [3, 5], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 6], "x": 9.5, "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, "w": 1.75},
+        {"matrix": [3, 13], "x": 17.25, "y": 3},
+
+        {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 2], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 3], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 7], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 8], "x": 16.75, "y": 4, "w": 1.5}
+      ]
+    },
     "LAYOUT_alice_split_bs": {
       "layout": [
         {"matrix": [5, 0], "x": 0, "y": 0},
diff --git a/keyboards/tgr/tris/config.h b/keyboards/tgr/tris/config.h
deleted file mode 100644
index f517c91d194c..000000000000
--- a/keyboards/tgr/tris/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2020 halfenergized
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGBLED_NUM 6
-#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/tgr/tris/info.json b/keyboards/tgr/tris/info.json
index f628405bcb8f..f7577757d954 100644
--- a/keyboards/tgr/tris/info.json
+++ b/keyboards/tgr/tris/info.json
@@ -16,6 +16,21 @@
     "backlight": {
         "pin": "D4"
     },
+    "rgblight": {
+        "led_count": 6,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/the_royal/liminal/config.h b/keyboards/the_royal/liminal/config.h
index 02c222b2b85a..fa9a83d08ec4 100644
--- a/keyboards/the_royal/liminal/config.h
+++ b/keyboards/the_royal/liminal/config.h
@@ -4,10 +4,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 1   // Number of LEDs
-
-#define RGBLIGHT_HUE_STEP 6
-#define RGBLIGHT_SAT_STEP 4
-#define RGBLIGHT_VAL_STEP 4
diff --git a/keyboards/the_royal/liminal/info.json b/keyboards/the_royal/liminal/info.json
index c62699df8443..046d535e4ab5 100644
--- a/keyboards/the_royal/liminal/info.json
+++ b/keyboards/the_royal/liminal/info.json
@@ -8,6 +8,12 @@
     "pid": "0x0003",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "hue_steps": 6,
+    "saturation_steps": 4,
+    "brightness_steps": 4,
+    "led_count": 1
+  },
   "ws2812": {
     "pin": "D4"
   },
diff --git a/keyboards/the_royal/schwann/config.h b/keyboards/the_royal/schwann/config.h
index 8cfda8f8e504..fa9a83d08ec4 100644
--- a/keyboards/the_royal/schwann/config.h
+++ b/keyboards/the_royal/schwann/config.h
@@ -4,20 +4,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#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 6
-#define RGBLIGHT_SAT_STEP 4
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/the_royal/schwann/info.json b/keyboards/the_royal/schwann/info.json
index df765f747c6d..5a0c4e50e588 100644
--- a/keyboards/the_royal/schwann/info.json
+++ b/keyboards/the_royal/schwann/info.json
@@ -8,6 +8,24 @@
       "pid": "0x3521",
       "device_version": "0.0.1"
   },
+  "rgblight": {
+    "hue_steps": 6,
+    "saturation_steps": 4,
+    "brightness_steps": 8,
+    "led_count": 8,
+    "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": "B3"
   },
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/config.h b/keyboards/themadnoodle/ncc1701kb/v2/config.h
deleted file mode 100644
index 3c3b68d78243..000000000000
--- a/keyboards/themadnoodle/ncc1701kb/v2/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2020 The Mad Noodle (Jesse Leventhal)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should 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 BackLight */
-#define RGBLED_NUM 4
-#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
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/info.json b/keyboards/themadnoodle/ncc1701kb/v2/info.json
index e769b23f1236..3ea2515e6467 100644
--- a/keyboards/themadnoodle/ncc1701kb/v2/info.json
+++ b/keyboards/themadnoodle/ncc1701kb/v2/info.json
@@ -18,6 +18,22 @@
       {"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"
   },
diff --git a/keyboards/themadnoodle/noodlepad/config.h b/keyboards/themadnoodle/noodlepad/config.h
deleted file mode 100644
index 3c3b68d78243..000000000000
--- a/keyboards/themadnoodle/noodlepad/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2020 The Mad Noodle (Jesse Leventhal)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should 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 BackLight */
-#define RGBLED_NUM 4
-#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
diff --git a/keyboards/themadnoodle/noodlepad/info.json b/keyboards/themadnoodle/noodlepad/info.json
index e60503469708..5f21cbbc758c 100644
--- a/keyboards/themadnoodle/noodlepad/info.json
+++ b/keyboards/themadnoodle/noodlepad/info.json
@@ -18,6 +18,22 @@
       {"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"
   },
diff --git a/keyboards/thevankeyboards/bananasplit/config.h b/keyboards/thevankeyboards/bananasplit/config.h
index d9dc5a84015d..c2949ab3a7a4 100644
--- a/keyboards/thevankeyboards/bananasplit/config.h
+++ b/keyboards/thevankeyboards/bananasplit/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define TAPPING_TERM      175
-
 /* 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/thevankeyboards/bananasplit/info.json b/keyboards/thevankeyboards/bananasplit/info.json
index 37f5dec719bc..36fcc06af220 100644
--- a/keyboards/thevankeyboards/bananasplit/info.json
+++ b/keyboards/thevankeyboards/bananasplit/info.json
@@ -16,6 +16,9 @@
     "backlight": {
         "pin": "B7"
     },
+    "tapping": {
+        "term": 175
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_iso"],
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
index abdb791c6f8c..2d65ae102bae 100644
--- a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
@@ -62,14 +62,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 };
 
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
 
@@ -86,7 +78,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       return true;
   }
 }
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c
index 1472f88212d6..5146c8f4f333 100644
--- a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c
@@ -91,12 +91,13 @@ Capslock's led cannot be controlled separately on bananasplit and you can only t
   leds at once. If you only install led for capslock, it will look like capslock has toggable
   backlight.
 */
-void led_set_user(uint8_t usb_led) {
-  if (usb_led && (1 << USB_LED_CAPS_LOCK)) {
+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/jetvan/config.h b/keyboards/thevankeyboards/jetvan/config.h
index e8aca5e86205..950d17c81376 100644
--- a/keyboards/thevankeyboards/jetvan/config.h
+++ b/keyboards/thevankeyboards/jetvan/config.h
@@ -22,20 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Define RGB Underglow */
-#define RGBLED_NUM 10
-#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_LAYER_BLINK*/
-
 /* Define less important options */
 
 /*
diff --git a/keyboards/thevankeyboards/jetvan/info.json b/keyboards/thevankeyboards/jetvan/info.json
index 80281fef1f80..fc04a4c013f3 100644
--- a/keyboards/thevankeyboards/jetvan/info.json
+++ b/keyboards/thevankeyboards/jetvan/info.json
@@ -8,6 +8,21 @@
         "pid": "0x8858",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 10,
+        "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": "D0"
     },
diff --git a/keyboards/thevankeyboards/minivan/config.h b/keyboards/thevankeyboards/minivan/config.h
index 44b61b7458b1..5070f051560f 100644
--- a/keyboards/thevankeyboards/minivan/config.h
+++ b/keyboards/thevankeyboards/minivan/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
-
-/* RGB Setup */
-#define RGBLED_NUM 3
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/thevankeyboards/minivan/info.json b/keyboards/thevankeyboards/minivan/info.json
index c20ad5427e5f..cff65e6fed81 100644
--- a/keyboards/thevankeyboards/minivan/info.json
+++ b/keyboards/thevankeyboards/minivan/info.json
@@ -8,6 +8,10 @@
     "pid": "0x8844",
     "device_version": "0.0.2"
   },
+  "rgblight": {
+    "led_count": 3,
+    "sleep": true
+  },
   "ws2812": {
     "pin": "D0"
   },
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c
index a1d82e992305..145da6b2a5a2 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/keymap.c
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    * 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 * XP(…).
+   * ('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. 
    *
diff --git a/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c b/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c
index f4416ca797a2..ddd37c89e354 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/josjoha/unicode_macros.c
@@ -2022,7 +2022,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 # endif // REMOVE_DRA
 
 
-        /* _BON layer definitions. Due to running out of X(…), XP(…) space.*/
+        /* _BON layer definitions. */
 
    // ------------------------- row 4
 # ifndef REMOVE_BON // Removes this layer entirely, if set.
diff --git a/keyboards/tkc/candybar/lefty/rules.mk b/keyboards/tkc/candybar/lefty/rules.mk
index 36101d2f8ee2..51c822797aa7 100644
--- a/keyboards/tkc/candybar/lefty/rules.mk
+++ b/keyboards/tkc/candybar/lefty/rules.mk
@@ -13,5 +13,3 @@ AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = no
 
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/tkc/candybar/righty/rules.mk b/keyboards/tkc/candybar/righty/rules.mk
index 36101d2f8ee2..51c822797aa7 100644
--- a/keyboards/tkc/candybar/righty/rules.mk
+++ b/keyboards/tkc/candybar/righty/rules.mk
@@ -13,5 +13,3 @@ AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = no
 
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/tkc/godspeed75/config.h b/keyboards/tkc/godspeed75/config.h
deleted file mode 100644
index e995bb1c7c1e..000000000000
--- a/keyboards/tkc/godspeed75/config.h
+++ /dev/null
@@ -1,45 +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/>.
- */
-
-#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 RGBLED_NUM 14
-#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/tkc/godspeed75/info.json b/keyboards/tkc/godspeed75/info.json
index 4e45459bb96c..4776a9bab86f 100644
--- a/keyboards/tkc/godspeed75/info.json
+++ b/keyboards/tkc/godspeed75/info.json
@@ -8,6 +8,21 @@
         "pid": "0x0006",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 14,
+        "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": "A13"
     },
diff --git a/keyboards/tkc/godspeed75/rules.mk b/keyboards/tkc/godspeed75/rules.mk
index 0f15f10b2081..0098dc473ac4 100644
--- a/keyboards/tkc/godspeed75/rules.mk
+++ b/keyboards/tkc/godspeed75/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h
index bad0f51bde3c..b9449c4714bf 100644
--- a/keyboards/tkc/m0lly/config.h
+++ b/keyboards/tkc/m0lly/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 30
-#    define RGBLIGHT_HUE_STEP 5
-#    define RGBLIGHT_SAT_STEP 10
-#    define RGBLIGHT_VAL_STEP 10
-//#    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
-
 /* 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/m0lly/info.json b/keyboards/tkc/m0lly/info.json
index 37a8c19bf805..462bc0f27b56 100644
--- a/keyboards/tkc/m0lly/info.json
+++ b/keyboards/tkc/m0lly/info.json
@@ -27,6 +27,24 @@
         "num_lock": "D2",
         "scroll_lock": "D4"
     },
+    "rgblight": {
+        "hue_steps": 5,
+        "saturation_steps": 10,
+        "brightness_steps": 10,
+        "led_count": 30,
+        "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": "D7"
     },
diff --git a/keyboards/tkc/m0lly/rules.mk b/keyboards/tkc/m0lly/rules.mk
index f07afe6ed407..6d915f6d417f 100644
--- a/keyboards/tkc/m0lly/rules.mk
+++ b/keyboards/tkc/m0lly/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/tkc/osav2/config.h b/keyboards/tkc/osav2/config.h
deleted file mode 100644
index f2a7de800ba7..000000000000
--- a/keyboards/tkc/osav2/config.h
+++ /dev/null
@@ -1,50 +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 RGBLED_NUM 9
-//   #define RGBLIGHT_HUE_STEP 10
-//   #define RGBLIGHT_SAT_STEP 17
-//   #define RGBLIGHT_VAL_STEP 17
-   #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
-
-/*
- * 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/tkc/osav2/info.json b/keyboards/tkc/osav2/info.json
index 78cad2daf2e2..cc878e14f48c 100644
--- a/keyboards/tkc/osav2/info.json
+++ b/keyboards/tkc/osav2/info.json
@@ -8,6 +8,22 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 9,
+        "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": "D4"
     },
@@ -17,6 +33,7 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "D6",
         "breathing": true
     },
diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/info.json
index f4f2e15e8408..6eb15efb7351 100644
--- a/keyboards/tkc/portico/info.json
+++ b/keyboards/tkc/portico/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "matrix_pins": {
         "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3"],
diff --git a/keyboards/tkc/portico68v2/info.json b/keyboards/tkc/portico68v2/info.json
index b37f02ecc979..7a11cb617208 100644
--- a/keyboards/tkc/portico68v2/info.json
+++ b/keyboards/tkc/portico68v2/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3"],
diff --git a/keyboards/tkc/portico75/info.json b/keyboards/tkc/portico75/info.json
index 4380caba4f3c..5a900369725d 100644
--- a/keyboards/tkc/portico75/info.json
+++ b/keyboards/tkc/portico75/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3741"
+        "driver": "is31fl3741"
     },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B3", "B7"],
@@ -113,97 +113,6 @@
                 {"matrix": [5, 12], "x": 14.25, "y": 5.5},
                 {"matrix": [5, 13], "x": 15.25, "y": 5.5}
             ]
-        },
-        "LAYOUT_75_via": {
-            "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": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [1, 14], "x": 29, "y": 0},
-
-                {"matrix": [2, 0], "x": 30, "y": 0},
-                {"matrix": [2, 1], "x": 31, "y": 0},
-                {"matrix": [2, 2], "x": 32, "y": 0},
-                {"matrix": [2, 3], "x": 33, "y": 0},
-                {"matrix": [2, 4], "x": 34, "y": 0},
-                {"matrix": [2, 5], "x": 35, "y": 0},
-                {"matrix": [2, 6], "x": 36, "y": 0},
-                {"matrix": [2, 7], "x": 37, "y": 0},
-                {"matrix": [2, 8], "x": 38, "y": 0},
-                {"matrix": [2, 9], "x": 39, "y": 0},
-                {"matrix": [2, 10], "x": 40, "y": 0},
-                {"matrix": [2, 11], "x": 41, "y": 0},
-                {"matrix": [2, 12], "x": 42, "y": 0},
-                {"matrix": [2, 13], "x": 43, "y": 0},
-                {"matrix": [2, 14], "x": 44, "y": 0},
-
-                {"matrix": [3, 0], "x": 45, "y": 0},
-                {"matrix": [3, 1], "x": 46, "y": 0},
-                {"matrix": [3, 2], "x": 47, "y": 0},
-                {"matrix": [3, 3], "x": 48, "y": 0},
-                {"matrix": [3, 4], "x": 49, "y": 0},
-                {"matrix": [3, 5], "x": 50, "y": 0},
-                {"matrix": [3, 6], "x": 51, "y": 0},
-                {"matrix": [3, 7], "x": 52, "y": 0},
-                {"matrix": [3, 8], "x": 53, "y": 0},
-                {"matrix": [3, 9], "x": 54, "y": 0},
-                {"matrix": [3, 10], "x": 55, "y": 0},
-                {"matrix": [3, 11], "x": 56, "y": 0},
-                {"matrix": [3, 12], "x": 57, "y": 0},
-                {"matrix": [3, 14], "x": 58, "y": 0},
-
-                {"matrix": [4, 0], "x": 59, "y": 0},
-                {"matrix": [4, 1], "x": 60, "y": 0},
-                {"matrix": [4, 2], "x": 61, "y": 0},
-                {"matrix": [4, 3], "x": 62, "y": 0},
-                {"matrix": [4, 4], "x": 63, "y": 0},
-                {"matrix": [4, 5], "x": 64, "y": 0},
-                {"matrix": [4, 6], "x": 65, "y": 0},
-                {"matrix": [4, 7], "x": 66, "y": 0},
-                {"matrix": [4, 8], "x": 67, "y": 0},
-                {"matrix": [4, 9], "x": 68, "y": 0},
-                {"matrix": [4, 10], "x": 69, "y": 0},
-                {"matrix": [4, 11], "x": 70, "y": 0},
-                {"matrix": [4, 12], "x": 71, "y": 0},
-                {"matrix": [4, 14], "x": 72, "y": 0},
-
-                {"matrix": [5, 0], "x": 73, "y": 0},
-                {"matrix": [5, 1], "x": 74, "y": 0},
-                {"matrix": [5, 2], "x": 75, "y": 0},
-                {"matrix": [5, 5], "x": 76, "y": 0},
-                {"matrix": [5, 9], "x": 77, "y": 0},
-                {"matrix": [5, 10], "x": 78, "y": 0},
-                {"matrix": [5, 11], "x": 79, "y": 0},
-                {"matrix": [5, 12], "x": 80, "y": 0},
-                {"matrix": [5, 13], "x": 81, "y": 0}
-            ]
         }
     }
 }
diff --git a/keyboards/tkc/portico75/keymaps/via/keymap.c b/keyboards/tkc/portico75/keymaps/via/keymap.c
index befb3b882996..03e96a27066a 100644
--- a/keyboards/tkc/portico75/keymaps/via/keymap.c
+++ b/keyboards/tkc/portico75/keymaps/via/keymap.c
@@ -27,47 +27,47 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //  BR_INC, BR_DEC,   // backlight brightness increase/decrease
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_75_via(
+    [0] = LAYOUT_75_ansi(
         KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_PSCR, KC_MUTE,
         KC_GRV,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_HOME,
         KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-        KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,  KC_ENT,          KC_VOLD,
-        KC_LSFT, 	KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,   KC_UP,          KC_VOLU,
+        KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,  KC_ENT,
+        KC_LSFT, 	KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,   KC_UP,
         KC_LCTL, KC_LGUI, KC_LALT,                    KC_SPC,                            KC_RALT,   MO(1), KC_LEFT, KC_DOWN, KC_RGHT
     ),
 #ifdef RGB_BACKLIGHT_PORTICO75
-    [1] = LAYOUT_75_via(
+    [1] = LAYOUT_75_ansi(
         _______,  EF_INC,  EF_DEC,  H1_INC,  H1_DEC,  S1_INC,  S1_DEC,  H2_INC,  H2_DEC,  S2_INC,  S2_DEC,  BR_INC,  BR_DEC, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
     ),
 #else
-    [1] = LAYOUT_75_via(
+    [1] = LAYOUT_75_ansi(
         _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
     ),
 #endif
-    [2] = LAYOUT_75_via(
+    [2] = LAYOUT_75_ansi(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
     ),
-    [3] = LAYOUT_75_via(
+    [3] = LAYOUT_75_ansi(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
     )
 };
diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h
index dd6631f5456a..b9449c4714bf 100644
--- a/keyboards/tkc/tkc1800/config.h
+++ b/keyboards/tkc/tkc1800/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Underlight configuration
- */
-#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 5
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
-
 /* 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/tkc1800/info.json b/keyboards/tkc/tkc1800/info.json
index 5cf8f83c8087..b99d4ca60f83 100644
--- a/keyboards/tkc/tkc1800/info.json
+++ b/keyboards/tkc/tkc1800/info.json
@@ -27,6 +27,24 @@
     "num_lock": "D2",
     "scroll_lock": "D4"
   },
+  "rgblight": {
+    "hue_steps": 5,
+    "saturation_steps": 10,
+    "brightness_steps": 10,
+    "led_count": 30,
+    "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": "D7"
   },
diff --git a/keyboards/tkc/tkc1800/rules.mk b/keyboards/tkc/tkc1800/rules.mk
index f9f3b206d04a..fc74989daffd 100644
--- a/keyboards/tkc/tkc1800/rules.mk
+++ b/keyboards/tkc/tkc1800/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h
index 95ce321679ba..5a3bda67c26a 100644
--- a/keyboards/tkc/tkl_ab87/config.h
+++ b/keyboards/tkc/tkl_ab87/config.h
@@ -20,22 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations
 
-  #define RGBLED_NUM 22
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/tkl_ab87/info.json b/keyboards/tkc/tkl_ab87/info.json
index c0a178595b16..0d464a2db9d6 100644
--- a/keyboards/tkc/tkl_ab87/info.json
+++ b/keyboards/tkc/tkl_ab87/info.json
@@ -25,7 +25,23 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 22,
+        "max_brightness": 200,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h
index 4837c2fda6cd..a963fbfb510e 100644
--- a/keyboards/tkw/grandiceps/config.h
+++ b/keyboards/tkw/grandiceps/config.h
@@ -17,22 +17,6 @@
 
 #define SELECT_SOFT_SERIAL_SPEED 1
 
-#define MATRIX_IO_DELAY 5
-#define TAP_CODE_DELAY 10
-
-#define RGBLED_NUM 16
-#define RGBLED_SPLIT { 8,8 }
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 2
diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json
index 1b16db1bf8c9..de4fa5cd491a 100644
--- a/keyboards/tkw/grandiceps/info.json
+++ b/keyboards/tkw/grandiceps/info.json
@@ -11,11 +11,26 @@
         "driver": "pwm"
     },
     "rgblight": {
-        "max_brightness": 120
+        "led_count": 16,
+        "max_brightness": 120,
+        "split_count": [8, 8],
+        "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": ["B0", "A7", "A3", "A5", "A4", "A2"],
-        "rows": ["B12", "A6", "B13", "B9", "B8"]
+        "rows": ["B12", "A6", "B13", "B9", "B8"],
+        "io_delay": 5
     },
     "diode_direction": "COL2ROW",
     "encoder": {
@@ -32,6 +47,9 @@
             }
         }
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "STM32F411",
     "bootloader": "stm32-dfu",
     "board": "BLACKPILL_STM32_F411",
diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk
index 2565f116a19c..86483ba9207a 100644
--- a/keyboards/tkw/grandiceps/rules.mk
+++ b/keyboards/tkw/grandiceps/rules.mk
@@ -16,7 +16,6 @@ KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+m
 SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = usart
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
 
 DEFAULT_FOLDER = tkw/grandiceps/rev1
diff --git a/keyboards/tkw/stoutgat/v1/config.h b/keyboards/tkw/stoutgat/v1/config.h
deleted file mode 100644
index b168318aa029..000000000000
--- a/keyboards/tkw/stoutgat/v1/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*Copyright 2020 Thys de Wet
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-#define TAP_CODE_DELAY 10
diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/info.json
index 334ace4d3ac7..9d7a60a4b97c 100644
--- a/keyboards/tkw/stoutgat/v1/info.json
+++ b/keyboards/tkw/stoutgat/v1/info.json
@@ -19,6 +19,9 @@
             {"pin_a": "B0", "pin_b": "B1"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "processor": "atmega32a",
     "bootloader": "usbasploader",
     "community_layouts": ["65_iso", "65_ansi"],
diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h
index 3e5d5a452a37..bf68edcfae94 100644
--- a/keyboards/tkw/stoutgat/v2/config.h
+++ b/keyboards/tkw/stoutgat/v2/config.h
@@ -15,21 +15,6 @@
  */
 #pragma once
 
-#define MATRIX_IO_DELAY 5
-#define TAP_CODE_DELAY 10
-
-#define RGBLED_NUM 13
-#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 WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 2
diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json
index e0cc720365cb..b1232f6816ee 100644
--- a/keyboards/tkw/stoutgat/v2/info.json
+++ b/keyboards/tkw/stoutgat/v2/info.json
@@ -13,11 +13,25 @@
         "driver": "pwm"
     },
     "rgblight": {
-        "max_brightness": 120
+        "led_count": 13,
+        "max_brightness": 120,
+        "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": ["B0", "A7", "A6", "A5", "A4", "A3", "A1", "A0", "C15", "C14", "C13", "A15", "B3", "B4", "B5"],
-        "rows": ["B6", "A2", "B7", "B9", "B8"]
+        "rows": ["B6", "A2", "B7", "B9", "B8"],
+        "io_delay": 5
     },
     "diode_direction": "COL2ROW",
     "encoder": {
@@ -26,6 +40,9 @@
             {"pin_a": "B12", "pin_b": "B13"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "community_layouts": ["65_iso", "65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
diff --git a/keyboards/tmo50/config.h b/keyboards/tmo50/config.h
index 29151c2a22b0..8964ad6d2f4b 100644
--- a/keyboards/tmo50/config.h
+++ b/keyboards/tmo50/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 10
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* 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/info.json b/keyboards/tmo50/info.json
index f4cb7b1aa8e8..ff3f95b223b4 100644
--- a/keyboards/tmo50/info.json
+++ b/keyboards/tmo50/info.json
@@ -17,6 +17,24 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "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": "C7"
     },
diff --git a/keyboards/toffee_studio/blueberry/config.h b/keyboards/toffee_studio/blueberry/config.h
index 07a4bae2be0d..f15e82696a21 100644
--- a/keyboards/toffee_studio/blueberry/config.h
+++ b/keyboards/toffee_studio/blueberry/config.h
@@ -16,25 +16,6 @@
 
 #pragma once
 
-#   define RGBLED_NUM 22
-
-/* RGB LED logical order map */
-/* Top->Bottom, Right->Left */
-#define RGBLIGHT_LED_MAP {      \
-  19, 18, 17, 16, 15, 14, 13, 12, 11,   \
-  20,                             10,   \
-  21,			                   9,   \
-   0,  1,  2,  3,  4,  5,  6,  7,  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_ALTERNATING
-
 /* 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/toffee_studio/blueberry/info.json b/keyboards/toffee_studio/blueberry/info.json
index 6acd8f4a589c..3f94299b7838 100644
--- a/keyboards/toffee_studio/blueberry/info.json
+++ b/keyboards/toffee_studio/blueberry/info.json
@@ -12,7 +12,19 @@
         "pin": "D0"
     },
     "rgblight": {
-        "max_brightness": 192
+        "led_count": 22,
+        "max_brightness": 192,
+        "led_map": [19, 18, 17, 16, 15, 14, 13, 12, 11, 20, 10, 21, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true
+        }
     },
     "matrix_pins": {
         "cols": ["B6", "D4", "D6", "D7", "B4", "B5", "C6", "C7"],
diff --git a/keyboards/tokyokeyboard/alix40/config.h b/keyboards/tokyokeyboard/alix40/config.h
index fad2d49c938c..1ca9b6c46dfe 100644
--- a/keyboards/tokyokeyboard/alix40/config.h
+++ b/keyboards/tokyokeyboard/alix40/config.h
@@ -20,22 +20,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
-
 /* Bluetooth */
 #define BATTERY_LEVEL_PIN   B6
-
-#define VIA_HAS_BROKEN_KEYCODES
diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/info.json
index d71fb56f0bc9..7b2f198e596c 100644
--- a/keyboards/tokyokeyboard/alix40/info.json
+++ b/keyboards/tokyokeyboard/alix40/info.json
@@ -13,11 +13,32 @@
         "rows": ["D7", "C6", "C7", "B5"]
     },
     "diode_direction": "ROW2COL",
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
     "backlight": {
         "pin": "B7",
         "levels": 31,
         "breathing": true
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "saturation_steps": 10,
+        "brightness_steps": 10,
+        "led_count": 12,
+        "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": "B0"
     },
diff --git a/keyboards/tokyokeyboard/alix40/rules.mk b/keyboards/tokyokeyboard/alix40/rules.mk
index 2c7a27584705..5d6d78ae10ae 100644
--- a/keyboards/tokyokeyboard/alix40/rules.mk
+++ b/keyboards/tokyokeyboard/alix40/rules.mk
@@ -14,4 +14,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h
index dd58e34f08f2..5f360813239b 100644
--- a/keyboards/tokyokeyboard/tokyo60/config.h
+++ b/keyboards/tokyokeyboard/tokyo60/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 10
-#define RGBLIGHT_HUE_STEP 12
-#define RGBLIGHT_SAT_STEP 12
-#define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/tokyokeyboard/tokyo60/info.json b/keyboards/tokyokeyboard/tokyo60/info.json
index aae81a4a6b6e..e0f756121ca8 100644
--- a/keyboards/tokyokeyboard/tokyo60/info.json
+++ b/keyboards/tokyokeyboard/tokyo60/info.json
@@ -18,6 +18,24 @@
         "pin": "B7",
         "levels": 6
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 12,
+        "brightness_steps": 12,
+        "led_count": 10,
+        "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": "F7"
     },
diff --git a/keyboards/tominabox1/bigboy/config.h b/keyboards/tominabox1/bigboy/config.h
deleted file mode 100755
index 77d49adbec4f..000000000000
--- a/keyboards/tominabox1/bigboy/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2022 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/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 5
-
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-
-    #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/tominabox1/bigboy/info.json b/keyboards/tominabox1/bigboy/info.json
index 87f8473bb8a4..8d8e26dc5512 100644
--- a/keyboards/tominabox1/bigboy/info.json
+++ b/keyboards/tominabox1/bigboy/info.json
@@ -8,6 +8,22 @@
         "pid": "0x6262",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 5,
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
         "pin": "B5"
     },
diff --git a/keyboards/tominabox1/le_chiffre/config.h b/keyboards/tominabox1/le_chiffre/config.h
index fb3860b0eb7c..9b01cb3da477 100644
--- a/keyboards/tominabox1/le_chiffre/config.h
+++ b/keyboards/tominabox1/le_chiffre/config.h
@@ -23,29 +23,5 @@
 /*
  * WS2812 Underglow Matrix options
  */
-
-#define RGBLED_NUM 11
-
-#define RGB_MATRIX_LED_COUNT 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 RGB_MATRIX_ENABLE
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+#define RGB_MATRIX_LED_COUNT 11
 #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_HUE_STEP 8
-#define RGB_MATRIX_SAT_STEP 8
-#define RGB_MATRIX_VAL_STEP 8
-#define RGB_MATRIX_SPD_STEP 10
-#endif
diff --git a/keyboards/tominabox1/le_chiffre/he/he.c b/keyboards/tominabox1/le_chiffre/he/he.c
deleted file mode 100644
index 6ee82149536b..000000000000
--- a/keyboards/tominabox1/le_chiffre/he/he.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2022 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 "quantum.h"
-
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
-  // Key Matrix to LED Index
-  { 3, 4, NO_LED, 5, 6 },
-  { NO_LED, NO_LED, 10, NO_LED, NO_LED },
-  { NO_LED, NO_LED, 9, NO_LED, NO_LED },
-  { 2, 1, 0, 8, 7 }
-}, {
-
-  // LED Index to Physical Position
-  { 128, 64 }, { 77, 64 }, { 0, 48 }, { 0, 0 }, { 115, 0 }, { 166, 0 }, { 255, 0 }, { 255, 48 }, { 178, 64 }, { 128, 40 }, { 128, 30 }
-}, {
-
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
-} };
-#endif
diff --git a/keyboards/tominabox1/le_chiffre/he/info.json b/keyboards/tominabox1/le_chiffre/he/info.json
index bab0d5242c55..e7eb527602a7 100644
--- a/keyboards/tominabox1/le_chiffre/he/info.json
+++ b/keyboards/tominabox1/le_chiffre/he/info.json
@@ -1,13 +1,7 @@
 {
-    "usb": {
-        "device_version": "0.0.3"
-    },
-    "ws2812": {
-        "pin": "F0"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "B0", "B2", "B1", "B4", "D7", "C7", "D2", "F7"],
-        "rows": ["B3", "D4", "F1", "C6"]
+    "bootloader": "atmel-dfu",
+    "build": {
+        "lto": true
     },
     "diode_direction": "COL2ROW",
     "encoder": {
@@ -15,11 +9,17 @@
             {"pin_a": "D5", "pin_b": "D3"}
         ]
     },
-    "rgb_matrix": {
-        "driver": "WS2812"
+    "matrix_pins": {
+        "cols": ["F4", "F5", "B0", "B2", "B1", "B4", "D7", "C7", "D2", "F7"],
+        "rows": ["B3", "D4", "F1", "C6"]
     },
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
+    "usb": {
+        "device_version": "0.0.3"
+    },
+    "ws2812": {
+        "pin": "F0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
@@ -34,34 +34,28 @@
                 {"matrix": [0, 7], "x": 8, "y": 0},
                 {"matrix": [0, 8], "x": 9, "y": 0},
                 {"matrix": [0, 9], "x": 10, "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": 6, "y": 1},
                 {"matrix": [1, 6], "x": 7, "y": 1},
                 {"matrix": [1, 7], "x": 8, "y": 1},
                 {"matrix": [1, 8], "x": 9, "y": 1},
                 {"matrix": [1, 9], "x": 10, "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": 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": [3, 2], "x": 1.75, "y": 3, "w": 1.25},
                 {"matrix": [3, 4], "x": 3, "y": 3, "w": 2},
-
                 {"matrix": [3, 5], "x": 6, "y": 3, "w": 2},
                 {"matrix": [3, 7], "x": 8, "y": 3, "w": 1.25}
             ]
diff --git a/keyboards/tominabox1/le_chiffre/he/rules.mk b/keyboards/tominabox1/le_chiffre/he/rules.mk
index 53d9b0d47b5a..6e7633bfe015 100644
--- a/keyboards/tominabox1/le_chiffre/he/rules.mk
+++ b/keyboards/tominabox1/le_chiffre/he/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 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
-RGB_MATRIX_ENABLE = yes
-LTO_ENABLE = yes
+# This file intentionally left blank
diff --git a/keyboards/tominabox1/le_chiffre/info.json b/keyboards/tominabox1/le_chiffre/info.json
index 25f19145a921..8ebc0778e652 100644
--- a/keyboards/tominabox1/le_chiffre/info.json
+++ b/keyboards/tominabox1/le_chiffre/info.json
@@ -1,10 +1,82 @@
 {
-  "keyboard_name": "Le Chiffre",
-  "manufacturer": "tominabox1",
-  "url": "",
-  "maintainer": "tominabox1",
-  "usb": {
-    "vid": "0x7431",
-    "pid": "0xD645"
-  }
+    "keyboard_name": "Le Chiffre",
+    "manufacturer": "tominabox1",
+    "url": "",
+    "maintainer": "tominabox1",
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "rgb_matrix": 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
+        },
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "max_brightness": 150,
+        "led_count": 11
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "animations": {
+            "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,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_pinwheel": 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
+        },
+        "layout": [
+            {"x": 128, "y": 64, "flags": 2},
+            {"x": 77, "y": 64, "flags": 2},
+            {"x": 0, "y": 48, "flags": 2},
+            {"x": 0, "y": 0, "flags": 2},
+            {"x": 115, "y": 0, "flags": 2},
+            {"x": 166, "y": 0, "flags": 2},
+            {"x": 255, "y": 0, "flags": 2},
+            {"x": 255, "y": 48, "flags": 2},
+            {"x": 178, "y": 64, "flags": 2},
+            {"x": 128, "y": 40, "flags": 8},
+            {"x": 128, "y": 30, "flags": 8}
+        ],
+        "max_brightness": 150,
+        "sat_steps": 8,
+        "speed_steps": 10,
+        "val_steps": 8
+    },
+    "usb": {
+        "vid": "0x7431",
+        "pid": "0xD645"
+    }
 }
diff --git a/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c b/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c
index e9205d94b3d8..7008550f2ba0 100644
--- a/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c
+++ b/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c
@@ -15,18 +15,10 @@
  */
 #include QMK_KEYBOARD_H
 
-enum layers{
-  _BASE,
-  _NUM_SYM,
-  _NAV
-};
-
-enum combo_events {
-  COMBO_BSPC,
-  COMBO_NUMBAK,
-  COMBO_TAB,
-  COMBO_ESC,
-  COMBO_DEL,
+enum layers {
+    _BASE,
+    _NUM_SYM,
+    _NAV
 };
 
 #define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)
@@ -39,6 +31,7 @@ enum combo_events {
 #define KC_AL RALT_T(KC_L)
 #define KC_GSCLN RGUI_T(KC_SCLN)
 
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT(
     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,  KC_MPLY,  KC_Y,   KC_U,    KC_I,   KC_O,     KC_P,
@@ -59,54 +52,58 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,           KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_END,
     RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,           KC_MINS,    KC_INT1,  KC_COMM,   KC_DOT,  KC_BSLS,
                                   KC_TRNS,KC_TRNS,           KC_TRNS,  KC_TRNS
-  ),
+  )
 };
+// clang-format on
 
-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;
-}
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_BASE] =  {ENCODER_CCW_CW(KC_MNXT, KC_MPRV) },
+    [_NUM_SYM] = { ENCODER_CCW_CW(KC_WH_D, KC_WH_U) },
+    [_NAV] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }
+};
+#endif
 
 #ifdef COMBO_ENABLE
-const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
+enum combo_events {
+    COMBO_BSPC,
+    COMBO_NUMBAK,
+    COMBO_TAB,
+    COMBO_ESC,
+    COMBO_DEL,
+};
+
+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_Q, KC_W, COMBO_END};
-const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END};
-const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
+const uint16_t PROGMEM combo_tab[]    = {KC_Q, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_esc[]    = {KC_E, 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),
-
+    [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
 
-#ifdef OLED_ENABLE  //Special thanks to Sickbabies for this great OLED widget!
+#ifdef OLED_ENABLE // Special thanks to Sickbabies for this great OLED widget!
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_90;  // rotates for proper orientation
+    return OLED_ROTATION_90; // rotates for proper orientation
 }
 
 void render_lechiffre_logo(void) {
     static const char PROGMEM lechiffre_logo[] = {
-	// 'lechiffre_logo', 32x20px
-   0x00, 0x3e, 0x20, 0x20, 0x00, 0x18, 0x2c, 0xa8, 0x80, 0x00, 0x1c, 0x22, 0x22, 0x00, 0x3e, 0x08,
-0x30, 0x00, 0x34, 0x00, 0x3c, 0x0a, 0x00, 0xbc, 0x8a, 0x00, 0x38, 0x08, 0x00, 0x18, 0x2c, 0x28,
-0x00, 0xb6, 0xb6, 0x00, 0xdb, 0xdb, 0x00, 0x6d, 0x6d, 0x00, 0xdb, 0xdb, 0x00, 0xdb, 0xdb, 0x00,
-0x00, 0xdb, 0xdb, 0x00, 0xdb, 0xdb, 0x00, 0x6d, 0x6d, 0x00, 0xdb, 0xdb, 0x00, 0xb6, 0xb6, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00,
-0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00
-};
-
-  oled_write_raw_P(lechiffre_logo, sizeof(lechiffre_logo));
+       // 'lechiffre_logo', 32x20px
+    0x00, 0x3e, 0x20, 0x20, 0x00, 0x18, 0x2c, 0xa8, 0x80, 0x00, 0x1c, 0x22, 0x22, 0x00, 0x3e, 0x08,
+    0x30, 0x00, 0x34, 0x00, 0x3c, 0x0a, 0x00, 0xbc, 0x8a, 0x00, 0x38, 0x08, 0x00, 0x18, 0x2c, 0x28,
+    0x00, 0xb6, 0xb6, 0x00, 0xdb, 0xdb, 0x00, 0x6d, 0x6d, 0x00, 0xdb, 0xdb, 0x00, 0xdb, 0xdb, 0x00,
+    0x00, 0xdb, 0xdb, 0x00, 0xdb, 0xdb, 0x00, 0x6d, 0x6d, 0x00, 0xdb, 0xdb, 0x00, 0xb6, 0xb6, 0x00,
+    0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00,
+    0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00};
+
+    oled_write_raw_P(lechiffre_logo, sizeof(lechiffre_logo));
 }
 
 static void render_layer_status(void) {
@@ -161,7 +158,7 @@ void update_log(void) {
     }
 }
 
-//Text only renders
+// Text only renders
 void render_keylogger_status(void) {
     oled_write_P(PSTR("-----"), false);
     oled_write(keylog_str, false);
@@ -170,15 +167,15 @@ void render_keylogger_status(void) {
 void render_keylock_status(led_t led_state) {
     oled_write_P(PSTR("-----"), false);
     oled_write_P(PSTR("C"), led_state.caps_lock);
-	oled_write_P(PSTR(" "), false);
+    oled_write_P(PSTR(" "), false);
     oled_write_P(PSTR("N"), led_state.num_lock);
-	oled_write_P(PSTR(" "), false);
+    oled_write_P(PSTR(" "), false);
     oled_write_P(PSTR("S"), led_state.scroll_lock);
-    //oled_write_ln_P(PSTR(" "), false);
+    // oled_write_ln_P(PSTR(" "), false);
 }
 
 void render_mod_status(uint8_t modifiers) {
-       oled_write_P(PSTR("-----"), false);
+    oled_write_P(PSTR("-----"), false);
     oled_write_ln_P(PSTR("SHFT"), (modifiers & MOD_MASK_SHIFT));
     oled_write_ln_P(PSTR("ALT"), (modifiers & MOD_MASK_ALT));
     oled_write_ln_P(PSTR("CTRL"), (modifiers & MOD_MASK_CTRL));
@@ -187,19 +184,19 @@ void render_mod_status(uint8_t modifiers) {
 
 bool oled_task_user(void) {
     render_lechiffre_logo();
-    oled_set_cursor(0,3);
-    render_layer_status();	// Renders the current keyboard state (layer, lock, caps, scroll, etc)
-	render_mod_status(get_mods()|get_oneshot_mods());
-	render_keylock_status(host_keyboard_led_state());
-	render_keylogger_status();
+    oled_set_cursor(0, 3);
+    render_layer_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
+    render_mod_status(get_mods() | get_oneshot_mods());
+    render_keylock_status(host_keyboard_led_state());
+    render_keylogger_status();
 
     return false;
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
-      add_keylog(keycode);
+        add_keylog(keycode);
     }
     return true;
-  }
+}
 #endif
diff --git a/keyboards/tominabox1/le_chiffre/keymaps/default/rules.mk b/keyboards/tominabox1/le_chiffre/keymaps/default/rules.mk
index ab1e438182a3..cbd8b4aa81ff 100644
--- a/keyboards/tominabox1/le_chiffre/keymaps/default/rules.mk
+++ b/keyboards/tominabox1/le_chiffre/keymaps/default/rules.mk
@@ -1 +1,2 @@
 COMBO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/tominabox1/le_chiffre/keymaps/via/keymap.c b/keyboards/tominabox1/le_chiffre/keymaps/via/keymap.c
index c626cba1cc02..2592ee5dc10e 100644
--- a/keyboards/tominabox1/le_chiffre/keymaps/via/keymap.c
+++ b/keyboards/tominabox1/le_chiffre/keymaps/via/keymap.c
@@ -15,57 +15,39 @@
  */
 #include QMK_KEYBOARD_H
 
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,  KC_MPLY,  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, KC_ENT,            KC_SPC, KC_RALT
-  ),
-
-  [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
-  ),
-
-  [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
-  ),
+  )
 };
+// clang-format on
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_MNXT);
-        } else {
-            tap_code(KC_MPRV);
-        }
-    }
-    return true;
-}
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_MNXT, KC_MPRV) }
+};
+#endif
 
-#ifdef OLED_ENABLE  //Special thanks to Sickbabies for this great OLED widget!
+#ifdef OLED_ENABLE // Special thanks to Sickbabies for this great OLED widget!
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_90;  // rotates for proper orientation
+    return OLED_ROTATION_90; // rotates for proper orientation
 }
 
 void render_lechiffre_logo(void) {
     static const char PROGMEM lechiffre_logo[] = {
-	// 'lechiffre_logo', 32x20px
-   0x00, 0x3e, 0x20, 0x20, 0x00, 0x18, 0x2c, 0xa8, 0x80, 0x00, 0x1c, 0x22, 0x22, 0x00, 0x3e, 0x08,
-0x30, 0x00, 0x34, 0x00, 0x3c, 0x0a, 0x00, 0xbc, 0x8a, 0x00, 0x38, 0x08, 0x00, 0x18, 0x2c, 0x28,
-0x00, 0xb6, 0xb6, 0x00, 0xdb, 0xdb, 0x00, 0x6d, 0x6d, 0x00, 0xdb, 0xdb, 0x00, 0xdb, 0xdb, 0x00,
-0x00, 0xdb, 0xdb, 0x00, 0xdb, 0xdb, 0x00, 0x6d, 0x6d, 0x00, 0xdb, 0xdb, 0x00, 0xb6, 0xb6, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00,
-0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00
-};
-
-  oled_write_raw_P(lechiffre_logo, sizeof(lechiffre_logo));
+       // 'lechiffre_logo', 32x20px
+    0x00, 0x3e, 0x20, 0x20, 0x00, 0x18, 0x2c, 0xa8, 0x80, 0x00, 0x1c, 0x22, 0x22, 0x00, 0x3e, 0x08,
+    0x30, 0x00, 0x34, 0x00, 0x3c, 0x0a, 0x00, 0xbc, 0x8a, 0x00, 0x38, 0x08, 0x00, 0x18, 0x2c, 0x28,
+    0x00, 0xb6, 0xb6, 0x00, 0xdb, 0xdb, 0x00, 0x6d, 0x6d, 0x00, 0xdb, 0xdb, 0x00, 0xdb, 0xdb, 0x00,
+    0x00, 0xdb, 0xdb, 0x00, 0xdb, 0xdb, 0x00, 0x6d, 0x6d, 0x00, 0xdb, 0xdb, 0x00, 0xb6, 0xb6, 0x00,
+    0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00,
+    0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00};
+
+    oled_write_raw_P(lechiffre_logo, sizeof(lechiffre_logo));
 }
 
 // static void render_layer_status(void) {
@@ -120,7 +102,7 @@ void update_log(void) {
     }
 }
 
-//Text only renders
+// Text only renders
 void render_keylogger_status(void) {
     oled_write_P(PSTR("-----"), false);
     oled_write(keylog_str, false);
@@ -129,36 +111,36 @@ void render_keylogger_status(void) {
 void render_keylock_status(led_t led_state) {
     oled_write_P(PSTR("-----"), false);
     oled_write_P(PSTR("C"), led_state.caps_lock);
-	oled_write_P(PSTR(" "), false);
+    oled_write_P(PSTR(" "), false);
     oled_write_P(PSTR("N"), led_state.num_lock);
-	oled_write_P(PSTR(" "), false);
+    oled_write_P(PSTR(" "), false);
     oled_write_P(PSTR("S"), led_state.scroll_lock);
-    //oled_write_ln_P(PSTR(" "), false);
+    // oled_write_ln_P(PSTR(" "), false);
 }
 
 void render_mod_status(uint8_t modifiers) {
-       oled_write_P(PSTR("-----"), false);
+    oled_write_P(PSTR("-----"), false);
     oled_write_ln_P(PSTR("SHFT"), (modifiers & MOD_MASK_SHIFT));
     oled_write_ln_P(PSTR("ALT"), (modifiers & MOD_MASK_ALT));
     oled_write_ln_P(PSTR("CTRL"), (modifiers & MOD_MASK_CTRL));
     oled_write_ln_P(PSTR("GUI"), (modifiers & MOD_MASK_GUI));
 }
 
-void oled_task_keymap(void) {
+bool oled_task_user(void) {
     render_lechiffre_logo();
-    oled_set_cursor(0,3);
-    // render_layer_status();	// Renders the current keyboard state (layer, lock, caps, scroll, etc)
-	render_mod_status(get_mods()|get_oneshot_mods());
-	render_keylock_status(host_keyboard_led_state());
-	render_keylogger_status();
+    oled_set_cursor(0, 3);
+    // render_layer_status();    // Renders the current keyboard state (layer, lock, caps, scroll, etc)
+    render_mod_status(get_mods() | get_oneshot_mods());
+    render_keylock_status(host_keyboard_led_state());
+    render_keylogger_status();
 
     return false;
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
-      add_keylog(keycode);
+        add_keylog(keycode);
     }
     return true;
-  }
+}
 #endif
diff --git a/keyboards/tominabox1/le_chiffre/keymaps/via/rules.mk b/keyboards/tominabox1/le_chiffre/keymaps/via/rules.mk
index 1e5b99807cb7..f1adcab005e8 100644
--- a/keyboards/tominabox1/le_chiffre/keymaps/via/rules.mk
+++ b/keyboards/tominabox1/le_chiffre/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/tominabox1/le_chiffre/readme.md b/keyboards/tominabox1/le_chiffre/readme.md
index 9ac3d6c81cac..23f1a9676868 100644
--- a/keyboards/tominabox1/le_chiffre/readme.md
+++ b/keyboards/tominabox1/le_chiffre/readme.md
@@ -1,16 +1,22 @@
 # Le Chiffre
 
-![Le Chiffre](https://i.imgur.com/X1WsUmdl.png)
+![Le Chiffre](https://i.imgur.com/X1WsUmdh.png)
 
-Le Chiffre (ironically, "the number" in French) is a 30% keyboard designed by tominabox1.  The purpose of the board is to provide a platform for MX and Choc ergo in one package for when ones wrists need a break. The board supports an RGB LED strip with DI on port F0. The board is also fitted with support for run-of-the-mill .91" OLED and EC11 rotary encoder.  
+Le Chiffre (ironically, "the number" in French) is a 30% keyboard designed by tominabox1.  The purpose of the board is to provide an ergonomic platform supporting MX, Choc and Alps—for when one's wrists need a break.
 
-There are 3 PCB revisions: Rev 1 (Original), Rev 2 (P3D version sold with the Le Chiffre Plus), and HE (Hotswap Edition from Checkerboards.xyz).
+As open source hardware, various revisions of the board exist. The original supports a run-of-the-mill .91" I2C OLED, EC11 rotary encoder and WS2812 RGB LED strip. Most versions also feature SMD footprints for underglow and indicator RGB LEDs.
 
-By default the OLED is **disabled**. This is to prevent issues with operation when one is not installed. Be sure to enable the OLED in the rules.mk file if you have one installed!
+Firmware support for several incompatible PCBs can be found in this repository. Examine your PCB to determine which firmware it uses before flashing.
+* Rev 1 (atmega32u4, atmel-dfu)
+  * The original.
+* Rev 2 (atmega32u4, atmel-dfu)
+  * Widely known as the "curly traces" version; notably sold by [P3D](https://p3dstore.com) with the Le Chiffre Plus case. (P3D's store page referred to this PCB version as "Rev 3".)
+* HE (atmega32u4, atmel-dfu)
+  * Created and sold by [Checker Boards](https://checkerboards.xyz). Uses MX hotswap sockets. No Choc or Alps support.
  
 * Keyboard Maintainer: [TJ Campie](https://github.com/tominabox1)
-* Hardware Supported: [Le Chiffre](https://github.com/tominabox1/Le-Chiffre-Keyboard)
-* Hardware Availability: Bring your own case.
+* Hardware Supported: [Le Chiffre](https://github.com/tominabox1/Le-Chiffre-Keyboard), [Le Chiffre HE](https://github.com/npspears/Le-Chiffre_HE)
+* Hardware Availability: Open source; PCBs are sometimes stocked by various keyboard vendors. Bring your own case.
 
 Make example for this keyboard (after setting up your build environment):
 
@@ -18,4 +24,22 @@ Make example for this keyboard (after setting up your build environment):
     make tominabox1/le_chiffre/rev2:default
     make tominabox1/le_chiffre/he:default
 
+Flashing example for this keyboard:
+
+    make tominabox1/le_chiffre/rev1:default:flash
+    make tominabox1/le_chiffre/rev2:default:flash
+    make tominabox1/le_chiffre/he: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. This will also clear EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Physical reset**: Press the central button on the underside of the PCB.
+* **Keycode in layout**: There is no key mapped to `QK_BOOT` in the pre-created keymaps, but you may assign this key in any keymaps you create.
+
+## Flashing
+
+After entering the bootloader through one of the three methods above, the keyboard will appear as an Atmel DFU device. It can be flashed using the QMK CLI or QMK Toolbox.
diff --git a/keyboards/tominabox1/le_chiffre/rev1/info.json b/keyboards/tominabox1/le_chiffre/rev1/info.json
index 5222f4ea5147..44982ecdf56b 100644
--- a/keyboards/tominabox1/le_chiffre/rev1/info.json
+++ b/keyboards/tominabox1/le_chiffre/rev1/info.json
@@ -1,13 +1,7 @@
 {
-    "usb": {
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "F0"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "B0", "B2", "B1", "B4", "D7", "C7", "D2", "F7"],
-        "rows": ["B3", "D4", "F1", "C6"]
+    "bootloader": "atmel-dfu",
+    "build": {
+        "lto": true
     },
     "diode_direction": "ROW2COL",
     "encoder": {
@@ -15,11 +9,17 @@
             {"pin_a": "D5", "pin_b": "D3"}
         ]
     },
-    "rgb_matrix": {
-        "driver": "WS2812"
+    "matrix_pins": {
+        "cols": ["F4", "F5", "B0", "B2", "B1", "B4", "D7", "C7", "D2", "F7"],
+        "rows": ["B3", "D4", "F1", "C6"]
     },
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
+    "usb": {
+        "device_version": "0.0.1"
+    },
+    "ws2812": {
+        "pin": "F0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
@@ -34,34 +34,28 @@
                 {"matrix": [0, 7], "x": 8, "y": 0},
                 {"matrix": [0, 8], "x": 9, "y": 0},
                 {"matrix": [0, 9], "x": 10, "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": 6, "y": 1},
                 {"matrix": [1, 6], "x": 7, "y": 1},
                 {"matrix": [1, 7], "x": 8, "y": 1},
                 {"matrix": [1, 8], "x": 9, "y": 1},
                 {"matrix": [1, 9], "x": 10, "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": 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": [3, 2], "x": 1.75, "y": 3, "w": 1.25},
                 {"matrix": [3, 4], "x": 3, "y": 3, "w": 2},
-
                 {"matrix": [3, 5], "x": 6, "y": 3, "w": 2},
                 {"matrix": [3, 7], "x": 8, "y": 3, "w": 1.25}
             ]
diff --git a/keyboards/tominabox1/le_chiffre/rev1/rev1.c b/keyboards/tominabox1/le_chiffre/rev1/rev1.c
deleted file mode 100644
index 66b0eb2f0858..000000000000
--- a/keyboards/tominabox1/le_chiffre/rev1/rev1.c
+++ /dev/null
@@ -1,33 +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 "quantum.h"
-
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
-  // Key Matrix to LED Index
-  { 3, 4, NO_LED, 5, 6 },
-  { NO_LED, NO_LED, 10, NO_LED, NO_LED },
-  { NO_LED, NO_LED, 9, NO_LED, NO_LED },
-  { 2, 1, 0, 8, 7 }
-}, {
-
-  // LED Index to Physical Position
-  { 128, 64 }, { 77, 64 }, { 0, 48 }, { 0, 0 }, { 115, 0 }, { 166, 0 }, { 255, 0 }, { 255, 48 }, { 178, 64 }, { 128, 40 }, { 128, 30 }
-}, {
-
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
-} };
-#endif
diff --git a/keyboards/tominabox1/le_chiffre/rev1/rules.mk b/keyboards/tominabox1/le_chiffre/rev1/rules.mk
index 7d791dd396c4..6e7633bfe015 100644
--- a/keyboards/tominabox1/le_chiffre/rev1/rules.mk
+++ b/keyboards/tominabox1/le_chiffre/rev1/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 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
-RGB_MATRIX_ENABLE = yes
-LTO_ENABLE = yes
-
+# This file intentionally left blank
diff --git a/keyboards/tominabox1/le_chiffre/rev2/info.json b/keyboards/tominabox1/le_chiffre/rev2/info.json
index f6773fb9bdfe..155b264ce219 100644
--- a/keyboards/tominabox1/le_chiffre/rev2/info.json
+++ b/keyboards/tominabox1/le_chiffre/rev2/info.json
@@ -1,13 +1,7 @@
 {
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "ws2812": {
-        "pin": "B1"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "F0", "F1", "F4", "F5", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["B3", "F6", "F7", "C7"]
+    "bootloader": "atmel-dfu",
+    "build": {
+        "lto": true
     },
     "diode_direction": "ROW2COL",
     "encoder": {
@@ -15,11 +9,17 @@
             {"pin_a": "B6", "pin_b": "C6"}
         ]
     },
-    "rgb_matrix": {
-        "driver": "WS2812"
+    "matrix_pins": {
+        "cols": ["B2", "F0", "F1", "F4", "F5", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B3", "F6", "F7", "C7"]
     },
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
+    "usb": {
+        "device_version": "0.0.2"
+    },
+    "ws2812": {
+        "pin": "B1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
@@ -34,34 +34,28 @@
                 {"matrix": [0, 7], "x": 8, "y": 0},
                 {"matrix": [0, 8], "x": 9, "y": 0},
                 {"matrix": [0, 9], "x": 10, "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": 6, "y": 1},
                 {"matrix": [1, 6], "x": 7, "y": 1},
                 {"matrix": [1, 7], "x": 8, "y": 1},
                 {"matrix": [1, 8], "x": 9, "y": 1},
                 {"matrix": [1, 9], "x": 10, "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": 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": [3, 2], "x": 1.75, "y": 3, "w": 1.25},
                 {"matrix": [3, 4], "x": 3, "y": 3, "w": 2},
-
                 {"matrix": [3, 5], "x": 6, "y": 3, "w": 2},
                 {"matrix": [3, 7], "x": 8, "y": 3, "w": 1.25}
             ]
diff --git a/keyboards/tominabox1/le_chiffre/rev2/rev2.c b/keyboards/tominabox1/le_chiffre/rev2/rev2.c
deleted file mode 100644
index 66b0eb2f0858..000000000000
--- a/keyboards/tominabox1/le_chiffre/rev2/rev2.c
+++ /dev/null
@@ -1,33 +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 "quantum.h"
-
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
-  // Key Matrix to LED Index
-  { 3, 4, NO_LED, 5, 6 },
-  { NO_LED, NO_LED, 10, NO_LED, NO_LED },
-  { NO_LED, NO_LED, 9, NO_LED, NO_LED },
-  { 2, 1, 0, 8, 7 }
-}, {
-
-  // LED Index to Physical Position
-  { 128, 64 }, { 77, 64 }, { 0, 48 }, { 0, 0 }, { 115, 0 }, { 166, 0 }, { 255, 0 }, { 255, 48 }, { 178, 64 }, { 128, 40 }, { 128, 30 }
-}, {
-
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
-} };
-#endif
diff --git a/keyboards/tominabox1/le_chiffre/rev2/rules.mk b/keyboards/tominabox1/le_chiffre/rev2/rules.mk
index 7d791dd396c4..6e7633bfe015 100644
--- a/keyboards/tominabox1/le_chiffre/rev2/rules.mk
+++ b/keyboards/tominabox1/le_chiffre/rev2/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 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
-RGB_MATRIX_ENABLE = yes
-LTO_ENABLE = yes
-
+# This file intentionally left blank
diff --git a/keyboards/tominabox1/qaz/config.h b/keyboards/tominabox1/qaz/config.h
index a9b9df681577..fa9a83d08ec4 100644
--- a/keyboards/tominabox1/qaz/config.h
+++ b/keyboards/tominabox1/qaz/config.h
@@ -4,18 +4,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 21
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/tominabox1/qaz/info.json b/keyboards/tominabox1/qaz/info.json
index 99ae387af7bf..1ddb07e6212f 100644
--- a/keyboards/tominabox1/qaz/info.json
+++ b/keyboards/tominabox1/qaz/info.json
@@ -8,6 +8,23 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 21,
+    "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": "F7"
   },
diff --git a/keyboards/tominabox1/underscore33/rev2/config.h b/keyboards/tominabox1/underscore33/rev2/config.h
index eac1807676e4..333d0a100ebb 100644
--- a/keyboards/tominabox1/underscore33/rev2/config.h
+++ b/keyboards/tominabox1/underscore33/rev2/config.h
@@ -19,17 +19,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#ifdef RGBLIGHT_ENABLE
-   #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
-#endif
diff --git a/keyboards/tominabox1/underscore33/rev2/info.json b/keyboards/tominabox1/underscore33/rev2/info.json
index 2b93047d4105..b9c8b87b5020 100644
--- a/keyboards/tominabox1/underscore33/rev2/info.json
+++ b/keyboards/tominabox1/underscore33/rev2/info.json
@@ -8,6 +8,21 @@
     "pid": "0x3302",
     "device_version": "0.0.2"
   },
+  "rgblight": {
+    "led_count": 12,
+    "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": "D6"
   },
diff --git a/keyboards/torn/rules.mk b/keyboards/torn/rules.mk
index 7d7b3015899b..d2ec5cf6d423 100644
--- a/keyboards/torn/rules.mk
+++ b/keyboards/torn/rules.mk
@@ -10,7 +10,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 ENCODER_ENABLE = yes        # Enable rotary encoder
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/tr60w/config.h b/keyboards/tr60w/config.h
index a6dfefb6b904..5f360813239b 100644
--- a/keyboards/tr60w/config.h
+++ b/keyboards/tr60w/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 4
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/tr60w/info.json b/keyboards/tr60w/info.json
index 62e5fae73b0d..ba0ce45233ce 100644
--- a/keyboards/tr60w/info.json
+++ b/keyboards/tr60w/info.json
@@ -16,6 +16,23 @@
     "backlight": {
         "pin": "B7"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 4,
+        "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": "F7"
     },
diff --git a/keyboards/trashman/ketch/config.h b/keyboards/trashman/ketch/config.h
index 0f391f70ba51..48893f953b2d 100644
--- a/keyboards/trashman/ketch/config.h
+++ b/keyboards/trashman/ketch/config.h
@@ -22,16 +22,4 @@ SOFTWARE.
 
 #pragma once
 
-#define RGBLED_NUM 10
-#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 NO_USB_STARTUP_CHECK
diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json
index 21f3bb7ec3a0..a674acb2759f 100644
--- a/keyboards/trashman/ketch/info.json
+++ b/keyboards/trashman/ketch/info.json
@@ -9,6 +9,22 @@
     "device_version": "0.0.1",
     "max_power": 100
   },
+  "rgblight": {
+    "led_count": 10,
+    "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": "F4"
   },
diff --git a/keyboards/trashman/ketch/ketch.h b/keyboards/trashman/ketch/ketch.h
new file mode 100644
index 000000000000..25be7cf8f9d9
--- /dev/null
+++ b/keyboards/trashman/ketch/ketch.h
@@ -0,0 +1,96 @@
+/*
+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
+#include "quantum.h"
+
+#define LAYOUT(\
+    K39, K40, K41, K42, K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7,\
+    K32, K33, K34, K35, K8,  K9,  K10, K11, K12, K13, K14, K15,\
+    K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
+    K37,  K43,   K24,      K26,      K27,  K28,  K29,    K31\
+) {\
+    { K0, K1, K2, K3, K4, K5, K6, K7 },\
+    { K8, K9, K10, K11, K12, K13, K14, K15 },\
+    { K16, K17, K18, K19, K20, K21, K22, K23 },\
+    { KC_NO, K24, K26, K27, K28, K29, KC_NO, K31 },\
+    { K32, K33, K34, K35, K36, K37, K38, KC_NO },\
+    { K39, K40, K41, K42, K43, K44, K45, KC_NO }\
+}
+
+#define LAYOUT_arrow(\
+    K39, K40, K41, K42, K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7,\
+    K32, K33, K34, K35, K8,  K9,  K10, K11, K12, K13, K14, K15,\
+    K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
+    K37,  K43,   K24,      K26,      K27,  K28,  K29, K30, K31\
+) {\
+    { K0, K1, K2, K3, K4, K5, K6, K7 }, \
+    { K8, K9, K10, K11, K12, K13, K14, K15 }, \
+    { K16, K17, K18, K19, K20, K21, K22, K23 }, \
+    { K24, KC_NO, K26, K27, K28, K29, K30, K31 }, \
+    { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
+    { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
+}
+
+#define LAYOUT_command(\
+    K39, K40, K41, K42, K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7,\
+    K32, K33, K34, K35, K8,  K9,  K10, K11, K12, K13, K14, K15,\
+    K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
+    K37, K43, K24, K25,    K26,      K27,  K28,  K29,    K31\
+) {\
+    { K0, K1, K2, K3, K4, K5, K6, K7 }, \
+    { K8, K9, K10, K11, K12, K13, K14, K15 }, \
+    { K16, K17, K18, K19, K20, K21, K22, K23 }, \
+    { K24, K25, K26, K27, K28, K29, KC_NO, K31 }, \
+    { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
+    { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
+}
+
+// This layout is typically called "southpaw_arrow" or "southpaw + arrow", but
+// using "all" here to match typical qmk conventions
+#define LAYOUT_all(\
+    K39, K40, K41, K42, K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7,\
+    K32, K33, K34, K35, K8,  K9,  K10, K11, K12, K13, K14, K15,\
+    K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
+    K37, K43, K24, K25,    K26,      K27,  K28,  K29, K30, K31\
+) {\
+    { K0, K1, K2, K3, K4, K5, K6, K7 }, \
+    { K8, K9, 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, KC_NO }, \
+    { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
+}
+
+#define LAYOUT_jetvan(\
+    K39, K40, K41, K42, K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7,\
+    K32, K33, K34, K35, K8,  K9,  K10, K11, K12, K13, K14, K15,\
+    K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
+    K37,  K43, K24,               K27,           K29, K30, K31\
+) {\
+    { K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7 }, \
+    { K8,  K9,  K10, K11, K12, K13, K14, K15 }, \
+    { K16, K17, K18, K19, K20, K21, K22, K23 }, \
+    { K24, KC_NO, KC_NO, K27, KC_NO, K29, K30, K31 }, \
+    { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
+    { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
+}
diff --git a/keyboards/trashman/ketch/keymaps/badger/keymap.c b/keyboards/trashman/ketch/keymaps/badger/keymap.c
new file mode 100644
index 000000000000..ebdcd1793641
--- /dev/null
+++ b/keyboards/trashman/ketch/keymaps/badger/keymap.c
@@ -0,0 +1,48 @@
+/*
+Copyright 2023 Dan White <opensource@bluetufa.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "badger.h"
+
+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,
+        MOVE_MAC, 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_RALT, KC_LGUI, LT_SPACE,         KC_SPC,            J_FUNCT, KC_RALT, J_MACRO
+    ),
+    [_MOVE]       = LAYOUT(
+        MAC_WND,  IJ_STEP, IJ_INTO, IJ_OUT,  IJ_RUN,  IJ_STOP,  IJ_TOP,  WD_BACK, KC_HOME, KC_END,  WD_FRWD, WD_DELE,
+        _______,  MM_LH,   MM_MAX,  MM_RH,   IJ_FIND, IJ_LINE,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_SCLN, KC_QUOT,
+        _______,  MM_LEFT, MM_RGHT, MAC_CPY, MAC_SPS, MAC_B,    IJ_BOTT, IJ_REN,  IJ_BACK, IJ_FWD,  KC_UP,   _______,
+        _______,  _______, _______, _______,          _______,           _______, _______, _______
+    ),
+    [_MACRO]      = 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,
+        _______,  MAC_ALL, MAC_SAV, MAC_DUP, MAC_FND, _______,  KC_BSLS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
+        _______,  MAC_UND, MAC_CUT, MAC_CPY, MAC_PST, _______,  _______, _______, _______, _______, KC_SCLN, _______,
+        _______,  _______, _______, _______,          _______,           _______, _______, _______
+    ),
+    [_FUNCTION]   = LAYOUT(
+        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_MINS, KC_COLN,  KC_PIPE, KC_UNDS, KC_PLUS, KC_LCBR, KC_LCBR, KC_DQUO,
+        _______,  _______, _______, _______, _______, _______,  _______, _______, _______, KC_COLN, KC_DQUO, _______,
+        _______,  _______, _______, _______,          _______,           _______, _______, CONFIG
+    ),
+    [_CONFIG]     = LAYOUT(
+        QK_BOOT,  _______, _______, _______, IJ_RFMT, _______,  _______, _______, _______, _______, _______, _______,
+        KC_CAPS,  RGB_TOG, BL_DOWN, DB_TOGG, RGB_M_P, RGB_M_B,  RGB_M_SN,RGB_M_R, RGB_M_SW,KC_F11,  KC_F12,  _______,
+        _______,  RGB_HUI, RGB_HUD, RGB_M_K, RGB_M_X, RGB_M_G,  RGB_M_T, RGB_VAI, RGB_VAD, _______, _______, _______,
+        _______,  _______, _______, _______,          _______,           _______, _______, _______
+    )
+};
diff --git a/keyboards/trashman/ketch/rules.mk b/keyboards/trashman/ketch/rules.mk
index 5525d13f88b3..6afd33d5b3f0 100644
--- a/keyboards/trashman/ketch/rules.mk
+++ b/keyboards/trashman/ketch/rules.mk
@@ -4,9 +4,10 @@
 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
+CONSOLE_ENABLE = yes        # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+# TAP_DANCE_ENABLE = yes      # Tap dance
diff --git a/keyboards/treasure/type9s3/config.h b/keyboards/treasure/type9s3/config.h
new file mode 100644
index 000000000000..b87cd59b2f28
--- /dev/null
+++ b/keyboards/treasure/type9s3/config.h
@@ -0,0 +1,30 @@
+// 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
new file mode 100644
index 000000000000..8e9c9fa38f1d
--- /dev/null
+++ b/keyboards/treasure/type9s3/info.json
@@ -0,0 +1,65 @@
+{
+    "manufacturer": "Treasure",
+    "keyboard_name": "Type-9 Series III",
+    "maintainer": "arnstadm",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["C7", "C6", "D3"],
+            ["B7", "C5", "D2"],
+            ["B5", "B4", "D4"]
+        ]
+    },
+    "processor": "atmega32u2",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x5493",
+        "vid": "0x5452"
+    },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "layout": [
+            { "matrix": [2, 0],"flags": 4, "x": 0, "y": 20 },
+            { "matrix": [2, 1],"flags": 4, "x": 10, "y": 20 },
+            { "matrix": [2, 2],"flags": 4, "x": 20, "y": 20 },
+            { "matrix": [1, 2],"flags": 4, "x": 20, "y": 10 },
+            { "matrix": [1, 1],"flags": 4, "x": 10, "y": 10 },
+            { "matrix": [1, 0],"flags": 4, "x": 0, "y": 10 },
+            { "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 }
+        ]
+    },
+    "community_layouts": ["ortho_3x3"],
+    "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 },
+                
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/treasure/type9s3/keymaps/default/keymap.c b/keyboards/treasure/type9s3/keymaps/default/keymap.c
new file mode 100644
index 000000000000..166062f649b7
--- /dev/null
+++ b/keyboards/treasure/type9s3/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+// Copyright 2023 Treasure
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_ortho_3x3(
+        MO(1),   KC_MPLY, RGB_TOG,
+        KC_VOLD, KC_MUTE, KC_VOLU,
+        KC_KP_1, KC_KP_2, KC_KP_3
+    ),
+
+    [1] = LAYOUT_ortho_3x3(
+        KC_TRNS, RGB_M_P, MO(2),
+        RGB_MOD, RGB_HUI, RGB_VAI,
+        RGB_RMOD, RGB_HUD, RGB_VAD
+    ),
+
+    [2] = LAYOUT_ortho_3x3(
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, MO(3)
+    ),
+
+    [3] = LAYOUT_ortho_3x3(
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        QK_BOOT,   KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/treasure/type9s3/keymaps/via/keymap.c b/keyboards/treasure/type9s3/keymaps/via/keymap.c
new file mode 100644
index 000000000000..166062f649b7
--- /dev/null
+++ b/keyboards/treasure/type9s3/keymaps/via/keymap.c
@@ -0,0 +1,31 @@
+// Copyright 2023 Treasure
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_ortho_3x3(
+        MO(1),   KC_MPLY, RGB_TOG,
+        KC_VOLD, KC_MUTE, KC_VOLU,
+        KC_KP_1, KC_KP_2, KC_KP_3
+    ),
+
+    [1] = LAYOUT_ortho_3x3(
+        KC_TRNS, RGB_M_P, MO(2),
+        RGB_MOD, RGB_HUI, RGB_VAI,
+        RGB_RMOD, RGB_HUD, RGB_VAD
+    ),
+
+    [2] = LAYOUT_ortho_3x3(
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, MO(3)
+    ),
+
+    [3] = LAYOUT_ortho_3x3(
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        QK_BOOT,   KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/treasure/type9s3/keymaps/via/rules.mk b/keyboards/treasure/type9s3/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/treasure/type9s3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/treasure/type9s3/readme.md b/keyboards/treasure/type9s3/readme.md
new file mode 100644
index 000000000000..354b63b04a31
--- /dev/null
+++ b/keyboards/treasure/type9s3/readme.md
@@ -0,0 +1,22 @@
+# Treasure TYPE-9 Series III
+
+![TYPE9SIII](https://i.imgur.com/lohJ0Dalh.png)
+
+Treasure TYPE-9 Series III is a 3x3 Macropad.
+
+* Keyboard Maintainer: [Treasure](https://github.com/TreasureTypes)
+* Hardware Supported: Treasure TYPE-9 Series III PCB
+* Hardware Availability: [Treasure Store](http://treasuretypes.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make treasure/type9s3: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 :
+
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard
diff --git a/keyboards/treasure/type9s3/rules.mk b/keyboards/treasure/type9s3/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/treasure/type9s3/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/tszaboo/ortho4exent/config.h b/keyboards/tszaboo/ortho4exent/config.h
index d04509a30de3..ec16cc36b104 100644
--- a/keyboards/tszaboo/ortho4exent/config.h
+++ b/keyboards/tszaboo/ortho4exent/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-   #define RGBLED_NUM 18
-
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-   #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
-
 /* 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/tszaboo/ortho4exent/info.json b/keyboards/tszaboo/ortho4exent/info.json
index 21c69b1eb07e..492ae6516faa 100644
--- a/keyboards/tszaboo/ortho4exent/info.json
+++ b/keyboards/tszaboo/ortho4exent/info.json
@@ -8,6 +8,24 @@
       "pid": "0x7934",
       "device_version": "0.0.1"
     },
+    "rgblight": {
+      "saturation_steps": 8,
+      "brightness_steps": 8,
+      "led_count": 18,
+      "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": "B6"
     },
diff --git a/keyboards/tunks/ergo33/config.h b/keyboards/tunks/ergo33/config.h
deleted file mode 100644
index 5ab6f8a34750..000000000000
--- a/keyboards/tunks/ergo33/config.h
+++ /dev/null
@@ -1,48 +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
-
-/* Underglow + top RGB configuration */
-#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
-
-#if !defined(RGBLED_NUM)
-/* RGB LED count
- * No external LED PCB: 10
- * External LED PCB: 14
- */
-#    define RGBLED_NUM 14
-#endif
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
diff --git a/keyboards/tunks/ergo33/info.json b/keyboards/tunks/ergo33/info.json
index afca170abd8c..213907999a01 100644
--- a/keyboards/tunks/ergo33/info.json
+++ b/keyboards/tunks/ergo33/info.json
@@ -7,6 +7,21 @@
     "pid": "0xA0A1",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "led_count": 14,
+    "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": "D4"
   },
diff --git a/keyboards/tw40/config.h b/keyboards/tw40/config.h
index 7c938233140c..99549d9efa14 100644
--- a/keyboards/tw40/config.h
+++ b/keyboards/tw40/config.h
@@ -17,18 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 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 LOCKING_SUPPORT_ENABLE
 
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/tw40/info.json b/keyboards/tw40/info.json
index d57206cbc5e9..79f3d7fbaaf3 100644
--- a/keyboards/tw40/info.json
+++ b/keyboards/tw40/info.json
@@ -8,6 +8,21 @@
     "pid": "0x5457",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "led_count": 15,
+    "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": "E6"
   },
diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json
index 2a50e5762d16..f0904b8578a1 100644
--- a/keyboards/tzarc/djinn/info.json
+++ b/keyboards/tzarc/djinn/info.json
@@ -38,7 +38,7 @@
     "driver": "pwm"
   },
   "rgb_matrix": {
-    "driver": "WS2812"
+    "driver": "ws2812"
   },
   "split": {
     "enabled": true,
diff --git a/keyboards/tzarc/djinn/rev1/config.h b/keyboards/tzarc/djinn/rev1/config.h
index 5ced7003233c..5dffc00141f4 100644
--- a/keyboards/tzarc/djinn/rev1/config.h
+++ b/keyboards/tzarc/djinn/rev1/config.h
@@ -14,7 +14,6 @@
 #endif // SERIAL_USART_SPEED
 
 // RGB configuration
-#define RGBLED_NUM 84
 #define RGB_MATRIX_LED_COUNT 84
 #define RGB_MATRIX_SPLIT \
     { 42, 42 }
diff --git a/keyboards/tzarc/djinn/rev2/config.h b/keyboards/tzarc/djinn/rev2/config.h
index 02224e4fc614..12a637240572 100644
--- a/keyboards/tzarc/djinn/rev2/config.h
+++ b/keyboards/tzarc/djinn/rev2/config.h
@@ -17,7 +17,6 @@
 #define SERIAL_USART_FULL_DUPLEX
 
 // RGB configuration
-#define RGBLED_NUM 86
 #define RGB_MATRIX_LED_COUNT 86
 #define RGB_MATRIX_SPLIT \
     { 43, 43 }
diff --git a/keyboards/tzarc/ghoul/config.h b/keyboards/tzarc/ghoul/config.h
index c027b77565d8..932ea8eb50df 100644
--- a/keyboards/tzarc/ghoul/config.h
+++ b/keyboards/tzarc/ghoul/config.h
@@ -13,4 +13,3 @@
 
 // RGB configuration
 #define RGB_MATRIX_LED_COUNT 40
-#define RGBLED_NUM 40
diff --git a/keyboards/tzarc/ghoul/info.json b/keyboards/tzarc/ghoul/info.json
index fe6de664703d..bf07f122c325 100644
--- a/keyboards/tzarc/ghoul/info.json
+++ b/keyboards/tzarc/ghoul/info.json
@@ -16,7 +16,7 @@
     "rgb_matrix": true
   },
   "rgb_matrix": {
-    "driver": "WS2812"
+    "driver": "ws2812"
   },
   "matrix_pins": {
     "rows": ["NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN"],
diff --git a/keyboards/tzarc/ghoul/rules.mk b/keyboards/tzarc/ghoul/rules.mk
index 10630d80cf22..9590c52217af 100644
--- a/keyboards/tzarc/ghoul/rules.mk
+++ b/keyboards/tzarc/ghoul/rules.mk
@@ -1,7 +1,6 @@
 CUSTOM_MATRIX = lite
 EEPROM_DRIVER = spi
 QUANTUM_PAINTER_DRIVERS = ssd1351_spi
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
 DEFAULT_FOLDER = tzarc/ghoul/rev1/stm32
 
diff --git a/keyboards/ubest/vn/config.h b/keyboards/ubest/vn/config.h
deleted file mode 100644
index fd3c59f509ac..000000000000
--- a/keyboards/ubest/vn/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2022 water <mfkiiyd@163.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 8
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
diff --git a/keyboards/ubest/vn/info.json b/keyboards/ubest/vn/info.json
index 4180f6f5ecb5..078605e4a576 100644
--- a/keyboards/ubest/vn/info.json
+++ b/keyboards/ubest/vn/info.json
@@ -20,7 +20,11 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 240
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "max_brightness": 240,
+        "sleep": true
     },
     "indicators": {
         "caps_lock": "B3",
@@ -30,8 +34,17 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "community_layouts": [
+        "65_ansi",
+        "65_ansi_split_bs",
+        "65_iso",
+        "65_iso_split_bs"
+    ],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -109,6 +122,314 @@
                 {"matrix": [4, 13], "x": 14, "y": 4},
                 {"matrix": [4, 14], "x": 15, "y": 4}
             ]
+        },
+        "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, 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, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "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}
+            ]
+        },
+        "LAYOUT_65_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": [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, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "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}
+            ]
+        },
+        "LAYOUT_65_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, "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": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 12], "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, 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, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "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}
+            ]
+        },
+        "LAYOUT_65_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": [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, 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": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 12], "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, 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, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "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/ubest/vn/keymaps/default/keymap.c b/keyboards/ubest/vn/keymaps/default/keymap.c
index 1e092273365a..c49cfceaa1a5 100644
--- a/keyboards/ubest/vn/keymaps/default/keymap.c
+++ b/keyboards/ubest/vn/keymaps/default/keymap.c
@@ -17,25 +17,25 @@
 #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_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(1),
-        KC_LCTL,   KC_LGUI,   KC_LALT,   KC_SPC,                                         KC_RALT, KC_RGUI, KC_APP,  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_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_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(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
-	[1] = LAYOUT(
+    [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_DEL,  _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
-        _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
-        _______,   _______,   _______,   _______,                                        _______, _______, _______, _______, _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______, _______
     ),
-	[2] = LAYOUT(
+    [2] = LAYOUT_all(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
-        _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
-        _______,   _______,   _______,   _______,                                        _______, _______, _______, _______, _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/ubest/vn/keymaps/via/keymap.c b/keyboards/ubest/vn/keymaps/via/keymap.c
index 31d80271215f..1486261cb352 100644
--- a/keyboards/ubest/vn/keymaps/via/keymap.c
+++ b/keyboards/ubest/vn/keymaps/via/keymap.c
@@ -17,32 +17,32 @@
 #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_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(1),
-        KC_LCTL,   KC_LGUI,   KC_LALT,   KC_SPC,                                         KC_RALT, KC_RGUI, KC_APP,  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_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_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(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
-	[1] = LAYOUT(
+    [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_DEL,  _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
-        _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
-        _______,   _______,   _______,   _______,                                        _______, _______, _______, _______, _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______, _______
     ),
-	[2] = LAYOUT(
+    [2] = LAYOUT_all(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
-        _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
-        _______,   _______,   _______,   _______,                                        _______, _______, _______, _______, _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______, _______
     ),
-	[3] = LAYOUT(
+    [3] = LAYOUT_all(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
-        _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
-        _______,   _______,   _______,   _______,                                        _______, _______, _______, _______, _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______, _______
     ),
 };
diff --git a/keyboards/ubest/vn/matrix_diagram.md b/keyboards/ubest/vn/matrix_diagram.md
new file mode 100644
index 000000000000..c3831c332d60
--- /dev/null
+++ b/keyboards/ubest/vn/matrix_diagram.md
@@ -0,0 +1,27 @@
+# Matrix Diagram for ubest vn
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0D     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D │0E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      ┌─────┐
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2C  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │2E │   │1D │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+│40  │41  │43  │47                  │48 │49 │4A │4B │4C │4D │4E │
+└────┴────┴────┴────────────────────┴───┴───┴───┴───┴───┴───┴───┘
+┌────────┐
+│30      │ 2.25u LShift
+└────────┘
+┌────┬────┬────┬────────────────────────┬───┬───┬───┬───┬───┬───┐
+│40  │41  │43  │47                      │49 │4A │4B │4C │4D │4E │ Standard
+└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┬───┐
+│40  │41  │43  │47                      │48  │49  │4A  │4B  │4E │ 4x 1.25u RMods
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┴───┘
+```
diff --git a/keyboards/uk78/config.h b/keyboards/uk78/config.h
index ab971a55ad85..822b37da7f7f 100644
--- a/keyboards/uk78/config.h
+++ b/keyboards/uk78/config.h
@@ -22,19 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* ws2812b options */
-#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/uk78/info.json b/keyboards/uk78/info.json
index f166936a9a2d..af41223de208 100644
--- a/keyboards/uk78/info.json
+++ b/keyboards/uk78/info.json
@@ -16,6 +16,23 @@
   "backlight": {
     "pin": "B6"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 20,
+    "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": "F6"
   },
diff --git a/keyboards/uk78/keymaps/default/keymap.c b/keyboards/uk78/keymaps/default/keymap.c
index 2fa09f7d6da1..e4bdf905085e 100644
--- a/keyboards/uk78/keymaps/default/keymap.c
+++ b/keyboards/uk78/keymaps/default/keymap.c
@@ -75,12 +75,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
     setPinOutput(A3);
     writePinHigh(A3);
   } else {
     setPinInput(A3);
     writePinLow(A3);
   }
+  return false;
 }
diff --git a/keyboards/uk78/keymaps/rask/keymap.c b/keyboards/uk78/keymaps/rask/keymap.c
index 97b1853aaec8..01220a775eae 100644
--- a/keyboards/uk78/keymaps/rask/keymap.c
+++ b/keyboards/uk78/keymaps/rask/keymap.c
@@ -74,47 +74,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+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);
   }
-
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_KANA)) {
-
-  } else {
-
-  }
-
+  return false;
 }
diff --git a/keyboards/ungodly/launch_pad/config.h b/keyboards/ungodly/launch_pad/config.h
index 9c6459abbda5..f3431bd412f7 100644
--- a/keyboards/ungodly/launch_pad/config.h
+++ b/keyboards/ungodly/launch_pad/config.h
@@ -21,8 +21,7 @@
 
 /* RGB Matrix configuration */
 #ifdef RGB_MATRIX_ENABLE
-#    define RGBLED_NUM 22
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#    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
@@ -30,10 +29,6 @@
 // #    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_HUE_STEP 8
-#    define RGB_MATRIX_SAT_STEP 8
-#    define RGB_MATRIX_VAL_STEP 8
-#    define RGB_MATRIX_SPD_STEP 10
 #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL  // default mode
 
 // RGB Matrix Animation modes. Explicitly enabled
diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/info.json
index 97f3d10407f5..5474bc5279f8 100644
--- a/keyboards/ungodly/launch_pad/info.json
+++ b/keyboards/ungodly/launch_pad/info.json
@@ -9,7 +9,10 @@
     "device_version": "99.9.9"
   },
   "rgb_matrix": {
-    "driver": "WS2812"
+    "driver": "ws2812",
+    "sat_steps": 8,
+    "val_steps": 8,
+    "speed_steps": 10
   },
   "matrix_pins": {
     "cols": ["B0", "B1", "B2", "B3"],
diff --git a/keyboards/ungodly/launch_pad/rules.mk b/keyboards/ungodly/launch_pad/rules.mk
index 5b696a9b0765..935414446645 100644
--- a/keyboards/ungodly/launch_pad/rules.mk
+++ b/keyboards/ungodly/launch_pad/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 MIDI_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
 SPACE_CADET_ENABLE = no
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk
index 225317b36747..9131708828a4 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk
@@ -14,4 +14,4 @@ AUDIO_ENABLE = no           # Audio output
 KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
 
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = SOLENOID
+HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk
index 225317b36747..9131708828a4 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk
@@ -14,4 +14,4 @@ AUDIO_ENABLE = no           # Audio output
 KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
 
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = SOLENOID
+HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk
index 225317b36747..9131708828a4 100644
--- a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk
@@ -14,4 +14,4 @@ AUDIO_ENABLE = no           # Audio output
 KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
 
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = SOLENOID
+HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk
index 225317b36747..9131708828a4 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk
@@ -14,4 +14,4 @@ AUDIO_ENABLE = no           # Audio output
 KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
 
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = SOLENOID
+HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk
index 225317b36747..9131708828a4 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk
@@ -14,4 +14,4 @@ AUDIO_ENABLE = no           # Audio output
 KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
 
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = SOLENOID
+HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unikorn/config.h b/keyboards/unikorn/config.h
deleted file mode 100644
index 4c3789155eef..000000000000
--- a/keyboards/unikorn/config.h
+++ /dev/null
@@ -1,32 +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
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 17
-#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/unikorn/info.json b/keyboards/unikorn/info.json
index 02202bef0774..35c749b2923f 100644
--- a/keyboards/unikorn/info.json
+++ b/keyboards/unikorn/info.json
@@ -16,6 +16,21 @@
     "backlight": {
         "pin": "D4"
     },
+    "rgblight": {
+        "led_count": 17,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/unison/v04/config.h b/keyboards/unison/v04/config.h
index d80dc827f6b6..1273f36fbde4 100644
--- a/keyboards/unison/v04/config.h
+++ b/keyboards/unison/v04/config.h
@@ -26,26 +26,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 /* RGB Lighting */
-  #define RGBLED_NUM 7 // Layer Indicator(2) + Rotary Encoder(5)
-  #define RGBLIGHT_LED_MAP {1, 2, 0, 3, 4, 5, 6} // align LEDs from Left to Right
-  #define RGBLIGHT_HUE_STEP 4
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  // #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
   /*== Lighting Layers ==*/
   #define RGBLIGHT_LAYERS
   // #define RGBLIGHT_MAX_LAYERS 2
   #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
-  #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
 
 /*
  * Feature disable options
diff --git a/keyboards/unison/v04/info.json b/keyboards/unison/v04/info.json
index 481c07f7a9af..7b182df2515f 100644
--- a/keyboards/unison/v04/info.json
+++ b/keyboards/unison/v04/info.json
@@ -12,6 +12,19 @@
         "cols": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"],
         "rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"]
     },
+    "rgblight": {
+        "hue_steps": 4,
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 7,
+        "led_map": [1, 2, 0, 3, 4, 5, 6],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "twinkle": true
+        }
+    },
     "ws2812": {
         "pin": "B7"
     },
diff --git a/keyboards/utd80/config.h b/keyboards/utd80/config.h
index 5d33e9e99cba..4a4d65e62f8a 100644
--- a/keyboards/utd80/config.h
+++ b/keyboards/utd80/config.h
@@ -20,18 +20,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 4
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/utd80/info.json b/keyboards/utd80/info.json
index 5a7bde1da1c4..a62bb41df6ec 100644
--- a/keyboards/utd80/info.json
+++ b/keyboards/utd80/info.json
@@ -21,6 +21,23 @@
       "caps_lock": "B6",
       "scroll_lock": "B5"
     },
+    "rgblight": {
+      "saturation_steps": 8,
+      "brightness_steps": 8,
+      "led_count": 4,
+      "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": "E2"
     },
diff --git a/keyboards/uzu42/rev1/config.h b/keyboards/uzu42/rev1/config.h
deleted file mode 100644
index d0bba6d5983b..000000000000
--- a/keyboards/uzu42/rev1/config.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-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 RGBLED_NUM 54    // Number of LEDs
-#define RGBLED_SPLIT { 27, 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_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-/*
- * 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/uzu42/rev1/info.json b/keyboards/uzu42/rev1/info.json
index 02d1b17be2c5..1354c6d93e67 100644
--- a/keyboards/uzu42/rev1/info.json
+++ b/keyboards/uzu42/rev1/info.json
@@ -20,7 +20,20 @@
     "pin": "D3"
   },
   "rgblight": {
-    "max_brightness": 120
+    "hue_steps": 10,
+    "led_count": 54,
+    "max_brightness": 120,
+    "split_count": [27, 27],
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "twinkle": true
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
diff --git a/keyboards/v60_type_r/config.h b/keyboards/v60_type_r/config.h
index 8eafa8d7b512..4354cb32c30d 100644
--- a/keyboards/v60_type_r/config.h
+++ b/keyboards/v60_type_r/config.h
@@ -17,17 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 1
-#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_STEP 16
 
 #define RGB_RED_PIN PF6
diff --git a/keyboards/v60_type_r/info.json b/keyboards/v60_type_r/info.json
index f219dd1727a0..633207199437 100644
--- a/keyboards/v60_type_r/info.json
+++ b/keyboards/v60_type_r/info.json
@@ -14,9 +14,26 @@
   },
   "diode_direction": "COL2ROW",
   "backlight": {
+    "driver": "timer",
     "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/keymap.c b/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
index ab1fbd70d9fb..419c9ad5a72c 100644
--- a/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
+++ b/keyboards/v60_type_r/keymaps/followingghosts/keymap.c
@@ -95,8 +95,8 @@ WASD are Up Left Right Down respectively
 
 };
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
       // output low
       DDRE  |=  (1<<PE6);
       PORTE &= ~(1<<PE6);
@@ -106,4 +106,5 @@ void led_set_user(uint8_t usb_led) {
       DDRE  &= ~(1<<PE6);
       PORTE &= ~(1<<PE6);
   }
+  return false;
 }
diff --git a/keyboards/v60_type_r/keymaps/ifohancroft/readme.md b/keyboards/v60_type_r/keymaps/ifohancroft/readme.md
index b2d2249081c4..c8106ae0cda9 100644
--- a/keyboards/v60_type_r/keymaps/ifohancroft/readme.md
+++ b/keyboards/v60_type_r/keymaps/ifohancroft/readme.md
@@ -7,7 +7,7 @@
  - 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, RGBLIGHT and RGBLIGHT_CUSTOM_DRIVER features, and enables the following features:
+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
index b7d5bb519858..03be782d45e0 100644
--- a/keyboards/v60_type_r/keymaps/ifohancroft/rules.mk
+++ b/keyboards/v60_type_r/keymaps/ifohancroft/rules.mk
@@ -2,6 +2,5 @@ MOUSEKEY_ENABLE = no
 EXTRAKEY_ENABLE = no
 BACKLIGHT_ENABLE = no
 RGBLIGHT_ENABLE = no
-RGBLIGHT_CUSTOM_DRIVER = no
 NKRO_ENABLE = yes
 VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/v60_type_r/keymaps/vimouse/keymap.c b/keyboards/v60_type_r/keymaps/vimouse/keymap.c
index f426a94044ea..2eb06c050377 100644
--- a/keyboards/v60_type_r/keymaps/vimouse/keymap.c
+++ b/keyboards/v60_type_r/keymaps/vimouse/keymap.c
@@ -97,8 +97,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _____,   _____,   _____,               _____,                                                      _____,   _____,  _____,  _____),
 };
 
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         // output low
         DDRE  |=  (1<<PE6);
         PORTE &= ~(1<<PE6);
@@ -108,4 +108,5 @@ void led_set_user(uint8_t usb_led) {
         DDRE  &= ~(1<<PE6);
         PORTE &= ~(1<<PE6);
     }
+    return false;
 }
diff --git a/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c b/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c
index 98bfa70d2f93..f2fd693ece19 100644
--- a/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/v60_type_r/keymaps/xtonhasvim/keymap.c
@@ -69,8 +69,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         // output low
         DDRE  |=  (1<<PE6);
         PORTE &= ~(1<<PE6);
@@ -80,6 +80,7 @@ void led_set_user(uint8_t usb_led) {
         DDRE  &= ~(1<<PE6);
         PORTE &= ~(1<<PE6);
     }
+    return false;
 }
 
 #define C_RED 0xFF, 0x00, 0x00
diff --git a/keyboards/v60_type_r/rules.mk b/keyboards/v60_type_r/rules.mk
index 77b555c20c57..d6654ffea641 100644
--- a/keyboards/v60_type_r/rules.mk
+++ b/keyboards/v60_type_r/rules.mk
@@ -9,7 +9,6 @@ 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_CUSTOM_DRIVER = yes
 AUDIO_ENABLE = no           # Audio output
 
 LTO_ENABLE = yes
diff --git a/keyboards/vertex/angle65/config.h b/keyboards/vertex/angle65/config.h
index 4db0deb111fc..b3cf8b2507fb 100644
--- a/keyboards/vertex/angle65/config.h
+++ b/keyboards/vertex/angle65/config.h
@@ -18,16 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SOLENOID_PIN A2
 
-#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 9
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 5
diff --git a/keyboards/vertex/angle65/info.json b/keyboards/vertex/angle65/info.json
index 03649ab0725f..096e89555aaa 100644
--- a/keyboards/vertex/angle65/info.json
+++ b/keyboards/vertex/angle65/info.json
@@ -20,6 +20,21 @@
         "caps_lock": "C13",
         "on_state": 0
     },
+    "rgblight": {
+        "led_count": 9,
+        "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"
     },
diff --git a/keyboards/vertex/angle65/rules.mk b/keyboards/vertex/angle65/rules.mk
index 87d50360410f..330f6ff76b82 100644
--- a/keyboards/vertex/angle65/rules.mk
+++ b/keyboards/vertex/angle65/rules.mk
@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER += SOLENOID
-
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+HAPTIC_DRIVER = solenoid
diff --git a/keyboards/vertex/angler2/config.h b/keyboards/vertex/angler2/config.h
deleted file mode 100644
index 79cb6d6aaed4..000000000000
--- a/keyboards/vertex/angler2/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2022 Vertex <xiaoxuxk@yeah.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
-
-#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
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/vertex/angler2/info.json b/keyboards/vertex/angler2/info.json
index 705af3fb0920..bf3d28bc457c 100644
--- a/keyboards/vertex/angler2/info.json
+++ b/keyboards/vertex/angler2/info.json
@@ -21,6 +21,23 @@
     "ws2812": {
         "pin": "E6"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "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": [
diff --git a/keyboards/vertex/arc60/config.h b/keyboards/vertex/arc60/config.h
index 791368b5b2c6..38b830e3df75 100644
--- a/keyboards/vertex/arc60/config.h
+++ b/keyboards/vertex/arc60/config.h
@@ -16,22 +16,9 @@ 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 RGBLED_NUM 9
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 5
 
-
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/vertex/arc60/info.json b/keyboards/vertex/arc60/info.json
index 8aa5a709d50b..7f9f5fdb3c41 100644
--- a/keyboards/vertex/arc60/info.json
+++ b/keyboards/vertex/arc60/info.json
@@ -18,6 +18,21 @@
         "caps_lock": "C13",
         "on_state": 0
     },
+    "rgblight": {
+        "led_count": 9,
+        "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"
     },
diff --git a/keyboards/vertex/arc60/rules.mk b/keyboards/vertex/arc60/rules.mk
index 5a90b0d7fe01..0c92de191873 100644
--- a/keyboards/vertex/arc60/rules.mk
+++ b/keyboards/vertex/arc60/rules.mk
@@ -17,5 +17,3 @@ DEFAULT_FOLDER = vertex/arc60
 
 
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/vertex/arc60h/config.h b/keyboards/vertex/arc60h/config.h
index e4cb0453537b..38b830e3df75 100644
--- a/keyboards/vertex/arc60h/config.h
+++ b/keyboards/vertex/arc60h/config.h
@@ -16,25 +16,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define LED_CAPS_LOCK_PIN C13
-#define LED_PIN_ON_STATE 0
-
-#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 9
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 5
 
-
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/vertex/arc60h/info.json b/keyboards/vertex/arc60h/info.json
index 831190a516b9..6a7a39cd162c 100644
--- a/keyboards/vertex/arc60h/info.json
+++ b/keyboards/vertex/arc60h/info.json
@@ -9,6 +9,25 @@
         "device_version": "0.0.1",
         "force_nkro": true
     },
+    "indicators": {
+        "caps_lock": "C13",
+        "on_state": 0
+    },
+    "rgblight": {
+        "led_count": 9,
+        "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"
diff --git a/keyboards/vertex/arc60h/rules.mk b/keyboards/vertex/arc60h/rules.mk
index 8e6bc896a654..e86dfab32725 100644
--- a/keyboards/vertex/arc60h/rules.mk
+++ b/keyboards/vertex/arc60h/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SLEEP_LED_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/viendi8l/config.h b/keyboards/viendi8l/config.h
index 825ceabbd314..0538906eccc5 100644
--- a/keyboards/viendi8l/config.h
+++ b/keyboards/viendi8l/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 TAPPING_TERM 200
-
 #define I2C_DRIVER I2CD1
 #define I2C_SCL_PIN B6
 #define I2C_SDA_PIN B7
@@ -35,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-#define RGBLED_NUM 4
 #define RGBLIGHT_DEFAULT_VAL 0
 
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
diff --git a/keyboards/viendi8l/info.json b/keyboards/viendi8l/info.json
index 301b5cc75656..17449f406c8d 100644
--- a/keyboards/viendi8l/info.json
+++ b/keyboards/viendi8l/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0877",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 4
+    },
     "ws2812": {
         "pin": "B15",
         "driver": "pwm"
diff --git a/keyboards/viendi8l/rules.mk b/keyboards/viendi8l/rules.mk
index dfa900c79249..da10e34d1c7c 100644
--- a/keyboards/viendi8l/rules.mk
+++ b/keyboards/viendi8l/rules.mk
@@ -15,5 +15,3 @@ LTO_ENABLE = no
 
 EEPROM_DRIVER = i2c
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/viktus/at101_bh/keymaps/default/keymap.c b/keyboards/viktus/at101_bh/keymaps/default/keymap.c
index 692c30ac611d..d05e549d21eb 100644
--- a/keyboards/viktus/at101_bh/keymaps/default/keymap.c
+++ b/keyboards/viktus/at101_bh/keymaps/default/keymap.c
@@ -19,26 +19,27 @@ 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,			KC_TRNS, 	  KC_TRNS),
 };
 
-void led_set_user(uint8_t usb_led) {
+bool led_update_user(led_t led_state) {
   setPinOutput(B4);
   setPinOutput(D6);
   setPinOutput(D7);
 
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
+  if (led_state.num_lock) {
     writePinHigh(D7);
   } else {
     writePinLow(D7);
   }
 
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+  if (led_state.caps_lock) {
     writePinHigh(B4);
   } else {
     writePinLow(B4);
   }
 
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
+  if (led_state.scroll_lock) {
     writePinHigh(D6);
   } else {
     writePinLow(D6);
   }
+  return false;
 }
diff --git a/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c b/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c
index 96976ba2a35d..e5fb6bf90255 100644
--- a/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c
+++ b/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c
@@ -22,24 +22,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 };
 
-void led_set_user(uint8_t usb_led) {
+bool led_update_user(led_t led_state) {
   DDRB |= (1 << 4) | (1 << 5) | (1 << 6);
 
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
+  if (led_state.num_lock) {
     PORTB |= (1 << 4);
   } else {
     PORTB &= ~(1 << 4);
   }
 
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+  if (led_state.caps_lock) {
     PORTB |= (1 << 5);
   } else {
     PORTB &= ~(1 << 5);
   }
 
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
+  if (led_state.scroll_lock) {
     PORTB |= (1 << 6);
   } else {
     PORTB &= ~(1 << 6);
   }
+  return false;
 }
diff --git a/keyboards/viktus/osav2/info.json b/keyboards/viktus/osav2/info.json
index eba02a413781..b528bac281f9 100644
--- a/keyboards/viktus/osav2/info.json
+++ b/keyboards/viktus/osav2/info.json
@@ -44,6 +44,7 @@
         "pin": "D4"
     },
     "backlight": {
+        "driver": "timer",
         "levels": 6,
         "max_brightness": 191,
         "pin": "D6"
diff --git a/keyboards/viktus/sp111_v2/info.json b/keyboards/viktus/sp111_v2/info.json
new file mode 100644
index 000000000000..63c531ee4488
--- /dev/null
+++ b/keyboards/viktus/sp111_v2/info.json
@@ -0,0 +1,198 @@
+{
+    "manufacturer": "BlindAssassin111",
+    "keyboard_name": "viktus/sp111_v2",
+    "maintainer": "blindassassin111",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["C6", "F6", "F5", "F4", "F1", "F7", "B7", "D2", "D3", "D5", "D4"],
+        "rows": ["C7", "B6", "B5", "B4", "D7", "D6"]
+    },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 150,
+        "layout": [
+            { "flags": 8, "x": 0, "y": 0 },
+            { "flags": 8, "x": 0, "y": 1 },
+            { "flags": 8, "x": 0, "y": 2 }
+        ],
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": 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_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true
+        }
+    },
+    "split": {
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "cols": ["C6", "F1", "B4", "B5", "D2", "D3", "D5", "D4", "D6", "D7"],
+                "rows": ["C7", "B6", "F4", "F5", "F6", "F7"]
+            }
+        },
+        "transport": {
+            "protocol": "i2c"
+        },
+        "usb_detect": {
+            "enabled": true
+        }
+    },
+    "url": "https://viktus.design/",
+    "usb": {
+        "device_version": "2.0.0",
+        "pid": "0x5112",
+        "vid": "0x5644"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "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.5, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 5.75, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 6.75, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 7.75, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 8.75, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 10, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 11, "y": 0 },
+                { "label": "6,0", "matrix": [6, 0], "x": 13, "y": 0 },
+                { "label": "6,1", "matrix": [6, 1], "x": 14, "y": 0 },
+                { "label": "6,3", "matrix": [6, 3], "x": 15.25, "y": 0 },
+                { "label": "6,4", "matrix": [6, 4], "x": 16.25, "y": 0 },
+                { "label": "6,5", "matrix": [6, 5], "x": 17.25, "y": 0 },
+                { "label": "6,6", "matrix": [6, 6], "x": 18.25, "y": 0 },
+                { "label": "6,7", "matrix": [6, 7], "x": 19.5, "y": 0 },
+                { "label": "6,8", "matrix": [6, 8], "x": 20.75, "y": 0 },
+                { "label": "6,9", "matrix": [6, 9], "x": 21.75, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.5 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.5 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.5 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.5 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1.5 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1.5 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1.5 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1.5 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1.5 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1.5 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1.5 },
+                { "label": "7,0", "matrix": [7, 0], "x": 12.5, "y": 1.5 },
+                { "label": "7,1", "matrix": [7, 1], "x": 13.5, "y": 1.5 },
+                { "label": "7,2", "matrix": [7, 2], "x": 14.5, "y": 1.5 },
+                { "label": "7,3", "matrix": [7, 3], "x": 15.5, "y": 1.5 },
+                { "label": "7,4", "matrix": [7, 4], "x": 16.5, "y": 1.5 },
+                { "label": "7,5", "matrix": [7, 5], "x": 17.5, "y": 1.5 },
+                { "label": "7,6", "matrix": [7, 6], "x": 18.5, "y": 1.5 },
+                { "label": "7,7", "matrix": [7, 7], "x": 19.5, "y": 1.5 },
+                { "label": "7,8", "matrix": [7, 8], "x": 20.75, "y": 1.5 },
+                { "label": "7,9", "matrix": [7, 9], "x": 21.75, "y": 1.5 },
+                { "label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.5 },
+                { "label": "2,1", "matrix": [2, 1], "x": 1, "y": 2.5 },
+                { "label": "2,2", "matrix": [2, 2], "x": 2, "y": 2.5 },
+                { "label": "2,3", "matrix": [2, 3], "x": 3, "y": 2.5 },
+                { "label": "2,4", "matrix": [2, 4], "w": 1.5, "x": 4.5, "y": 2.5 },
+                { "label": "2,5", "matrix": [2, 5], "x": 6, "y": 2.5 },
+                { "label": "2,6", "matrix": [2, 6], "x": 7, "y": 2.5 },
+                { "label": "2,7", "matrix": [2, 7], "x": 8, "y": 2.5 },
+                { "label": "2,8", "matrix": [2, 8], "x": 9, "y": 2.5 },
+                { "label": "2,9", "matrix": [2, 9], "x": 10, "y": 2.5 },
+                { "label": "8,0", "matrix": [8, 0], "x": 12, "y": 2.5 },
+                { "label": "8,1", "matrix": [8, 1], "x": 13, "y": 2.5 },
+                { "label": "8,2", "matrix": [8, 2], "x": 14, "y": 2.5 },
+                { "label": "8,3", "matrix": [8, 3], "x": 15, "y": 2.5 },
+                { "label": "8,4", "matrix": [8, 4], "x": 16, "y": 2.5 },
+                { "label": "8,5", "matrix": [8, 5], "x": 17, "y": 2.5 },
+                { "label": "8,6", "matrix": [8, 6], "x": 18, "y": 2.5 },
+                { "label": "8,7", "matrix": [8, 7], "w": 1.5, "x": 19, "y": 2.5 },
+                { "label": "8,8", "matrix": [8, 8], "x": 20.75, "y": 2.5 },
+                { "label": "8,9", "matrix": [8, 9], "x": 21.75, "y": 2.5 },
+                { "label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.5 },
+                { "label": "3,1", "matrix": [3, 1], "x": 1, "y": 3.5 },
+                { "label": "3,2", "matrix": [3, 2], "x": 2, "y": 3.5 },
+                { "label": "3,3", "matrix": [3, 3], "x": 3, "y": 3.5 },
+                { "label": "3,4", "matrix": [3, 4], "w": 1.75, "x": 4.5, "y": 3.5 },
+                { "label": "3,5", "matrix": [3, 5], "x": 6.25, "y": 3.5 },
+                { "label": "3,6", "matrix": [3, 6], "x": 7.25, "y": 3.5 },
+                { "label": "3,7", "matrix": [3, 7], "x": 8.25, "y": 3.5 },
+                { "label": "3,8", "matrix": [3, 8], "x": 9.25, "y": 3.5 },
+                { "label": "3,9", "matrix": [3, 9], "x": 10.25, "y": 3.5 },
+                { "label": "9,0", "matrix": [9, 0], "x": 12.25, "y": 3.5 },
+                { "label": "9,1", "matrix": [9, 1], "x": 13.25, "y": 3.5 },
+                { "label": "9,2", "matrix": [9, 2], "x": 14.25, "y": 3.5 },
+                { "label": "9,3", "matrix": [9, 3], "x": 15.25, "y": 3.5 },
+                { "label": "9,4", "matrix": [9, 4], "x": 16.25, "y": 3.5 },
+                { "label": "9,5", "matrix": [9, 5], "x": 17.25, "y": 3.5 },
+                { "label": "9,6", "matrix": [9, 6], "x": 18.25, "y": 3.5 },
+                { "label": "9,7", "matrix": [9, 7], "w": 1.25, "x": 19.25, "y": 3.5 },
+                { "label": "9,8", "matrix": [9, 8], "x": 20.75, "y": 3.5 },
+                { "label": "9,9", "matrix": [9, 9], "x": 21.75, "y": 3.5 },
+                { "label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.5 },
+                { "label": "4,1", "matrix": [4, 1], "x": 1, "y": 4.5 },
+                { "label": "4,2", "matrix": [4, 2], "x": 2, "y": 4.5 },
+                { "label": "4,3", "matrix": [4, 3], "x": 3, "y": 4.5 },
+                { "label": "4,4", "matrix": [4, 4], "w": 1.25, "x": 4.5, "y": 4.5 },
+                { "label": "4,5", "matrix": [4, 5], "x": 5.75, "y": 4.5 },
+                { "label": "4,6", "matrix": [4, 6], "x": 6.75, "y": 4.5 },
+                { "label": "4,7", "matrix": [4, 7], "x": 7.75, "y": 4.5 },
+                { "label": "4,8", "matrix": [4, 8], "x": 8.75, "y": 4.5 },
+                { "label": "4,9", "matrix": [4, 9], "x": 9.75, "y": 4.5 },
+                { "label": "4,10", "matrix": [4, 10], "x": 10.75, "y": 4.5 },
+                { "label": "10,1", "matrix": [10, 1], "x": 12.75, "y": 4.5 },
+                { "label": "10,1", "matrix": [10, 2], "x": 13.75, "y": 4.5 },
+                { "label": "10,2", "matrix": [10, 3], "x": 14.75, "y": 4.5 },
+                { "label": "10,3", "matrix": [10, 4], "x": 15.75, "y": 4.5 },
+                { "label": "10,4", "matrix": [10, 5], "x": 16.75, "y": 4.5 },
+                { "label": "10,6", "matrix": [10, 6], "w": 1.75, "x": 17.75, "y": 4.5 },
+                { "label": "10,7", "matrix": [10, 7], "x": 19.5, "y": 4.5 },
+                { "label": "10,8", "matrix": [10, 8], "x": 20.75, "y": 4.75 },
+                { "label": "5.0", "matrix": [5, 0], "x": 0, "y": 5.5 },
+                { "label": "5,1", "matrix": [5, 1], "x": 1, "y": 5.5 },
+                { "label": "5,2", "matrix": [5, 2], "x": 2, "y": 5.5 },
+                { "label": "5,3", "matrix": [5, 3], "x": 3, "y": 5.5 },
+                { "label": "5,4", "matrix": [5, 4], "w": 1.25, "x": 4.5, "y": 5.5 },
+                { "label": "5,5", "matrix": [5, 5], "w": 1.25, "x": 5.75, "y": 5.5 },
+                { "label": "5,7", "matrix": [5, 7], "w": 1.25, "x": 7, "y": 5.5 },
+                { "label": "5,8", "matrix": [5, 8], "x": 8.25, "y": 5.5 },
+                { "label": "5,9", "matrix": [5, 9], "w": 2.25, "x": 9.25, "y": 5.5 },
+                { "label": "11,2", "matrix": [11, 2], "w": 2.25, "x": 12.5, "y": 5.5 },
+                { "label": "11,3", "matrix": [11, 3], "x": 14.75, "y": 5.5 },
+                { "label": "11,4", "matrix": [11, 4], "w": 1.25, "x": 15.75, "y": 5.5 },
+                { "label": "11,5", "matrix": [11, 5], "w": 1.25, "x": 17, "y": 5.5 },
+                { "label": "11,6", "matrix": [11, 6], "w": 1.25, "x": 18.25, "y": 5.5 },
+                { "label": "11,7", "matrix": [11, 7], "x": 19.75, "y": 5.75 },
+                { "label": "11,8", "matrix": [11, 8], "x": 20.75, "y": 5.75 },
+                { "label": "11,9", "matrix": [11, 9], "x": 21.75, "y": 5.75 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/viktus/sp111_v2/keymaps/default/keymap.c b/keyboards/viktus/sp111_v2/keymaps/default/keymap.c
new file mode 100644
index 000000000000..ac1b84e19933
--- /dev/null
+++ b/keyboards/viktus/sp111_v2/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+// Copyright 2023 BlindAssassin111 (@blindassassin111)
+// 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] = {
+    /*
+    * ┌──┐┌──┐┌──┐┌──┐  ┌──┐ ┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐    ┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐ ┌──┐ ┌──┐┌──┐
+    * │0A││0B││0C││0D│  │0E│ │0F││0G││0H││0I│ │0J││0K│    │6A││6B│ │6D││6E││6F││6G│ │6H│ │6I││6J│
+    * └──┘└──┘└──┘└──┘  └──┘ └──┘└──┘└──┘└──┘ └──┘└──┘    └──┘└──┘ └──┘└──┘└──┘└──┘ └──┘ └──┘└──┘
+    * ┌──┐┌──┐┌──┐┌──┐  ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐    ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐
+    * │1A││1B││1C││1D│  │1E││1F││1G││1H││1I││1J││1K│    │7A││7B││7C││7D││7E││7F││7G││7H│ │7I││7J│
+    * └──┘└──┘└──┘└──┘  └──┘└──┘└──┘└──┘└──┘└──┘└──┘    └──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘
+    * ┌──┐┌──┐┌──┐┌──┐  ┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐    ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐ ┌──┐┌──┐
+    * │2A││2B││2C││2D│  │2E  ││2F││2G││2H││2I││2J│    │8A││8B││8C││8D││8E││8F││8G││8H  │ │8I││8J│
+    * └──┘└──┘└──┘└──┘  └────┘└──┘└──┘└──┘└──┘└──┘    └──┘└──┘└──┘└──┘└──┘└──┘└──┘└────┘ └──┘└──┘
+    * ┌──┐┌──┐┌──┐┌──┐  ┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐    ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌───┐ ┌──┐┌──┐
+    * │3A││3B││3C││3D│  │3E   ││3F││3G││3H││3I││3J│    │9A││9B││9C││9D││9E││9F││9G││9H │ │9I││9J│
+    * └──┘└──┘└──┘└──┘  └─────┘└──┘└──┘└──┘└──┘└──┘    └──┘└──┘└──┘└──┘└──┘└──┘└──┘└───┘ └──┘└──┘
+    * ┌──┐┌──┐┌──┐┌──┐  ┌───┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐    ┌──┐┌──┐┌──┐┌──┐┌──┐┌─────┐┌──┐
+    * │4A││4B││4C││4D│  │4E ││4F││4G││4H││4I││4J││4K│    │AB││AC││AD││AE││AF││AG   ││AH│ ┌──┐
+    * └──┘└──┘└──┘└──┘  └───┘└──┘└──┘└──┘└──┘└──┘└──┘    └──┘└──┘└──┘└──┘└──┘└─────┘└──┘ │AI│
+    * ┌──┐┌──┐┌──┐┌──┐  ┌───┐┌───┐┌───┐┌──┐┌───────┐    ┌───────┐┌──┐┌───┐┌───┐┌───┐     └──┘
+    * │5A││5B││5C││5D│  │5E ││5F ││5H ││5I││5J     │    │BC     ││BD││BE ││BF ││BG │ ┌──┐┌──┐┌──┐
+    * └──┘└──┘└──┘└──┘  └───┘└───┘└───┘└──┘└───────┘    └───────┘└──┘└───┘└───┘└───┘ │BH││BI││BJ│
+    *                                                                                └──┘└──┘└──┘
+    */
+    [_BASE] = LAYOUT(
+    KC_MUTE,KC_MPRV,KC_MPLY,KC_MNXT,    KC_ESC,  KC_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_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_DEL,  KC_HOME, 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_BSLS,          KC_END,  KC_DEL,
+    KC_P4,  KC_P5,  KC_P6,  KC_PEQL,    KC_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_PGDN,
+    KC_P1,  KC_P2,  KC_P3,  KC_PENT,    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(_FN),          KC_UP,
+    KC_P0,  KC_P0,  KC_P0,  KC_PDOT,    KC_LCTL, KC_LGUI, KC_LALT, KC_MUTE, KC_SPC,           KC_SPC,  KC_APP,  KC_RALT, KC_RGUI, KC_RCTL,                            KC_LEFT, KC_DOWN, KC_RIGHT),
+
+    [_FN] = LAYOUT(
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, QK_BOOT,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,                            _______, _______, _______)
+};
diff --git a/keyboards/viktus/sp111_v2/keymaps/via/config.h b/keyboards/viktus/sp111_v2/keymaps/via/config.h
new file mode 100644
index 000000000000..917fe0c8bb86
--- /dev/null
+++ b/keyboards/viktus/sp111_v2/keymaps/via/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 BlindAssassin111 (@blindassassin111)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/viktus/sp111_v2/keymaps/via/keymap.c b/keyboards/viktus/sp111_v2/keymaps/via/keymap.c
new file mode 100644
index 000000000000..57e25720f9a5
--- /dev/null
+++ b/keyboards/viktus/sp111_v2/keymaps/via/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 BlindAssassin111 (@blindassassin111)
+// 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_MPRV,KC_MPLY,KC_MNXT,    KC_ESC,  KC_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_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_BSPC, KC_HOME, KC_INS,
+    KC_P7,  KC_P8,  KC_P9,  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_END,  KC_DEL,
+    KC_P4,  KC_P5,  KC_P6,  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_PGUP, KC_PGDN,
+    KC_P1,  KC_P2,  KC_P3,  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, MO(1),            KC_UP,
+    KC_P0,  KC_P0,  KC_PDOT,  KC_PENT,  KC_LCTL, KC_LGUI, KC_LALT, KC_MUTE, KC_SPC,           KC_SPC,  KC_APP,  KC_RALT, KC_RGUI, KC_RCTL,                            KC_LEFT, KC_DOWN, KC_RIGHT),
+
+    [1] = LAYOUT(
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, QK_BOOT,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______,      _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,                            _______, _______, _______)
+};
diff --git a/keyboards/viktus/sp111_v2/keymaps/via/rules.mk b/keyboards/viktus/sp111_v2/keymaps/via/rules.mk
new file mode 100644
index 000000000000..36b7ba9cbc98
--- /dev/null
+++ b/keyboards/viktus/sp111_v2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/viktus/sp111_v2/readme.md b/keyboards/viktus/sp111_v2/readme.md
new file mode 100644
index 000000000000..c3767ba02ba5
--- /dev/null
+++ b/keyboards/viktus/sp111_v2/readme.md
@@ -0,0 +1,27 @@
+# Viktus Styrka v2
+
+![viktus/sp111_v2](https://i.imgur.com/ApgZRhgh.png)
+
+A split southpaw fullsize-esque layout. Round 2 of the board has RGB LED indicators.
+
+* Keyboard Maintainer: [BlindAssassin111](https://github.com/blindassassin111)
+* Hardware Supported: SP-111 round 2 PCBs only
+* Hardware Availability: Space Cables, Ashkeebs, protoTypist, mykeyboard, ilumkb, SwitchKeys
+
+Make example for this keyboard (after setting up your build environment):
+
+    make viktus/sp111_v2:default
+
+Flashing example for this keyboard:
+
+    make viktus/sp111_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/viktus/sp111_v2/rules.mk b/keyboards/viktus/sp111_v2/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/viktus/sp111_v2/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/viktus/sp111_v2/sp111_v2.c b/keyboards/viktus/sp111_v2/sp111_v2.c
new file mode 100644
index 000000000000..96a9aaa5fe40
--- /dev/null
+++ b/keyboards/viktus/sp111_v2/sp111_v2.c
@@ -0,0 +1,12 @@
+// Copyright 2023 BlindAssassin111 (@blindassassin111)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+void keyboard_pre_init_kb(void) {
+    // enable built in pullups to avoid timeouts when right hand not connected
+    setPinInputHigh(D0);
+    setPinInputHigh(D1);
+
+    keyboard_pre_init_user();
+}
diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h
index bc80a8ebcabb..6c7ecf85151d 100644
--- a/keyboards/viktus/sp_mini/config.h
+++ b/keyboards/viktus/sp_mini/config.h
@@ -23,22 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MASTER_LEFT
 #define USE_I2C
 
-/* ws2812 RGB LED */
-#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_SPLIT
-#define RGBLED_NUM 24    // Number of LEDs
-#define RGBLED_SPLIT { 12, 12 }
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json
index 19bba8fea6a7..6deb64c63caa 100644
--- a/keyboards/viktus/sp_mini/info.json
+++ b/keyboards/viktus/sp_mini/info.json
@@ -26,6 +26,22 @@
             }
         }
     },
+    "rgblight": {
+        "led_count": 24,
+        "split_count": [12, 12],
+        "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": "E6"
     },
diff --git a/keyboards/viktus/styrka_topre/info.json b/keyboards/viktus/styrka_topre/info.json
index f6d3560985fa..7095a8f48498 100644
--- a/keyboards/viktus/styrka_topre/info.json
+++ b/keyboards/viktus/styrka_topre/info.json
@@ -26,93 +26,19 @@
         "cols": ["B5", "B4", "D7", "D6", "F6", "F5", "F4", "C7", "C6", "B6", "F7", "B1", "B2", "B3", "B7", "F1", "F0", "E6"],
         "rows": ["A7", "A6", "A4", "A5", "A3"]
     },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_xt_ansi_blocker_split_bs",
+        "LAYOUT_2u_6u": "LAYOUT_65_xt_ansi_blocker",
+        "LAYOUT_2u_7u": "LAYOUT_65_xt_ansi_blocker_tsangan",
+        "LAYOUT_split_6u": "LAYOUT_65_xt_ansi_blocker_split_bs",
+        "LAYOUT_split_7u": "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs"
+    },
     "layouts": {
-        "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": "K00A", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K00B", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "K00C", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "K00D", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "K00E", "matrix": [0, 14], "x": 14, "y": 0},
-                {"label": "K00F", "matrix": [0, 15], "x": 15, "y": 0},
-                {"label": "K010", "matrix": [0, 16], "x": 16, "y": 0},
-                {"label": "K011", "matrix": [0, 17], "x": 17, "y": 0},
-                {"label": "K100", "matrix": [1, 0], "x": 18, "y": 0},
-                {"label": "K101", "matrix": [1, 1], "x": 19, "y": 0},
-                {"label": "K102", "matrix": [1, 2], "x": 20, "y": 0},
-                {"label": "K103", "matrix": [1, 3], "x": 21, "y": 0},
-                {"label": "K104", "matrix": [1, 4], "x": 22, "y": 0},
-                {"label": "K105", "matrix": [1, 5], "x": 23, "y": 0},
-                {"label": "K106", "matrix": [1, 6], "x": 24, "y": 0},
-                {"label": "K107", "matrix": [1, 7], "x": 25, "y": 0},
-                {"label": "K108", "matrix": [1, 8], "x": 26, "y": 0},
-                {"label": "K109", "matrix": [1, 9], "x": 27, "y": 0},
-                {"label": "K10A", "matrix": [1, 10], "x": 28, "y": 0},
-                {"label": "K10B", "matrix": [1, 11], "x": 29, "y": 0},
-                {"label": "K10C", "matrix": [1, 12], "x": 30, "y": 0},
-                {"label": "K10D", "matrix": [1, 13], "x": 31, "y": 0},
-                {"label": "K10E", "matrix": [1, 14], "x": 32, "y": 0},
-                {"label": "K110", "matrix": [1, 16], "x": 33, "y": 0},
-                {"label": "K111", "matrix": [1, 17], "x": 34, "y": 0},
-                {"label": "K200", "matrix": [2, 0], "x": 35, "y": 0},
-                {"label": "K201", "matrix": [2, 1], "x": 36, "y": 0},
-                {"label": "K202", "matrix": [2, 2], "x": 37, "y": 0},
-                {"label": "K203", "matrix": [2, 3], "x": 38, "y": 0},
-                {"label": "K204", "matrix": [2, 4], "x": 39, "y": 0},
-                {"label": "K205", "matrix": [2, 5], "x": 40, "y": 0},
-                {"label": "K206", "matrix": [2, 6], "x": 41, "y": 0},
-                {"label": "K207", "matrix": [2, 7], "x": 42, "y": 0},
-                {"label": "K208", "matrix": [2, 8], "x": 43, "y": 0},
-                {"label": "K209", "matrix": [2, 9], "x": 44, "y": 0},
-                {"label": "K20A", "matrix": [2, 10], "x": 45, "y": 0},
-                {"label": "K20B", "matrix": [2, 11], "x": 46, "y": 0},
-                {"label": "K20C", "matrix": [2, 12], "x": 47, "y": 0},
-                {"label": "K20D", "matrix": [2, 13], "x": 48, "y": 0},
-                {"label": "K20F", "matrix": [2, 15], "x": 49, "y": 0},
-                {"label": "K211", "matrix": [2, 17], "x": 50, "y": 0},
-                {"label": "K300", "matrix": [3, 0], "x": 51, "y": 0},
-                {"label": "K301", "matrix": [3, 1], "x": 52, "y": 0},
-                {"label": "K302", "matrix": [3, 2], "x": 53, "y": 0},
-                {"label": "K304", "matrix": [3, 4], "x": 54, "y": 0},
-                {"label": "K305", "matrix": [3, 5], "x": 55, "y": 0},
-                {"label": "K306", "matrix": [3, 6], "x": 56, "y": 0},
-                {"label": "K307", "matrix": [3, 7], "x": 57, "y": 0},
-                {"label": "K308", "matrix": [3, 8], "x": 58, "y": 0},
-                {"label": "K309", "matrix": [3, 9], "x": 59, "y": 0},
-                {"label": "K30A", "matrix": [3, 10], "x": 60, "y": 0},
-                {"label": "K30B", "matrix": [3, 11], "x": 61, "y": 0},
-                {"label": "K30C", "matrix": [3, 12], "x": 62, "y": 0},
-                {"label": "K30D", "matrix": [3, 13], "x": 63, "y": 0},
-                {"label": "K30E", "matrix": [3, 14], "x": 64, "y": 0},
-                {"label": "K310", "matrix": [3, 16], "x": 65, "y": 0},
-                {"label": "K311", "matrix": [3, 17], "x": 66, "y": 0},
-                {"label": "K400", "matrix": [4, 0], "x": 67, "y": 0},
-                {"label": "K401", "matrix": [4, 1], "x": 68, "y": 0},
-                {"label": "K402", "matrix": [4, 2], "x": 69, "y": 0},
-                {"label": "K403", "matrix": [4, 3], "x": 70, "y": 0},
-                {"label": "K404", "matrix": [4, 4], "x": 71, "y": 0},
-                {"label": "K408", "matrix": [4, 8], "x": 72, "y": 0},
-                {"label": "K40C", "matrix": [4, 12], "x": 73, "y": 0},
-                {"label": "K40D", "matrix": [4, 13], "x": 74, "y": 0},
-                {"label": "K40E", "matrix": [4, 14], "x": 75, "y": 0},
-                {"label": "K410", "matrix": [4, 16], "x": 76, "y": 0},
-                {"label": "K411", "matrix": [4, 17], "x": 77, "y": 0}
-            ]
-        },
-        "LAYOUT_2u_6u": {
+        "LAYOUT_65_xt_ansi_blocker": {
             "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.25, "y": 0},
                 {"label": "K003", "matrix": [0, 3], "x": 3.25, "y": 0},
                 {"label": "K004", "matrix": [0, 4], "x": 4.25, "y": 0},
@@ -128,8 +54,10 @@
                 {"label": "K00E", "matrix": [0, 14], "x": 14.25, "y": 0},
                 {"label": "K010", "matrix": [0, 16], "x": 15.25, "y": 0, "w": 2},
                 {"label": "K011", "matrix": [0, 17], "x": 17.25, "y": 0},
+
                 {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1},
                 {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1},
+
                 {"label": "K102", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
                 {"label": "K103", "matrix": [1, 3], "x": 3.75, "y": 1},
                 {"label": "K104", "matrix": [1, 4], "x": 4.75, "y": 1},
@@ -145,8 +73,10 @@
                 {"label": "K10E", "matrix": [1, 14], "x": 14.75, "y": 1},
                 {"label": "K110", "matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
                 {"label": "K111", "matrix": [1, 17], "x": 17.25, "y": 1},
+
                 {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2},
                 {"label": "K201", "matrix": [2, 1], "x": 1, "y": 2},
+
                 {"label": "K202", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
                 {"label": "K203", "matrix": [2, 3], "x": 4, "y": 2},
                 {"label": "K204", "matrix": [2, 4], "x": 5, "y": 2},
@@ -161,8 +91,10 @@
                 {"label": "K20D", "matrix": [2, 13], "x": 14, "y": 2},
                 {"label": "K20F", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
                 {"label": "K211", "matrix": [2, 17], "x": 17.25, "y": 2},
+
                 {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3},
                 {"label": "K301", "matrix": [3, 1], "x": 1, "y": 3},
+
                 {"label": "K302", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
                 {"label": "K304", "matrix": [3, 4], "x": 4.5, "y": 3},
                 {"label": "K305", "matrix": [3, 5], "x": 5.5, "y": 3},
@@ -177,23 +109,26 @@
                 {"label": "K30E", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
                 {"label": "K310", "matrix": [3, 16], "x": 16.25, "y": 3},
                 {"label": "K311", "matrix": [3, 17], "x": 17.25, "y": 3},
+
                 {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4},
                 {"label": "K401", "matrix": [4, 1], "x": 1, "y": 4},
-                {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"label": "K403", "matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"label": "K408", "matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
-                {"label": "K40C", "matrix": [4, 12], "x": 12.25, "y": 4},
-                {"label": "K40D", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"label": "K403", "matrix": [4, 3], "x": 3.75, "y": 4},
+                {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"label": "K408", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 6},
+                {"label": "K40C", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.5},
+                {"label": "K40D", "matrix": [4, 13], "x": 13.75, "y": 4},
                 {"label": "K40E", "matrix": [4, 14], "x": 15.25, "y": 4},
                 {"label": "K410", "matrix": [4, 16], "x": 16.25, "y": 4},
                 {"label": "K411", "matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         },
-        "LAYOUT_2u_7u": {
+        "LAYOUT_65_xt_ansi_blocker_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.25, "y": 0},
                 {"label": "K003", "matrix": [0, 3], "x": 3.25, "y": 0},
                 {"label": "K004", "matrix": [0, 4], "x": 4.25, "y": 0},
@@ -209,8 +144,10 @@
                 {"label": "K00E", "matrix": [0, 14], "x": 14.25, "y": 0},
                 {"label": "K010", "matrix": [0, 16], "x": 15.25, "y": 0, "w": 2},
                 {"label": "K011", "matrix": [0, 17], "x": 17.25, "y": 0},
+
                 {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1},
                 {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1},
+
                 {"label": "K102", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
                 {"label": "K103", "matrix": [1, 3], "x": 3.75, "y": 1},
                 {"label": "K104", "matrix": [1, 4], "x": 4.75, "y": 1},
@@ -226,8 +163,10 @@
                 {"label": "K10E", "matrix": [1, 14], "x": 14.75, "y": 1},
                 {"label": "K110", "matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
                 {"label": "K111", "matrix": [1, 17], "x": 17.25, "y": 1},
+
                 {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2},
                 {"label": "K201", "matrix": [2, 1], "x": 1, "y": 2},
+
                 {"label": "K202", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
                 {"label": "K203", "matrix": [2, 3], "x": 4, "y": 2},
                 {"label": "K204", "matrix": [2, 4], "x": 5, "y": 2},
@@ -242,8 +181,10 @@
                 {"label": "K20D", "matrix": [2, 13], "x": 14, "y": 2},
                 {"label": "K20F", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
                 {"label": "K211", "matrix": [2, 17], "x": 17.25, "y": 2},
+
                 {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3},
                 {"label": "K301", "matrix": [3, 1], "x": 1, "y": 3},
+
                 {"label": "K302", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
                 {"label": "K304", "matrix": [3, 4], "x": 4.5, "y": 3},
                 {"label": "K305", "matrix": [3, 5], "x": 5.5, "y": 3},
@@ -258,8 +199,10 @@
                 {"label": "K30E", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
                 {"label": "K310", "matrix": [3, 16], "x": 16.25, "y": 3},
                 {"label": "K311", "matrix": [3, 17], "x": 17.25, "y": 3},
+
                 {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4},
                 {"label": "K401", "matrix": [4, 1], "x": 1, "y": 4},
+
                 {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
                 {"label": "K403", "matrix": [4, 3], "x": 3.75, "y": 4},
                 {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
@@ -270,11 +213,11 @@
                 {"label": "K411", "matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         },
-
-        "LAYOUT_split_6u": {
+        "LAYOUT_65_xt_ansi_blocker_split_bs": {
             "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.25, "y": 0},
                 {"label": "K003", "matrix": [0, 3], "x": 3.25, "y": 0},
                 {"label": "K004", "matrix": [0, 4], "x": 4.25, "y": 0},
@@ -291,8 +234,10 @@
                 {"label": "K00F", "matrix": [0, 15], "x": 15.25, "y": 0},
                 {"label": "K010", "matrix": [0, 16], "x": 16.25, "y": 0},
                 {"label": "K011", "matrix": [0, 17], "x": 17.25, "y": 0},
+
                 {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1},
                 {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1},
+
                 {"label": "K102", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
                 {"label": "K103", "matrix": [1, 3], "x": 3.75, "y": 1},
                 {"label": "K104", "matrix": [1, 4], "x": 4.75, "y": 1},
@@ -308,8 +253,10 @@
                 {"label": "K10E", "matrix": [1, 14], "x": 14.75, "y": 1},
                 {"label": "K110", "matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
                 {"label": "K111", "matrix": [1, 17], "x": 17.25, "y": 1},
+
                 {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2},
                 {"label": "K201", "matrix": [2, 1], "x": 1, "y": 2},
+
                 {"label": "K202", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
                 {"label": "K203", "matrix": [2, 3], "x": 4, "y": 2},
                 {"label": "K204", "matrix": [2, 4], "x": 5, "y": 2},
@@ -324,8 +271,10 @@
                 {"label": "K20D", "matrix": [2, 13], "x": 14, "y": 2},
                 {"label": "K20F", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
                 {"label": "K211", "matrix": [2, 17], "x": 17.25, "y": 2},
+
                 {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3},
                 {"label": "K301", "matrix": [3, 1], "x": 1, "y": 3},
+
                 {"label": "K302", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
                 {"label": "K304", "matrix": [3, 4], "x": 4.5, "y": 3},
                 {"label": "K305", "matrix": [3, 5], "x": 5.5, "y": 3},
@@ -340,23 +289,26 @@
                 {"label": "K30E", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
                 {"label": "K310", "matrix": [3, 16], "x": 16.25, "y": 3},
                 {"label": "K311", "matrix": [3, 17], "x": 17.25, "y": 3},
+
                 {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4},
                 {"label": "K401", "matrix": [4, 1], "x": 1, "y": 4},
-                {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"label": "K403", "matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-                {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"label": "K408", "matrix": [4, 8], "x": 6, "y": 4, "w": 6.25},
-                {"label": "K40C", "matrix": [4, 12], "x": 12.25, "y": 4},
-                {"label": "K40D", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"label": "K403", "matrix": [4, 3], "x": 3.75, "y": 4},
+                {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"label": "K408", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 6},
+                {"label": "K40C", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.5},
+                {"label": "K40D", "matrix": [4, 13], "x": 13.75, "y": 4},
                 {"label": "K40E", "matrix": [4, 14], "x": 15.25, "y": 4},
                 {"label": "K410", "matrix": [4, 16], "x": 16.25, "y": 4},
                 {"label": "K411", "matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         },
-        "LAYOUT_split_7u": {
+        "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs": {
             "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.25, "y": 0},
                 {"label": "K003", "matrix": [0, 3], "x": 3.25, "y": 0},
                 {"label": "K004", "matrix": [0, 4], "x": 4.25, "y": 0},
@@ -373,8 +325,10 @@
                 {"label": "K00F", "matrix": [0, 15], "x": 15.25, "y": 0},
                 {"label": "K010", "matrix": [0, 16], "x": 16.25, "y": 0},
                 {"label": "K011", "matrix": [0, 17], "x": 17.25, "y": 0},
+
                 {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1},
                 {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1},
+
                 {"label": "K102", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
                 {"label": "K103", "matrix": [1, 3], "x": 3.75, "y": 1},
                 {"label": "K104", "matrix": [1, 4], "x": 4.75, "y": 1},
@@ -390,8 +344,10 @@
                 {"label": "K10E", "matrix": [1, 14], "x": 14.75, "y": 1},
                 {"label": "K110", "matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
                 {"label": "K111", "matrix": [1, 17], "x": 17.25, "y": 1},
+
                 {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2},
                 {"label": "K201", "matrix": [2, 1], "x": 1, "y": 2},
+
                 {"label": "K202", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
                 {"label": "K203", "matrix": [2, 3], "x": 4, "y": 2},
                 {"label": "K204", "matrix": [2, 4], "x": 5, "y": 2},
@@ -406,8 +362,10 @@
                 {"label": "K20D", "matrix": [2, 13], "x": 14, "y": 2},
                 {"label": "K20F", "matrix": [2, 15], "x": 15, "y": 2, "w": 2.25},
                 {"label": "K211", "matrix": [2, 17], "x": 17.25, "y": 2},
+
                 {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3},
                 {"label": "K301", "matrix": [3, 1], "x": 1, "y": 3},
+
                 {"label": "K302", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
                 {"label": "K304", "matrix": [3, 4], "x": 4.5, "y": 3},
                 {"label": "K305", "matrix": [3, 5], "x": 5.5, "y": 3},
@@ -422,8 +380,10 @@
                 {"label": "K30E", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
                 {"label": "K310", "matrix": [3, 16], "x": 16.25, "y": 3},
                 {"label": "K311", "matrix": [3, 17], "x": 17.25, "y": 3},
+
                 {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4},
                 {"label": "K401", "matrix": [4, 1], "x": 1, "y": 4},
+
                 {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
                 {"label": "K403", "matrix": [4, 3], "x": 3.75, "y": 4},
                 {"label": "K404", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
diff --git a/keyboards/viktus/styrka_topre/keymaps/default/keymap.c b/keyboards/viktus/styrka_topre/keymaps/default/keymap.c
index 5c3f8fa0310f..38a453090523 100644
--- a/keyboards/viktus/styrka_topre/keymaps/default/keymap.c
+++ b/keyboards/viktus/styrka_topre/keymaps/default/keymap.c
@@ -17,11 +17,11 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_2u_7u(
-        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_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_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_LGUI, KC_LALT,                         KC_SPC,                            KC_RCTL,          KC_LEFT, KC_DOWN,  KC_RIGHT
+    [0] = LAYOUT_65_xt_ansi_blocker_tsangan(
+        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_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_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_LGUI, KC_LALT,                            KC_SPC,                             KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     )
 };
diff --git a/keyboards/viktus/styrka_topre/keymaps/via/keymap.c b/keyboards/viktus/styrka_topre/keymaps/via/keymap.c
index 5c3f8fa0310f..38a453090523 100644
--- a/keyboards/viktus/styrka_topre/keymaps/via/keymap.c
+++ b/keyboards/viktus/styrka_topre/keymaps/via/keymap.c
@@ -17,11 +17,11 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_2u_7u(
-        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_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_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_LGUI, KC_LALT,                         KC_SPC,                            KC_RCTL,          KC_LEFT, KC_DOWN,  KC_RIGHT
+    [0] = LAYOUT_65_xt_ansi_blocker_tsangan(
+        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_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_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_LGUI, KC_LALT,                            KC_SPC,                             KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     )
 };
diff --git a/keyboards/viktus/styrka_topre/matrix_diagram.md b/keyboards/viktus/styrka_topre/matrix_diagram.md
new file mode 100644
index 000000000000..6289d2387ab9
--- /dev/null
+++ b/keyboards/viktus/styrka_topre/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Viktus Design LLC Styrka - Topre
+
+```
+                                                             ┌───────┐
+                                                2u Backspace │0G     │
+                                                             └───────┘
+┌───┬───┐┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 ││02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │0G │0H │
+├───┼───┤├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+│10 │11 ││12   │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1G   │1H │
+├───┼───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+│20 │21 ││22    │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2F      │2H │
+├───┼───┤├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+│30 │31 ││32      │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E    │3G │3H │
+├───┼───┤├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴┬─┬───┼───┼───┤
+│40 │41 ││42   │43 │44   │48                     │4C   │4D │ │4E │4G │4H │
+└───┴───┘└─────┴───┴─────┴───────────────────────┴─────┴───┘ └───┴───┴───┘
+         ┌─────┬───┬─────┬───────────────────────────┬─────┐
+         │42   │43 │44   │48                         │4D   │ Blocker Tsangan
+         └─────┴───┴─────┴───────────────────────────┴─────┘
+```
diff --git a/keyboards/vinhcatba/uncertainty/bongo.c b/keyboards/vinhcatba/uncertainty/bongo.c
new file mode 100644
index 000000000000..707955ee8810
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/bongo.c
@@ -0,0 +1,506 @@
+// Copyright 2022 Parker Levin (@pedker)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#define ANIM_FRAME_DURATION 75 // how long each frame lasts in ms
+#define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024
+#define IDLE_FRAMES 5
+#define IDLE_TIMEOUT 750 // the amount of time it takes to return to idle
+#define TAP_FRAMES 2
+#define KEYS_SIZE 104 // the number of keys stored in the array that tracks keypresses; how many keys are on the board?
+
+enum anim_states
+{
+    Idle,
+    Prep,
+    Tap
+};
+uint8_t anim_state = Idle;
+uint32_t idle_timeout_timer = 0;
+uint32_t anim_timer = 0;
+uint8_t current_idle_frame = 0;
+uint8_t current_tap_frame = 0;
+
+struct pair_int_int
+{
+    uint8_t first;
+    uint8_t second;
+};
+struct pair_int_int pressed_keys[KEYS_SIZE];
+struct pair_int_int pressed_keys_prev[KEYS_SIZE];
+uint8_t pressed_keys_index = 0;
+
+bool key_down = 0;
+char wpm[42];
+
+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 idle_minimal[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, 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, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 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, 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, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 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, 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, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 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, 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, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 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, 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, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 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, 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, 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 prep_minimal[][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, 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, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 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, 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, 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
+    }
+};
+
+static const char PROGMEM tap_minimal[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, 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, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 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, 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, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 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, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    }
+};
+
+bool detect_key_down(void)
+{
+    // store the previous cycle's cache
+    for (uint8_t i = 0; i < KEYS_SIZE; ++i)
+    {
+        pressed_keys_prev[i].first = pressed_keys[i].first;
+        pressed_keys_prev[i].second = pressed_keys[i].second;
+    }
+
+    // fill cache with currently pressed keys
+    pressed_keys_index = 0;
+    for (uint8_t x = 0; x < MATRIX_ROWS; x++)
+    {
+        for (uint8_t y = 0; y < MATRIX_COLS; y++)
+        {
+            // is this key is currently down?
+            if (((matrix_get_row(x) & (1 << y)) > 0))
+            {
+                pressed_keys[pressed_keys_index].first = x+1; // adding 1 to the row/col so that we can use 0 as a null-check
+                pressed_keys[pressed_keys_index].second = y+1;
+            }
+            else
+            {
+                pressed_keys[pressed_keys_index].first = 0;
+                pressed_keys[pressed_keys_index].second = 0;
+            }
+            pressed_keys_index++;
+        }
+    }
+
+    // check for a new key down compared to last cycle
+    for (uint8_t i = 0; i < KEYS_SIZE; ++i)
+    {
+        if (pressed_keys[i].first && pressed_keys[i].second && !pressed_keys_prev[i].first && !pressed_keys_prev[i].second)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+void eval_anim_state(void)
+{
+    key_down = detect_key_down();
+
+    switch (anim_state)
+    {
+        case Idle:
+            if (key_down) // Idle to Tap
+            {
+                anim_state = Tap;
+            }
+            break;
+
+        case Prep:
+            if (key_down) // Prep to Tap
+            {
+                anim_state = Tap;
+            }
+            else if (timer_elapsed32(idle_timeout_timer) >= IDLE_TIMEOUT) // Prep to Idle
+            {
+                anim_state = Idle;
+                current_idle_frame = 0;
+            }
+            break;
+
+        case Tap:
+            if (!key_down) // Tap to Prep
+            {
+                anim_state = Prep;
+                idle_timeout_timer = timer_read32();
+            }
+            break;
+
+        default:
+            break;
+    }
+}
+
+void draw_bongo(bool minimal)
+{
+    eval_anim_state();
+
+    oled_set_cursor(0, 0);
+
+    switch (anim_state)
+    {
+        case Idle:
+            if (minimal)
+                oled_write_raw_P(idle_minimal[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
+            else
+                oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
+            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION)
+            {
+                current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
+                anim_timer = timer_read32();
+            }
+            break;
+
+        case Prep:
+            if (minimal)
+                oled_write_raw_P(prep_minimal[0], ANIM_SIZE);
+            else
+                oled_write_raw_P(prep[0], ANIM_SIZE);
+            break;
+
+        case Tap:
+            if (minimal)
+                oled_write_raw_P(tap_minimal[abs((TAP_FRAMES - 1) - current_tap_frame)], ANIM_SIZE);
+            else
+                oled_write_raw_P(tap[abs((TAP_FRAMES - 1) - current_tap_frame)], ANIM_SIZE);
+            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
+            break;
+
+        default:
+            break;
+    }
+
+    if (!minimal)
+    {
+        // print wpm
+        oled_set_cursor(0, 0);
+        oled_write("WPM:", false);
+        oled_write(get_u8_str(get_current_wpm(),'0'), false);
+    }
+}
diff --git a/keyboards/vinhcatba/uncertainty/bongo.h b/keyboards/vinhcatba/uncertainty/bongo.h
new file mode 100644
index 000000000000..d1cecbc61972
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/bongo.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Parker Levin (@pedker)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+void draw_bongo(bool minimal);
diff --git a/keyboards/vinhcatba/uncertainty/config.h b/keyboards/vinhcatba/uncertainty/config.h
new file mode 100644
index 000000000000..288f1d81a947
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/config.h
@@ -0,0 +1,30 @@
+// Copyright 2023 Vinh Le (@vinhcatba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* WS2812 driver config specifically for STM32F401 */
+// DI pin = PB1, which is AF02, TIM3_CH4 (table 9 in datasheet)
+#define RGBLIGHT_LED_MAP { 2, 3, 4, 5, 6, 0, 1, 7, 8, 9, 10, 11, 12, 13}    // index 5 = CAPS; index 6 = NUM
+
+#define WS2812_PWM_DRIVER PWMD3     // TIM3
+#define WS2812_PWM_CHANNEL 4        // CH4
+#define WS2812_PWM_PAL_MODE 2       // AF2
+
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM2        // DMA1 Stream 2 for TIM3_UP (table 28 in reference manual)
+#define WS2812_DMA_CHANNEL 5                        // DMA Channel 5 for TIM3_UP  (table 28 in reference manual)
+
+
+#define I2C1_CLOCK_SPEED 400000
+#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_16_9
+
+/* eeprom i2c driver config */
+#define EXTERNAL_EEPROM_I2C_BASE_ADDRESS 0b10100000
+#define EXTERNAL_EEPROM_BYTE_COUNT 4096
+#define EXTERNAL_EEPROM_PAGE_SIZE 32
+#define EXTERNAL_EEPROM_WRITE_TIME 10
+//#define EEPROM_I2C_24LC32
+
+/* OLED config */
+#define OLED_UPDATE_INTERVAL 100
+#define OLED_BRIGHTNESS 200
diff --git a/keyboards/vinhcatba/uncertainty/halconf.h b/keyboards/vinhcatba/uncertainty/halconf.h
new file mode 100644
index 000000000000..0b105e29b8a3
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/halconf.h
@@ -0,0 +1,11 @@
+// Copyright 2023 Vinh Le (@vinhcatba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#undef HAL_USE_PWM
+#define HAL_USE_PWM TRUE
+
+#undef HAL_USE_I2C
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/vinhcatba/uncertainty/info.json b/keyboards/vinhcatba/uncertainty/info.json
new file mode 100644
index 000000000000..fc0e69ad19fb
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/info.json
@@ -0,0 +1,170 @@
+{
+    "manufacturer": "Vinh Le",
+    "keyboard_name": "Uncertainty",
+    "maintainer": "vinhcatba",
+    "development_board": "blackpill_f401",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A13", "pin_b": "A14"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "wpm": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true,
+        "oled": true
+    },
+    "matrix_pins": {
+        "cols": ["A15", "B3", "B4", "B5", "B8", "B9", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14", "C13"],
+        "rows": ["B12", "B13", "B14", "B15", "A8", "A10"]
+    },
+    "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,
+        "layers": {
+            "enabled": true,
+            "override_rgb": true
+        },
+        "led_count": 14,
+        "max_brightness": 255,
+        "sleep": true
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0x564C"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "B1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "0,0", "matrix": [0, 0], "x": 1.25, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 2.25, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 3.25, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 4.25, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 5.25, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 6.25, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 7.25, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 8.25, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 9.25, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 10.25, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 11.25, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 12.25, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 13.25, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 14.25, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "0,15", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "0,16", "matrix": [0, 16], "x": 17.25, "y": 0},
+                {"label": "0,17", "matrix": [0, 17], "x": 18.25, "y": 0},
+                {"label": "1,17", "matrix": [1, 17], "x": 19.25, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "x": 1.25, "y": 1},
+                {"label": "1,1", "matrix": [1, 1], "x": 2.25, "y": 1},
+                {"label": "1,2", "matrix": [1, 2], "x": 3.25, "y": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 4.25, "y": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 5.25, "y": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 6.25, "y": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 7.25, "y": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 8.25, "y": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 9.25, "y": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 10.25, "y": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 11.25, "y": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 12.25, "y": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 13.25, "y": 1},
+                {"label": "1,13", "matrix": [1, 13], "x": 14.25, "y": 1, "w": 2},
+                {"label": "1,14", "matrix": [1, 14], "x": 16.25, "y": 1},
+                {"label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1},
+                {"label": "1,16", "matrix": [1, 16], "x": 18.25, "y": 1},
+                {"label": "3,17", "matrix": [3, 17], "x": 19.25, "y": 1},
+                {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 1.75},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.5},
+                {"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": "2,13", "matrix": [2, 13], "x": 13.75, "y": 2},
+                {"label": "2,14", "matrix": [2, 14], "x": 14.75, "y": 2, "w": 1.5},
+                {"label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 2},
+                {"label": "2,16", "matrix": [2, 16], "x": 17.25, "y": 2},
+                {"label": "2,17", "matrix": [2, 17], "x": 18.25, "y": 2},
+                {"label": "4,17", "matrix": [4, 17], "x": 19.25, "y": 2, "h": 2},
+                {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.75},
+                {"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, "w": 2.25},
+                {"label": "3,14", "matrix": [3, 14], "x": 16.25, "y": 3},
+                {"label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 3},
+                {"label": "3,16", "matrix": [3, 16], "x": 18.25, "y": 3},
+                {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 2.25},
+                {"label": "4,2", "matrix": [4, 2], "x": 3.5, "y": 4},
+                {"label": "4,3", "matrix": [4, 3], "x": 4.5, "y": 4},
+                {"label": "4,4", "matrix": [4, 4], "x": 5.5, "y": 4},
+                {"label": "4,5", "matrix": [4, 5], "x": 6.5, "y": 4},
+                {"label": "4,6", "matrix": [4, 6], "x": 7.5, "y": 4},
+                {"label": "4,7", "matrix": [4, 7], "x": 8.5, "y": 4},
+                {"label": "4,8", "matrix": [4, 8], "x": 9.5, "y": 4},
+                {"label": "4,9", "matrix": [4, 9], "x": 10.5, "y": 4},
+                {"label": "4,10", "matrix": [4, 10], "x": 11.5, "y": 4},
+                {"label": "4,11", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "4,12", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.75},
+                {"label": "4,13", "matrix": [4, 13], "x": 15.25, "y": 4},
+                {"label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4},
+                {"label": "4,15", "matrix": [4, 15], "x": 17.25, "y": 4},
+                {"label": "4,16", "matrix": [4, 16], "x": 18.25, "y": 4},
+                {"label": "5,17", "matrix": [5, 17], "x": 19.25, "y": 4, "h": 2},
+                {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5},
+                {"label": "5,1", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "5,2", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "5,3", "matrix": [5, 3], "x": 3.75, "y": 5, "w": 1.25},
+                {"label": "5,6", "matrix": [5, 6], "x": 5, "y": 5, "w": 6.25},
+                {"label": "5,7", "matrix": [5, 7], "x": 11.25, "y": 5},
+                {"label": "5,10", "matrix": [5, 10], "x": 12.25, "y": 5},
+                {"label": "5,11", "matrix": [5, 11], "x": 13.25, "y": 5},
+                {"label": "5,12", "matrix": [5, 12], "x": 14.25, "y": 5},
+                {"label": "5,13", "matrix": [5, 13], "x": 15.25, "y": 5},
+                {"label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 5},
+                {"label": "5,15", "matrix": [5, 15], "x": 17.25, "y": 5},
+                {"label": "5,16", "matrix": [5, 16], "x": 18.25, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/vinhcatba/uncertainty/keymaps/default/keymap.c b/keyboards/vinhcatba/uncertainty/keymaps/default/keymap.c
new file mode 100644
index 000000000000..910453e76d9d
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/keymaps/default/keymap.c
@@ -0,0 +1,89 @@
+// Copyright 2023 Vinh Le (@vinhcatba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] =    {
+
+    /* 0
+    *        ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
+    *        │ Esc  │  F1  │  F2  │  F3  │  F4  │  F5  │  F6  │  F7  │  F8  │  F9  │  F10 │  F11 │  F12 │PrtScn│  Del │ Home │  End │ PgUp │ PgDn │
+    *        ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┴──────┼──────┼──────┼──────┼──────┤
+    *        │   `  │   1  │   2  │   3  │   4  │   5  │   6  │   7  │   8  │   9  │   0  │  -   │  =   │    Bksp     │ # Lk │   /  │   *  │  -   │
+    * ┌──────┼──────┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬─────────┼──────┼──────┼──────┼──────┤
+    * │ Mute │   Tab    │   Q  │   W  │   E  │   R  │   T  │   Y  │   U  │   I  │   O  │   P  │  [   │  ]   │    \    │  7   │  8   │  9   │      │
+    * ├──────┼──────────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─────────┼──────┼──────┼──────┤  +   |
+    * │ Null │   Caps     │   A  │   S  │   D  │   F  │   G  │   H  │   J  │   K  │   L  │   ;  │   '  │    Enter     │  4   │  5   │  6   │      |
+    * ├──────┼────────────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴───────┬──────┼──────┤──────┼──────┼──────┤
+    * │ Null │     Shft     │   Z  │   X  │   C  │   V  │   B  │   N  │   M  │   ,  │   .  │   /  │    Shft    │  Up  │  1   │  2   │  3   │      │
+    * ├──────┼───────┬──────┴┬─────┴─┬────┴──────┴──────┴──────┴──────┴──────┴─────┬┴─────┬┴─────┬┴─────┬──────┼──────┼──────┼──────┼──────┤ Entr |
+    * │ Null │ Ctrl  │ Gui   │ Alt   │                  Space                      │ Alt  │  Fn  │ Ctrl │ Left │ Down │ Right│  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_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_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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_CALC, KC_CAPS, KC_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,
+        C(KC_V), KC_LSFT,          KC_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,
+        C(KC_C), 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(
+                 QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS , KC_SCRL, _______, _______, EE_CLR ,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        OLED_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
+        _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_VAI, _______, _______, _______, _______,
+        _______, _______, _______, _______,                    _______                                   , _______, _______, _______,RGB_RMOD, RGB_VAD, RGB_MOD, _______, _______
+    )
+};
+
+#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_BRID, KC_BRIU) }
+};
+#endif // endif ENCODER_MAP_ENABLE
+
+#ifdef RGBLIGHT_ENABLE
+#    define HSV_PASTEL_BLUE 150, 155, 51
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 1, HSV_PASTEL_BLUE}       // Light 1 LED, starting with LED 0
+);
+
+const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {1, 1, HSV_PASTEL_BLUE}       // Light 1 LED, starting with LED 1
+);
+
+const rgblight_segment_t PROGMEM indicators_off_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 2, HSV_OFF}       // Turn off 2 LEDs, 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(
+    indicators_off_layer,
+    my_capslock_layer,
+    my_numlock_layer
+);
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(1, led_state.caps_lock);
+    rgblight_set_layer_state(2, led_state.num_lock);
+    return true;
+}
+
+void keyboard_post_init_user(void) {
+    // debug_enable=true;
+    // debug_matrix=true;
+
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+    rgblight_set_layer_state(0, 1);
+    rgblight_set_effect_range(2, 12);
+    rgblight_enable();
+}
+#endif // endif RGBLIGHT_ENABLE
+
+
diff --git a/keyboards/vinhcatba/uncertainty/keymaps/default/rules.mk b/keyboards/vinhcatba/uncertainty/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/vinhcatba/uncertainty/keymaps/via/keymap.c b/keyboards/vinhcatba/uncertainty/keymaps/via/keymap.c
new file mode 100644
index 000000000000..2427393be72d
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/keymaps/via/keymap.c
@@ -0,0 +1,88 @@
+// Copyright 2023 Vinh Le (@vinhcatba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] =    {
+
+    /* 0
+    *        ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐
+    *        │ Esc  │  F1  │  F2  │  F3  │  F4  │  F5  │  F6  │  F7  │  F8  │  F9  │  F10 │  F11 │  F12 │PrtScn│  Del │ Home │  End │ PgUp │ PgDn │
+    *        ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┴──────┼──────┼──────┼──────┼──────┤
+    *        │   `  │   1  │   2  │   3  │   4  │   5  │   6  │   7  │   8  │   9  │   0  │  -   │  =   │    Bksp     │ # Lk │   /  │   *  │  -   │
+    * ┌──────┼──────┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬─────────┼──────┼──────┼──────┼──────┤
+    * │ Mute │   Tab    │   Q  │   W  │   E  │   R  │   T  │   Y  │   U  │   I  │   O  │   P  │  [   │  ]   │    \    │  7   │  8   │  9   │      │
+    * ├──────┼──────────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─────────┼──────┼──────┼──────┤  +   |
+    * │ Null │   Caps     │   A  │   S  │   D  │   F  │   G  │   H  │   J  │   K  │   L  │   ;  │   '  │    Enter     │  4   │  5   │  6   │      |
+    * ├──────┼────────────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴─┬────┴───────┬──────┼──────┤──────┼──────┼──────┤
+    * │ Null │     Shft     │   Z  │   X  │   C  │   V  │   B  │   N  │   M  │   ,  │   .  │   /  │    Shft    │  Up  │  1   │  2   │  3   │      │
+    * ├──────┼───────┬──────┴┬─────┴─┬────┴──────┴──────┴──────┴──────┴──────┴─────┬┴─────┬┴─────┬┴─────┬──────┼──────┼──────┼──────┼──────┤ Entr |
+    * │ Null │ Ctrl  │ Gui   │ Alt   │                  Space                      │ Alt  │  Fn  │ Ctrl │ Left │ Down │ Right│  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_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_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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_CALC, KC_CAPS, KC_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,
+        C(KC_V), KC_LSFT,          KC_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,
+        C(KC_C), 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(
+                 QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS , KC_SCRL, _______, _______, EE_CLR ,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        OLED_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
+        _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_VAI, _______, _______, _______, _______,
+        _______, _______, _______, _______,                    _______                                   , _______, _______, _______,RGB_RMOD, RGB_VAD, RGB_MOD, _______, _______
+    )
+};
+
+#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_BRID, KC_BRIU)  }
+};
+#endif // endif ENCODER_MAP_ENABLE
+
+#ifdef RGBLIGHT_ENABLE
+#define HSV_PASTEL_BLUE 150, 155, 51
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 1, HSV_PASTEL_BLUE}       // Light 1 LED, starting with LED 0
+);
+
+const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {1, 1, HSV_PASTEL_BLUE}       // Light 1 LED, starting with LED 1
+);
+
+const rgblight_segment_t PROGMEM indicators_off_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 2, HSV_OFF}       // Turn off 2 LEDs, 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(
+    indicators_off_layer,
+    my_capslock_layer,
+    my_numlock_layer
+);
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(1, led_state.caps_lock);
+    rgblight_set_layer_state(2, led_state.num_lock);
+    return true;
+}
+
+void keyboard_post_init_user(void) {
+    // debug_enable=true;
+    // debug_matrix=true;
+
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+    rgblight_set_layer_state(0, 1);
+    rgblight_set_effect_range(2, 12);
+    rgblight_enable();
+}
+#endif // endif RGBLIGHT_ENABLE
+
diff --git a/keyboards/vinhcatba/uncertainty/keymaps/via/rules.mk b/keyboards/vinhcatba/uncertainty/keymaps/via/rules.mk
new file mode 100644
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/vinhcatba/uncertainty/mcuconf.h b/keyboards/vinhcatba/uncertainty/mcuconf.h
new file mode 100644
index 000000000000..313f8dd06a69
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/mcuconf.h
@@ -0,0 +1,10 @@
+// Copyright 2023 Vinh Le (@vinhcatba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/vinhcatba/uncertainty/readme.md b/keyboards/vinhcatba/uncertainty/readme.md
new file mode 100644
index 000000000000..ead5d17c5403
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/readme.md
@@ -0,0 +1,26 @@
+# uncertainty
+
+![uncertainty](https://i.imgur.com/IKrn37Bh.jpeg)
+
+*This is an open source keyboard with exposed-component design. It has 96% (1800) layout with extra 3 keys on the left for custom macro (default are Copy, Paste and open Calculator). It features OLED screen, RGB Backlight, Encoder and VIA-supported. Powered by a STM32F401 Blackpill.*
+
+* Keyboard Maintainer: [Vinh Le](https://github.com/vinhcatba)
+* Hardware Supported: The PCB is [here](https://github.com/vinhcatba/uncertainty), controller supported: STM32F401 Blackpill, SSD1306 128x32 OLED, WS2812B RGB, External EEPROM, Rotary Encoder.
+* Hardware Availability: [Open-source hardware](https://github.com/vinhcatba/uncertainty)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make vinhcatba/uncertainty:default
+
+Flashing example for this keyboard:
+
+    make vinhcatba/uncertainty: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. This will also clear EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Physical reset button**: On Blackpill board: Hold `NRST` and `BOOT0` -> Release `NRST` first and **quickly** release `BOOT0` right after.
+* **Keycode in layout**: `QK_BOOT` is on the second layer, replacing Escape (top left key).
diff --git a/keyboards/vinhcatba/uncertainty/rules.mk b/keyboards/vinhcatba/uncertainty/rules.mk
new file mode 100644
index 000000000000..6255f6529472
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/rules.mk
@@ -0,0 +1,3 @@
+SRC += bongo.c
+# using external i2c eeprom
+EEPROM_DRIVER = i2c
diff --git a/keyboards/vinhcatba/uncertainty/uncertainty.c b/keyboards/vinhcatba/uncertainty/uncertainty.c
new file mode 100644
index 000000000000..19e5a5cfd537
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/uncertainty.c
@@ -0,0 +1,32 @@
+// Copyright 2023 Vinh Le (@vinhcatba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+#include "quantum.h"
+
+#ifdef OLED_ENABLE
+#include "bongo.h"
+// Used to draw on to the oled screen
+bool oled_minimal = true;
+bool oled_task_kb(void) {
+    if(!oled_task_user()) { return false; }
+    draw_bongo(oled_minimal);
+    return false;
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+     if (!process_record_user(keycode, record)) {
+        return false;
+    }
+
+    switch (keycode) {
+        case OLED_TOG:
+            if (record->event.pressed) {
+                oled_minimal = !oled_minimal;
+            }
+            return false;
+        default:
+            return true;
+    }
+}
+#endif // endif OLED_ENABLE
diff --git a/keyboards/vinhcatba/uncertainty/uncertainty.h b/keyboards/vinhcatba/uncertainty/uncertainty.h
new file mode 100644
index 000000000000..91a3500b0889
--- /dev/null
+++ b/keyboards/vinhcatba/uncertainty/uncertainty.h
@@ -0,0 +1,10 @@
+// Copyright 2023 Vinh Le (@vinhcatba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+#include "quantum.h"
+
+enum my_keycodes {
+    OLED_TOG = QK_KB
+};
+
diff --git a/keyboards/vitamins_included/rev1/config.h b/keyboards/vitamins_included/rev1/config.h
index 81dd72ca9ea1..027686726dfd 100644
--- a/keyboards/vitamins_included/rev1/config.h
+++ b/keyboards/vitamins_included/rev1/config.h
@@ -28,18 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLED_NUM 16    // 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
-
 /* Audio settings */
 #ifdef AUDIO_ENABLE
     #define AUDIO_PIN C6 // Define this to enable the buzzer
diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/info.json
index f9fd3d018e97..ff1504a5aa76 100644
--- a/keyboards/vitamins_included/rev1/info.json
+++ b/keyboards/vitamins_included/rev1/info.json
@@ -10,6 +10,21 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "led_count": 16,
+        "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": "F0"
     },
diff --git a/keyboards/vitamins_included/rev2/config.h b/keyboards/vitamins_included/rev2/config.h
index ce07676feeb5..519af227a49c 100644
--- a/keyboards/vitamins_included/rev2/config.h
+++ b/keyboards/vitamins_included/rev2/config.h
@@ -22,19 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SPLIT_HAND_PIN B4
 
-#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 RGBLED_SPLIT { 6, 6 }
-
 /* Audio settings */
 #ifdef AUDIO_ENABLE
 #    define AUDIO_PIN C6  // Define this to enable the buzzer
diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/info.json
index 9170f80a7d48..ed8596538df6 100644
--- a/keyboards/vitamins_included/rev2/info.json
+++ b/keyboards/vitamins_included/rev2/info.json
@@ -16,6 +16,22 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6],
+        "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": "F0"
     },
diff --git a/keyboards/w1_at/rules.mk b/keyboards/w1_at/rules.mk
index 7000bb65710c..7c0709f41e6c 100644
--- a/keyboards/w1_at/rules.mk
+++ b/keyboards/w1_at/rules.mk
@@ -1,11 +1,6 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/waldo/config.h b/keyboards/waldo/config.h
index a0d7763711ac..b9449c4714bf 100644
--- a/keyboards/waldo/config.h
+++ b/keyboards/waldo/config.h
@@ -37,20 +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
-
-// RGB LED
-#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
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/waldo/info.json b/keyboards/waldo/info.json
index 0959861ca978..f6aa8a8190e7 100644
--- a/keyboards/waldo/info.json
+++ b/keyboards/waldo/info.json
@@ -16,6 +16,24 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "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": "B0"
     },
diff --git a/keyboards/walletburner/cajal/config.h b/keyboards/walletburner/cajal/config.h
index 6d33342cf8ae..af1fe3ab43e0 100644
--- a/keyboards/walletburner/cajal/config.h
+++ b/keyboards/walletburner/cajal/config.h
@@ -21,18 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 18
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/walletburner/cajal/info.json b/keyboards/walletburner/cajal/info.json
index 36b66474653a..5578ba3d8c1e 100644
--- a/keyboards/walletburner/cajal/info.json
+++ b/keyboards/walletburner/cajal/info.json
@@ -18,6 +18,23 @@
             {"pin_a": "D6", "pin_b": "D7"}
         ]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "F7"
     },
diff --git a/keyboards/walletburner/neuron/config.h b/keyboards/walletburner/neuron/config.h
index 2dae864ddb2e..5f360813239b 100644
--- a/keyboards/walletburner/neuron/config.h
+++ b/keyboards/walletburner/neuron/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 1
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/walletburner/neuron/info.json b/keyboards/walletburner/neuron/info.json
index fb6b3e96f8ea..fc9aad49e203 100644
--- a/keyboards/walletburner/neuron/info.json
+++ b/keyboards/walletburner/neuron/info.json
@@ -8,6 +8,23 @@
         "pid": "0x6E75",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "B1"
     },
diff --git a/keyboards/waterfowl/config.h b/keyboards/waterfowl/config.h
index 40d9a4b8da47..2ddc7228d497 100644
--- a/keyboards/waterfowl/config.h
+++ b/keyboards/waterfowl/config.h
@@ -20,6 +20,3 @@
 #define SPLIT_MODS_ENABLE
 #define SPLIT_WPM_ENABLE
 #define SPLIT_USB_DETECT
-
-// Tapping term
-#define TAPPING_TERM 200
\ No newline at end of file
diff --git a/keyboards/waterfowl/rules.mk b/keyboards/waterfowl/rules.mk
index 4f359b9ee8d9..0eed9cdd8f68 100644
--- a/keyboards/waterfowl/rules.mk
+++ b/keyboards/waterfowl/rules.mk
@@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 OLED_ENABLE = yes        # Enables the use of OLED displays
-OLED_DRIVER = SSD1306    # Specifies the type of OLED
 SPLIT_KEYBOARD = yes     # Enables split functionality
-ENCODER_ENABLE = yes	 # Enables the encoders
\ No newline at end of file
+ENCODER_ENABLE = yes	 # Enables the encoders
diff --git a/keyboards/wavtype/foundation/config.h b/keyboards/wavtype/foundation/config.h
index 09d5a7bf8a8b..4376386c3e6e 100644
--- a/keyboards/wavtype/foundation/config.h
+++ b/keyboards/wavtype/foundation/config.h
@@ -3,22 +3,6 @@
 
 #pragma once
 
-#    define RGBLED_NUM 16
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/wavtype/foundation/info.json b/keyboards/wavtype/foundation/info.json
index ea0adf2ee54f..b5e8793b8fb2 100644
--- a/keyboards/wavtype/foundation/info.json
+++ b/keyboards/wavtype/foundation/info.json
@@ -8,6 +8,24 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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": "B0"
     },
diff --git a/keyboards/wavtype/p01_ultra/config.h b/keyboards/wavtype/p01_ultra/config.h
index e6b401aa75dc..e01f469285da 100644
--- a/keyboards/wavtype/p01_ultra/config.h
+++ b/keyboards/wavtype/p01_ultra/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 18
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== or choose animations ==*/
-#    define RGBLIGHT_EFFECT_BREATHING
-#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#    define RGBLIGHT_EFFECT_SNAKE
-#    define RGBLIGHT_EFFECT_KNIGHT
-#    define RGBLIGHT_EFFECT_CHRISTMAS
-#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#    define RGBLIGHT_EFFECT_RGB_TEST
-#    define RGBLIGHT_EFFECT_ALTERNATING
-
 /* 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/wavtype/p01_ultra/info.json b/keyboards/wavtype/p01_ultra/info.json
index fa04ce785010..7205b503664d 100644
--- a/keyboards/wavtype/p01_ultra/info.json
+++ b/keyboards/wavtype/p01_ultra/info.json
@@ -8,6 +8,23 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/weirdo/geminate60/config.h b/keyboards/weirdo/geminate60/config.h
index 948bd0c7f1fc..5e0e8b40a9fc 100644
--- a/keyboards/weirdo/geminate60/config.h
+++ b/keyboards/weirdo/geminate60/config.h
@@ -15,12 +15,6 @@
   */ 
 #pragma once
 
-#define RGBLED_NUM 1
-//#define RGBLIGHT_DISABLE_KEYCODES
-
-
-
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/weirdo/geminate60/info.json b/keyboards/weirdo/geminate60/info.json
index e8bda126ea0e..722d1d3bfe0a 100644
--- a/keyboards/weirdo/geminate60/info.json
+++ b/keyboards/weirdo/geminate60/info.json
@@ -8,6 +8,9 @@
         "pid": "0x676D",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 1
+    },
     "ws2812": {
         "pin": "A6"
     },
diff --git a/keyboards/weirdo/kelowna/rgb64/config.h b/keyboards/weirdo/kelowna/rgb64/config.h
index 0a446abebab3..5c0ed9cf6121 100644
--- a/keyboards/weirdo/kelowna/rgb64/config.h
+++ b/keyboards/weirdo/kelowna/rgb64/config.h
@@ -15,12 +15,6 @@
   */ 
 #pragma once
 
-#define RGBLED_NUM 64
-//#define RGBLIGHT_DISABLE_KEYCODES
-
-
-
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/weirdo/kelowna/rgb64/info.json b/keyboards/weirdo/kelowna/rgb64/info.json
index 89053ba9cca2..12188f6f3020 100644
--- a/keyboards/weirdo/kelowna/rgb64/info.json
+++ b/keyboards/weirdo/kelowna/rgb64/info.json
@@ -8,6 +8,9 @@
         "pid": "0x4C64",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 64
+    },
     "ws2812": {
         "pin": "A6"
     },
diff --git a/keyboards/weirdo/ls_60/config.h b/keyboards/weirdo/ls_60/config.h
index d2b9299c8f08..5c0ed9cf6121 100644
--- a/keyboards/weirdo/ls_60/config.h
+++ b/keyboards/weirdo/ls_60/config.h
@@ -15,12 +15,6 @@
   */ 
 #pragma once
 
-#define RGBLED_NUM 1
-//#define RGBLIGHT_DISABLE_KEYCODES
-
-
-
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/weirdo/ls_60/info.json b/keyboards/weirdo/ls_60/info.json
index f386d40b6699..0dadf9d32cea 100644
--- a/keyboards/weirdo/ls_60/info.json
+++ b/keyboards/weirdo/ls_60/info.json
@@ -8,6 +8,9 @@
         "pid": "0x4C53",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 1
+    },
     "ws2812": {
         "pin": "A6"
     },
diff --git a/keyboards/weirdo/naiping/np64/config.h b/keyboards/weirdo/naiping/np64/config.h
index 2c312472777a..2c7e4c037b50 100644
--- a/keyboards/weirdo/naiping/np64/config.h
+++ b/keyboards/weirdo/naiping/np64/config.h
@@ -15,12 +15,6 @@
   */
 #pragma once
 
-#define RGBLED_NUM 80
-//#define RGBLIGHT_DISABLE_KEYCODES
-
-
-
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/weirdo/naiping/np64/info.json b/keyboards/weirdo/naiping/np64/info.json
index 0f91be1b8390..63e6297f7d5a 100644
--- a/keyboards/weirdo/naiping/np64/info.json
+++ b/keyboards/weirdo/naiping/np64/info.json
@@ -8,6 +8,9 @@
         "pid": "0x7064",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 80
+    },
     "ws2812": {
         "pin": "B1"
     },
diff --git a/keyboards/weirdo/naiping/nphhkb/config.h b/keyboards/weirdo/naiping/nphhkb/config.h
index 0a3df009abe8..5c0ed9cf6121 100644
--- a/keyboards/weirdo/naiping/nphhkb/config.h
+++ b/keyboards/weirdo/naiping/nphhkb/config.h
@@ -15,12 +15,6 @@
   */ 
 #pragma once
 
-#define RGBLED_NUM 78
-//#define RGBLIGHT_DISABLE_KEYCODES
-
-
-
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/weirdo/naiping/nphhkb/info.json b/keyboards/weirdo/naiping/nphhkb/info.json
index 730c17c61fa0..931f81db1f01 100644
--- a/keyboards/weirdo/naiping/nphhkb/info.json
+++ b/keyboards/weirdo/naiping/nphhkb/info.json
@@ -8,6 +8,9 @@
         "pid": "0x7068",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 78
+    },
     "ws2812": {
         "pin": "A7"
     },
diff --git a/keyboards/weirdo/naiping/npminila/config.h b/keyboards/weirdo/naiping/npminila/config.h
index 782833a3afd7..5c0ed9cf6121 100644
--- a/keyboards/weirdo/naiping/npminila/config.h
+++ b/keyboards/weirdo/naiping/npminila/config.h
@@ -15,12 +15,6 @@
   */ 
 #pragma once
 
-#define RGBLED_NUM 82
-//#define RGBLIGHT_DISABLE_KEYCODES
-
-
-
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/weirdo/naiping/npminila/info.json b/keyboards/weirdo/naiping/npminila/info.json
index 5162849225e0..3824802e0204 100644
--- a/keyboards/weirdo/naiping/npminila/info.json
+++ b/keyboards/weirdo/naiping/npminila/info.json
@@ -8,6 +8,9 @@
         "pid": "0x706D",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 82
+    },
     "ws2812": {
         "pin": "D1"
     },
diff --git a/keyboards/wekey/polaris/info.json b/keyboards/wekey/polaris/info.json
index 4d9d3e7cfa3f..661799f750dd 100644
--- a/keyboards/wekey/polaris/info.json
+++ b/keyboards/wekey/polaris/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
     "matrix_pins": {
         "cols": ["E6", "B4", "B5", "B6", "D0", "D1", "D2", "D3"],
         "rows": ["F4", "F1", "F0", "B7", "F7", "D5", "C6", "C7", "F5", "F6"]
diff --git a/keyboards/wekey/polaris/rules.mk b/keyboards/wekey/polaris/rules.mk
index 7805f1f3c658..3b6a1809db18 100644
--- a/keyboards/wekey/polaris/rules.mk
+++ b/keyboards/wekey/polaris/rules.mk
@@ -10,5 +10,3 @@ 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
-
-DEBOUNCE_TYPE	  = sym_defer_pk
diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h
index a2d6575d8e50..30127708e0b0 100644
--- a/keyboards/wekey/we27/config.h
+++ b/keyboards/wekey/we27/config.h
@@ -80,9 +80,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #endif
 
-#define ENCODERS_CW_KEY { { 4, 5 } }
-#define ENCODERS_CCW_KEY { { 4, 3 } }
-
 /* 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/encoder_actions.c b/keyboards/wekey/we27/encoder_actions.c
deleted file mode 100644
index 87a53676e660..000000000000
--- a/keyboards/wekey/we27/encoder_actions.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- * Copyright 2021 drashna jael're (@drashna)
- * Copyright 2021 uybv
- *
- * This program is free software: you can 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 "encoder_actions.h"
-
-#ifdef ENCODER_ENABLE
-static uint8_t  encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS]    = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS]   = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
-
-#endif
diff --git a/keyboards/wekey/we27/encoder_actions.h b/keyboards/wekey/we27/encoder_actions.h
deleted file mode 100644
index 1a7fb72014de..000000000000
--- a/keyboards/wekey/we27/encoder_actions.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can 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 "quantum.h"
-
-void encoder_action_unregister(void);
-
-void encoder_action_register(uint8_t index, bool clockwise);
diff --git a/keyboards/wekey/we27/info.json b/keyboards/wekey/we27/info.json
index 7fa45a13abcd..4d4081faf0cc 100644
--- a/keyboards/wekey/we27/info.json
+++ b/keyboards/wekey/we27/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F4", "F5", "C7", "D6", "D4"],
@@ -24,6 +24,9 @@
     "ws2812": {
         "pin": "C6"
     },
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["numpad_6x5"],
@@ -63,45 +66,6 @@
                 {"matrix": [5, 3], "x": 3, "y": 5.5},
                 {"matrix": [4, 4], "x": 4, "y": 4.5, "h": 2}
             ]
-        },
-        "LAYOUT_numpad_6x5_encoder": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.75},
-                {"matrix": [0, 1], "x": 1, "y": 0.75},
-                {"matrix": [0, 2], "x": 2, "y": 0.75},
-                {"matrix": [0, 3], "x": 3, "y": 0.75},
-                {"matrix": [0, 4], "x": 4, "y": 0.75},
-
-                {"matrix": [3, 4], "x": 3.75, "y": 0, "w": 0.75, "h": 0.75},
-                {"matrix": [5, 4], "x": 4.5, "y": 0, "w": 0.75, "h": 0.75},
-
-                {"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": [2, 0], "x": 0, "y": 3.25},
-                {"matrix": [2, 1], "x": 1, "y": 3.25},
-                {"matrix": [2, 2], "x": 2, "y": 3.25},
-                {"matrix": [2, 3], "x": 3, "y": 3.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 4.25},
-                {"matrix": [3, 1], "x": 1, "y": 4.25},
-                {"matrix": [3, 2], "x": 2, "y": 4.25},
-                {"matrix": [3, 3], "x": 3, "y": 4.25},
-                {"matrix": [2, 4], "x": 4, "y": 3.25, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 5.25},
-                {"matrix": [4, 1], "x": 1, "y": 5.25},
-                {"matrix": [4, 2], "x": 2, "y": 5.25},
-                {"matrix": [4, 3], "x": 3, "y": 5.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 6.25},
-                {"matrix": [5, 1], "x": 1, "y": 6.25, "w": 2},
-                {"matrix": [5, 3], "x": 3, "y": 6.25},
-                {"matrix": [4, 4], "x": 4, "y": 5.25, "h": 2}
-            ]
         }
     }
 }
diff --git a/keyboards/wekey/we27/keymaps/default/keymap.c b/keyboards/wekey/we27/keymaps/default/keymap.c
index 741b25e3e702..cd2d215d2c71 100644
--- a/keyboards/wekey/we27/keymaps/default/keymap.c
+++ b/keyboards/wekey/we27/keymaps/default/keymap.c
@@ -17,32 +17,32 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	/* Base */
-	[0] = LAYOUT_numpad_6x5_encoder(
-		KC_ESC , KC_PWR , KC_SLEP, KC_F11 , KC_MUTE, KC_VOLD, KC_VOLU,
+	[0] = LAYOUT_numpad_6x5(
+		KC_ESC , KC_PWR , KC_SLEP, KC_F11 , KC_MUTE,
 		KC_NUM,  KC_BSPC, KC_PSLS, KC_PAST, KC_PMNS,
 		RGB_MOD, KC_P7  , KC_P8  , KC_P9  ,
 		RGB_RMOD, KC_P4  , KC_P5  , KC_P6  , KC_PPLS,
 		RGB_TOG, KC_P1  , KC_P2  , KC_P3  ,
 		MO(1)  , KC_P0  ,          KC_PDOT, KC_PENT
 	),
-	[1] = LAYOUT_numpad_6x5_encoder(
-		_______, _______, _______, _______, KC_MPLY, KC_MPRV, KC_MNXT,
+	[1] = LAYOUT_numpad_6x5(
+		_______, _______, _______, _______, KC_MPLY,
 		_______, _______, _______, _______, _______,
 		RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI,
 		RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______,
-		_______, _______, _______, _______, 
+		_______, _______, _______, _______,
 		_______, _______,          _______, QK_BOOT
 	),
-	[2] = LAYOUT_numpad_6x5_encoder(
-		_______, _______, _______, _______, _______, _______, _______,
+	[2] = LAYOUT_numpad_6x5(
+		_______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______,
 		_______, _______, _______, _______,
 		_______, _______, _______, _______, _______,
 		_______, _______, _______, _______,
 		_______, _______,          _______, _______
 	),
-	[3] = LAYOUT_numpad_6x5_encoder(
-		_______, _______, _______, _______, _______, _______, _______,
+	[3] = LAYOUT_numpad_6x5(
+		_______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______,
 		_______, _______, _______, _______,
 		_______, _______, _______, _______, _______,
@@ -50,3 +50,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, _______,          _______, _______
 	)
 };
+
+#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(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/wekey/we27/keymaps/default/rules.mk b/keyboards/wekey/we27/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/wekey/we27/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/wekey/we27/keymaps/via/keymap.c b/keyboards/wekey/we27/keymaps/via/keymap.c
index 741b25e3e702..cd2d215d2c71 100644
--- a/keyboards/wekey/we27/keymaps/via/keymap.c
+++ b/keyboards/wekey/we27/keymaps/via/keymap.c
@@ -17,32 +17,32 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	/* Base */
-	[0] = LAYOUT_numpad_6x5_encoder(
-		KC_ESC , KC_PWR , KC_SLEP, KC_F11 , KC_MUTE, KC_VOLD, KC_VOLU,
+	[0] = LAYOUT_numpad_6x5(
+		KC_ESC , KC_PWR , KC_SLEP, KC_F11 , KC_MUTE,
 		KC_NUM,  KC_BSPC, KC_PSLS, KC_PAST, KC_PMNS,
 		RGB_MOD, KC_P7  , KC_P8  , KC_P9  ,
 		RGB_RMOD, KC_P4  , KC_P5  , KC_P6  , KC_PPLS,
 		RGB_TOG, KC_P1  , KC_P2  , KC_P3  ,
 		MO(1)  , KC_P0  ,          KC_PDOT, KC_PENT
 	),
-	[1] = LAYOUT_numpad_6x5_encoder(
-		_______, _______, _______, _______, KC_MPLY, KC_MPRV, KC_MNXT,
+	[1] = LAYOUT_numpad_6x5(
+		_______, _______, _______, _______, KC_MPLY,
 		_______, _______, _______, _______, _______,
 		RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI,
 		RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______,
-		_______, _______, _______, _______, 
+		_______, _______, _______, _______,
 		_______, _______,          _______, QK_BOOT
 	),
-	[2] = LAYOUT_numpad_6x5_encoder(
-		_______, _______, _______, _______, _______, _______, _______,
+	[2] = LAYOUT_numpad_6x5(
+		_______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______,
 		_______, _______, _______, _______,
 		_______, _______, _______, _______, _______,
 		_______, _______, _______, _______,
 		_______, _______,          _______, _______
 	),
-	[3] = LAYOUT_numpad_6x5_encoder(
-		_______, _______, _______, _______, _______, _______, _______,
+	[3] = LAYOUT_numpad_6x5(
+		_______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______,
 		_______, _______, _______, _______,
 		_______, _______, _______, _______, _______,
@@ -50,3 +50,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, _______,          _______, _______
 	)
 };
+
+#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(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/wekey/we27/keymaps/via/rules.mk b/keyboards/wekey/we27/keymaps/via/rules.mk
index 36b7ba9cbc98..1189f4ad1927 100644
--- a/keyboards/wekey/we27/keymaps/via/rules.mk
+++ b/keyboards/wekey/we27/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/wekey/we27/rules.mk b/keyboards/wekey/we27/rules.mk
index c76f29ff7536..1c5cc136ca44 100644
--- a/keyboards/wekey/we27/rules.mk
+++ b/keyboards/wekey/we27/rules.mk
@@ -13,7 +13,4 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
 
-DEBOUNCE_TYPE	  = sym_defer_pk
 RGB_MATRIX_CUSTOM_KB = yes
-
-SRC += encoder_actions.c
diff --git a/keyboards/wekey/we27/we27.c b/keyboards/wekey/we27/we27.c
index 9f2b85d95f80..03ec6f5512ed 100644
--- a/keyboards/wekey/we27/we27.c
+++ b/keyboards/wekey/we27/we27.c
@@ -15,7 +15,6 @@
  */
 
 #include "quantum.h"
-#include "encoder_actions.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
@@ -45,14 +44,3 @@ led_config_t g_led_config = { {
 } };
 
 #endif
-
-void matrix_scan_kb(void) {
-    encoder_action_unregister();
-    matrix_scan_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    encoder_action_register(index, clockwise);
-    return true;
-};
diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h
index 9a29563ec7d8..c024f9d8d91f 100644
--- a/keyboards/westfoxtrot/aanzee/config.h
+++ b/keyboards/westfoxtrot/aanzee/config.h
@@ -17,21 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-   #define RGBLED_NUM 9
-   #define RGBLIGHT_HUE_STEP 12
-   #define RGBLIGHT_SAT_STEP 25
-   #define RGBLIGHT_VAL_STEP 12
-   #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
 #define RGBW
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/westfoxtrot/aanzee/info.json b/keyboards/westfoxtrot/aanzee/info.json
index 9dd3fcb2a40f..9524eaea1276 100644
--- a/keyboards/westfoxtrot/aanzee/info.json
+++ b/keyboards/westfoxtrot/aanzee/info.json
@@ -22,6 +22,25 @@
     "caps_lock": "B2",
     "on_state": 0
   },
+  "rgblight": {
+    "hue_steps": 12,
+    "saturation_steps": 25,
+    "brightness_steps": 12,
+    "led_count": 9,
+    "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": "E6"
   },
diff --git a/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c b/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c
index 94d134d7c98c..40f8c98344d9 100644
--- a/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c
+++ b/keyboards/westfoxtrot/cyclops/keymaps/peippo/keymap.c
@@ -61,19 +61,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_LSFT, _______, _______,    _______, _______, _______, _______, _______, _______,     _______,    _______, _______, KC_RSFT, _______, KC_MPLY,
 		_______, _______, _______,                               _______,                                   _______, _______,          KC_MRWD, KC_MUTE, KC_MFFD),
 };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/keymap.c b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/keymap.c
index eed5e664a80e..9763abe36911 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/keymap.c
+++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/keymap.c
@@ -51,23 +51,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 };
 
-
-
-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;
-}
-
-void led_set_user(uint8_t usb_led) {
+bool led_update_user(led_t led_state) {
   // Insert custom handling for CAPS_LOCK, NUM_LOCK, SCROLL_LOCK here
-      if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
+      if (led_state.num_lock) {
         writePinHigh(F4);
         writePinHigh(F1);
         writePinHigh(F5);
@@ -76,4 +62,5 @@ void led_set_user(uint8_t usb_led) {
         writePinLow(F1);
         writePinLow(F5);
     }
+    return false;
 }
diff --git a/keyboards/westfoxtrot/cypher/rev5/config.h b/keyboards/westfoxtrot/cypher/rev5/config.h
index ed68bff9d456..cd1f84bc1fce 100644
--- a/keyboards/westfoxtrot/cypher/rev5/config.h
+++ b/keyboards/westfoxtrot/cypher/rev5/config.h
@@ -26,19 +26,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
  */
 #define GRAVE_ESC_CTRL_OVERRIDE
-
-   #define RGBLED_NUM 10
-   #define RGBLIGHT_HUE_STEP 12
-   #define RGBLIGHT_SAT_STEP 25
-   #define RGBLIGHT_VAL_STEP 12
-   #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
diff --git a/keyboards/westfoxtrot/cypher/rev5/info.json b/keyboards/westfoxtrot/cypher/rev5/info.json
index d3f57b6e67f2..b72f7173e46c 100644
--- a/keyboards/westfoxtrot/cypher/rev5/info.json
+++ b/keyboards/westfoxtrot/cypher/rev5/info.json
@@ -12,10 +12,30 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "D0",
         "levels": 5,
         "breathing": true
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 25,
+        "brightness_steps": 12,
+        "led_count": 10,
+        "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": "E6"
     },
diff --git a/keyboards/westfoxtrot/prophet/rules.mk b/keyboards/westfoxtrot/prophet/rules.mk
index 1d3680aec148..14d4af4e1421 100644
--- a/keyboards/westfoxtrot/prophet/rules.mk
+++ b/keyboards/westfoxtrot/prophet/rules.mk
@@ -11,5 +11,3 @@ SLEEP_LED_ENABLE = yes
 BACKLIGHT_ENABLE = no
 RGBLIGHT_ENABLE = no
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/westm/westm68/rev1/config.h b/keyboards/westm/westm68/rev1/config.h
deleted file mode 100644
index db711fcfd97e..000000000000
--- a/keyboards/westm/westm68/rev1/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 WestM
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGBLED_NUM 16
-#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/westm/westm68/rev1/info.json b/keyboards/westm/westm68/rev1/info.json
index 70c31e162b65..4cecee049dab 100644
--- a/keyboards/westm/westm68/rev1/info.json
+++ b/keyboards/westm/westm68/rev1/info.json
@@ -2,6 +2,21 @@
     "usb": {
         "pid": "0x0101"
     },
+    "rgblight": {
+        "led_count": 16,
+        "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": "A8"
     }
diff --git a/keyboards/westm/westm68/rev2/config.h b/keyboards/westm/westm68/rev2/config.h
deleted file mode 100644
index db711fcfd97e..000000000000
--- a/keyboards/westm/westm68/rev2/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 WestM
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGBLED_NUM 16
-#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/westm/westm68/rev2/info.json b/keyboards/westm/westm68/rev2/info.json
index 50711496d3cc..0edcf115ede2 100644
--- a/keyboards/westm/westm68/rev2/info.json
+++ b/keyboards/westm/westm68/rev2/info.json
@@ -2,6 +2,21 @@
     "usb": {
         "pid": "0x0102"
     },
+    "rgblight": {
+        "led_count": 16,
+        "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": "A8"
     }
diff --git a/keyboards/westm/westm9/rev1/config.h b/keyboards/westm/westm9/rev1/config.h
index 17de75167cd1..9492e7f6cac7 100644
--- a/keyboards/westm/westm9/rev1/config.h
+++ b/keyboards/westm/westm9/rev1/config.h
@@ -16,18 +16,6 @@
 
 #pragma once
 
-#define RGBLED_NUM 14
-#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
-
 /* Default Oled init */
 #define OLED_DISPLAY_128X64
 #define OLED_BRIGHTNESS 255
diff --git a/keyboards/westm/westm9/rev1/info.json b/keyboards/westm/westm9/rev1/info.json
index 5986e5c1c8d4..5561baa5a9ec 100644
--- a/keyboards/westm/westm9/rev1/info.json
+++ b/keyboards/westm/westm9/rev1/info.json
@@ -2,6 +2,21 @@
     "usb": {
         "pid": "0x0301"
     },
+    "rgblight": {
+        "led_count": 14,
+        "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": "F1"
     }
diff --git a/keyboards/westm/westm9/rev2/config.h b/keyboards/westm/westm9/rev2/config.h
index 17de75167cd1..9492e7f6cac7 100644
--- a/keyboards/westm/westm9/rev2/config.h
+++ b/keyboards/westm/westm9/rev2/config.h
@@ -16,18 +16,6 @@
 
 #pragma once
 
-#define RGBLED_NUM 14
-#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
-
 /* Default Oled init */
 #define OLED_DISPLAY_128X64
 #define OLED_BRIGHTNESS 255
diff --git a/keyboards/westm/westm9/rev2/info.json b/keyboards/westm/westm9/rev2/info.json
index faebf5d443c9..66fe8159f55b 100644
--- a/keyboards/westm/westm9/rev2/info.json
+++ b/keyboards/westm/westm9/rev2/info.json
@@ -2,6 +2,21 @@
     "usb": {
         "pid": "0x0302"
     },
+    "rgblight": {
+        "led_count": 14,
+        "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": "F1"
     }
diff --git a/keyboards/westm/westm9/rules.mk b/keyboards/westm/westm9/rules.mk
index 00ce09e1a6c8..e522c525602a 100644
--- a/keyboards/westm/westm9/rules.mk
+++ b/keyboards/westm/westm9/rules.mk
@@ -15,6 +15,5 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 OLED_ENABLE = yes			# Enable the OLED feature
-OLED_DRIVER = SSD1306    	# OLED driver
 
 DEFAULT_FOLDER = westm/westm9/rev2
diff --git a/keyboards/westm/westmergo/config.h b/keyboards/westm/westmergo/config.h
index 2b6482785655..4e85b2e402ae 100644
--- a/keyboards/westm/westmergo/config.h
+++ b/keyboards/westm/westmergo/config.h
@@ -16,18 +16,6 @@
 
 #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 RGBLED_NUM 16
-
 /* 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/westm/westmergo/info.json b/keyboards/westm/westmergo/info.json
index 30e82dfad69a..de733b988a8f 100644
--- a/keyboards/westm/westmergo/info.json
+++ b/keyboards/westm/westmergo/info.json
@@ -8,6 +8,21 @@
         "pid": "0x0201",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 16,
+        "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": "A8"
     },
@@ -18,6 +33,7 @@
     "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "community_layouts": ["alice"],
     "layouts": {
         "LAYOUT_alice": {
             "layout": [
diff --git a/keyboards/wilba_tech/wt70_jb/config.h b/keyboards/wilba_tech/wt70_jb/config.h
index 914d9b2763c5..9b6b3c795583 100644
--- a/keyboards/wilba_tech/wt70_jb/config.h
+++ b/keyboards/wilba_tech/wt70_jb/config.h
@@ -19,19 +19,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-// RGBLIGHT configuation
-   #define RGBLED_NUM 2
-   #define RGBLIGHT_HUE_STEP 8
-   #define RGBLIGHT_SAT_STEP 8
-   #define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/wilba_tech/wt70_jb/info.json b/keyboards/wilba_tech/wt70_jb/info.json
index d750e86d90a0..e02cb6150986 100644
--- a/keyboards/wilba_tech/wt70_jb/info.json
+++ b/keyboards/wilba_tech/wt70_jb/info.json
@@ -8,6 +8,23 @@
         "pid": "0x001F",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 2,
+        "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": "B2"
     },
diff --git a/keyboards/wilba_tech/wt_mono_backlight.c b/keyboards/wilba_tech/wt_mono_backlight.c
index c79fc02cd99f..28ee5fae81c7 100644
--- a/keyboards/wilba_tech/wt_mono_backlight.c
+++ b/keyboards/wilba_tech/wt_mono_backlight.c
@@ -64,12 +64,12 @@ void backlight_init_drivers(void)
 {
 	// Initialize I2C
 	i2c_init();
-	IS31FL3736_init( ISSI_ADDR_DEFAULT );
+	is31fl3736_init( ISSI_ADDR_DEFAULT );
 
 	for ( uint8_t index = 0; index < 96; index++ )	{
-		IS31FL3736_mono_set_led_control_register( index, true );
+		is31fl3736_mono_set_led_control_register( index, true );
 	}
-	IS31FL3736_update_led_control_registers( ISSI_ADDR_DEFAULT, 0x00 );
+	is31fl3736_update_led_control_registers( ISSI_ADDR_DEFAULT, 0x00 );
 }
 
 void backlight_set_key_hit(uint8_t row, uint8_t column)
@@ -119,17 +119,17 @@ void backlight_set_suspend_state(bool state)
 
 void backlight_set_brightness_all( uint8_t value )
 {
-	IS31FL3736_mono_set_brightness_all( value );
+	is31fl3736_mono_set_brightness_all( value );
 }
 
 void backlight_effect_all_off(void)
 {
-	IS31FL3736_mono_set_brightness_all( 0 );
+	is31fl3736_mono_set_brightness_all( 0 );
 }
 
 void backlight_effect_all_on(void)
 {
-	IS31FL3736_mono_set_brightness_all( g_config.brightness );
+	is31fl3736_mono_set_brightness_all( g_config.brightness );
 }
 
 void backlight_effect_raindrops(bool initialize)
@@ -143,7 +143,7 @@ void backlight_effect_raindrops(bool initialize)
         // If not, all but one will stay the same as before.
         if ( initialize || i == led_to_change )
         {
-            IS31FL3736_mono_set_brightness(i, rand() & 0xFF );
+            is31fl3736_mono_set_brightness(i, rand() & 0xFF );
         }
     }
 }
@@ -165,9 +165,9 @@ void backlight_effect_indicators(void)
     // SW7,CS8 = (6*8+7) = 55
     // SW8,CS8 = (7*8+7) = 63
     // SW9,CS8 = (8*8+7) = 71
-    IS31FL3736_mono_set_brightness(55, rgb.r);
-    IS31FL3736_mono_set_brightness(63, rgb.g);
-    IS31FL3736_mono_set_brightness(71, rgb.b);
+    is31fl3736_mono_set_brightness(55, rgb.r);
+    is31fl3736_mono_set_brightness(63, rgb.g);
+    is31fl3736_mono_set_brightness(71, rgb.b);
 #endif // MONO_BACKLIGHT_WT75_A
 
 // This pairs with "All Off" already setting zero brightness,
@@ -181,19 +181,19 @@ defined(MONO_BACKLIGHT_WT75_C) || \
 defined(MONO_BACKLIGHT_WT80_A)
     if ( host_keyboard_led_state().caps_lock ) {
         // SW3,CS1 = (2*8+0) = 16
-        IS31FL3736_mono_set_brightness(16, 255);
+        is31fl3736_mono_set_brightness(16, 255);
     }
 #endif
 #if defined(MONO_BACKLIGHT_WT80_A)
     if ( host_keyboard_led_state().scroll_lock ) {
         // SW7,CS7 = (6*8+6) = 54
-        IS31FL3736_mono_set_brightness(54, 255);
+        is31fl3736_mono_set_brightness(54, 255);
     }
 #endif
 #if defined(MONO_BACKLIGHT_WT75_C)
     if ( host_keyboard_led_state().scroll_lock ) {
         // SW7,CS8 = (6*8+7) = 55
-        IS31FL3736_mono_set_brightness(55, 255);
+        is31fl3736_mono_set_brightness(55, 255);
     }
 #endif
 }
@@ -361,7 +361,7 @@ void backlight_config_save(void)
 
 void backlight_update_pwm_buffers(void)
 {
-	IS31FL3736_update_pwm_buffers(ISSI_ADDR_DEFAULT,0x00);
+	is31fl3736_update_pwm_buffers(ISSI_ADDR_DEFAULT,0x00);
 }
 
 bool process_record_backlight(uint16_t keycode, keyrecord_t *record)
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
index 1cd00ae41f6d..6c57416622cb 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -1771,36 +1771,36 @@ void map_row_column_to_led( uint8_t row, uint8_t column, uint8_t *led )
 void backlight_update_pwm_buffers(void)
 {
 #if defined(RGB_BACKLIGHT_M6_B)
-    IS31FL3218_update_pwm_buffers();
+    is31fl3218_update_pwm_buffers();
 #elif defined(RGB_BACKLIGHT_PORTICO75)
-	IS31FL3741_update_pwm_buffers( ISSI_ADDR_1, 0 );
-    IS31FL3741_update_led_control_registers( ISSI_ADDR_1, 0 );
+	is31fl3741_update_pwm_buffers( ISSI_ADDR_1, 0 );
+    is31fl3741_update_led_control_registers( ISSI_ADDR_1, 0 );
 #elif defined(RGB_BACKLIGHT_M10_C)
-    IS31FL3731_update_pwm_buffers( ISSI_ADDR_1, 0 );
-    IS31FL3731_update_led_control_registers( ISSI_ADDR_1, 0 );
+    is31fl3731_update_pwm_buffers( ISSI_ADDR_1, 0 );
+    is31fl3731_update_led_control_registers( ISSI_ADDR_1, 0 );
 #elif defined(RGB_BACKLIGHT_HS60)
-    IS31FL3733_update_pwm_buffers( ISSI_ADDR_1, 0 );
-    IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 );
+    is31fl3733_update_pwm_buffers( ISSI_ADDR_1, 0 );
+    is31fl3733_update_led_control_registers( ISSI_ADDR_1, 0 );
 #elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NK87) || defined(RGB_BACKLIGHT_KW_MEGA)
-    IS31FL3733_update_pwm_buffers( ISSI_ADDR_1, 0 );
-    IS31FL3733_update_pwm_buffers( ISSI_ADDR_2, 1 );
-    IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 );
-    IS31FL3733_update_led_control_registers( ISSI_ADDR_2, 1 );
+    is31fl3733_update_pwm_buffers( ISSI_ADDR_1, 0 );
+    is31fl3733_update_pwm_buffers( ISSI_ADDR_2, 1 );
+    is31fl3733_update_led_control_registers( ISSI_ADDR_1, 0 );
+    is31fl3733_update_led_control_registers( ISSI_ADDR_2, 1 );
 #elif defined(RGB_BACKLIGHT_NEBULA12)
-    IS31FL3731_update_pwm_buffers( ISSI_ADDR_1, 0 );
-    IS31FL3731_update_led_control_registers( ISSI_ADDR_1, 0 );
+    is31fl3731_update_pwm_buffers( ISSI_ADDR_1, 0 );
+    is31fl3731_update_led_control_registers( ISSI_ADDR_1, 0 );
 #elif defined(RGB_BACKLIGHT_U80_A)
     static uint8_t driver = 0;
     switch ( driver )
     {
         case 0:
-            IS31FL3731_update_pwm_buffers( ISSI_ADDR_1, 0 );
+            is31fl3731_update_pwm_buffers( ISSI_ADDR_1, 0 );
             break;
         case 1:
-            IS31FL3731_update_pwm_buffers( ISSI_ADDR_2, 1 );
+            is31fl3731_update_pwm_buffers( ISSI_ADDR_2, 1 );
             break;
         case 2:
-            IS31FL3731_update_pwm_buffers( ISSI_ADDR_3, 2 );
+            is31fl3731_update_pwm_buffers( ISSI_ADDR_3, 2 );
             break;
     }
     if ( ++driver > 2 )
@@ -1808,31 +1808,31 @@ void backlight_update_pwm_buffers(void)
         driver = 0;
     }
 #else
-    IS31FL3731_update_pwm_buffers( ISSI_ADDR_1, 0 );
-    IS31FL3731_update_pwm_buffers( ISSI_ADDR_2, 1 );
-    IS31FL3731_update_led_control_registers( ISSI_ADDR_1, 0 );
-    IS31FL3731_update_led_control_registers( ISSI_ADDR_2, 1 );
+    is31fl3731_update_pwm_buffers( ISSI_ADDR_1, 0 );
+    is31fl3731_update_pwm_buffers( ISSI_ADDR_2, 1 );
+    is31fl3731_update_led_control_registers( ISSI_ADDR_1, 0 );
+    is31fl3731_update_led_control_registers( ISSI_ADDR_2, 1 );
 #endif
 }
 
 void backlight_set_color( int index, uint8_t red, uint8_t green, uint8_t blue )
 {
 #if defined(RGB_BACKLIGHT_M6_B)
-    IS31FL3218_set_color( index, red, green, blue );
+    is31fl3218_set_color( index, red, green, blue );
 #elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_KW_MEGA)
-    IS31FL3733_set_color( index, red, green, blue );
+    is31fl3733_set_color( index, red, green, blue );
 #elif defined (RGB_BACKLIGHT_PORTICO)
-    IS31FL3731_set_color( index, red, green, blue );
+    is31fl3731_set_color( index, red, green, blue );
 #elif defined (RGB_BACKLIGHT_PORTICO75)
-    IS31FL3741_set_color( index, red, green, blue );
+    is31fl3741_set_color( index, red, green, blue );
 #elif defined(RGB_BACKLIGHT_NK87)
     // This is done to avoid indicator LEDs being set
     if (( index != 63+64-1 ) && ( index != 48+64-1 )) {
-        IS31FL3733_set_color( index, red, green, blue );
+        is31fl3733_set_color( index, red, green, blue );
     }
 #elif defined(RGB_BACKLIGHT_DAWN60)
     if( index < RGB_MATRIX_LED_COUNT ) {
-        IS31FL3731_set_color( index, red, green, blue );
+        is31fl3731_set_color( index, red, green, blue );
     } else {
         g_ws2812_leds[index - RGB_MATRIX_LED_COUNT].r = red;
         g_ws2812_leds[index - RGB_MATRIX_LED_COUNT].g = green;
@@ -1840,38 +1840,38 @@ void backlight_set_color( int index, uint8_t red, uint8_t green, uint8_t blue )
         ws2812_setleds(g_ws2812_leds, WS2812_LED_TOTAL);
     }
 #else
-    IS31FL3731_set_color( index, red, green, blue );
+    is31fl3731_set_color( index, red, green, blue );
 #endif
 }
 
 void backlight_set_color_all( uint8_t red, uint8_t green, uint8_t blue )
 {
 #if defined(RGB_BACKLIGHT_M6_B)
-    IS31FL3218_set_color_all( red, green, blue );
+    is31fl3218_set_color_all( red, green, blue );
 #elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_KW_MEGA)
     // This is done to avoid indicator LEDs being set
     for (int i = 0; i < BACKLIGHT_LED_COUNT; i++) {
-        IS31FL3733_set_color(i, red, green, blue);
+        is31fl3733_set_color(i, red, green, blue);
     }
 #elif defined (RGB_BACKLIGHT_PORTICO)
     // This is done to avoid indicator LEDs being set
     for (int i = 0; i < BACKLIGHT_LED_COUNT; i++) {
-        IS31FL3731_set_color(i, red, green, blue);
+        is31fl3731_set_color(i, red, green, blue);
     }
 #elif defined (RGB_BACKLIGHT_PORTICO75)
     // This is done to avoid indicator LEDs being set
     for (int i = 0; i < BACKLIGHT_LED_COUNT; i++) {
-        IS31FL3741_set_color(i, red, green, blue);
+        is31fl3741_set_color(i, red, green, blue);
     }
 #elif defined(RGB_BACKLIGHT_NK87)
     // This is done to avoid indicator LEDs being set
     for (int i = 0; i < BACKLIGHT_LED_COUNT; i++) {
         if (( i != 63+64-1 ) && ( i != 48+64-1 )) {
-            IS31FL3733_set_color(i, red, green, blue);
+            is31fl3733_set_color(i, red, green, blue);
         }
     }
 #elif defined(RGB_BACKLIGHT_DAWN60)
-    IS31FL3731_set_color_all( red, green, blue );
+    is31fl3731_set_color_all( red, green, blue );
     for (uint8_t i = 0; i < WS2812_LED_TOTAL; i++) {
         g_ws2812_leds[i].r = red;
         g_ws2812_leds[i].g = green;
@@ -1879,7 +1879,7 @@ void backlight_set_color_all( uint8_t red, uint8_t green, uint8_t blue )
     }
     ws2812_setleds(g_ws2812_leds, WS2812_LED_TOTAL);
 #else
-    IS31FL3731_set_color_all( red, green, blue );
+    is31fl3731_set_color_all( red, green, blue );
 #endif
 }
 
@@ -2914,9 +2914,9 @@ void backlight_init_drivers(void)
     i2c_init();
 
 #if defined(RGB_BACKLIGHT_M6_B)
-    IS31FL3218_init();
+    is31fl3218_init();
 #elif defined(RGB_BACKLIGHT_HS60)
-    IS31FL3733_init( ISSI_ADDR_1, 0 );
+    is31fl3733_init( ISSI_ADDR_1, 0 );
 
     for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ )
     {
@@ -2932,28 +2932,28 @@ void backlight_init_drivers(void)
                           ( index == 61-1 ) ); //LA61
 #endif
                 // This only caches it for later
-        IS31FL3733_set_led_control_register( index, enabled, enabled, enabled );
+        is31fl3733_set_led_control_register( index, enabled, enabled, enabled );
     }
     // This actually updates the LED drivers
-    IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 );
+    is31fl3733_update_led_control_registers( ISSI_ADDR_1, 0 );
 #elif defined(RGB_BACKLIGHT_NK65)
-    IS31FL3733_init( ISSI_ADDR_1, 0 );
-    IS31FL3733_init( ISSI_ADDR_2, 0 );
+    is31fl3733_init( ISSI_ADDR_1, 0 );
+    is31fl3733_init( ISSI_ADDR_2, 0 );
 
     for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ )
     {
         bool enabled = !( ( index == 61-1 )   || //LA61
                           ( index > 6+64-1 ) ); //LB7-LB64
         // This only caches it for later
-        IS31FL3733_set_led_control_register( index, enabled, enabled, enabled );
+        is31fl3733_set_led_control_register( index, enabled, enabled, enabled );
     }
-    IS31FL3733_set_led_control_register( 7+64-1, 0, 1, 0 ); //Enable LB7 green enable for indicators
+    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( ISSI_ADDR_1, 0 );
-    IS31FL3733_update_led_control_registers( ISSI_ADDR_2, 1 );
+    is31fl3733_update_led_control_registers( ISSI_ADDR_1, 0 );
+    is31fl3733_update_led_control_registers( ISSI_ADDR_2, 1 );
 #elif defined(RGB_BACKLIGHT_NK87)
-    IS31FL3733_init( ISSI_ADDR_1, 0 );
-    IS31FL3733_init( ISSI_ADDR_2, 0 );
+    is31fl3733_init( ISSI_ADDR_1, 0 );
+    is31fl3733_init( ISSI_ADDR_2, 0 );
 
     for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ )
     {
@@ -2975,59 +2975,59 @@ void backlight_init_drivers(void)
                           ( index == 58+64-1 )   ||
                           ( index == 62+64-1 ) );
         // This only caches it for later
-        IS31FL3733_set_led_control_register( index, enabled, enabled, enabled );
+        is31fl3733_set_led_control_register( index, enabled, enabled, enabled );
     }
-    IS31FL3733_set_led_control_register( 48+64-1, 0, 0, 1 ); //Enable LB48 blue enable for indicators
+    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( ISSI_ADDR_1, 0 );
-    IS31FL3733_update_led_control_registers( ISSI_ADDR_2, 1 );
+    is31fl3733_update_led_control_registers( ISSI_ADDR_1, 0 );
+    is31fl3733_update_led_control_registers( ISSI_ADDR_2, 1 );
 #elif defined(RGB_BACKLIGHT_NEBULA68)
-    IS31FL3733_init( ISSI_ADDR_1, 0 );
-    IS31FL3733_init( ISSI_ADDR_2, 0 );
+    is31fl3733_init( ISSI_ADDR_1, 0 );
+    is31fl3733_init( ISSI_ADDR_2, 0 );
 
     for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ )
     {
         bool enabled = !( ( index == 61-1 )   || //LA61
                           ( index > 5+64-1 ) ); //LB6-LB64
         // This only caches it for later
-        IS31FL3733_set_led_control_register( index, enabled, enabled, enabled );
+        is31fl3733_set_led_control_register( index, enabled, enabled, enabled );
     }
     // This actually updates the LED drivers
-    IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 );
-    IS31FL3733_update_led_control_registers( ISSI_ADDR_2, 1 );
+    is31fl3733_update_led_control_registers( ISSI_ADDR_1, 0 );
+    is31fl3733_update_led_control_registers( ISSI_ADDR_2, 1 );
 #elif defined(RGB_BACKLIGHT_PORTICO75)
-    IS31FL3741_init( ISSI_ADDR_1 );
+    is31fl3741_init( ISSI_ADDR_1 );
 	bool enabled = true;
     for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ )
     {
-        IS31FL3741_set_led_control_register( index, enabled, enabled, enabled );
+        is31fl3741_set_led_control_register( index, enabled, enabled, enabled );
     }
     // This actually updates the LED drivers
-    IS31FL3741_update_led_control_registers( ISSI_ADDR_1, 0 );
+    is31fl3741_update_led_control_registers( ISSI_ADDR_1, 0 );
 #elif defined(RGB_BACKLIGHT_KW_MEGA)
-    IS31FL3733_init( ISSI_ADDR_1, 0 );
-    IS31FL3733_init( ISSI_ADDR_2, 0 );
+    is31fl3733_init( ISSI_ADDR_1, 0 );
+    is31fl3733_init( ISSI_ADDR_2, 0 );
 
     for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ )
     {
         bool enabled = !( ( index == 61-1 )   || //LA61
                           ( index > 6+64-1 ) ); //LB7-LB64
         // This only caches it for later
-        IS31FL3733_set_led_control_register( index, enabled, enabled, enabled );
+        is31fl3733_set_led_control_register( index, enabled, enabled, enabled );
     }
     // This actually updates the LED drivers
-    IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 );
-    IS31FL3733_update_led_control_registers( ISSI_ADDR_2, 1 );
+    is31fl3733_update_led_control_registers( ISSI_ADDR_1, 0 );
+    is31fl3733_update_led_control_registers( ISSI_ADDR_2, 1 );
 #else
     // Init the #1 driver
-    IS31FL3731_init( ISSI_ADDR_1 );
+    is31fl3731_init( ISSI_ADDR_1 );
     // Init the #2 driver (if used)
 #if !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_M10_C)
-    IS31FL3731_init( ISSI_ADDR_2 );
+    is31fl3731_init( ISSI_ADDR_2 );
 #endif
     // Init the #3 driver (if used)
 #if defined(RGB_BACKLIGHT_U80_A)
-    IS31FL3731_init( ISSI_ADDR_3 );
+    is31fl3731_init( ISSI_ADDR_3 );
 #endif
 
     // Experimental feature, not in configuration yet
@@ -3156,16 +3156,16 @@ void backlight_init_drivers(void)
         bool enabled = true;
 #endif
         // This only caches it for later
-        IS31FL3731_set_led_control_register( index, enabled, enabled, enabled );
+        is31fl3731_set_led_control_register( index, enabled, enabled, enabled );
     }
     // This actually updates the LED drivers
     // TODO: refactor this to use DRIVER_COUNT
-    IS31FL3731_update_led_control_registers( ISSI_ADDR_1, 0 );
+    is31fl3731_update_led_control_registers( ISSI_ADDR_1, 0 );
 #if !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_M10_C)
-    IS31FL3731_update_led_control_registers( ISSI_ADDR_2, 1 );
+    is31fl3731_update_led_control_registers( ISSI_ADDR_2, 1 );
 #endif
 #if defined(RGB_BACKLIGHT_U80_A)
-    IS31FL3731_update_led_control_registers( ISSI_ADDR_3, 2 );
+    is31fl3731_update_led_control_registers( ISSI_ADDR_3, 2 );
 #endif
 #endif
 
@@ -3399,11 +3399,11 @@ void backlight_test_led( uint8_t index, bool red, bool green, bool blue )
     {
         if ( i == index )
         {
-            IS31FL3731_set_led_control_register( i, red, green, blue );
+            is31fl3731_set_led_control_register( i, red, green, blue );
         }
         else
         {
-            IS31FL3731_set_led_control_register( i, false, false, false );
+            is31fl3731_set_led_control_register( i, false, false, false );
         }
     }
 }
diff --git a/keyboards/willoucom/keypad/info.json b/keyboards/willoucom/keypad/info.json
new file mode 100644
index 000000000000..dc517ccc1648
--- /dev/null
+++ b/keyboards/willoucom/keypad/info.json
@@ -0,0 +1,63 @@
+{
+    "manufacturer": "Willou.com",
+    "keyboard_name": "keypad",
+    "maintainer": "willoucom",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP0", "GP1", "GP2", "GP3", "GP4", "GP20", "GP5", "GP6", "GP7", "GP8", "GP9", "GP21", "GP10"],
+            ["GP11", "GP12", "GP13", "GP14", "GP22", "GP26", "GP15", "GP16", "GP17", "GP18", "GP19", "GP27", "GP28"]
+        ]
+    },
+    "processor": "RP2040",
+    "tapping": {
+        "hold_on_other_key_press": true
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "force_nkro": true,
+        "pid": "0x4B50",
+        "vid": "0x574A"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "GRV", "matrix": [0, 0], "x": 0, "y": 0.25},
+                {"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": "ESC", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "LSFT", "matrix": [0, 6], "x": 0, "y": 1.25},
+                {"label": "Q", "matrix": [0, 7], "x": 1, "y": 1},
+                {"label": "W", "matrix": [0, 8], "x": 2, "y": 1},
+                {"label": "E", "matrix": [0, 9], "x": 3, "y": 1},
+                {"label": "R", "matrix": [0, 10], "x": 4, "y": 1},
+                {"label": "LBRC", "matrix": [0, 11], "x": 6.5, "y": 1},
+                {"label": "LCTL", "matrix": [0, 12], "x": 0, "y": 2.25},
+                {"label": "A", "matrix": [1, 0], "x": 1, "y": 2},
+                {"label": "S", "matrix": [1, 1], "x": 2, "y": 2},
+                {"label": "D", "matrix": [1, 2], "x": 3, "y": 2},
+                {"label": "F", "matrix": [1, 3], "x": 4, "y": 2},
+                {"label": "ENT", "matrix": [1, 4], "x": 5.5, "y": 2},
+                {"label": "G", "matrix": [1, 5], "x": 7.5, "y": 2},
+                {"label": "SPC", "matrix": [1, 6], "x": 0, "y": 3.25},
+                {"label": "TAB", "matrix": [1, 7], "x": 1, "y": 3},
+                {"label": "Z", "matrix": [1, 8], "x": 2, "y": 3},
+                {"label": "X", "matrix": [1, 9], "x": 3, "y": 3},
+                {"label": "C", "matrix": [1, 10], "x": 4, "y": 3},
+                {"label": "RBRC", "matrix": [1, 11], "x": 6.5, "y": 3},
+                {"label": "M", "matrix": [1, 12], "x": 6.5, "y": 4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/willoucom/keypad/keymaps/default/keymap.json b/keyboards/willoucom/keypad/keymaps/default/keymap.json
new file mode 100644
index 000000000000..c16729bd6ccc
--- /dev/null
+++ b/keyboards/willoucom/keypad/keymaps/default/keymap.json
@@ -0,0 +1,13 @@
+{
+    "keyboard": "willoucom/keypad",
+    "layout": "LAYOUT",
+    "layers": [
+        [
+            "KC_GRV",   "KC_1",     "KC_2",     "KC_3",     "KC_4",                 "KC_ESC",
+            "KC_LSFT",  "KC_Q",     "KC_W",     "KC_E",     "KC_R",                 "KC_LBRC",
+            "KC_LCTL",  "KC_A",     "KC_S",     "KC_D",     "KC_F",     "KC_ENT",               "KC_G",
+            "KC_SPC",   "KC_TAB",   "KC_Z",     "KC_X",     "KC_C",                 "KC_RBRC",
+                                                                                    "KC_M"
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/keyboards/willoucom/keypad/keymaps/via/keymap.json b/keyboards/willoucom/keypad/keymaps/via/keymap.json
new file mode 100644
index 000000000000..0d233e59e6a0
--- /dev/null
+++ b/keyboards/willoucom/keypad/keymaps/via/keymap.json
@@ -0,0 +1,19 @@
+{
+    "keyboard": "willoucom/keypad",
+    "config": {
+        "features": {
+            "via": true
+        }
+    },
+    "keymap": "via",
+    "layout": "LAYOUT",
+    "layers": [
+        [
+            "KC_GRV",   "KC_1",     "KC_2",     "KC_3",     "KC_4",                 "KC_ESC",
+            "KC_LSFT",  "KC_Q",     "KC_W",     "KC_E",     "KC_R",                 "KC_LBRC",
+            "KC_LCTL",  "KC_A",     "KC_S",     "KC_D",     "KC_F",     "KC_ENT",               "KC_G",
+            "KC_SPC",   "KC_TAB",   "KC_Z",     "KC_X",     "KC_C",                 "KC_RBRC",
+                                                                                    "KC_M"
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/keyboards/willoucom/keypad/readme.md b/keyboards/willoucom/keypad/readme.md
new file mode 100644
index 000000000000..863ce79d37e6
--- /dev/null
+++ b/keyboards/willoucom/keypad/readme.md
@@ -0,0 +1,20 @@
+# willoucom/keypad
+
+A programmable keypad for Productivity and Gaming.
+
+* Keyboard Maintainer: [Wilfried JEANNIARD](https://github.com/willoucom)
+* Product Page : [The Keypad](https://www.willou.com/keypad/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb willoucom/keypad -km default
+
+Flashing example for this keyboard:
+
+    qmk flash -kb willoucom/keypad -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
+
+Push the reset button twice. Then drop the u2f file in the usb drive.
\ No newline at end of file
diff --git a/keyboards/willoucom/keypad/rules.mk b/keyboards/willoucom/keypad/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/willoucom/keypad/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/winkeyless/b87/config.h b/keyboards/winkeyless/b87/config.h
deleted file mode 100644
index b585802fb85b..000000000000
--- a/keyboards/winkeyless/b87/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021 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
-
-#define RGBLED_NUM 20  // Number of LEDs
-// RGB effects
-#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/winkeyless/b87/info.json b/keyboards/winkeyless/b87/info.json
index 10b20c41c013..8a5f6fdbea46 100644
--- a/keyboards/winkeyless/b87/info.json
+++ b/keyboards/winkeyless/b87/info.json
@@ -16,6 +16,21 @@
     "backlight": {
         "pin": "D4"
     },
+    "rgblight": {
+        "led_count": 20,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/winkeyless/bface/config.h b/keyboards/winkeyless/bface/config.h
deleted file mode 100644
index b7529e431110..000000000000
--- a/keyboards/winkeyless/bface/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Copyright 2017 Sebastian Kaim <sebastian.kaim@sebb767.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
-
-#define RGBLED_NUM 16
-#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/winkeyless/bface/info.json b/keyboards/winkeyless/bface/info.json
index 2d716a89c78c..6e8369272f23 100644
--- a/keyboards/winkeyless/bface/info.json
+++ b/keyboards/winkeyless/bface/info.json
@@ -16,6 +16,21 @@
   "backlight": {
     "pin": "D4"
   },
+  "rgblight": {
+    "led_count": 16,
+    "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": {
     "driver": "i2c"
   },
diff --git a/keyboards/winkeyless/bmini/config.h b/keyboards/winkeyless/bmini/config.h
deleted file mode 100644
index ddc21dae3085..000000000000
--- a/keyboards/winkeyless/bmini/config.h
+++ /dev/null
@@ -1,32 +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
-
-
-#define RGBLED_NUM 16
-
-#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/winkeyless/bmini/info.json b/keyboards/winkeyless/bmini/info.json
index 2a18caeed4cd..05c6fbe9b8d9 100644
--- a/keyboards/winkeyless/bmini/info.json
+++ b/keyboards/winkeyless/bmini/info.json
@@ -16,6 +16,21 @@
   "backlight": {
     "pin": "D4"
   },
+  "rgblight": {
+    "led_count": 16,
+    "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": {
     "driver": "i2c"
   },
diff --git a/keyboards/winkeyless/bminiex/config.h b/keyboards/winkeyless/bminiex/config.h
deleted file mode 100644
index 116c09d6ac78..000000000000
--- a/keyboards/winkeyless/bminiex/config.h
+++ /dev/null
@@ -1,32 +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
-
-
-#define RGBLED_NUM 20
-
-#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/winkeyless/bminiex/info.json b/keyboards/winkeyless/bminiex/info.json
index 03a8e408b51b..fbd0f9b024a9 100644
--- a/keyboards/winkeyless/bminiex/info.json
+++ b/keyboards/winkeyless/bminiex/info.json
@@ -17,6 +17,21 @@
     "pin": "D4",
     "levels": 5
   },
+  "rgblight": {
+    "led_count": 20,
+    "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": {
     "driver": "i2c"
   },
diff --git a/keyboards/winkeys/mini_winni/config.h b/keyboards/winkeys/mini_winni/config.h
deleted file mode 100644
index 73844a7bc7f8..000000000000
--- a/keyboards/winkeys/mini_winni/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-/*
-Copyright 2021 Matthew Dias
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGBLED_NUM 4
-#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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
diff --git a/keyboards/winkeys/mini_winni/info.json b/keyboards/winkeys/mini_winni/info.json
index 7828dba46897..21cfdc6a2bef 100644
--- a/keyboards/winkeys/mini_winni/info.json
+++ b/keyboards/winkeys/mini_winni/info.json
@@ -15,6 +15,21 @@
             ["F6", "F7", "B6", "B5"]
         ]
     },
+    "rgblight": {
+        "led_count": 4,
+        "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": "E6"
     },
diff --git a/keyboards/winry/winry25tc/config.h b/keyboards/winry/winry25tc/config.h
deleted file mode 100644
index e668a8521822..000000000000
--- a/keyboards/winry/winry25tc/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 Andrzej Ressel (andrzej.ressel@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 RGBLED_NUM 40
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/winry/winry25tc/info.json b/keyboards/winry/winry25tc/info.json
index 40768171e4ab..a5d3b71a2613 100644
--- a/keyboards/winry/winry25tc/info.json
+++ b/keyboards/winry/winry25tc/info.json
@@ -12,7 +12,13 @@
         "pin": "D5"
     },
     "rgblight": {
-        "max_brightness": 150
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 40,
+        "max_brightness": 150,
+        "animations": {
+            "rainbow_swirl": true
+        }
     },
     "matrix_pins": {
         "cols": ["F5", "C7", "B7", "B2", "B4"],
diff --git a/keyboards/winry/winry315/config.h b/keyboards/winry/winry315/config.h
index 09724a2c001a..4a3c8c3e274f 100644
--- a/keyboards/winry/winry315/config.h
+++ b/keyboards/winry/winry315/config.h
@@ -3,38 +3,11 @@
 
 #pragma once
 
-// Encoder mappings (used for VIA).
-#define ENCODERS_CW_KEY  { { 22, 0 }, { 18, 0 }, { 20, 0 } }
-#define ENCODERS_CCW_KEY { { 23, 0 }, { 19, 0 }, { 21, 0 } }
-
 // clang-format on
 
-// RGB LED parameters.
-// This PCB uses a single chain of WS2812-compatible addressable RGB LEDs for
-// per-key backlight and underglow.
-#define RGBLED_NUM 27
-
-// RGB Lighting configuration.  This mode is used by the vendor firmware, and
-// can be chosen if the full RGB Matrix support is not desired for some reason.
-#ifdef RGBLIGHT_ENABLE
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-#endif
-
 // RGB Matrix configuration.
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT 27
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 
 #    define RGB_MATRIX_CENTER \
diff --git a/keyboards/winry/winry315/info.json b/keyboards/winry/winry315/info.json
index cfd52d368a30..98bb376ba2a5 100644
--- a/keyboards/winry/winry315/info.json
+++ b/keyboards/winry/winry315/info.json
@@ -9,10 +9,25 @@
         "vid": "0xF1F1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "rgblight": {
-        "max_brightness": 150
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 27,
+        "max_brightness": 150,
+        "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
+        }
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/winry/winry315/keymaps/via/encoder_actions.c b/keyboards/winry/winry315/keymaps/via/encoder_actions.c
deleted file mode 100644
index d24d13bb26ca..000000000000
--- a/keyboards/winry/winry315/keymaps/via/encoder_actions.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- * Copyright 2021 drashna jael're (@drashna)
- * Copyright 2022 Sergey Vlasov (@sigprof)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 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 "encoder_actions.h"
-
-#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
-
-#    ifndef ENCODER_TAP_DURATION_MS
-#        define ENCODER_TAP_DURATION_MS 10
-#    endif
-
-#    define ENCODER_STATE_CW 0x01
-#    define ENCODER_STATE_CCW 0x02
-
-static uint8_t  encoder_state[NUM_ENCODERS] = {0};
-static uint16_t encoder_timer[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS]    = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS]   = ENCODERS_CCW_KEY;
-
-static void exec_encoder_action(uint8_t index, bool clockwise, bool pressed) {
-    // clang-format off
-    keyevent_t encoder_event = (keyevent_t) {
-        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
-        .pressed = pressed,
-        .time = timer_read(),
-        .type = KEY_EVENT
-    };
-    // clang-format on
-    action_exec(encoder_event);
-}
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < NUM_ENCODERS; ++index) {
-        if (encoder_state[index] && (timer_elapsed(encoder_timer[index]) >= ENCODER_TAP_DURATION_MS)) {
-            bool clockwise       = !!(encoder_state[index] & ENCODER_STATE_CW);
-            encoder_state[index] = 0;
-            exec_encoder_action(index, clockwise, false);
-        }
-    }
-}
-
-void encoder_action_register(uint8_t index, bool clockwise) {
-    if (encoder_state[index]) {
-        bool was_clockwise   = !!(encoder_state[index] & ENCODER_STATE_CW);
-        encoder_state[index] = 0;
-        exec_encoder_action(index, was_clockwise, false);
-    }
-    encoder_state[index] = clockwise ? ENCODER_STATE_CW : ENCODER_STATE_CCW;
-    encoder_timer[index] = timer_read();
-    exec_encoder_action(index, clockwise, true);
-}
-
-void matrix_scan_kb(void) {
-    encoder_action_unregister();
-    matrix_scan_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    encoder_action_register(index, clockwise);
-    // don't return user actions, because they are in the keymap
-    // encoder_update_user(index, clockwise);
-    return true;
-};
-
-#endif
diff --git a/keyboards/winry/winry315/keymaps/via/encoder_actions.h b/keyboards/winry/winry315/keymaps/via/encoder_actions.h
deleted file mode 100644
index 2484af52ae18..000000000000
--- a/keyboards/winry/winry315/keymaps/via/encoder_actions.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-void encoder_action_unregister(void);
-
-void encoder_action_register(uint8_t index, bool clockwise);
diff --git a/keyboards/winry/winry315/keymaps/via/keymap.c b/keyboards/winry/winry315/keymaps/via/keymap.c
index 67598ac33763..0641fbfd03ea 100644
--- a/keyboards/winry/winry315/keymaps/via/keymap.c
+++ b/keyboards/winry/winry315/keymaps/via/keymap.c
@@ -5,36 +5,23 @@
 
 // clang-format off
 
-#define LAYOUT_via(             \
-      k17,     k15,    k16,     \
-    k23,k22, k19,k18, k21,k20,  \
-     k00, k01, k02, k03, k04,   \
-     k05, k06, k07, k08, k09,   \
-     k10, k11, k12, k13, k14    \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23 } \
-}
-
 #define U_LTESC LT(1, KC_ESC)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_via(
+    [0] = LAYOUT_top(
             KC_HOME,           KC_MUTE,           KC_MPLY,
-        KC_PGUP, KC_PGDN,  KC_VOLD, KC_VOLU,  KC_MPRV, KC_MNXT,
              KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
              KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
              U_LTESC, KC_TAB,  KC_SPC,  KC_BSPC, KC_ENT
     ),
-    [1] = LAYOUT_via(
+    [1] = LAYOUT_top(
             RGB_M_P,           RGB_M_B,           RGB_M_R,
-        RGB_HUD, RGB_HUI,  RGB_SAD, RGB_SAI,  RGB_VAD, RGB_VAI,
              RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,
              RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,
              KC_TRNS, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R
     ),
-    [2 ... 7] = LAYOUT_via(
+    [2 ... 7] = LAYOUT_top(
             KC_TRNS,           KC_TRNS,           KC_TRNS,
-        KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
@@ -42,3 +29,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 // 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_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
+    [1] =        { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [2 ... 7] =  { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
+};
+#endif
diff --git a/keyboards/winry/winry315/keymaps/via/rules.mk b/keyboards/winry/winry315/keymaps/via/rules.mk
index 6098ef3ad8fa..1189f4ad1927 100644
--- a/keyboards/winry/winry315/keymaps/via/rules.mk
+++ b/keyboards/winry/winry315/keymaps/via/rules.mk
@@ -1,4 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-SRC += encoder_actions.c
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/wolf/m60_b/info.json b/keyboards/wolf/m60_b/info.json
index 87ec3f890027..2c3b4a3b0d37 100644
--- a/keyboards/wolf/m60_b/info.json
+++ b/keyboards/wolf/m60_b/info.json
@@ -23,7 +23,7 @@
     },
     "processor": "atmega32u4",
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [2, 0], "x": 7, "y": 32},
             {"flags": 4, "matrix": [1, 0], "x": 4, "y": 16},
diff --git a/keyboards/wolf/m6_c/config.h b/keyboards/wolf/m6_c/config.h
new file mode 100644
index 000000000000..d5f391bcdd24
--- /dev/null
+++ b/keyboards/wolf/m6_c/config.h
@@ -0,0 +1,10 @@
+// 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
new file mode 100644
index 000000000000..ff83a951641f
--- /dev/null
+++ b/keyboards/wolf/m6_c/info.json
@@ -0,0 +1,101 @@
+{
+    "manufacturer": "Rama",
+    "keyboard_name": "M6-C",
+    "maintainer": "ToastyStoemp",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B7"],
+        "rows": ["B2", "B3"]
+    },
+    "processor": "atmega32u4",
+    "ws2812": {
+        "pin": "D5"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 120,
+        "animations": {
+            "solid_color": true,
+            "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": 122, "y": 0 },
+            { "flags": 4, "matrix": [0, 2], "x": 243, "y": 0 },
+            { "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 }
+        ]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0060",
+        "vid": "0x5453"
+    },
+    "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/wolf/m6_c/keymaps/default/keymap.c b/keyboards/wolf/m6_c/keymaps/default/keymap.c
new file mode 100644
index 000000000000..893ea2eb900a
--- /dev/null
+++ b/keyboards/wolf/m6_c/keymaps/default/keymap.c
@@ -0,0 +1,12 @@
+// Copyright 2020-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_ortho_2x3(
+        KC_1, KC_2, KC_3,
+        KC_4, KC_5, KC_6
+    )
+};
diff --git a/keyboards/wolf/m6_c/keymaps/via/keymap.c b/keyboards/wolf/m6_c/keymaps/via/keymap.c
new file mode 100644
index 000000000000..893ea2eb900a
--- /dev/null
+++ b/keyboards/wolf/m6_c/keymaps/via/keymap.c
@@ -0,0 +1,12 @@
+// Copyright 2020-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_ortho_2x3(
+        KC_1, KC_2, KC_3,
+        KC_4, KC_5, KC_6
+    )
+};
diff --git a/keyboards/wolf/m6_c/keymaps/via/rules.mk b/keyboards/wolf/m6_c/keymaps/via/rules.mk
new file mode 100644
index 000000000000..43061db1dd46
--- /dev/null
+++ b/keyboards/wolf/m6_c/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/wolf/m6_c/readme.md b/keyboards/wolf/m6_c/readme.md
new file mode 100644
index 000000000000..c07471dca01e
--- /dev/null
+++ b/keyboards/wolf/m6_c/readme.md
@@ -0,0 +1,24 @@
+# M6-C
+
+![M6-C](https://i.imgur.com/gkRotHh.jpeg)
+
+The following is the QMK Firmware for the M6-C PCB.
+
+* Keyboard Maintainer: [Wolf](https://github.com/ToastyStoemp)
+* Hardware Supported: M6-C PCB
+* Hardware Availability: https://ramaworks.store/products/m6-c
+
+Make example for this keyboard (after setting up your build environment):
+
+	make wolf/m6_c:default
+
+Flashing example for this keyboard:
+
+    make wolf/m6_c: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)
+* **Physical reset button**: Double press the button through the pinhole in the case
+* **Keycode in layout**: Press the key mapped to `QK_BOOT`
diff --git a/keyboards/wolf/m6_c/rules.mk b/keyboards/wolf/m6_c/rules.mk
new file mode 100644
index 000000000000..3437a35bdf1d
--- /dev/null
+++ b/keyboards/wolf/m6_c/rules.mk
@@ -0,0 +1,2 @@
+# Processor frequency
+F_CPU = 8000000
diff --git a/keyboards/wolf/neely65/info.json b/keyboards/wolf/neely65/info.json
index 5535036f376a..9a90105b9689 100644
--- a/keyboards/wolf/neely65/info.json
+++ b/keyboards/wolf/neely65/info.json
@@ -23,86 +23,186 @@
         "pid": "0x0071",
         "vid": "0x5453"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_xt_ansi_blocker_tsangan_wkl": {
+            "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": 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": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "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": 14.5, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0, "w": 2},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+                {"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": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+                {"matrix": [1, 12], "x": 13, "y": 1},
+                {"matrix": [1, 13], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"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": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 12], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "y": 2},
+                {"matrix": [2, 15], "x": 15.25, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25},
+                {"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": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3},
+                {"matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 16.5, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 12], "x": 13.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 15.5, "y": 4},
+                {"matrix": [4, 15], "x": 16.5, "y": 4},
+                {"matrix": [4, 16], "x": 17.5, "y": 4}
+            ]
+        },
+        "LAYOUT_65_xt_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.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": [0, 8], "x": 8.5, "y": 0 },
-                { "matrix": [0, 9], "x": 9.5, "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": 14.5, "y": 0 },
-                { "matrix": [0, 15], "x": 15.5, "y": 0 },
-                { "matrix": [2, 14], "x": 16.5, "y": 0 },
-                { "matrix": [0, 16], "x": 17.5, "y": 0 },
-                { "matrix": [1, 0], "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1, "y": 1 },
-                { "matrix": [1, 2], "w": 1.5, "x": 2.5, "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": [1, 8], "x": 9, "y": 1 },
-                { "matrix": [1, 9], "x": 10, "y": 1 },
-                { "matrix": [1, 10], "x": 11, "y": 1 },
-                { "matrix": [1, 11], "x": 12, "y": 1 },
-                { "matrix": [1, 12], "x": 13, "y": 1 },
-                { "matrix": [1, 13], "x": 14, "y": 1 },
-                { "matrix": [1, 14], "x": 15, "y": 1 },
-                { "matrix": [1, 15], "w": 1.5, "x": 16, "y": 1 },
-                { "matrix": [1, 16], "x": 17.5, "y": 1 },
-                { "matrix": [2, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1, "y": 2 },
-                { "matrix": [2, 2], "w": 1.75, "x": 2.5, "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": [2, 7], "x": 8.25, "y": 2 },
-                { "matrix": [2, 8], "x": 9.25, "y": 2 },
-                { "matrix": [2, 9], "x": 10.25, "y": 2 },
-                { "matrix": [2, 10], "x": 11.25, "y": 2 },
-                { "matrix": [2, 11], "x": 12.25, "y": 2 },
-                { "matrix": [2, 12], "x": 13.25, "y": 2 },
-                { "matrix": [2, 13], "x": 14.25, "y": 2 },
-                { "matrix": [2, 15], "w": 2.25, "x": 15.25, "y": 2 },
-                { "matrix": [2, 16], "x": 17.5, "y": 2 },
-                { "matrix": [3, 0], "x": 0, "y": 3 },
-                { "matrix": [3, 1], "x": 1, "y": 3 },
-                { "matrix": [3, 2], "w": 2.25, "x": 2.5, "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": [3, 7], "x": 8.75, "y": 3 },
-                { "matrix": [3, 8], "x": 9.75, "y": 3 },
-                { "matrix": [3, 9], "x": 10.75, "y": 3 },
-                { "matrix": [3, 10], "x": 11.75, "y": 3 },
-                { "matrix": [3, 11], "x": 12.75, "y": 3 },
-                { "matrix": [3, 12], "x": 13.75, "y": 3 },
-                { "matrix": [3, 14], "w": 1.75, "x": 14.75, "y": 3 },
-                { "matrix": [3, 15], "x": 16.5, "y": 3 },
-                { "matrix": [3, 16], "x": 17.5, "y": 3 },
-                { "matrix": [4, 0], "x": 0, "y": 4 },
-                { "matrix": [4, 1], "x": 1, "y": 4 },
-                { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
-                { "matrix": [4, 4], "w": 1.5, "x": 4.75, "y": 4 },
-                { "matrix": [4, 7], "w": 7, "x": 6.25, "y": 4 },
-                { "matrix": [4, 12], "w": 1.5, "x": 13.25, "y": 4 },
-                { "matrix": [4, 14], "x": 15.5, "y": 4 },
-                { "matrix": [4, 15], "x": 16.5, "y": 4 },
-                { "matrix": [4, 16], "x": 17.5, "y": 4 }
+                {"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": 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": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "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": 14.5, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [2, 14], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+                {"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": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+                {"matrix": [1, 12], "x": 13, "y": 1},
+                {"matrix": [1, 13], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"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": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 12], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "y": 2},
+                {"matrix": [2, 15], "x": 15.25, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25},
+                {"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": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3},
+                {"matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 16.5, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 12], "x": 13.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 15.5, "y": 4},
+                {"matrix": [4, 15], "x": 16.5, "y": 4},
+                {"matrix": [4, 16], "x": 17.5, "y": 4}
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/wolf/neely65/keymaps/default/keymap.c b/keyboards/wolf/neely65/keymaps/default/keymap.c
index 3e1350a75e7e..ea14c0b4c0bd 100644
--- a/keyboards/wolf/neely65/keymaps/default/keymap.c
+++ b/keyboards/wolf/neely65/keymaps/default/keymap.c
@@ -5,19 +5,19 @@
 
 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_HOME, KC_F1, 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_PGUP, KC_F3, KC_F4,
-        KC_CAPS, 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_PGDN, KC_F5, KC_F6,
-        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_END,  KC_F7, KC_F8,
-        KC_LCTL,       KC_LALT,                   KC_SPC,                                      KC_RALT,          MO(1),   KC_RCTL, KC_APP,  KC_F9, KC_F10
+    [0] = LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs(
+        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_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, MO(1),   KC_END,
+        KC_F9,   KC_F10,     KC_LCTL,          KC_LALT,                            KC_SPC,                             KC_RALT,          MO(1),   KC_RCTL, KC_APP
     ),
 
-    [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_AUDIO_VOL_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_AUDIO_VOL_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, KC_TRNS, KC_MEDIA_PREV_TRACK,  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_MEDIA_NEXT_TRACK,  KC_TRNS, KC_TRNS,
-        KC_TRNS,          KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_AUDIO_MUTE,        KC_TRNS, KC_TRNS
+    [1] = LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs(
+        KC_TRNS, KC_TRNS,    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_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_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_MPRV,
+        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_MNXT,
+        KC_TRNS, KC_TRNS,    KC_TRNS,          KC_TRNS,                            KC_TRNS,                            KC_TRNS,          KC_TRNS, KC_TRNS, KC_MUTE
     )
-};
\ No newline at end of file
+};
diff --git a/keyboards/wolf/neely65/keymaps/via/keymap.c b/keyboards/wolf/neely65/keymaps/via/keymap.c
index 3e1350a75e7e..ea14c0b4c0bd 100644
--- a/keyboards/wolf/neely65/keymaps/via/keymap.c
+++ b/keyboards/wolf/neely65/keymaps/via/keymap.c
@@ -5,19 +5,19 @@
 
 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_HOME, KC_F1, 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_PGUP, KC_F3, KC_F4,
-        KC_CAPS, 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_PGDN, KC_F5, KC_F6,
-        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_END,  KC_F7, KC_F8,
-        KC_LCTL,       KC_LALT,                   KC_SPC,                                      KC_RALT,          MO(1),   KC_RCTL, KC_APP,  KC_F9, KC_F10
+    [0] = LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs(
+        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_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, MO(1),   KC_END,
+        KC_F9,   KC_F10,     KC_LCTL,          KC_LALT,                            KC_SPC,                             KC_RALT,          MO(1),   KC_RCTL, KC_APP
     ),
 
-    [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_AUDIO_VOL_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_AUDIO_VOL_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, KC_TRNS, KC_MEDIA_PREV_TRACK,  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_MEDIA_NEXT_TRACK,  KC_TRNS, KC_TRNS,
-        KC_TRNS,          KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_AUDIO_MUTE,        KC_TRNS, KC_TRNS
+    [1] = LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs(
+        KC_TRNS, KC_TRNS,    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_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_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_MPRV,
+        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_MNXT,
+        KC_TRNS, KC_TRNS,    KC_TRNS,          KC_TRNS,                            KC_TRNS,                            KC_TRNS,          KC_TRNS, KC_TRNS, KC_MUTE
     )
-};
\ No newline at end of file
+};
diff --git a/keyboards/wolf/neely65/matrix_diagram.md b/keyboards/wolf/neely65/matrix_diagram.md
new file mode 100644
index 000000000000..111cb05a089e
--- /dev/null
+++ b/keyboards/wolf/neely65/matrix_diagram.md
@@ -0,0 +1,18 @@
+# Matrix Diagram for Neely Neely65
+
+```
+                                                              ┌───────┐
+                                                 2u Backspace │0F     │
+                                                              └───────┘
+┌───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │ │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │2E │0G │
+├───┼───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+│10 │11 │ │12   │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F   │1G │
+├───┼───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+│20 │21 │ │22    │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2F      │2G │
+├───┼───┤ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+│30 │31 │ │32      │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3E    │3F │3G │
+├───┼───┤ ├─────┬──┼───┴─┬─┴───┴───┴───┴───┴───┴───┴─┬─┴───┼──┬───┼───┼───┤
+│40 │41 │ │42   │  │44   │47                         │4C   │  │4E │4F │4G │
+└───┴───┘ └─────┘  └─────┴───────────────────────────┴─────┘  └───┴───┴───┘
+```
diff --git a/keyboards/wolf/silhouette/info.json b/keyboards/wolf/silhouette/info.json
index fa52666b2a08..548a89aa19d3 100644
--- a/keyboards/wolf/silhouette/info.json
+++ b/keyboards/wolf/silhouette/info.json
@@ -26,85 +26,1098 @@
         "pid": "0x0080",
         "vid": "0x5453"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "community_layouts": [
+        "tkl_nofrow_ansi",
+        "tkl_nofrow_iso"
+    ],
     "layouts": {
-        "LAYOUT": {
+        "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, 14], "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, "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.25, "y": 1},
+                {"matrix": [1, 16], "x": 17.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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.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": [3, 15], "x": 16.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, 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": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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": [0, 16], "x": 17.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": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+                {"matrix": [1, 16], "x": 17.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": 2.75},
+
+                {"matrix": [3, 15], "x": 16.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, 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": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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, 14], "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, "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.25, "y": 1},
+                {"matrix": [1, 16], "x": 17.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, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 15], "x": 16.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, 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": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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": [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, "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.25, "y": 1},
+                {"matrix": [1, 16], "x": 17.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": 2.75},
+
+                {"matrix": [3, 15], "x": 16.25, "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": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_ansi_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, 14], "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, "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.25, "y": 1},
+                {"matrix": [1, 16], "x": 17.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, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 15], "x": 16.25, "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": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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.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, "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.25, "y": 1},
+                {"matrix": [1, 16], "x": 17.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": 2.75},
+
+                {"matrix": [3, 15], "x": 16.25, "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, 7], "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},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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, 14], "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, "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.25, "y": 1},
+                {"matrix": [1, 16], "x": 17.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, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 15], "x": 16.25, "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, 7], "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},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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.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, "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": [1, 15], "x": 16.25, "y": 1},
+                {"matrix": [1, 16], "x": 17.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},
+                {"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": [3, 15], "x": 16.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, 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": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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, 14], "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, "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": [1, 15], "x": 16.25, "y": 1},
+                {"matrix": [1, 16], "x": 17.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},
+                {"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": [3, 15], "x": 16.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, 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": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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": [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, "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": [1, 15], "x": 16.25, "y": 1},
+                {"matrix": [1, 16], "x": 17.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},
+                {"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": [3, 15], "x": 16.25, "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": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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, 14], "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, "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": [1, 15], "x": 16.25, "y": 1},
+                {"matrix": [1, 16], "x": 17.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},
+                {"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": [3, 15], "x": 16.25, "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": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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.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, "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": [1, 15], "x": 16.25, "y": 1},
+                {"matrix": [1, 16], "x": 17.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},
+                {"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": [3, 15], "x": 16.25, "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, 7], "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},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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, 14], "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], "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.25, "y": 1 },
-                { "matrix": [1, 15], "x": 16.25, "y": 1 },
-                { "matrix": [1, 16], "x": 17.25, "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], "x": 19.5, "y": 2 },
-                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
-                { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-                { "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], "w": 1.75, "x": 12.25, "y": 3 },
-                { "matrix": [3, 13], "x": 14, "y": 3 },
-                { "matrix": [3, 15], "x": 16.25, "y": 3 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
-                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
-                { "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
-                { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
-                { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
-                { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 },
-                { "matrix": [4, 14], "x": 15.25, "y": 4 },
-                { "matrix": [4, 15], "x": 16.25, "y": 4 },
-                { "matrix": [4, 16], "x": 17.25, "y": 4 }
+                {"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, 14], "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, "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": [1, 15], "x": 16.25, "y": 1},
+                {"matrix": [1, 16], "x": 17.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},
+                {"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": [3, 15], "x": 16.25, "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, 7], "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},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4}
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/wolf/silhouette/keymaps/default/keymap.c b/keyboards/wolf/silhouette/keymaps/default/keymap.c
index 9a5e5b24d763..b49f1ea8e4ae 100644
--- a/keyboards/wolf/silhouette/keymaps/default/keymap.c
+++ b/keyboards/wolf/silhouette/keymaps/default/keymap.c
@@ -5,7 +5,7 @@
 
 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_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,         
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [1] = LAYOUT(
+    [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_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, 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/wolf/silhouette/keymaps/via/keymap.c b/keyboards/wolf/silhouette/keymaps/via/keymap.c
index 9a5e5b24d763..b49f1ea8e4ae 100644
--- a/keyboards/wolf/silhouette/keymaps/via/keymap.c
+++ b/keyboards/wolf/silhouette/keymaps/via/keymap.c
@@ -5,7 +5,7 @@
 
 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_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,         
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [1] = LAYOUT(
+    [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_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, 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/wolf/silhouette/matrix_diagram.md b/keyboards/wolf/silhouette/matrix_diagram.md
new file mode 100644
index 000000000000..2128e99716d7
--- /dev/null
+++ b/keyboards/wolf/silhouette/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for 4GT Silhouette
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐    ┌───────┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2E ││0E │0F │0G │    │0D     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤    └─┬─────┤
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   ││1E │1F │1G │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘   ┌──┴┐2D  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │                │2C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐       └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │    │3F │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
+│40  │41  │42  │47                      │4A  │4B  │4C  │4D  ││4E │4F │4G │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+┌────────┐                                       ┌──────────┐
+│30      │ 2.25u LShift             2.75u RShift │3C        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40   │41 │42   │47                         │4B   │4C │4D   │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```
diff --git a/keyboards/wolf/ts60/config.h b/keyboards/wolf/ts60/config.h
index 5064157a5270..81e0b787cbf7 100644
--- a/keyboards/wolf/ts60/config.h
+++ b/keyboards/wolf/ts60/config.h
@@ -17,19 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Define RGB Underglow */
-#define RGBLED_NUM 16
-#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_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 d1337177b413..5e883d2bf199 100644
--- a/keyboards/wolf/ts60/info.json
+++ b/keyboards/wolf/ts60/info.json
@@ -17,6 +17,22 @@
         "pin": "B7",
         "levels": 6
     },
+    "rgblight": {
+        "led_count": 16,
+        "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": "D0"
     },
diff --git a/keyboards/wolf/ziggurat/info.json b/keyboards/wolf/ziggurat/info.json
index 2e8d39dacba4..bb12d5ab2f2b 100644
--- a/keyboards/wolf/ziggurat/info.json
+++ b/keyboards/wolf/ziggurat/info.json
@@ -23,89 +23,466 @@
         "pid": "0x0084",
         "vid": "0x5453"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+
+                {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 1},
+                {"matrix": [2, 2], "x": 4.75, "y": 1},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [3, 7], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+
+                {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 7], "x": 15, "y": 2},
+                {"matrix": [5, 7], "x": 16, "y": 2, "w": 1.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+
+                {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 1], "x": 3.5, "y": 3},
+                {"matrix": [9, 2], "x": 4.5, "y": 3},
+                {"matrix": [6, 2], "x": 5.5, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [6, 3], "x": 7.5, "y": 3},
+                {"matrix": [7, 3], "x": 8.5, "y": 3},
+                {"matrix": [6, 4], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3},
+                {"matrix": [6, 5], "x": 11.5, "y": 3},
+                {"matrix": [7, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 16.25, "y": 3},
+                {"matrix": [6, 8], "x": 17.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+
+                {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 3.75, "y": 4},
+                {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [8, 4], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [8, 6], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 7], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_65_xt_ansi_blocker_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+
+                {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 1},
+                {"matrix": [2, 2], "x": 4.75, "y": 1},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [3, 7], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+
+                {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [5, 7], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+
+                {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [9, 2], "x": 4.5, "y": 3},
+                {"matrix": [6, 2], "x": 5.5, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [6, 3], "x": 7.5, "y": 3},
+                {"matrix": [7, 3], "x": 8.5, "y": 3},
+                {"matrix": [6, 4], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3},
+                {"matrix": [6, 5], "x": 11.5, "y": 3},
+                {"matrix": [7, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 16.25, "y": 3},
+                {"matrix": [6, 8], "x": 17.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+
+                {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 3.75, "y": 4},
+                {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [8, 4], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [8, 6], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 7], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+
+                {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 1},
+                {"matrix": [2, 2], "x": 4.75, "y": 1},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [3, 7], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+
+                {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [5, 7], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+
+                {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [9, 2], "x": 4.5, "y": 3},
+                {"matrix": [6, 2], "x": 5.5, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [6, 3], "x": 7.5, "y": 3},
+                {"matrix": [7, 3], "x": 8.5, "y": 3},
+                {"matrix": [6, 4], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3},
+                {"matrix": [6, 5], "x": 11.5, "y": 3},
+                {"matrix": [7, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 16.25, "y": 3},
+                {"matrix": [6, 8], "x": 17.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+
+                {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 3.75, "y": 4},
+                {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [8, 4], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [8, 6], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 7], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_65_xt_iso_blocker_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+
+                {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 1},
+                {"matrix": [2, 2], "x": 4.75, "y": 1},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+
+                {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 7], "x": 15, "y": 2},
+                {"matrix": [5, 7], "x": 16, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [4, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+
+                {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 1], "x": 3.5, "y": 3},
+                {"matrix": [9, 2], "x": 4.5, "y": 3},
+                {"matrix": [6, 2], "x": 5.5, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [6, 3], "x": 7.5, "y": 3},
+                {"matrix": [7, 3], "x": 8.5, "y": 3},
+                {"matrix": [6, 4], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3},
+                {"matrix": [6, 5], "x": 11.5, "y": 3},
+                {"matrix": [7, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 16.25, "y": 3},
+                {"matrix": [6, 8], "x": 17.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+
+                {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 3.75, "y": 4},
+                {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [8, 4], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [8, 6], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 7], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_65_xt_iso_blocker_tsangan_split_bs": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [1, 0], "x": 1, "y": 0 },
-                { "matrix": [0, 1], "x": 2.25, "y": 0 },
-                { "matrix": [1, 1], "x": 3.25, "y": 0 },
-                { "matrix": [0, 2], "x": 4.25, "y": 0 },
-                { "matrix": [1, 2], "x": 5.25, "y": 0 },
-                { "matrix": [0, 3], "x": 6.25, "y": 0 },
-                { "matrix": [1, 3], "x": 7.25, "y": 0 },
-                { "matrix": [0, 4], "x": 8.25, "y": 0 },
-                { "matrix": [1, 4], "x": 9.25, "y": 0 },
-                { "matrix": [0, 5], "x": 10.25, "y": 0 },
-                { "matrix": [1, 5], "x": 11.25, "y": 0 },
-                { "matrix": [0, 6], "x": 12.25, "y": 0 },
-                { "matrix": [1, 6], "x": 13.25, "y": 0 },
-                { "matrix": [7, 6], "x": 14.25, "y": 0 },
-                { "matrix": [0, 7], "x": 15.25, "y": 0 },
-                { "matrix": [1, 7], "x": 16.25, "y": 0 },
-                { "matrix": [0, 8], "x": 17.25, "y": 0 },
-                { "matrix": [2, 0], "x": 0, "y": 1 },
-                { "matrix": [3, 0], "x": 1, "y": 1 },
-                { "matrix": [2, 1], "w": 1.5, "x": 2.25, "y": 1 },
-                { "matrix": [3, 1], "x": 3.75, "y": 1 },
-                { "matrix": [2, 2], "x": 4.75, "y": 1 },
-                { "matrix": [3, 2], "x": 5.75, "y": 1 },
-                { "matrix": [2, 3], "x": 6.75, "y": 1 },
-                { "matrix": [3, 3], "x": 7.75, "y": 1 },
-                { "matrix": [2, 4], "x": 8.75, "y": 1 },
-                { "matrix": [3, 4], "x": 9.75, "y": 1 },
-                { "matrix": [2, 5], "x": 10.75, "y": 1 },
-                { "matrix": [3, 5], "x": 11.75, "y": 1 },
-                { "matrix": [2, 6], "x": 12.75, "y": 1 },
-                { "matrix": [3, 6], "x": 13.75, "y": 1 },
-                { "matrix": [2, 7], "x": 14.75, "y": 1 },
-                { "matrix": [3, 7], "w": 1.5, "x": 15.75, "y": 1 },
-                { "matrix": [2, 8], "x": 17.25, "y": 1 },
-                { "matrix": [4, 0], "x": 0, "y": 2 },
-                { "matrix": [5, 0], "x": 1, "y": 2 },
-                { "matrix": [4, 1], "w": 1.75, "x": 2.25, "y": 2 },
-                { "matrix": [5, 1], "x": 4, "y": 2 },
-                { "matrix": [4, 2], "x": 5, "y": 2 },
-                { "matrix": [5, 2], "x": 6, "y": 2 },
-                { "matrix": [4, 3], "x": 7, "y": 2 },
-                { "matrix": [5, 3], "x": 8, "y": 2 },
-                { "matrix": [4, 4], "x": 9, "y": 2 },
-                { "matrix": [5, 4], "x": 10, "y": 2 },
-                { "matrix": [4, 5], "x": 11, "y": 2 },
-                { "matrix": [5, 5], "x": 12, "y": 2 },
-                { "matrix": [4, 6], "x": 13, "y": 2 },
-                { "matrix": [5, 6], "x": 14, "y": 2 },
-                { "matrix": [4, 7], "x": 19, "y": 2 },
-                { "matrix": [5, 7], "w": 2.25, "x": 15, "y": 2 },
-                { "matrix": [4, 8], "x": 17.25, "y": 2 },
-                { "matrix": [6, 0], "x": 0, "y": 3 },
-                { "matrix": [7, 0], "x": 1, "y": 3 },
-                { "matrix": [6, 1], "w": 1.25, "x": 2.25, "y": 3 },
-                { "matrix": [7, 1], "x": 3.5, "y": 3 },
-                { "matrix": [9, 2], "x": 4.5, "y": 3 },
-                { "matrix": [6, 2], "x": 5.5, "y": 3 },
-                { "matrix": [7, 2], "x": 6.5, "y": 3 },
-                { "matrix": [6, 3], "x": 7.5, "y": 3 },
-                { "matrix": [7, 3], "x": 8.5, "y": 3 },
-                { "matrix": [6, 4], "x": 9.5, "y": 3 },
-                { "matrix": [7, 4], "x": 10.5, "y": 3 },
-                { "matrix": [6, 5], "x": 11.5, "y": 3 },
-                { "matrix": [7, 5], "x": 12.5, "y": 3 },
-                { "matrix": [6, 6], "x": 13.5, "y": 3 },
-                { "matrix": [6, 7], "w": 1.75, "x": 14.5, "y": 3 },
-                { "matrix": [7, 7], "x": 16.25, "y": 3 },
-                { "matrix": [6, 8], "x": 17.25, "y": 3 },
-                { "matrix": [8, 0], "x": 0, "y": 4 },
-                { "matrix": [9, 0], "x": 1, "y": 4 },
-                { "matrix": [8, 1], "w": 1.5, "x": 2.25, "y": 4 },
-                { "matrix": [9, 1], "x": 3.75, "y": 4 },
-                { "matrix": [8, 2], "w": 1.5, "x": 4.75, "y": 4 },
-                { "matrix": [8, 4], "w": 7, "x": 6.25, "y": 4 },
-                { "matrix": [8, 6], "w": 1.5, "x": 13.25, "y": 4 },
-                { "matrix": [8, 7], "x": 15.25, "y": 4 },
-                { "matrix": [9, 7], "x": 16.25, "y": 4 },
-                { "matrix": [8, 8], "x": 17.25, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [7, 6], "x": 14.25, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+
+                {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 1},
+                {"matrix": [2, 2], "x": 4.75, "y": 1},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [2, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+
+                {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 7], "x": 15, "y": 2},
+                {"matrix": [5, 7], "x": 16, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [4, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+
+                {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 1], "x": 3.5, "y": 3},
+                {"matrix": [9, 2], "x": 4.5, "y": 3},
+                {"matrix": [6, 2], "x": 5.5, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [6, 3], "x": 7.5, "y": 3},
+                {"matrix": [7, 3], "x": 8.5, "y": 3},
+                {"matrix": [6, 4], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3},
+                {"matrix": [6, 5], "x": 11.5, "y": 3},
+                {"matrix": [7, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 16.25, "y": 3},
+                {"matrix": [6, 8], "x": 17.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+
+                {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 3.75, "y": 4},
+                {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [8, 4], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [8, 6], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 7], "x": 16.25, "y": 4},
+                {"matrix": [8, 8], "x": 17.25, "y": 4}
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/wolf/ziggurat/keymaps/default/keymap.c b/keyboards/wolf/ziggurat/keymaps/default/keymap.c
index e26689efa71f..3e005d83699d 100644
--- a/keyboards/wolf/ziggurat/keymaps/default/keymap.c
+++ b/keyboards/wolf/ziggurat/keymaps/default/keymap.c
@@ -6,7 +6,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT(
+    [0] = LAYOUT_all(
         KC_F1, KC_F6,       KC_ESC,  KC_1,    KC_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_F2, KC_F7,       KC_TAB,  KC_Q,    KC_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_F3, KC_F8,       KC_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,
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_F5, KC_F10,      KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [1] = LAYOUT(
+    [1] = LAYOUT_all(
         KC_F1, KC_F6,       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_F2, KC_F7,       _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         KC_F3, KC_F8,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/wolf/ziggurat/keymaps/via/keymap.c b/keyboards/wolf/ziggurat/keymaps/via/keymap.c
index e26689efa71f..3e005d83699d 100644
--- a/keyboards/wolf/ziggurat/keymaps/via/keymap.c
+++ b/keyboards/wolf/ziggurat/keymaps/via/keymap.c
@@ -6,7 +6,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT(
+    [0] = LAYOUT_all(
         KC_F1, KC_F6,       KC_ESC,  KC_1,    KC_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_F2, KC_F7,       KC_TAB,  KC_Q,    KC_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_F3, KC_F8,       KC_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,
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_F5, KC_F10,      KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [1] = LAYOUT(
+    [1] = LAYOUT_all(
         KC_F1, KC_F6,       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_F2, KC_F7,       _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
         KC_F3, KC_F8,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/wolf/ziggurat/matrix_diagram.md b/keyboards/wolf/ziggurat/matrix_diagram.md
new file mode 100644
index 000000000000..4f0c10b9b9f0
--- /dev/null
+++ b/keyboards/wolf/ziggurat/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Laminar Ziggurat
+
+```
+                                                             ┌───────┐
+                                                2u Backspace │17     │
+                                                             └───────┘
+┌───┬───┐┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │10 ││01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │16 │76 │07 │17 │08 │
+├───┼───┤├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      ┌─────┐
+│20 │30 ││21   │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │27 │37   │28 │      │     │
+├───┼───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐57  │ ISO Enter
+│40 │50 ││41    │51 │42 │52 │43 │53 │44 │54 │45 │55 │46 │56 │57      │48 │   │47 │    │
+├───┼───┤├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+│60 │70 ││61  │71 │92 │62 │72 │63 │73 │64 │74 │65 │75 │66 │67    │77 │68 │
+├───┼───┤├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤
+│80 │90 ││81   │91 │82   │84                         │86   │ │87 │97 │88 │
+└───┴───┘└─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘
+         ┌────────┐
+         │61      │ 2.25u LShift
+         └────────┘
+```
diff --git a/keyboards/wolfmarkclub/wm1/config.h b/keyboards/wolfmarkclub/wm1/config.h
index 8df536bf5466..4b007cf387ee 100644
--- a/keyboards/wolfmarkclub/wm1/config.h
+++ b/keyboards/wolfmarkclub/wm1/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 18
-#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  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-
 /* 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/wolfmarkclub/wm1/info.json b/keyboards/wolfmarkclub/wm1/info.json
index 099327f417f0..04b8ae3b1150 100644
--- a/keyboards/wolfmarkclub/wm1/info.json
+++ b/keyboards/wolfmarkclub/wm1/info.json
@@ -8,6 +8,24 @@
         "pid": "0x2B29",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "A3"
     },
diff --git a/keyboards/wolfmarkclub/wm1/rules.mk b/keyboards/wolfmarkclub/wm1/rules.mk
index a712747048a6..512ef119fdb6 100644
--- a/keyboards/wolfmarkclub/wm1/rules.mk
+++ b/keyboards/wolfmarkclub/wm1/rules.mk
@@ -25,5 +25,3 @@ AUDIO_ENABLE = no           # Audio output
 SLEEP_LED_ENABLE = yes
 LTO_ENABLE = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/woodkeys/bigseries/1key/config.h b/keyboards/woodkeys/bigseries/1key/config.h
index d81dd8611b7e..c726e1007532 100755
--- a/keyboards/woodkeys/bigseries/1key/config.h
+++ b/keyboards/woodkeys/bigseries/1key/config.h
@@ -21,17 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define IS_COMMAND() ( \
     false \
 )
-
-#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 RGBLED_NUM 5
-#endif
diff --git a/keyboards/woodkeys/bigseries/1key/info.json b/keyboards/woodkeys/bigseries/1key/info.json
index 1dd1e6fa0c76..43d7b0f536cb 100644
--- a/keyboards/woodkeys/bigseries/1key/info.json
+++ b/keyboards/woodkeys/bigseries/1key/info.json
@@ -12,7 +12,20 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 128
+        "led_count": 5,
+        "max_brightness": 128,
+        "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": ["B4"],
diff --git a/keyboards/woodkeys/bigseries/1key/keymaps/8ball/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/8ball/keymap.c
index 500fddd53f44..b72b1a0d9aae 100755
--- a/keyboards/woodkeys/bigseries/1key/keymaps/8ball/keymap.c
+++ b/keyboards/woodkeys/bigseries/1key/keymaps/8ball/keymap.c
@@ -98,40 +98,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 
-void led_set_user(uint8_t usb_led) {
-
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_KANA)) {
-
-  } else {
-
-  }
-
-}
-
 void reset_rgb(void) {
   // This gets called on init and after the timeout for the answer color
   // If you want to change the default color/mode, do it here
diff --git a/keyboards/woodkeys/bigseries/1key/keymaps/ctrl-alt-del/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/ctrl-alt-del/keymap.c
index d87471b00777..4cc698b1df7d 100755
--- a/keyboards/woodkeys/bigseries/1key/keymaps/ctrl-alt-del/keymap.c
+++ b/keyboards/woodkeys/bigseries/1key/keymaps/ctrl-alt-del/keymap.c
@@ -42,46 +42,3 @@ void matrix_init_user(void) {
       initialized = 1;
     }
 }
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  }
-  return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_KANA)) {
-
-  } else {
-
-  }
-
-}
diff --git a/keyboards/woodkeys/bigseries/1key/keymaps/lock/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/lock/keymap.c
index 650554e0200a..dbdd5a8e3c4d 100755
--- a/keyboards/woodkeys/bigseries/1key/keymaps/lock/keymap.c
+++ b/keyboards/woodkeys/bigseries/1key/keymaps/lock/keymap.c
@@ -41,44 +41,3 @@ void matrix_init_user(void) {
       initialized = 1;
     }
 }
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_KANA)) {
-
-  } else {
-
-  }
-
-}
diff --git a/keyboards/woodkeys/bigseries/2key/config.h b/keyboards/woodkeys/bigseries/2key/config.h
index ecb564941924..c726e1007532 100755
--- a/keyboards/woodkeys/bigseries/2key/config.h
+++ b/keyboards/woodkeys/bigseries/2key/config.h
@@ -21,17 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define IS_COMMAND() ( \
     false \
 )
-
-#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 RGBLED_NUM 8
-#endif
diff --git a/keyboards/woodkeys/bigseries/2key/info.json b/keyboards/woodkeys/bigseries/2key/info.json
index a488fc1515a8..98cbeab77d1c 100644
--- a/keyboards/woodkeys/bigseries/2key/info.json
+++ b/keyboards/woodkeys/bigseries/2key/info.json
@@ -12,7 +12,20 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 128
+        "led_count": 8,
+        "max_brightness": 128,
+        "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": ["B4", "B3"],
diff --git a/keyboards/woodkeys/bigseries/3key/config.h b/keyboards/woodkeys/bigseries/3key/config.h
index a225c19d3a47..c726e1007532 100755
--- a/keyboards/woodkeys/bigseries/3key/config.h
+++ b/keyboards/woodkeys/bigseries/3key/config.h
@@ -21,17 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define IS_COMMAND() ( \
     false \
 )
-
-#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 RGBLED_NUM 11
-#endif
diff --git a/keyboards/woodkeys/bigseries/3key/info.json b/keyboards/woodkeys/bigseries/3key/info.json
index 0152a2ce0403..8c24efb09df1 100644
--- a/keyboards/woodkeys/bigseries/3key/info.json
+++ b/keyboards/woodkeys/bigseries/3key/info.json
@@ -12,7 +12,20 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 128
+        "led_count": 11,
+        "max_brightness": 128,
+        "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": ["B4", "B3", "B5"],
diff --git a/keyboards/woodkeys/bigseries/3key/keymaps/ctrl-alt-del/keymap.c b/keyboards/woodkeys/bigseries/3key/keymaps/ctrl-alt-del/keymap.c
index d1410ecf1eba..d97c057c6fb7 100755
--- a/keyboards/woodkeys/bigseries/3key/keymaps/ctrl-alt-del/keymap.c
+++ b/keyboards/woodkeys/bigseries/3key/keymaps/ctrl-alt-del/keymap.c
@@ -42,46 +42,3 @@ void matrix_init_user(void) {
       initialized = 1;
     }
 }
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  }
-  return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-
-  } else {
-
-  }
-
-  if (usb_led & (1 << USB_LED_KANA)) {
-
-  } else {
-
-  }
-
-}
diff --git a/keyboards/woodkeys/bigseries/4key/config.h b/keyboards/woodkeys/bigseries/4key/config.h
index 02ed67b9cb5a..c726e1007532 100755
--- a/keyboards/woodkeys/bigseries/4key/config.h
+++ b/keyboards/woodkeys/bigseries/4key/config.h
@@ -21,17 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define IS_COMMAND() ( \
     false \
 )
-
-#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 RGBLED_NUM 12
-#endif
diff --git a/keyboards/woodkeys/bigseries/4key/info.json b/keyboards/woodkeys/bigseries/4key/info.json
index e228efd54ce6..789eb9ecbbbe 100644
--- a/keyboards/woodkeys/bigseries/4key/info.json
+++ b/keyboards/woodkeys/bigseries/4key/info.json
@@ -12,7 +12,20 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 128
+        "led_count": 12,
+        "max_brightness": 128,
+        "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": ["B4", "B3"],
diff --git a/keyboards/woodkeys/meira/config.h b/keyboards/woodkeys/meira/config.h
index d5bdf9540c6e..4b3491cfa138 100644
--- a/keyboards/woodkeys/meira/config.h
+++ b/keyboards/woodkeys/meira/config.h
@@ -22,11 +22,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12
 
-/* COL2ROW, ROW2COL*/
-//#define DIODE_DIRECTION
-
 #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255}
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 15    // Number of LEDs
-#endif
diff --git a/keyboards/woodkeys/meira/featherble/info.json b/keyboards/woodkeys/meira/featherble/info.json
new file mode 100644
index 000000000000..2ce28918df53
--- /dev/null
+++ b/keyboards/woodkeys/meira/featherble/info.json
@@ -0,0 +1,5 @@
+{
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    }
+}
diff --git a/keyboards/woodkeys/meira/featherble/rules.mk b/keyboards/woodkeys/meira/featherble/rules.mk
index 01f1af1ae8af..174947ff399b 100644
--- a/keyboards/woodkeys/meira/featherble/rules.mk
+++ b/keyboards/woodkeys/meira/featherble/rules.mk
@@ -2,4 +2,3 @@
 F_CPU = 8000000
 
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = BluefruitLE
diff --git a/keyboards/woodkeys/meira/info.json b/keyboards/woodkeys/meira/info.json
index e39df58323af..5905c00d2d0b 100644
--- a/keyboards/woodkeys/meira/info.json
+++ b/keyboards/woodkeys/meira/info.json
@@ -12,6 +12,9 @@
         "driver": "custom",
         "levels": 10
     },
+    "rgblight": {
+        "led_count": 15
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/woodkeys/meira/keymaps/cole/config.h b/keyboards/woodkeys/meira/keymaps/cole/config.h
index 90c490e83620..1dd4c39f2543 100644
--- a/keyboards/woodkeys/meira/keymaps/cole/config.h
+++ b/keyboards/woodkeys/meira/keymaps/cole/config.h
@@ -14,10 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
+#pragma once
 
 // place overrides here
 #define MUSIC_MASK (keycode != KC_NO)
@@ -27,5 +24,3 @@
    #define NO_MUSIC_MODE
 
 #endif
-
-#endif
diff --git a/keyboards/woodkeys/meira/keymaps/cole/keymap.c b/keyboards/woodkeys/meira/keymaps/cole/keymap.c
index 365c9d18e5ab..b85da25a28bb 100644
--- a/keyboards/woodkeys/meira/keymaps/cole/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/cole/keymap.c
@@ -26,7 +26,7 @@ extern rgblight_config_t rgblight_config;
 #define _DVORAK 2
 #define _LOWER 3
 #define _RAISE 4
-#define _ADJUST 16
+#define _ADJUST 5
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
@@ -214,7 +214,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
   return true;
 }
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/woodkeys/meira/keymaps/grahampheath/config.h b/keyboards/woodkeys/meira/keymaps/grahampheath/config.h
index 604f37846156..638ebffb8cea 100644
--- a/keyboards/woodkeys/meira/keymaps/grahampheath/config.h
+++ b/keyboards/woodkeys/meira/keymaps/grahampheath/config.h
@@ -14,15 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
+#pragma once
 
 // place overrides here
 #define MUSIC_MASK (keycode != KC_NO)
-#define AUDIO_PIN C6
 #ifdef AUDIO_ENABLE
+#undef AUDIO_PIN
+#define AUDIO_PIN C6
     #define STARTUP_SONG SONG(PLANCK_SOUND)
     // #define STARTUP_SONG SONG(NO_SOUND)
 
@@ -31,5 +29,3 @@
                                   SONG(DVORAK_SOUND) \
                                 }
 #endif
-
-#endif
diff --git a/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c b/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c
index aa9730b88f21..8057bcf2b42f 100644
--- a/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c
@@ -26,7 +26,7 @@ extern rgblight_config_t rgblight_config;
 #define _LOWER 3
 #define _RAISE 4
 #define _EMOJI 5
-#define _ADJUST 16
+#define _ADJUST 6
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
@@ -391,6 +391,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/woodkeys/meira/keymaps/takmiya/config.h b/keyboards/woodkeys/meira/keymaps/takmiya/config.h
deleted file mode 100644
index 97210115b9e5..000000000000
--- a/keyboards/woodkeys/meira/keymaps/takmiya/config.h
+++ /dev/null
@@ -1,24 +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/>.
- */
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
diff --git a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
index ddd695461ecf..8e3c41c33280 100644
--- a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
@@ -24,7 +24,7 @@ extern rgblight_config_t rgblight_config;
 #define _QWERTY 0
 #define _LOWER 1
 #define _RAISE 2
-#define _ADJUST 16
+#define _ADJUST 3
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
@@ -227,7 +227,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
   return true;
 }
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/woodkeys/meira/post_rules.mk b/keyboards/woodkeys/meira/post_rules.mk
new file mode 100644
index 000000000000..5d85581c6eeb
--- /dev/null
+++ b/keyboards/woodkeys/meira/post_rules.mk
@@ -0,0 +1,9 @@
+SRC += matrix.c TWIlib.c issi.c lighting.c
+
+#ifeq ($(strip $(ISSI_ENABLE)), yes)
+#    OPT_DEFS += -DISSI_ENABLE
+#endif
+
+#ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
+#    OPT_DEFS += -DWATCHDOG_ENABLE
+#endif
diff --git a/keyboards/woodkeys/meira/rules.mk b/keyboards/woodkeys/meira/rules.mk
index 20802b31790e..63586244c0e3 100644
--- a/keyboards/woodkeys/meira/rules.mk
+++ b/keyboards/woodkeys/meira/rules.mk
@@ -14,13 +14,4 @@ AUDIO_ENABLE = no           # Audio output
 
 CUSTOM_MATRIX = yes
 
-#ifeq ($(strip $(ISSI_ENABLE)), yes)
-#    TMK_COMMON_DEFS += -DISSI_ENABLE
-#endif
-
-#ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
-#    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
-#endif
-SRC += matrix.c TWIlib.c issi.c lighting.c
-
 DEFAULT_FOLDER = woodkeys/meira/promicro
diff --git a/keyboards/woodkeys/scarletbandana/config.h b/keyboards/woodkeys/scarletbandana/config.h
index 3854dc86596c..89ebddeb6e4a 100644
--- a/keyboards/woodkeys/scarletbandana/config.h
+++ b/keyboards/woodkeys/scarletbandana/config.h
@@ -17,20 +17,6 @@ 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 RGBLED_NUM 8    // Number of LEDs
-#endif
-
 #ifdef AUDIO_ENABLE
 #define AUDIO_PIN C6
 #define STARTUP_SONG SONG(PREONIC_SOUND)
diff --git a/keyboards/woodkeys/scarletbandana/info.json b/keyboards/woodkeys/scarletbandana/info.json
index d74555a178d0..b3197a7c1b92 100644
--- a/keyboards/woodkeys/scarletbandana/info.json
+++ b/keyboards/woodkeys/scarletbandana/info.json
@@ -8,6 +8,21 @@
         "pid": "0x6969",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 8,
+        "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": "D3"
     },
diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h
index cf25b4b5b700..28c506d8675d 100644
--- a/keyboards/work_louder/loop/config.h
+++ b/keyboards/work_louder/loop/config.h
@@ -18,19 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGBLIGHT_DI_PIN E6
-//#    define RGBLIGHT_HUE_STEP 8
-//#    define RGBLIGHT_SAT_STEP 8
-//#    define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== or choose animations ==*/
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLIGHT_DEFAULT_MODE         RGBLIGHT_MODE_STATIC_LIGHT
 #define RGBLIGHT_DEFAULT_HUE          36
diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json
index 966f0a6b02ed..eacbbbccbd4d 100644
--- a/keyboards/work_louder/loop/info.json
+++ b/keyboards/work_louder/loop/info.json
@@ -9,7 +9,7 @@
         "max_power": 100
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B3", "B2", "B1", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
@@ -30,7 +30,18 @@
         "pin": "F1"
     },
     "rgblight": {
-        "max_brightness": 120
+        "max_brightness": 120,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/work_louder/loop/rev1/config.h b/keyboards/work_louder/loop/rev1/config.h
deleted file mode 100644
index 1bc02d08a68a..000000000000
--- a/keyboards/work_louder/loop/rev1/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#    define RGBLED_NUM 24
diff --git a/keyboards/work_louder/loop/rev1/info.json b/keyboards/work_louder/loop/rev1/info.json
index 90ac25f360b6..3caea9b338f2 100644
--- a/keyboards/work_louder/loop/rev1/info.json
+++ b/keyboards/work_louder/loop/rev1/info.json
@@ -1,5 +1,8 @@
 {
     "usb": {
         "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "led_count": 24
     }
 }
diff --git a/keyboards/work_louder/loop/rev3/config.h b/keyboards/work_louder/loop/rev3/config.h
deleted file mode 100644
index 5451d4466e25..000000000000
--- a/keyboards/work_louder/loop/rev3/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define RGBLED_NUM 11
diff --git a/keyboards/work_louder/loop/rev3/info.json b/keyboards/work_louder/loop/rev3/info.json
index b377cdff008e..603bca5c6a4e 100644
--- a/keyboards/work_louder/loop/rev3/info.json
+++ b/keyboards/work_louder/loop/rev3/info.json
@@ -1,5 +1,8 @@
 {
     "usb": {
         "device_version": "0.0.3"
+    },
+    "rgblight": {
+        "led_count": 11
     }
 }
diff --git a/keyboards/work_louder/micro/config.h b/keyboards/work_louder/micro/config.h
index 234b1de6023d..98f2b869735f 100644
--- a/keyboards/work_louder/micro/config.h
+++ b/keyboards/work_louder/micro/config.h
@@ -12,7 +12,6 @@
 // #define RGB_MATRIX_KEYPRESSES
 
 #define RGBLIGHT_DI_PIN D2
-#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_GRADIENT + 9
 #define RGBLIGHT_DEFAULT_HUE 213
 
diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/info.json
index 6b14ecfbe793..d76e7aa04943 100644
--- a/keyboards/work_louder/micro/info.json
+++ b/keyboards/work_louder/micro/info.json
@@ -37,13 +37,14 @@
         "hue_steps": 8,
         "led_count": 8,
         "max_brightness": 150,
-        "saturation_steps": 8
+        "saturation_steps": 8,
+        "sleep": true
     },
     "ws2812": {
         "pin": "D1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "url": "https://worklouder.cc/",
     "usb": {
diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h
index 593304a0533b..22c6f7b1bddb 100644
--- a/keyboards/work_louder/nano/config.h
+++ b/keyboards/work_louder/nano/config.h
@@ -18,20 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGBLIGHT_DI_PIN        C7
-#define RGBLED_NUM             6
-//#    define RGBLIGHT_HUE_STEP 8
-//#    define RGBLIGHT_SAT_STEP 8
-//#    define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== or choose animations ==*/
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLIGHT_DEFAULT_MODE         RGBLIGHT_MODE_STATIC_LIGHT
 #define RGBLIGHT_DEFAULT_HUE          170
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json
index adc32d10a64f..ab064bd019ed 100644
--- a/keyboards/work_louder/nano/info.json
+++ b/keyboards/work_louder/nano/info.json
@@ -10,7 +10,7 @@
         "max_power": 100
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B5", "B6", "C6"],
@@ -26,7 +26,19 @@
         "pin": "F6"
     },
     "rgblight": {
-        "max_brightness": 120
+        "led_count": 6,
+        "max_brightness": 120,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
     },
     "bootmagic": {
         "matrix": [0, 2]
diff --git a/keyboards/work_louder/numpad/info.json b/keyboards/work_louder/numpad/info.json
index 4fa9c1442c5a..0fa2bf2565d9 100644
--- a/keyboards/work_louder/numpad/info.json
+++ b/keyboards/work_louder/numpad/info.json
@@ -29,7 +29,7 @@
         "lto": true
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 1, "matrix": [3, 3], "x": 141, "y": 64},
             {"flags": 1, "matrix": [3, 2], "x": 122, "y": 64},
diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h
index 56615c8e495b..de91d98de931 100644
--- a/keyboards/work_louder/work_board/config.h
+++ b/keyboards/work_louder/work_board/config.h
@@ -18,19 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGBLIGHT_DI_PIN        D2
-//#    define RGBLIGHT_HUE_STEP 8
-//#    define RGBLIGHT_SAT_STEP 8
-//#    define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== or choose animations ==*/
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLIGHT_DEFAULT_MODE         RGBLIGHT_MODE_STATIC_GRADIENT + 9
 #define RGBLIGHT_DEFAULT_HUE          213
@@ -75,21 +62,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
+// #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 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
diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json
index 067a2b292e87..1946b8bcf40b 100644
--- a/keyboards/work_louder/work_board/info.json
+++ b/keyboards/work_louder/work_board/info.json
@@ -9,7 +9,7 @@
       "max_power": 100
     },
     "rgb_matrix": {
-      "driver": "WS2812"
+      "driver": "ws2812"
     },
     "matrix_pins": {
       "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "E6"],
@@ -25,7 +25,18 @@
       "pin": "D1"
     },
     "rgblight": {
-      "max_brightness": 120
+      "max_brightness": 120,
+      "sleep": true,
+      "animations": {
+        "breathing": true,
+        "rainbow_mood": true,
+        "rainbow_swirl": true,
+        "snake": true,
+        "knight": true,
+        "christmas": true,
+        "static_gradient": true,
+        "twinkle": true
+      }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/work_louder/work_board/keymaps/drashna/keymap.c b/keyboards/work_louder/work_board/keymaps/drashna/keymap.c
index 1747ab638eb0..2c2022574252 100644
--- a/keyboards/work_louder/work_board/keymaps/drashna/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/drashna/keymap.c
@@ -110,7 +110,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
 
 bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
     uint8_t this_mod = get_mods();
-    uint8_t this_led = host_keyboard_leds();
+    led_t   this_led = host_keyboard_led_state();
     uint8_t this_osm = get_oneshot_mods();
 #define THUMB_LED                                   6
 #define RGB_MATRIX_INDICATOR_SET_COLOR_wrapper(...) RGB_MATRIX_INDICATOR_SET_COLOR(__VA_ARGS__)
@@ -134,7 +134,7 @@ bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
         }
     }
 
-    if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led & (1 << USB_LED_CAPS_LOCK)) {
+    if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led.caps_lock) {
         if (!layer_state_is(_ADJUST)) {
             RGB_MATRIX_INDICATOR_SET_COLOR(12, 0x00, 0xFF, 0x00);
             RGB_MATRIX_INDICATOR_SET_COLOR(13, 0x00, 0xFF, 0x00);
diff --git a/keyboards/work_louder/work_board/rev1/config.h b/keyboards/work_louder/work_board/rev1/config.h
deleted file mode 100644
index b7d85d490d9b..000000000000
--- a/keyboards/work_louder/work_board/rev1/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#    define RGBLED_NUM 26
diff --git a/keyboards/work_louder/work_board/rev1/info.json b/keyboards/work_louder/work_board/rev1/info.json
index 90ac25f360b6..9884ca6e4898 100644
--- a/keyboards/work_louder/work_board/rev1/info.json
+++ b/keyboards/work_louder/work_board/rev1/info.json
@@ -1,5 +1,8 @@
 {
     "usb": {
         "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "led_count": 26
     }
 }
diff --git a/keyboards/work_louder/work_board/rev3/config.h b/keyboards/work_louder/work_board/rev3/config.h
deleted file mode 100644
index 8e3cd8bce806..000000000000
--- a/keyboards/work_louder/work_board/rev3/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define RGBLED_NUM 19
diff --git a/keyboards/work_louder/work_board/rev3/info.json b/keyboards/work_louder/work_board/rev3/info.json
index b377cdff008e..63e757dfe211 100644
--- a/keyboards/work_louder/work_board/rev3/info.json
+++ b/keyboards/work_louder/work_board/rev3/info.json
@@ -1,5 +1,8 @@
 {
     "usb": {
         "device_version": "0.0.3"
+    },
+    "rgblight": {
+        "led_count": 19
     }
 }
diff --git a/keyboards/wsk/alpha9/config.h b/keyboards/wsk/alpha9/config.h
index defc0a92dcb1..af1fe3ab43e0 100644
--- a/keyboards/wsk/alpha9/config.h
+++ b/keyboards/wsk/alpha9/config.h
@@ -21,18 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 5
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wsk/alpha9/info.json b/keyboards/wsk/alpha9/info.json
index 0b1586305993..5b9a30946040 100644
--- a/keyboards/wsk/alpha9/info.json
+++ b/keyboards/wsk/alpha9/info.json
@@ -17,6 +17,23 @@
     "caps_lock": "D3",
     "on_state": 0
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 5,
+    "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": "F4"
   },
diff --git a/keyboards/wsk/g4m3ralpha/config.h b/keyboards/wsk/g4m3ralpha/config.h
index a14f9dbde2f7..af1fe3ab43e0 100644
--- a/keyboards/wsk/g4m3ralpha/config.h
+++ b/keyboards/wsk/g4m3ralpha/config.h
@@ -21,18 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 5
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wsk/g4m3ralpha/info.json b/keyboards/wsk/g4m3ralpha/info.json
index e9c24279f3da..a6ecaccb0591 100644
--- a/keyboards/wsk/g4m3ralpha/info.json
+++ b/keyboards/wsk/g4m3ralpha/info.json
@@ -8,6 +8,23 @@
     "pid": "0x56D9",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 5,
+    "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": "F4"
   },
diff --git a/keyboards/wsk/gothic50/config.h b/keyboards/wsk/gothic50/config.h
index 541e19beced2..55edc22470dc 100644
--- a/keyboards/wsk/gothic50/config.h
+++ b/keyboards/wsk/gothic50/config.h
@@ -1,20 +1,5 @@
 #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 RGBLED_NUM 10
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/wsk/gothic50/info.json b/keyboards/wsk/gothic50/info.json
index 8cc097187990..2dd4ae8296bd 100644
--- a/keyboards/wsk/gothic50/info.json
+++ b/keyboards/wsk/gothic50/info.json
@@ -8,6 +8,23 @@
         "pid": "0x04EF",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "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": "F7"
     },
diff --git a/keyboards/wsk/gothic70/config.h b/keyboards/wsk/gothic70/config.h
index b6ee3e9cc88f..5f360813239b 100644
--- a/keyboards/wsk/gothic70/config.h
+++ b/keyboards/wsk/gothic70/config.h
@@ -1,20 +1,5 @@
 #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 RGBLED_NUM 7
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/wsk/gothic70/info.json b/keyboards/wsk/gothic70/info.json
index 06ee936ce7d2..0912ade63f70 100644
--- a/keyboards/wsk/gothic70/info.json
+++ b/keyboards/wsk/gothic70/info.json
@@ -8,6 +8,23 @@
         "pid": "0x63CC",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "F4"
     },
diff --git a/keyboards/wsk/kodachi50/config.h b/keyboards/wsk/kodachi50/config.h
index da4d3257a62a..5f360813239b 100644
--- a/keyboards/wsk/kodachi50/config.h
+++ b/keyboards/wsk/kodachi50/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 10
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wsk/kodachi50/info.json b/keyboards/wsk/kodachi50/info.json
index b5d0f9459b71..a19501459512 100644
--- a/keyboards/wsk/kodachi50/info.json
+++ b/keyboards/wsk/kodachi50/info.json
@@ -8,6 +8,23 @@
         "pid": "0x72D4",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "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": "D3"
     },
diff --git a/keyboards/wsk/pain27/config.h b/keyboards/wsk/pain27/config.h
index edc623d08fa5..5f360813239b 100644
--- a/keyboards/wsk/pain27/config.h
+++ b/keyboards/wsk/pain27/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 8
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wsk/pain27/info.json b/keyboards/wsk/pain27/info.json
index f542c999a170..813bde3d027c 100644
--- a/keyboards/wsk/pain27/info.json
+++ b/keyboards/wsk/pain27/info.json
@@ -8,6 +8,23 @@
         "pid": "0x9E8C",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "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": "D1"
     },
diff --git a/keyboards/wsk/sl40/config.h b/keyboards/wsk/sl40/config.h
index d33de62b5fb4..af1fe3ab43e0 100644
--- a/keyboards/wsk/sl40/config.h
+++ b/keyboards/wsk/sl40/config.h
@@ -21,18 +21,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 1
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wsk/sl40/info.json b/keyboards/wsk/sl40/info.json
index 09f5f9881426..262e0fb9bb21 100644
--- a/keyboards/wsk/sl40/info.json
+++ b/keyboards/wsk/sl40/info.json
@@ -8,6 +8,23 @@
         "pid": "0xC456",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "F1"
     },
diff --git a/keyboards/wsk/tkl30/config.h b/keyboards/wsk/tkl30/config.h
index 2dae864ddb2e..5f360813239b 100644
--- a/keyboards/wsk/tkl30/config.h
+++ b/keyboards/wsk/tkl30/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 1
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/wsk/tkl30/info.json b/keyboards/wsk/tkl30/info.json
index 10465560518d..0dcbab7d7242 100644
--- a/keyboards/wsk/tkl30/info.json
+++ b/keyboards/wsk/tkl30/info.json
@@ -8,6 +8,23 @@
         "pid": "0x0B7F",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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
+        }
+    },
     "ws2812": {
         "pin": "B1"
     },
diff --git a/keyboards/wuque/creek70/config.h b/keyboards/wuque/creek70/config.h
deleted file mode 100644
index d33ee006aa6a..000000000000
--- a/keyboards/wuque/creek70/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2023 wuque
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#    define RGBLED_NUM 7
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
diff --git a/keyboards/wuque/creek70/info.json b/keyboards/wuque/creek70/info.json
index 10e43b340dbe..f0951430db3e 100644
--- a/keyboards/wuque/creek70/info.json
+++ b/keyboards/wuque/creek70/info.json
@@ -30,7 +30,23 @@
     "pin": "D0"
   },
   "rgblight": {
-    "max_brightness": 200
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 7,
+    "max_brightness": 200,
+    "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
+    }
   },
   "layout_aliases": {
     "LAYOUT": "LAYOUT_all"
diff --git a/keyboards/wuque/ikki68/config.h b/keyboards/wuque/ikki68/config.h
index 80ecfb420d22..f0510424ffef 100644
--- a/keyboards/wuque/ikki68/config.h
+++ b/keyboards/wuque/ikki68/config.h
@@ -22,20 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-    #define RGBLED_NUM 8
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*======= RGB function=======*/
-#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/wuque/ikki68/info.json b/keyboards/wuque/ikki68/info.json
index e450f95dbfb5..86d1de3d4a95 100644
--- a/keyboards/wuque/ikki68/info.json
+++ b/keyboards/wuque/ikki68/info.json
@@ -12,7 +12,23 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "max_brightness": 200,
+        "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": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6", "F7"],
diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h
index c5726c333e06..db5a8d534ef7 100644
--- a/keyboards/wuque/ikki68_aurora/config.h
+++ b/keyboards/wuque/ikki68_aurora/config.h
@@ -22,20 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-    #define RGBLED_NUM 20
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*======= RGB function=======*/
-#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/wuque/ikki68_aurora/info.json b/keyboards/wuque/ikki68_aurora/info.json
index 2e93f0efc789..a65b265b66c8 100644
--- a/keyboards/wuque/ikki68_aurora/info.json
+++ b/keyboards/wuque/ikki68_aurora/info.json
@@ -21,10 +21,27 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 200
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "max_brightness": 200,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "community_layouts": ["68_ansi", "68_iso"],
     "layouts": {
         "LAYOUT_68_ansi": {
             "layout": [
@@ -486,7 +503,8 @@
                 {"matrix": [2, 12], "x": 12.75, "y": 2},
                 {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
-                {"matrix": [3, 0], "x": 0, "y": 3, "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},
diff --git a/keyboards/wuque/ikki68_aurora/keymaps/68_iso/keymap.c b/keyboards/wuque/ikki68_aurora/keymaps/68_iso/keymap.c
index 50bb0444906d..d75e3b881196 100644
--- a/keyboards/wuque/ikki68_aurora/keymaps/68_iso/keymap.c
+++ b/keyboards/wuque/ikki68_aurora/keymaps/68_iso/keymap.c
@@ -20,29 +20,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_68_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_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_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_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_UP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,    KC_UP,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_68_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,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,             _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______,
         _______, _______, _______,                            _______,                            _______, _______, _______,    _______, _______, _______
-    ),
-    [2] = LAYOUT_68_iso(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______,    _______, _______, _______
-    ),
-    [3] = LAYOUT_68_iso(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______,    _______, _______, _______
-    ),
+    )
 };
diff --git a/keyboards/wuque/ikki68_aurora/matrix_diagram.md b/keyboards/wuque/ikki68_aurora/matrix_diagram.md
new file mode 100644
index 000000000000..af2829e67036
--- /dev/null
+++ b/keyboards/wuque/ikki68_aurora/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix diagram for Wuque Ikki68 Aurora
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┐     ┌───────┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D ││0E │0F │     │0D     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┤     └─┬─────┤
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   ││1E │1F │       │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┘    ┌──┴┐1D  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │             │2C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤┌───┐        └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D ││3E │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴┬──┴┼───┼───┐
+│40  │41  │42  │46                      │4A  │4B  │4C  │ │4D │4E │4F │
+└────┴────┴────┴────────────────────────┴────┴────┴────┘ └───┴───┴───┘
+┌────────┐                                       ┌──────────┐
+│30      │ 2.25u LShift             2.75u RShift │3C        │
+└────────┘                                       └──────────┘
+┌────┬────┬────┬────────┬────┬──────────┬────┬────┬────┐
+│40  │41  │42  │44      │46  │48        │4A  │4B  │4C  │ Split Space
+└────┴────┴────┴────────┴────┴──────────┴────┴────┴────┘
+```
diff --git a/keyboards/wuque/mammoth20x/config.h b/keyboards/wuque/mammoth20x/config.h
index c35fac65d61d..db5a8d534ef7 100644
--- a/keyboards/wuque/mammoth20x/config.h
+++ b/keyboards/wuque/mammoth20x/config.h
@@ -22,7 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-// Note:  array is { col, row )
-#define ENCODERS_CW_KEY  { { 3, 2 } }
-#define ENCODERS_CCW_KEY { { 3, 4 } }
diff --git a/keyboards/wuque/mammoth20x/info.json b/keyboards/wuque/mammoth20x/info.json
index 3c0c0e29b8e5..f7917ae26d84 100644
--- a/keyboards/wuque/mammoth20x/info.json
+++ b/keyboards/wuque/mammoth20x/info.json
@@ -29,9 +29,7 @@
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
                 {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [2, 3], "x": 3, "y": 0, "w": 0.5},
                 {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [4, 3], "x": 4.5, "y": 0, "w": 0.5},
 
                 {"matrix": [1, 0], "x": 0, "y": 1},
                 {"matrix": [1, 1], "x": 1, "y": 1},
diff --git a/keyboards/wuque/mammoth20x/keymaps/default/keymap.c b/keyboards/wuque/mammoth20x/keymaps/default/keymap.c
index e19b3bc172f1..5f444bbff3b7 100644
--- a/keyboards/wuque/mammoth20x/keymaps/default/keymap.c
+++ b/keyboards/wuque/mammoth20x/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_ESC,  KC_PAUS, KC_DEL,  KC_VOLU, KC_MUTE, KC_VOLD,
+        KC_ESC,  KC_PAUS, KC_DEL,  KC_MUTE,
         KC_LNUM, KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_P0,            KC_PDOT, KC_PENT
     ),
     [1] = LAYOUT(
-        _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______,
         _______, _______, _______, _______,
         _______, _______, _______,
         _______, _______, _______, _______,
diff --git a/keyboards/wuque/mammoth20x/keymaps/via/keymap.c b/keyboards/wuque/mammoth20x/keymaps/via/keymap.c
index e5fe34fd7ba6..e48b8b50d1ef 100644
--- a/keyboards/wuque/mammoth20x/keymaps/via/keymap.c
+++ b/keyboards/wuque/mammoth20x/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_ESC,  KC_PAUS, KC_DEL,  KC_VOLD, KC_MUTE, KC_VOLU,
+        KC_ESC,  KC_PAUS, KC_DEL,  KC_MUTE,
         KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_P0,            KC_PDOT, KC_PENT
     ),
     [1] = LAYOUT(
-        _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______,
         _______, _______, _______, _______,
         _______, _______, _______,
         _______, _______, _______, _______,
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,          _______, _______
     ),
     [2] = LAYOUT(
-        _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______,
         _______, _______, _______, _______,
         _______, _______, _______,
         _______, _______, _______, _______,
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,          _______, _______
     ),
     [3] = LAYOUT(
-        _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______,
         _______, _______, _______, _______,
         _______, _______, _______,
         _______, _______, _______, _______,
@@ -50,3 +50,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,          _______, _______
     ),
 };
+
+#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(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/wuque/mammoth20x/keymaps/via/rules.mk b/keyboards/wuque/mammoth20x/keymaps/via/rules.mk
index 36b7ba9cbc98..1189f4ad1927 100644
--- a/keyboards/wuque/mammoth20x/keymaps/via/rules.mk
+++ b/keyboards/wuque/mammoth20x/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/wuque/mammoth20x/mammoth20x.c b/keyboards/wuque/mammoth20x/mammoth20x.c
deleted file mode 100644
index eeaea79c710e..000000000000
--- a/keyboards/wuque/mammoth20x/mammoth20x.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright 2021 wuquestudio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You 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"
-
-static uint8_t encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void)
-{
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
-
-void matrix_scan_kb(void)
-{
-    encoder_action_unregister();
-    matrix_scan_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise)
-{
-    encoder_action_register(index, clockwise);
-    return true;
-};
diff --git a/keyboards/wuque/mammoth75x/config.h b/keyboards/wuque/mammoth75x/config.h
index 6b0d17be5cd0..db5a8d534ef7 100644
--- a/keyboards/wuque/mammoth75x/config.h
+++ b/keyboards/wuque/mammoth75x/config.h
@@ -22,7 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-// Note:  array is { col, row )
-#define ENCODERS_CW_KEY  { { 3, 5 } }
-#define ENCODERS_CCW_KEY { { 5, 5 } }
diff --git a/keyboards/wuque/mammoth75x/info.json b/keyboards/wuque/mammoth75x/info.json
index ef48587375be..9b9bc1abb66d 100644
--- a/keyboards/wuque/mammoth75x/info.json
+++ b/keyboards/wuque/mammoth75x/info.json
@@ -41,10 +41,7 @@
                 {"matrix": [0, 11], "x": 11.75, "y": 0},
                 {"matrix": [0, 12], "x": 12.75, "y": 0},
                 {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [5, 3], "x": 15.65, "y": 0.125, "w": 0.6, "h": 0.5},
                 {"matrix": [0, 14], "x": 15.75, "y": 0.625},
-                {"matrix": [5, 5], "x": 16.25, "y": 0.125, "w": 0.6, "h": 0.5},
 
                 {"matrix": [1, 0], "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "x": 1, "y": 1.25},
diff --git a/keyboards/wuque/mammoth75x/keymaps/default/keymap.c b/keyboards/wuque/mammoth75x/keymaps/default/keymap.c
index b0273298dc96..0ed2bdfebe16 100644
--- a/keyboards/wuque/mammoth75x/keymaps/default/keymap.c
+++ b/keyboards/wuque/mammoth75x/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_VOLD, KC_MUTE,KC_VOLU,
+        KC_ESC,  KC_F1,   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_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_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_END, KC_PGDN,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_MPRV, KC_MPLY, KC_MNXT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,               _______, _______,
diff --git a/keyboards/wuque/mammoth75x/keymaps/via/keymap.c b/keyboards/wuque/mammoth75x/keymaps/via/keymap.c
index 13d5d4fa7a9e..57f7a13cbdc2 100644
--- a/keyboards/wuque/mammoth75x/keymaps/via/keymap.c
+++ b/keyboards/wuque/mammoth75x/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_VOLD, KC_MUTE,KC_VOLU,
+        KC_ESC,  KC_F1,   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_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_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_END, KC_PGDN,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_MPRV, KC_MPLY, KC_MNXT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,               _______, _______,
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______,               _______, _______, _______
     ),
     [2] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,               _______, _______,
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______,               _______, _______, _______
     ),
     [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,               _______, _______,
@@ -50,3 +50,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______,               _______, _______, _______
     ),
 };
+
+#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_MPRV, KC_MNXT) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/wuque/mammoth75x/keymaps/via/rules.mk b/keyboards/wuque/mammoth75x/keymaps/via/rules.mk
index 36b7ba9cbc98..1189f4ad1927 100644
--- a/keyboards/wuque/mammoth75x/keymaps/via/rules.mk
+++ b/keyboards/wuque/mammoth75x/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/wuque/mammoth75x/mammoth75x.c b/keyboards/wuque/mammoth75x/mammoth75x.c
deleted file mode 100644
index 3b2d995b7e19..000000000000
--- a/keyboards/wuque/mammoth75x/mammoth75x.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright 2021 wuquestudio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You 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 VIA_ENABLE
-static uint8_t encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void)
-{
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
-
-void matrix_scan_kb(void)
-{
-    encoder_action_unregister();
-    matrix_scan_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise)
-{
-    encoder_action_register(index, clockwise);
-    return true;
-};
-#endif
diff --git a/keyboards/wuque/promise87/ansi/config.h b/keyboards/wuque/promise87/ansi/config.h
deleted file mode 100644
index b0e79e97c7b8..000000000000
--- a/keyboards/wuque/promise87/ansi/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2022 wuque
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 1
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*======= RGB function=======*/
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
diff --git a/keyboards/wuque/promise87/ansi/info.json b/keyboards/wuque/promise87/ansi/info.json
index d49b4aaa793c..e7e0a0b46eeb 100644
--- a/keyboards/wuque/promise87/ansi/info.json
+++ b/keyboards/wuque/promise87/ansi/info.json
@@ -21,7 +21,16 @@
     "pin": "D2"
   },
   "rgblight": {
-    "max_brightness": 200
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 1,
+    "max_brightness": 200,
+    "sleep": true,
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "static_gradient": true
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
diff --git a/keyboards/wuque/promise87/wkl/config.h b/keyboards/wuque/promise87/wkl/config.h
deleted file mode 100644
index b0e79e97c7b8..000000000000
--- a/keyboards/wuque/promise87/wkl/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2022 wuque
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-    #define RGBLED_NUM 1
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*======= RGB function=======*/
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
diff --git a/keyboards/wuque/promise87/wkl/info.json b/keyboards/wuque/promise87/wkl/info.json
index 7e0d7cfdcb59..29809d2a1534 100644
--- a/keyboards/wuque/promise87/wkl/info.json
+++ b/keyboards/wuque/promise87/wkl/info.json
@@ -21,7 +21,16 @@
     "pin": "D2"
   },
   "rgblight": {
-    "max_brightness": 200
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 1,
+    "max_brightness": 200,
+    "sleep": true,
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "static_gradient": true
+    }
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
diff --git a/keyboards/wuque/serneity65/config.h b/keyboards/wuque/serneity65/config.h
deleted file mode 100644
index 134605fcab5c..000000000000
--- a/keyboards/wuque/serneity65/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 wuque
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// Note:  array is { col, row )
-#define ENCODERS_CW_KEY  { { 3, 4 } }
-#define ENCODERS_CCW_KEY { { 5, 4 } }
diff --git a/keyboards/wuque/serneity65/info.json b/keyboards/wuque/serneity65/info.json
index 9ebc9af8438b..f27073b28583 100644
--- a/keyboards/wuque/serneity65/info.json
+++ b/keyboards/wuque/serneity65/info.json
@@ -41,9 +41,7 @@
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [4, 3], "x": 15, "y": 0, "w": 0.5},
                 {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [4, 5], "x": 16.5, "y": 0, "w": 0.5},
 
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "x": 1.5, "y": 1},
diff --git a/keyboards/wuque/serneity65/keymaps/default/keymap.c b/keyboards/wuque/serneity65/keymaps/default/keymap.c
index 2acca2f0c0b8..23ddfced8883 100644
--- a/keyboards/wuque/serneity65/keymaps/default/keymap.c
+++ b/keyboards/wuque/serneity65/keymaps/default/keymap.c
@@ -18,17 +18,17 @@
 
 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_VOLD, KC_MUTE, KC_VOLU,
+        KC_ESC,  KC_1,    KC_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,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_BSPC, KC_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_END,
         KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, MO(1),   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_MPRV, KC_MPLY, KC_MNXT,
+        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_MPLY,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
         _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______
-    ),
-};
+    )
+ };
diff --git a/keyboards/wuque/serneity65/keymaps/via/keymap.c b/keyboards/wuque/serneity65/keymaps/via/keymap.c
index 8e820022feab..05abb620da61 100644
--- a/keyboards/wuque/serneity65/keymaps/via/keymap.c
+++ b/keyboards/wuque/serneity65/keymaps/via/keymap.c
@@ -18,31 +18,40 @@
 
 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_VOLD, KC_MUTE, KC_VOLU,
+        KC_ESC,  KC_1,    KC_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,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_BSPC, KC_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_END,
         KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, MO(1),   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_MPRV, KC_MPLY, KC_MNXT,
+        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_MPLY,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
         _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______
     ),
     [2] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______
     ),
     [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______
     ),
 };
+
+#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_MPRV, KC_MNXT) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/wuque/serneity65/keymaps/via/rules.mk b/keyboards/wuque/serneity65/keymaps/via/rules.mk
index 43061db1dd46..1189f4ad1927 100644
--- a/keyboards/wuque/serneity65/keymaps/via/rules.mk
+++ b/keyboards/wuque/serneity65/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
+LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/wuque/serneity65/serneity65.c b/keyboards/wuque/serneity65/serneity65.c
deleted file mode 100644
index 58e066346753..000000000000
--- a/keyboards/wuque/serneity65/serneity65.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright 2021 wuque
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You 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 VIA_ENABLE
-static uint8_t encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void)
-{
-    for (int index = 0; index < NUM_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(),
-                .type = KEY_EVENT
-            };
-            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(),
-        .type = KEY_EVENT
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
-
-void matrix_scan_kb(void)
-{
-    encoder_action_unregister();
-    matrix_scan_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise)
-{
-    encoder_action_register(index, clockwise);
-    return true;
-};
-#endif
diff --git a/keyboards/xbows/knight/info.json b/keyboards/xbows/knight/info.json
index 3d507b38a919..7684ca6b3964 100644
--- a/keyboards/xbows/knight/info.json
+++ b/keyboards/xbows/knight/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "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/info.json b/keyboards/xbows/knight_plus/info.json
index 7aa1fe74f5c5..695ef03672d3 100644
--- a/keyboards/xbows/knight_plus/info.json
+++ b/keyboards/xbows/knight_plus/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
diff --git a/keyboards/xbows/nature/info.json b/keyboards/xbows/nature/info.json
index 0287c13ee4a4..892dda887812 100644
--- a/keyboards/xbows/nature/info.json
+++ b/keyboards/xbows/nature/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
diff --git a/keyboards/xbows/numpad/info.json b/keyboards/xbows/numpad/info.json
index 34744625d863..2f5f5f4cd86d 100644
--- a/keyboards/xbows/numpad/info.json
+++ b/keyboards/xbows/numpad/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "matrix_pins": {
         "cols": ["D4", "D6", "B2", "B1"],
diff --git a/keyboards/xbows/ranger/info.json b/keyboards/xbows/ranger/info.json
index ec3fcb0fb3bb..edbb5fc5045c 100644
--- a/keyboards/xbows/ranger/info.json
+++ b/keyboards/xbows/ranger/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "matrix_pins": {
         "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "D7", "F6", "F7", "D4", "D5", "D3"],
diff --git a/keyboards/xbows/woody/info.json b/keyboards/xbows/woody/info.json
index 7e4e25357f35..8212f3103437 100644
--- a/keyboards/xbows/woody/info.json
+++ b/keyboards/xbows/woody/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "IS31FL3731"
+        "driver": "is31fl3731"
     },
     "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 9757bde9c94d..fa0ba7f768a0 100644
--- a/keyboards/xbows/woody/woody.c
+++ b/keyboards/xbows/woody/woody.c
@@ -101,7 +101,7 @@ bool rgb_matrix_indicators_kb(void) {
     if (!rgb_matrix_indicators_user()) {
         return false;
     }
-    if (IS_LED_ON(host_keyboard_leds(), USB_LED_CAPS_LOCK)) {
+    if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(30, 0xFF, 0x00, 0x00);
     }
     return true;
diff --git a/keyboards/xelus/akis/config.h b/keyboards/xelus/akis/config.h
index ae0e69219161..5df8b9c56bd5 100644
--- a/keyboards/xelus/akis/config.h
+++ b/keyboards/xelus/akis/config.h
@@ -16,19 +16,6 @@
 
 #pragma once
 
-/* RGB Lighting */
-#define RGBLED_NUM 23
-#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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/xelus/akis/info.json b/keyboards/xelus/akis/info.json
index 320ad9824bb9..b5b082a37ace 100644
--- a/keyboards/xelus/akis/info.json
+++ b/keyboards/xelus/akis/info.json
@@ -8,6 +8,21 @@
         "pid": "0xA04B",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 23,
+        "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": "B0"
     },
diff --git a/keyboards/xelus/dawn60/rev1_qmk/config.h b/keyboards/xelus/dawn60/rev1_qmk/config.h
index d84773e5fbcd..ad399bd96239 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/config.h
+++ b/keyboards/xelus/dawn60/rev1_qmk/config.h
@@ -80,8 +80,8 @@
 #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
+// #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
diff --git a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
index f153c9ef9deb..7b7780732663 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
+++ b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
@@ -167,28 +167,28 @@ led_config_t g_led_config = { {
 //Custom Driver
 static void init(void) {
     i2c_init();
-    IS31FL3731_init(DRIVER_ADDR_1);
-    IS31FL3731_init(DRIVER_ADDR_2);
+    is31fl3731_init(DRIVER_ADDR_1);
+    is31fl3731_init(DRIVER_ADDR_2);
     for (int index = 0; index < ISSI_DRIVER_TOTAL; index++) {
         bool enabled = true;
-        IS31FL3731_set_led_control_register(index, enabled, enabled, enabled);
+        is31fl3731_set_led_control_register(index, enabled, enabled, enabled);
     }
-    IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
-    IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1);
+    is31fl3731_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3731_update_led_control_registers(DRIVER_ADDR_2, 1);
     
     //RGB Underglow ws2812
     
 }
 
 static void flush(void) {
-    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
-    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
+    is31fl3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
     ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_TOTAL);
 }
 
 static void set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     if (index < ISSI_DRIVER_TOTAL) {
-        IS31FL3731_set_color(index, red, green, blue);
+        is31fl3731_set_color(index, red, green, blue);
     } else {
         rgb_matrix_ws2812_array[index - ISSI_DRIVER_TOTAL].r = red;
         rgb_matrix_ws2812_array[index - ISSI_DRIVER_TOTAL].g = green;
@@ -197,7 +197,7 @@ static void set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
 }
 
 static void set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
-    IS31FL3731_set_color_all( red, green, blue );
+    is31fl3731_set_color_all( red, green, blue );
     for (uint8_t i = 0; i < WS2812_LED_TOTAL; i++) {
         rgb_matrix_ws2812_array[i].r = red;
         rgb_matrix_ws2812_array[i].g = green;
diff --git a/keyboards/xelus/kangaroo/rev1/rules.mk b/keyboards/xelus/kangaroo/rev1/rules.mk
index 805e07ebc2e2..a6006b71501e 100644
--- a/keyboards/xelus/kangaroo/rev1/rules.mk
+++ b/keyboards/xelus/kangaroo/rev1/rules.mk
@@ -11,5 +11,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 EEPROM_DRIVER = i2c
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/xelus/kangaroo/rev2/rules.mk b/keyboards/xelus/kangaroo/rev2/rules.mk
index c7c6f5f1633a..613adf3a226d 100644
--- a/keyboards/xelus/kangaroo/rev2/rules.mk
+++ b/keyboards/xelus/kangaroo/rev2/rules.mk
@@ -14,5 +14,3 @@ EEPROM_DRIVER = i2c
 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
diff --git a/keyboards/xelus/la_plus/config.h b/keyboards/xelus/la_plus/config.h
index 82ada2e6da93..6e3a51166ebc 100755
--- a/keyboards/xelus/la_plus/config.h
+++ b/keyboards/xelus/la_plus/config.h
@@ -59,21 +59,21 @@
 #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_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 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
diff --git a/keyboards/xelus/la_plus/info.json b/keyboards/xelus/la_plus/info.json
index 24f84a7d80fa..be1fa1158468 100644
--- a/keyboards/xelus/la_plus/info.json
+++ b/keyboards/xelus/la_plus/info.json
@@ -12,7 +12,7 @@
         "pin": "F1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
diff --git a/keyboards/xelus/ninjin/config.h b/keyboards/xelus/ninjin/config.h
index a922b89dbf2b..9db59dcc66ce 100644
--- a/keyboards/xelus/ninjin/config.h
+++ b/keyboards/xelus/ninjin/config.h
@@ -16,19 +16,6 @@
 
 #pragma once
 
-/* RGB Underglow */
-#define RGBLED_NUM 26
-#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
-
 // PWM RGB Underglow Defines
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
diff --git a/keyboards/xelus/ninjin/info.json b/keyboards/xelus/ninjin/info.json
index 242362ab7e26..ae3159562384 100644
--- a/keyboards/xelus/ninjin/info.json
+++ b/keyboards/xelus/ninjin/info.json
@@ -13,7 +13,20 @@
         "driver": "pwm"
     },
     "rgblight": {
-        "max_brightness": 200
+        "led_count": 26,
+        "max_brightness": 200,
+        "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": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "B6", "B5"],
diff --git a/keyboards/xelus/ninjin/rules.mk b/keyboards/xelus/ninjin/rules.mk
index ead22f6c1558..e59fc84570d1 100644
--- a/keyboards/xelus/ninjin/rules.mk
+++ b/keyboards/xelus/ninjin/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/xelus/pachi/rev1/rules.mk b/keyboards/xelus/pachi/rev1/rules.mk
index c02eb841df6c..d3ca7b060e17 100644
--- a/keyboards/xelus/pachi/rev1/rules.mk
+++ b/keyboards/xelus/pachi/rev1/rules.mk
@@ -1,5 +1,3 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/xelus/pachi/rgb/rev1/rev1.c b/keyboards/xelus/pachi/rgb/rev1/rev1.c
index 856cdc13026d..156c5228dab4 100644
--- a/keyboards/xelus/pachi/rgb/rev1/rev1.c
+++ b/keyboards/xelus/pachi/rgb/rev1/rev1.c
@@ -188,7 +188,7 @@ led_config_t g_led_config = { {
 
 static void init(void) {
     i2c_init();
-    IS31FL3741_init(DRIVER_ADDR_1);
+    is31fl3741_init(DRIVER_ADDR_1);
     for (int index = 0; index < ISSI_DRIVER_TOTAL; index++) {
         bool enabled = !(   ( index == -1+0+13) || //A13
                             ( index == -1+13+3) || //B3
@@ -221,19 +221,19 @@ static void init(void) {
                             ( index == -1+104+12) || //I12
                             ( index == -1+104+13) //I13
                         );
-        IS31FL3741_set_led_control_register(index, enabled, enabled, enabled);
+        is31fl3741_set_led_control_register(index, enabled, enabled, enabled);
     }
-    IS31FL3741_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3741_update_led_control_registers(DRIVER_ADDR_1, 0);
 }
 
 static void flush(void) {
-    IS31FL3741_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3741_update_pwm_buffers(DRIVER_ADDR_1, 0);
 }
 
 const rgb_matrix_driver_t rgb_matrix_driver = {
     .init = init,
     .flush = flush,
-    .set_color = IS31FL3741_set_color,
-    .set_color_all = IS31FL3741_set_color_all
+    .set_color = is31fl3741_set_color,
+    .set_color_all = is31fl3741_set_color_all
 };
 #endif
diff --git a/keyboards/xelus/pachi/rgb/rev2/rev2.c b/keyboards/xelus/pachi/rgb/rev2/rev2.c
index da5bb96a7517..d7c74730f8a9 100644
--- a/keyboards/xelus/pachi/rgb/rev2/rev2.c
+++ b/keyboards/xelus/pachi/rgb/rev2/rev2.c
@@ -194,7 +194,7 @@ led_config_t g_led_config = { {
 
 static void init(void) {
     i2c_init();
-    IS31FL3741_init(DRIVER_ADDR_1);
+    is31fl3741_init(DRIVER_ADDR_1);
     for (int index = 0; index < ISSI_DRIVER_TOTAL; index++) {
         bool enabled = !(   ( index == -1+0+13) || //A13
                             ( index == -1+13+3) || //B3
@@ -227,20 +227,20 @@ static void init(void) {
                             ( index == -1+104+12) || //I12
                             ( index == -1+104+13) //I13
                         );
-        IS31FL3741_set_led_control_register(index, enabled, enabled, enabled);
+        is31fl3741_set_led_control_register(index, enabled, enabled, enabled);
     }
-    IS31FL3741_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3741_update_led_control_registers(DRIVER_ADDR_1, 0);
 }
 
 static void flush(void) {
-    IS31FL3741_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3741_update_pwm_buffers(DRIVER_ADDR_1, 0);
 }
 
 const rgb_matrix_driver_t rgb_matrix_driver = {
     .init = init,
     .flush = flush,
-    .set_color = IS31FL3741_set_color,
-    .set_color_all = IS31FL3741_set_color_all
+    .set_color = is31fl3741_set_color,
+    .set_color_all = is31fl3741_set_color_all
 };
 
 #ifdef VIA_ENABLE
diff --git a/keyboards/xelus/rs108/rules.mk b/keyboards/xelus/rs108/rules.mk
index 8441c649b264..612c1d666aae 100644
--- a/keyboards/xelus/rs108/rules.mk
+++ b/keyboards/xelus/rs108/rules.mk
@@ -16,5 +16,3 @@ EEPROM_DRIVER = i2c
 # Save hid interface
 KEYBOARD_SHARED_EP = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/xelus/rs60/rev2_0/rules.mk b/keyboards/xelus/rs60/rev2_0/rules.mk
index e81b538301a0..965f4edaefba 100644
--- a/keyboards/xelus/rs60/rev2_0/rules.mk
+++ b/keyboards/xelus/rs60/rev2_0/rules.mk
@@ -15,5 +15,3 @@ EEPROM_DRIVER = i2c
 # Save hid interface
 KEYBOARD_SHARED_EP = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/xelus/rs60/rev2_1/rules.mk b/keyboards/xelus/rs60/rev2_1/rules.mk
index 6329d2c31d43..9eeaa8553bb6 100644
--- a/keyboards/xelus/rs60/rev2_1/rules.mk
+++ b/keyboards/xelus/rs60/rev2_1/rules.mk
@@ -17,5 +17,3 @@ WEAR_LEVELING_DRIVER = embedded_flash
 # Save hid interface
 KEYBOARD_SHARED_EP = yes
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/xelus/trinityxttkl/rules.mk b/keyboards/xelus/trinityxttkl/rules.mk
index 120a444ec8a5..ef90964f9b33 100644
--- a/keyboards/xelus/trinityxttkl/rules.mk
+++ b/keyboards/xelus/trinityxttkl/rules.mk
@@ -14,5 +14,3 @@ BACKLIGHT_ENABLE = no
 RGBLIGHT_ENABLE = no
 
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/xelus/valor/rev1/config.h b/keyboards/xelus/valor/rev1/config.h
index c431ddad8739..fe18ba5b7173 100644
--- a/keyboards/xelus/valor/rev1/config.h
+++ b/keyboards/xelus/valor/rev1/config.h
@@ -16,19 +16,6 @@
 
 #pragma once
 
-/* RGB Underglow */
-#define RGBLED_NUM 28
-#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
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/xelus/valor/rev1/info.json b/keyboards/xelus/valor/rev1/info.json
index 2545fb24b018..a07e426978e7 100644
--- a/keyboards/xelus/valor/rev1/info.json
+++ b/keyboards/xelus/valor/rev1/info.json
@@ -12,7 +12,20 @@
         "pin": "B0"
     },
     "rgblight": {
-        "max_brightness": 200
+        "led_count": 28,
+        "max_brightness": 200,
+        "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": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
@@ -21,11 +34,91 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
-    "community_layouts": ["alice_split_bs"],
+    "community_layouts": ["alice", "alice_split_bs"],
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_alice_split_bs"
     },
     "layouts": {
+        "LAYOUT_alice": {
+            "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": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"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": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"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": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
         "LAYOUT_alice_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/xelus/valor/rev1/matrix_diagram.md b/keyboards/xelus/valor/rev1/matrix_diagram.md
new file mode 100644
index 000000000000..2c4e53a40bf5
--- /dev/null
+++ b/keyboards/xelus/valor/rev1/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for Xelus Valor Rev. 1
+
+```
+                                                                       ┌───────┐
+                                                          2u Backspace │0E     │
+                                                                       └───────┘
+  ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+  │00 │  │01 │02 │03 │04 │05 │06 │07 │         │08 │09 │0A │0B │0C │0D │0E │2E │
+ ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
+ │10 │  │11   │12 │13 │14 │15 │16 │          │17 │18 │19 │1A │1B │1C │1D │1E    │
+┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤          └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐
+│20 │  │21    │22 │23 │24 │25 │26 │           │27 │28 │29 │2A │2B │2C │2D        │
+└───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐
+      │31      │32 │33 │34 │35 │36 │        │37 │38 │39 │3A │3B │3C │3D       │3E │
+      ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴──┐     ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘
+      │41   │     │43   │45     │46   │     │48        │4A   │             │4D   │
+      └─────┘     └─────┴───────┴─────┘     └──────────┴─────┘             └─────┘
+                                                                     ┌────────────┐
+                                                        2.75u RShift │3D          │
+                                                                     └────────────┘
+                        ┌─────────┬───┐
+                        │45       │46 │ 2.25u-1u Left Space
+                        └─────────┴───┘
+```
diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h
index cc63e70bb400..e5acad6f9c81 100644
--- a/keyboards/xelus/valor/rev2/config.h
+++ b/keyboards/xelus/valor/rev2/config.h
@@ -40,7 +40,6 @@
 #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8191
 
 /* RGB Matrix */
-#define RGBLED_NUM 28
 #define RGB_MATRIX_LED_COUNT 28
 #define NOP_FUDGE 0.4
 
diff --git a/keyboards/xelus/valor/rev2/info.json b/keyboards/xelus/valor/rev2/info.json
index d3f134fdf88f..cdb3bb994766 100644
--- a/keyboards/xelus/valor/rev2/info.json
+++ b/keyboards/xelus/valor/rev2/info.json
@@ -13,7 +13,7 @@
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B2", "B1", "B0", "A7", "A6", "A5", "A4", "A13", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
@@ -22,11 +22,90 @@
     "diode_direction": "COL2ROW",
     "processor": "STM32L422",
     "bootloader": "stm32-dfu",
-    "community_layouts": ["alice_split_bs"],
+    "community_layouts": ["alice", "alice_split_bs"],
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_alice_split_bs"
     },
     "layouts": {
+        "LAYOUT_alice": {
+            "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": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"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": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"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": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
         "LAYOUT_alice_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/xelus/valor/rev2/matrix_diagram.md b/keyboards/xelus/valor/rev2/matrix_diagram.md
new file mode 100644
index 000000000000..b8a071af530b
--- /dev/null
+++ b/keyboards/xelus/valor/rev2/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Xelus Valor Rev. 2
+
+```
+                                                                       ┌───────┐
+                                                          2u Backspace │0E     │
+                                                                       └───────┘
+  ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+  │00 │  │01 │02 │03 │04 │05 │06 │07 │         │08 │09 │0A │0B │0C │0D │0E │2E │
+ ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
+ │10 │  │11   │12 │13 │14 │15 │16 │          │17 │18 │19 │1A │1B │1C │1D │1E    │
+┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤          └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐
+│20 │  │21    │22 │23 │24 │25 │26 │           │27 │28 │29 │2A │2B │2C │2D        │
+└───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐
+      │31      │32 │33 │34 │35 │36 │        │37 │38 │39 │3A │3B │3C │3D       │3E │
+      ├─────┬──┴──┬┴───┴┬──┴───┴──┬┴──┐     ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘
+      │41   │     │43   │45       │46 │     │48        │4A   │             │4D   │
+      └─────┘     └─────┴─────────┴───┘     └──────────┴─────┘             └─────┘
+                                                                     ┌────────────┐
+                                                        2.75u RShift │3D          │
+                                                                     └────────────┘
+```
diff --git a/keyboards/xelus/valor_frl_tkl/rev1/rules.mk b/keyboards/xelus/valor_frl_tkl/rev1/rules.mk
index 35173d663a95..efbd7d0e9b5c 100644
--- a/keyboards/xelus/valor_frl_tkl/rev1/rules.mk
+++ b/keyboards/xelus/valor_frl_tkl/rev1/rules.mk
@@ -13,5 +13,3 @@ AUDIO_ENABLE = no           # Audio output
 
 EEPROM_DRIVER = i2c
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk b/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk
index 4ecf72dea775..8ee0c3e8fe85 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk
+++ b/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk
@@ -11,7 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk b/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk
index 4ecf72dea775..8ee0c3e8fe85 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk
+++ b/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk
@@ -11,7 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
 KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/xelus/xs108/rules.mk b/keyboards/xelus/xs108/rules.mk
index a204d485fa67..5ed7b869aee7 100644
--- a/keyboards/xelus/xs108/rules.mk
+++ b/keyboards/xelus/xs108/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 EEPROM_DRIVER = i2c
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/xelus/xs60/hotswap/config.h b/keyboards/xelus/xs60/hotswap/config.h
index 242560c06784..d1138c735de9 100644
--- a/keyboards/xelus/xs60/hotswap/config.h
+++ b/keyboards/xelus/xs60/hotswap/config.h
@@ -38,7 +38,6 @@
 #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8191
 
 // RGBLIGHT
-#define RGBLED_NUM 8            // actually only has 1
 #define RGBLIGHT_LAYERS
 #define WS2812_EXTERNAL_PULLUP
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/xelus/xs60/hotswap/info.json b/keyboards/xelus/xs60/hotswap/info.json
index 4d6888f70764..81cf86498b20 100644
--- a/keyboards/xelus/xs60/hotswap/info.json
+++ b/keyboards/xelus/xs60/hotswap/info.json
@@ -8,6 +8,9 @@
         "pid": "0x5861",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 8
+    },
     "ws2812": {
         "pin": "A10"
     },
diff --git a/keyboards/xelus/xs60/soldered/config.h b/keyboards/xelus/xs60/soldered/config.h
index cbbdc49b1220..4b7be4d44148 100644
--- a/keyboards/xelus/xs60/soldered/config.h
+++ b/keyboards/xelus/xs60/soldered/config.h
@@ -37,7 +37,6 @@
 // More EEPROM for layers
 
 // RGBLIGHT
-#define RGBLED_NUM 8            // actually only has 1
 #define RGBLIGHT_LAYERS
 #define WS2812_EXTERNAL_PULLUP
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/xelus/xs60/soldered/info.json b/keyboards/xelus/xs60/soldered/info.json
index 6e540617c24d..20de0ef8377f 100644
--- a/keyboards/xelus/xs60/soldered/info.json
+++ b/keyboards/xelus/xs60/soldered/info.json
@@ -8,6 +8,9 @@
         "pid": "0x5860",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 8
+    },
     "ws2812": {
         "pin": "A10"
     },
diff --git a/keyboards/xiudi/xd002/config.h b/keyboards/xiudi/xd002/config.h
index d442ee57623d..0d0cd3712a76 100644
--- a/keyboards/xiudi/xd002/config.h
+++ b/keyboards/xiudi/xd002/config.h
@@ -15,8 +15,6 @@
  */
 #pragma once
 
-#define RGBLED_NUM 2
-
 // Save as much space as we can...
 #define LAYER_STATE_8BIT
 #define NO_ACTION_LAYER
diff --git a/keyboards/xiudi/xd002/info.json b/keyboards/xiudi/xd002/info.json
index cce509be7986..1e0b22f96b1d 100644
--- a/keyboards/xiudi/xd002/info.json
+++ b/keyboards/xiudi/xd002/info.json
@@ -8,6 +8,9 @@
     "pid": "0x0202",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "led_count": 2
+  },
   "ws2812": {
     "pin": "B2"
   },
diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/info.json
index 597c5dc818f4..531283c78a9d 100644
--- a/keyboards/xiudi/xd004/info.json
+++ b/keyboards/xiudi/xd004/info.json
@@ -11,6 +11,14 @@
         "pin": "D5",
         "levels": 6
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 2,
+        "animations": {
+            "rainbow_swirl": true,
+            "static_gradient": true
+        }
+    },
     "ws2812": {
         "pin": "C6"
     },
diff --git a/keyboards/xiudi/xd004/v1/config.h b/keyboards/xiudi/xd004/v1/config.h
deleted file mode 100644
index 823ba8635881..000000000000
--- a/keyboards/xiudi/xd004/v1/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2019 Sidney Bovet <sidney.bovet@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: the following configuration uses 98% of the flash memory, be
-careful if you enable anything else. Also have a look at rules.mk
-where some things are disabled to save space as well.
-*/
-
-#pragma once
-
-/* RGB Underglow
-This will not be used, as RGBLIGHT_ENABLE is set to 'no' in rules.mk
-We do not have enough space in the flash for this at the moment, maybe
-further optimizations can be done on that side.
-*/
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLED_NUM 2
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-/* disable action features */
-// #define NO_ACTION_ONESHOT // 462 bytes <- this needs to be un-commented out if Link Time Optimization is disabled, otherwise file is too large
-// The two below are implicit since we use LTO_ENABLE (in rules.mk)
diff --git a/keyboards/xiudi/xd60/rev2/config.h b/keyboards/xiudi/xd60/rev2/config.h
index 21efad0d8109..4e5969481849 100644
--- a/keyboards/xiudi/xd60/rev2/config.h
+++ b/keyboards/xiudi/xd60/rev2/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB Underglow
- */
-#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 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
 /* 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/xiudi/xd60/rev2/info.json b/keyboards/xiudi/xd60/rev2/info.json
index c45ef7af6437..2f994ac2e45e 100644
--- a/keyboards/xiudi/xd60/rev2/info.json
+++ b/keyboards/xiudi/xd60/rev2/info.json
@@ -9,10 +9,27 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "F5",
         "levels": 6,
         "on_state": 0
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 6,
+        "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": "F6"
     },
diff --git a/keyboards/xiudi/xd60/rev3/config.h b/keyboards/xiudi/xd60/rev3/config.h
index f8845d411fac..61a74eb88a99 100644
--- a/keyboards/xiudi/xd60/rev3/config.h
+++ b/keyboards/xiudi/xd60/rev3/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB Underglow
- */
-#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 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
 /* 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/xiudi/xd60/rev3/info.json b/keyboards/xiudi/xd60/rev3/info.json
index 68c97c0a9e80..89a0983bf4fe 100644
--- a/keyboards/xiudi/xd60/rev3/info.json
+++ b/keyboards/xiudi/xd60/rev3/info.json
@@ -9,10 +9,27 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "F5",
         "levels": 6,
         "on_state": 0
     },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 12,
+        "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": "F6"
     },
diff --git a/keyboards/xiudi/xd68/config.h b/keyboards/xiudi/xd68/config.h
index e62b98a12d1d..139fb913228a 100644
--- a/keyboards/xiudi/xd68/config.h
+++ b/keyboards/xiudi/xd68/config.h
@@ -37,19 +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
-
-// ws2812 options
-#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)
diff --git a/keyboards/xiudi/xd68/info.json b/keyboards/xiudi/xd68/info.json
index 0522a66e5728..d55a8535c6f0 100644
--- a/keyboards/xiudi/xd68/info.json
+++ b/keyboards/xiudi/xd68/info.json
@@ -14,11 +14,30 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "F5",
         "levels": 6,
         "breathing": true,
         "on_state": 0
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 25,
+        "brightness_steps": 12,
+        "led_count": 12,
+        "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": "F6"
     },
diff --git a/keyboards/xiudi/xd75/config.h b/keyboards/xiudi/xd75/config.h
index 8acfb92cf5bb..9bbab0cdf0b1 100644
--- a/keyboards/xiudi/xd75/config.h
+++ b/keyboards/xiudi/xd75/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 6
-#    define RGBLIGHT_HUE_STEP 12
-#    define RGBLIGHT_SAT_STEP 25
-#    define RGBLIGHT_VAL_STEP 12
-//#    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
-
 /* 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/xiudi/xd75/info.json b/keyboards/xiudi/xd75/info.json
index bc2e724214dc..58af00e97245 100644
--- a/keyboards/xiudi/xd75/info.json
+++ b/keyboards/xiudi/xd75/info.json
@@ -18,6 +18,24 @@
         "levels": 6,
         "on_state": 0
     },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 25,
+        "brightness_steps": 12,
+        "led_count": 6,
+        "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": "F6"
     },
diff --git a/keyboards/xiudi/xd75/keymaps/billypython/keymap.c b/keyboards/xiudi/xd75/keymaps/billypython/keymap.c
index 30b9f79606c2..d8301194f8c3 100644
--- a/keyboards/xiudi/xd75/keymaps/billypython/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/billypython/keymap.c
@@ -41,7 +41,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   case NUMPAD:
     if (record->event.pressed) {
       layer_invert(L_NUMPAD);
-      bool num_lock = host_keyboard_leds() & 1<<USB_LED_NUM_LOCK;
+      bool num_lock = host_keyboard_led_state().num_lock;
       if (num_lock != (bool)IS_LAYER_ON(L_NUMPAD)) {
         tap_code(KC_NUM_LOCK); // Toggle Num Lock to match layer state.
       }
diff --git a/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c b/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c
index 1c5aa90627dc..1f3897f484e8 100644
--- a/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/boy_314/keymap.c
@@ -126,16 +126,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 void matrix_init_user(void) {
-  if (!(host_keyboard_leds() & (1<<USB_LED_NUM_LOCK))) {
+  if (!host_keyboard_led_state().num_lock) {
     register_code(KC_NUM_LOCK);
     unregister_code(KC_NUM_LOCK);
   }
 }
 
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_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/bramver/keymap.c b/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
index f44adaf76862..960ef3ff1c78 100644
--- a/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/bramver/keymap.c
@@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_EMOJIFY] = LAYOUT_ortho_5x15(
     TO(0)   , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , QK_BOOT,
     _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______,
-    _______ , X(CELE) , X(PRAY) , X(NAIL) , X(OK)   , X(THNK) , _______ , _______ , _______ , X(UNAM) , X(HEYE) , X(COOL) , X(EYES) , X(SMIR) , _______,
+    _______ , UM(CELE), UM(PRAY), UM(NAIL), UM(OK)  , UM(THNK), _______ , _______ , _______ , UM(UNAM), UM(HEYE), UM(COOL), UM(EYES), UM(SMIR), _______,
     _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______,
     _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______
   )
diff --git a/keyboards/xiudi/xd75/keymaps/bramver/readme.md b/keyboards/xiudi/xd75/keymaps/bramver/readme.md
index a8ef38703bf9..cd1a78936e3e 100644
--- a/keyboards/xiudi/xd75/keymaps/bramver/readme.md
+++ b/keyboards/xiudi/xd75/keymaps/bramver/readme.md
@@ -37,7 +37,7 @@ _RAISE
 _EMOJIFY
   | TO(0)   | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | RESET   |
   | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ | _______ |
-  | _______ | X(CELE) | X(PRAY) | X(NAIL) | X(OK)   | X(THNK) | _______ | _______ | _______ | X(UNAM) | X(HEYE) | X(COOL) | X(EYES) | X(SMIR) | _______ |
+  | _______ | 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/bulbizarre/keymap.c b/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c
index 64add732ad2c..02dbe01f1715 100644
--- a/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/bulbizarre/keymap.c
@@ -130,16 +130,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         capslock_led_on();
     } else {
         capslock_led_off();
@@ -149,4 +141,5 @@ void led_set_user(uint8_t usb_led) {
     } else {
         gp100_led_off();
     }
+    return false;
 }
diff --git a/keyboards/xiudi/xd75/keymaps/minna/keymap.c b/keyboards/xiudi/xd75/keymaps/minna/keymap.c
index d3ff7557be1e..535c870ff7b0 100644
--- a/keyboards/xiudi/xd75/keymaps/minna/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/minna/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    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, XP(BEER, BEERS), KC_SPC, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+   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),
 
 /*
  * ┌────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
diff --git a/keyboards/xiudi/xd75/keymaps/odyssey/keymap.c b/keyboards/xiudi/xd75/keymaps/odyssey/keymap.c
index ae27ba029299..4fe70b9cca86 100644
--- a/keyboards/xiudi/xd75/keymaps/odyssey/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/odyssey/keymap.c
@@ -201,8 +201,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 
-void matrix_init_user(void) { }
-
 // Rainbow globals
 int t = 0;
 int rc = 0;
@@ -237,5 +235,3 @@ void matrix_scan_user(void) {
   }
   rc--;
 }
-
-void led_set_user(uint8_t usb_led) { }
diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h
index 42cce6f1c07a..0ad3910060c8 100644
--- a/keyboards/xiudi/xd84/config.h
+++ b/keyboards/xiudi/xd84/config.h
@@ -21,18 +21,6 @@
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15
 
-#define RGBLED_NUM 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
-
 /* 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/xiudi/xd84/info.json b/keyboards/xiudi/xd84/info.json
index f7bfaeaebd0c..b97efe9cf85e 100644
--- a/keyboards/xiudi/xd84/info.json
+++ b/keyboards/xiudi/xd84/info.json
@@ -17,6 +17,21 @@
         "caps_lock": "B6",
         "on_state": 0
     },
+    "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": "C7"
     },
diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h
index ed84a2ad6f0f..1e378e8f4723 100644
--- a/keyboards/xiudi/xd84pro/config.h
+++ b/keyboards/xiudi/xd84pro/config.h
@@ -16,22 +16,6 @@
 
 #pragma once
 
-    #define RGBLED_NUM 12
-//   #define RGBLIGHT_HUE_STEP 8
-//   #define RGBLIGHT_SAT_STEP 8
-//   #define RGBLIGHT_VAL_STEP 8
-    #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
-
 /* 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/xiudi/xd84pro/info.json b/keyboards/xiudi/xd84pro/info.json
index e905ff3e7e2e..bcdc0d2cf105 100644
--- a/keyboards/xiudi/xd84pro/info.json
+++ b/keyboards/xiudi/xd84pro/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "backlight": {
+        "driver": "timer",
         "pin": "F5",
         "levels": 10,
         "on_state": 0
@@ -22,6 +23,22 @@
         "caps_lock": "B2",
         "on_state": 0
     },
+    "rgblight": {
+        "led_count": 12,
+        "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": "F6"
     },
diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h
index d89929e9c820..95110fa59001 100644
--- a/keyboards/xiudi/xd87/config.h
+++ b/keyboards/xiudi/xd87/config.h
@@ -17,21 +17,6 @@ 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 RGBLED_NUM 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* 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/xiudi/xd87/info.json b/keyboards/xiudi/xd87/info.json
index 5aa56a60e9d0..3c30f69ba9a4 100644
--- a/keyboards/xiudi/xd87/info.json
+++ b/keyboards/xiudi/xd87/info.json
@@ -14,6 +14,7 @@
   },
   "diode_direction": "COL2ROW",
   "backlight": {
+    "driver": "timer",
     "pin": "D0",
     "on_state": 0
   },
@@ -21,6 +22,23 @@
     "caps_lock": "E2",
     "on_state": 0
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 14,
+    "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"
   },
diff --git a/keyboards/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h
index 5329d5148323..059b57a0c6f6 100644
--- a/keyboards/xiudi/xd96/config.h
+++ b/keyboards/xiudi/xd96/config.h
@@ -21,18 +21,6 @@
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 18
 
-#define RGBLED_NUM 16
-#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
-
 /* 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/xiudi/xd96/info.json b/keyboards/xiudi/xd96/info.json
index 5a0431013018..98ebfcb48318 100644
--- a/keyboards/xiudi/xd96/info.json
+++ b/keyboards/xiudi/xd96/info.json
@@ -13,7 +13,20 @@
     "levels": 10
   },
   "rgblight": {
-    "max_brightness": 50
+    "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",
diff --git a/keyboards/xw60/rules.mk b/keyboards/xw60/rules.mk
index 460d3ced43e4..710fb4ca887b 100644
--- a/keyboards/xw60/rules.mk
+++ b/keyboards/xw60/rules.mk
@@ -11,4 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = SOLENOID
+HAPTIC_DRIVER = solenoid
diff --git a/keyboards/yampad/config.h b/keyboards/yampad/config.h
deleted file mode 100644
index 6327578ebfee..000000000000
--- a/keyboards/yampad/config.h
+++ /dev/null
@@ -1,47 +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
-
-/* Underlight configuration */
-#define RGBLED_NUM 9
-#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
-
-/*
- * 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/yampad/info.json b/keyboards/yampad/info.json
index 54c363b28bbe..bf9841492d9a 100644
--- a/keyboards/yampad/info.json
+++ b/keyboards/yampad/info.json
@@ -8,9 +8,27 @@
         "pid": "0x8369",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_count": 9,
+        "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": "F4"
     },
+    "build": {
+        "debounce_type": "sym_eager_pk"
+    },
     "matrix_pins": {
         "cols": ["B1", "B3", "B2", "B6"],
         "rows": ["C6", "D7", "E6", "B4", "B5"]
diff --git a/keyboards/yampad/keymaps/default/keymap.c b/keyboards/yampad/keymaps/default/keymap.c
index f54d4f33b07a..61e6d8ff7467 100644
--- a/keyboards/yampad/keymaps/default/keymap.c
+++ b/keyboards/yampad/keymaps/default/keymap.c
@@ -22,6 +22,7 @@ SOFTWARE.
 */
 
 #include QMK_KEYBOARD_H
+#include <stdio.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.
diff --git a/keyboards/yampad/keymaps/via/keymap.c b/keyboards/yampad/keymaps/via/keymap.c
index f54d4f33b07a..61e6d8ff7467 100644
--- a/keyboards/yampad/keymaps/via/keymap.c
+++ b/keyboards/yampad/keymaps/via/keymap.c
@@ -22,6 +22,7 @@ SOFTWARE.
 */
 
 #include QMK_KEYBOARD_H
+#include <stdio.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.
diff --git a/keyboards/yampad/rules.mk b/keyboards/yampad/rules.mk
index 9f1bf1986397..498bf77b9779 100644
--- a/keyboards/yampad/rules.mk
+++ b/keyboards/yampad/rules.mk
@@ -6,11 +6,9 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 COMMAND_ENABLE = no         # Commands for debug and configuration
 CONSOLE_ENABLE = no         # Console for debug
-DEBOUNCE_TYPE = sym_eager_pk
 EXTRAKEY_ENABLE = no        # Audio control and System control
 LTO_ENABLE = yes            # Link time optimise, reduce firmware size
 MOUSEKEY_ENABLE = no        # Mouse keys
 NKRO_ENABLE = yes           # Enable N-Key Rollover
-OLED_DRIVER = SSD1306
 OLED_ENABLE = yes
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
diff --git a/keyboards/yampad/yampad.c b/keyboards/yampad/yampad.c
index 45b0c42484c3..94eac85089ea 100644
--- a/keyboards/yampad/yampad.c
+++ b/keyboards/yampad/yampad.c
@@ -15,6 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "quantum.h"
+#include <stdio.h>
 
 #if defined(OLED_ENABLE)
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h
index 677e41a00d6a..9d3f3e44c064 100644
--- a/keyboards/yandrstudio/buff67v3/config.h
+++ b/keyboards/yandrstudio/buff67v3/config.h
@@ -17,17 +17,6 @@
 
 #ifdef RGBLIGHT_ENABLE
 
-#    define RGBLED_NUM 1
-#    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
 #    define RGBLIGHT_LAYERS_RETAIN_VAL
 #    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/yandrstudio/buff67v3/info.json b/keyboards/yandrstudio/buff67v3/info.json
index 69d4903bd635..9fe09cd95b90 100644
--- a/keyboards/yandrstudio/buff67v3/info.json
+++ b/keyboards/yandrstudio/buff67v3/info.json
@@ -6,6 +6,21 @@
         "pid": "0xAA88",
         "device_version": "1.0.0"
     },
+    "rgblight": {
+        "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
+        }
+    },
     "ws2812": {
         "pin": "B4",
         "driver": "pwm"
diff --git a/keyboards/yandrstudio/buff67v3/rules.mk b/keyboards/yandrstudio/buff67v3/rules.mk
index 663aac242032..421ae9fce118 100644
--- a/keyboards/yandrstudio/buff67v3/rules.mk
+++ b/keyboards/yandrstudio/buff67v3/rules.mk
@@ -12,5 +12,4 @@ 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
-RGBLIGHT_DRIVER = WS2812    # RGB driver support
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h
index dcf74a160b24..6985b4b8bb26 100644
--- a/keyboards/yandrstudio/eau_r2/config.h
+++ b/keyboards/yandrstudio/eau_r2/config.h
@@ -17,20 +17,6 @@
 
 #ifdef RGBLIGHT_ENABLE
 
-#    define RGBLED_NUM 12
-#    define RGBLIGHT_SLEEP
-#    define RGBLIGHT_VAL_STEP 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_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_MOOD
 
 #    define WS2812_PWM_DRIVER PWMD1
diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json
index e2700ea0cbe1..a1b5a0e9cfa3 100644
--- a/keyboards/yandrstudio/eau_r2/info.json
+++ b/keyboards/yandrstudio/eau_r2/info.json
@@ -15,7 +15,22 @@
         "pin": "A8"
     },
     "rgblight": {
-        "max_brightness": 200
+        "brightness_steps": 5,
+        "led_count": 12,
+        "max_brightness": 200,
+        "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
+        }
     },
     "debounce": 8,
     "layouts": {
diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h
index c6760befde45..98480b2687e2 100644
--- a/keyboards/yandrstudio/nightstar75/config.h
+++ b/keyboards/yandrstudio/nightstar75/config.h
@@ -15,20 +15,6 @@
  */
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-
-#    define RGBLED_NUM 4
-
-#    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_MOOD
 
 #    define RGBLIGHT_LAYERS
@@ -40,5 +26,3 @@
 #   define WS2812_PWM_PAL_MODE 2
 #   define WS2812_DMA_STREAM STM32_DMA1_STREAM3
 #   define WS2812_DMA_CHANNEL 3
-
-#endif
diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/info.json
index 32d0e292639a..2bf8cd36b3d4 100644
--- a/keyboards/yandrstudio/nightstar75/info.json
+++ b/keyboards/yandrstudio/nightstar75/info.json
@@ -11,7 +11,20 @@
         "driver": "pwm"
     },
     "rgblight": {
-        "max_brightness": 180
+        "led_count": 4,
+        "max_brightness": 180,
+        "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": ["C13", "C14", "C15", "A3", "A4", "A5", "A6", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "B8"],
diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h
index 5e4cdaaea0c3..4aa37c5f20b1 100644
--- a/keyboards/yandrstudio/nz64/config.h
+++ b/keyboards/yandrstudio/nz64/config.h
@@ -15,13 +15,9 @@
  */
 #pragma once
 
-/* Fix VIA RGB_light */
-#define VIA_HAS_BROKEN_KEYCODES
-
 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE
-#   define RGBLED_NUM 82
-#   define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#   define RGB_MATRIX_LED_COUNT 82
 
 #   define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
 #   define WS2812_PWM_CHANNEL 2  // default: 2
@@ -31,7 +27,6 @@
 
 
 #   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
-#   define RGBLIGHT_VAL_STEP 18
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED true
 #   define RGB_MATRIX_CENTER { 96, 32 }
 #   define RGB_MATRIX_KEYPRESSES
@@ -87,9 +82,6 @@
 
 
 #ifdef RGBLIGHT_ENABLE
-#   define RGBLED_NUM 82
-#   define RGB_MATRIX_LED_COUNT RGBLED_NUM
-
 #   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
diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json
index 6c054018d181..1ac32fe9a49c 100644
--- a/keyboards/yandrstudio/nz64/info.json
+++ b/keyboards/yandrstudio/nz64/info.json
@@ -4,12 +4,15 @@
         "pid": "0xAAAF",
         "device_version": "1.0.0"
     },
+    "rgblight": {
+        "led_count": 82
+    },
     "ws2812": {
         "pin": "A7",
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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 860ee45381b9..dba2f773950a 100644
--- a/keyboards/yandrstudio/nz67v2/config.h
+++ b/keyboards/yandrstudio/nz67v2/config.h
@@ -16,16 +16,12 @@
 
 #pragma once
 
-#define TAP_CODE_DELAY 15
-
 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE
 
-#    define RGBLED_NUM 86
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT 86
 
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
-#    define RGBLIGHT_VAL_STEP 5
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/yandrstudio/nz67v2/info.json b/keyboards/yandrstudio/nz67v2/info.json
index 6149c998f784..3cd784934ab0 100644
--- a/keyboards/yandrstudio/nz67v2/info.json
+++ b/keyboards/yandrstudio/nz67v2/info.json
@@ -11,7 +11,7 @@
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["B9", "A3", "A4", "A5", "A6", "A7", "B0", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
@@ -23,84 +23,85 @@
             {"pin_a": "A9", "pin_b": "A10"}
         ]
     },
+    "qmk": {
+        "tap_keycode_delay": 15
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.5},
-                {"matrix": [0, 1], "x": 1, "y": 0.5},
-                {"matrix": [0, 2], "x": 2, "y": 0.5},
-                {"matrix": [0, 3], "x": 3, "y": 0.5},
-                {"matrix": [0, 4], "x": 4, "y": 0.5},
-                {"matrix": [0, 5], "x": 5, "y": 0.5},
-                {"matrix": [0, 6], "x": 6, "y": 0.5},
-                {"matrix": [0, 7], "x": 7, "y": 0.5},
-                {"matrix": [0, 8], "x": 8, "y": 0.5},
-                {"matrix": [0, 9], "x": 9, "y": 0.5},
-                {"matrix": [0, 10], "x": 10, "y": 0.5},
-                {"matrix": [0, 11], "x": 11, "y": 0.5},
-                {"matrix": [0, 12], "x": 12, "y": 0.5},
-                {"matrix": [0, 13], "x": 13, "y": 0.5, "w": 2},
-                {"matrix": [4, 4], "x": 16, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0.5},
+                {"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": [4, 6], "x": 16, "y": 1},
-                {"matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "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, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1.5},
+                {"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.5, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.75, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.75, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.75, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.75, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.75, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.75, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.75, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.75, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.75, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.75, "y": 2.5},
-                {"matrix": [2, 13], "x": 12.75, "y": 2.5, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2.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": [2, 14], "x": 15, "y": 2},
 
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3.5},
-                {"matrix": [3, 2], "x": 3.25, "y": 3.5},
-                {"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, 12], "x": 12.25, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3.5},
-                {"matrix": [3, 14], "x": 15, "y": 3.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": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 5], "x": 6, "y": 4.5, "w": 1.75},
-                {"matrix": [4, 7], "x": 7.75, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 9], "x": 10, "y": 4.5, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.5, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4.5},
-                {"matrix": [4, 13], "x": 14, "y": 4.5},
-                {"matrix": [4, 14], "x": 15, "y": 4.5}
+                {"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": 2.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.75},
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "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": {
diff --git a/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c b/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c
index 7ed06c9ec5b1..f1069c37db6f 100644
--- a/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c
+++ b/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c
@@ -18,16 +18,15 @@
 
 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_VOLD, KC_HOME, KC_VOLU,
+        KC_ESC,  KC_1,    KC_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_SPC,  KC_SPC,           KC_RALT, MO(1),            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_TRNS, KC_TRNS, KC_TRNS,
+        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, URGB_K,  RGB_HUI, RGB_HUD, RGB_SAI,  RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS,          RGB_TOG, RGB_MOD, RGB_RMOD, 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)
 };
-
diff --git a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
index 56a083d444af..52e0d15c8e50 100644
--- a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
+++ b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
@@ -18,59 +18,36 @@
 
 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_VOLD, KC_HOME, KC_VOLU,
+        KC_ESC,  KC_1,    KC_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_SPC,  KC_SPC,           KC_RALT, MO(1),            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_TRNS, KC_TRNS, KC_TRNS,
+        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, URGB_K,  RGB_HUI, RGB_HUD, RGB_SAI,  RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS,          RGB_TOG, RGB_MOD, RGB_RMOD, 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),
     [2] = LAYOUT_all(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
     [3] = LAYOUT_all(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
 };
-#ifdef ENCODER_ENABLE
-keyevent_t encoder1_ccw = {.key = (keypos_t){.row = 4, .col = 4}, .pressed = false, .type = KEY_EVENT};
-
-keyevent_t encoder1_cw = {.key = (keypos_t){.row = 4, .col = 6}, .pressed = false, .type = KEY_EVENT};
 
-void matrix_scan_user(void) {
-    if (encoder1_ccw.pressed) {
-        encoder1_ccw.pressed = false;
-        encoder1_ccw.time    = timer_read();
-        action_exec(encoder1_ccw);
-    }
-
-    if (encoder1_cw.pressed) {
-        encoder1_cw.pressed = false;
-        encoder1_cw.time    = timer_read();
-        action_exec(encoder1_cw);
-    }
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-        encoder1_cw.pressed = true;
-        encoder1_cw.time    = timer_read();
-        action_exec(encoder1_cw);
-    } else {
-        encoder1_ccw.pressed = true;
-        encoder1_ccw.time    = timer_read();
-        action_exec(encoder1_ccw);
-    }
-    return true;
-}
+#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(_______, _______) },
+    [2] = { ENCODER_CCW_CW(_______, _______) },
+    [3] = { ENCODER_CCW_CW(_______, _______) },
+};
 #endif
diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h
index 373b5bcbf93b..3386838c7494 100644
--- a/keyboards/yandrstudio/tg67/config.h
+++ b/keyboards/yandrstudio/tg67/config.h
@@ -18,11 +18,9 @@
 /* RGB Matrix */
 #ifdef RGB_MATRIX_ENABLE
 
-#    define RGBLED_NUM 69
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT 69
 
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 250
-#    define RGBLIGHT_VAL_STEP 5
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/yandrstudio/tg67/info.json b/keyboards/yandrstudio/tg67/info.json
index 925d6c1d9493..a82f58300b1d 100644
--- a/keyboards/yandrstudio/tg67/info.json
+++ b/keyboards/yandrstudio/tg67/info.json
@@ -11,7 +11,7 @@
         "driver": "pwm"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "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 74c8f4adce7e..592953720f1e 100644
--- a/keyboards/yandrstudio/yr6095/config.h
+++ b/keyboards/yandrstudio/yr6095/config.h
@@ -15,29 +15,13 @@
  */
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-
-#    define RGBLED_NUM 1
-
 #    define RGBLIGHT_LAYERS
 #    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 #    define RGBLIGHT_LAYERS_RETAIN_VAL
 
-#    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_MOOD
 
 #    define WS2812_PWM_DRIVER PWMD3
 #    define WS2812_PWM_CHANNEL 2
 #    define WS2812_DMA_STREAM STM32_DMA1_STREAM3
 #    define WS2812_DMA_CHANNEL 3
-
-#endif
diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/info.json
index 3ec826052cf7..0ea82bd3adf1 100644
--- a/keyboards/yandrstudio/yr6095/info.json
+++ b/keyboards/yandrstudio/yr6095/info.json
@@ -6,6 +6,21 @@
         "pid": "0xAA0C",
         "device_version": "1.0.0"
     },
+    "rgblight": {
+        "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
+        }
+    },
     "ws2812": {
         "pin": "B5",
         "driver": "pwm"
diff --git a/keyboards/yandrstudio/yr80/config.h b/keyboards/yandrstudio/yr80/config.h
index 0e8602dee9f2..a0841c469ce6 100644
--- a/keyboards/yandrstudio/yr80/config.h
+++ b/keyboards/yandrstudio/yr80/config.h
@@ -16,25 +16,10 @@
 
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-
-#    define RGBLED_NUM 1
-#    define DRIVER_LED_TOTAL RGBLED_NUM
-
 #    define RGBLIGHT_LAYERS
 #    define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 #    define RGBLIGHT_LAYERS_RETAIN_VAL
 
-#    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_MOOD
 
 #   define WS2812_PWM_DRIVER PWMD3
@@ -42,5 +27,3 @@
 #   define WS2812_PWM_PAL_MODE 2
 #   define WS2812_DMA_STREAM STM32_DMA1_STREAM3
 #   define WS2812_DMA_CHANNEL 3
-
-#endif
diff --git a/keyboards/yandrstudio/yr80/info.json b/keyboards/yandrstudio/yr80/info.json
index 7faaa482eff1..ce9f4bc37904 100644
--- a/keyboards/yandrstudio/yr80/info.json
+++ b/keyboards/yandrstudio/yr80/info.json
@@ -6,6 +6,21 @@
         "pid": "0xAA0D",
         "device_version": "1.0.0"
     },
+    "rgblight": {
+        "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
+        }
+    },
     "ws2812": {
         "pin": "A7",
         "driver": "pwm"
diff --git a/keyboards/yanghu/unicorne/config.h b/keyboards/yanghu/unicorne/config.h
index 8a4ce9ec490c..99d38fe44ab6 100644
--- a/keyboards/yanghu/unicorne/config.h
+++ b/keyboards/yanghu/unicorne/config.h
@@ -28,20 +28,6 @@
 #define AUDIO_PWM_DRIVER PWMD1
 #define AUDIO_PWM_CHANNEL 1
 
-/* RGB LED */
-#define RGBLED_NUM 8
-#define RGB_MATRIX_LED_COUNT 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 WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 2
diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json
index 52a703d21917..26d54c2c8276 100644
--- a/keyboards/yanghu/unicorne/info.json
+++ b/keyboards/yanghu/unicorne/info.json
@@ -8,12 +8,27 @@
     "pid": "0x0204",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "led_count": 8,
+    "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": "B1",
     "driver": "pwm"
   },
   "rgb_matrix": {
-    "driver": "WS2812"
+    "driver": "ws2812"
   },
   "matrix_pins": {
     "cols": ["A14", "A15", "B13", "B14", "B15", "A13", "A0", "A1", "A2", "A3", "A6", "A7"],
diff --git a/keyboards/yanghu/unicorne/rules.mk b/keyboards/yanghu/unicorne/rules.mk
index 651d6bedf382..014f5d4d4225 100644
--- a/keyboards/yanghu/unicorne/rules.mk
+++ b/keyboards/yanghu/unicorne/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 
 AUDIO_DRIVER = pwm_hardware
 
diff --git a/keyboards/ydkb/chili/config.h b/keyboards/ydkb/chili/config.h
index dd6631f5456a..b9449c4714bf 100644
--- a/keyboards/ydkb/chili/config.h
+++ b/keyboards/ydkb/chili/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Underlight configuration
- */
-#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 5
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
-
 /* 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/ydkb/chili/info.json b/keyboards/ydkb/chili/info.json
index 998f3073e1fd..0b6b8cfebc5b 100644
--- a/keyboards/ydkb/chili/info.json
+++ b/keyboards/ydkb/chili/info.json
@@ -17,6 +17,24 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "hue_steps": 5,
+        "saturation_steps": 10,
+        "brightness_steps": 10,
+        "led_count": 30,
+        "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": "B3"
     },
diff --git a/keyboards/ydkb/grape/config.h b/keyboards/ydkb/grape/config.h
index 0d488de5d418..c0bea85abae6 100644
--- a/keyboards/ydkb/grape/config.h
+++ b/keyboards/ydkb/grape/config.h
@@ -24,10 +24,6 @@
 
 #define SN74X138_ADDRESS_PINS { D2, D1, D0 }
 
-#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 4
-#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/ydkb/grape/info.json b/keyboards/ydkb/grape/info.json
index 17d2f88773d3..32c9914bdbc1 100644
--- a/keyboards/ydkb/grape/info.json
+++ b/keyboards/ydkb/grape/info.json
@@ -12,6 +12,9 @@
         "pin": "B7",
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 4
+    },
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/ydkb/yd68/config.h b/keyboards/ydkb/yd68/config.h
deleted file mode 100644
index 991480385385..000000000000
--- a/keyboards/ydkb/yd68/config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Copyright 2018 Ryan "Izzy" Bales
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have 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 RGBLED_NUM 10
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-/*
- * 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/ydkb/yd68/info.json b/keyboards/ydkb/yd68/info.json
index b552f9e2cf72..f805369f8ddc 100644
--- a/keyboards/ydkb/yd68/info.json
+++ b/keyboards/ydkb/yd68/info.json
@@ -17,6 +17,23 @@
     "caps_lock": "D4",
     "on_state": 0
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 10,
+    "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": "B3"
   },
diff --git a/keyboards/yeehaw/config.h b/keyboards/yeehaw/config.h
deleted file mode 100644
index 273fd9fca80c..000000000000
--- a/keyboards/yeehaw/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Caleb Lightfoot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-  #define RGBLED_NUM 7
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
diff --git a/keyboards/yeehaw/info.json b/keyboards/yeehaw/info.json
index 1bcda0bcda97..fce210458222 100644
--- a/keyboards/yeehaw/info.json
+++ b/keyboards/yeehaw/info.json
@@ -13,6 +13,24 @@
       {"pin_a": "D1", "pin_b": "D0"}
     ]
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 7,
+    "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": "B2"
   },
diff --git a/keyboards/yiancardesigns/seigaiha/info.json b/keyboards/yiancardesigns/seigaiha/info.json
index 26ab6ab528aa..91a0529e88a9 100644
--- a/keyboards/yiancardesigns/seigaiha/info.json
+++ b/keyboards/yiancardesigns/seigaiha/info.json
@@ -14,8 +14,247 @@
     },
     "processor": "atmega328p",
     "bootloader": "usbasploader",
-    "community_layouts": ["alice_split_bs"],
+    "community_layouts": ["alice", "alice_split_bs"],
     "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [2, 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": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 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": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_rshift": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [2, 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": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 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": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_rshift_split_bs": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 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": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 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": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
         "LAYOUT_alice_split_bs": {
             "layout": [
                 {"matrix": [1, 0], "x": 0, "y": 0},
diff --git a/keyboards/yiancardesigns/seigaiha/matrix_diagram.md b/keyboards/yiancardesigns/seigaiha/matrix_diagram.md
new file mode 100644
index 000000000000..7ab40f87f004
--- /dev/null
+++ b/keyboards/yiancardesigns/seigaiha/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Yiancar-Designs Seigaiha
+
+```
+                                                                       ┌───────┐
+                                                          2u Backspace │0E     │
+                                                                       └───────┘
+  ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+  │10 │  │00 │01 │02 │03 │04 │05 │06 │         │07 │08 │09 │0A │0B │0C │0D │0E │
+ ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
+ │20 │  │11   │12 │13 │14 │15 │16 │          │17 │18 │19 │1A │1B │1C │1D │1E    │
+┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤          └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐
+│30 │  │21    │22 │23 │24 │25 │26 │           │27 │28 │29 │2A │2B │2C │2E        │
+└───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐
+      │31      │32 │33 │34 │35 │36 │        │37 │38 │39 │3A │3B │3C │3D       │3E │
+      ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴──┐     ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘
+      │41   │     │43   │45     │46   │     │48        │4A   │             │4E   │
+      └─────┘     └─────┴───────┴─────┘     └──────────┴─────┘             └─────┘
+                                                                     ┌────────────┐
+                                                        2.75u RShift │3D          │
+                                                                     └────────────┘
+```
diff --git a/keyboards/ymdk/bface/config.h b/keyboards/ymdk/bface/config.h
deleted file mode 100644
index 08303c4b13e5..000000000000
--- a/keyboards/ymdk/bface/config.h
+++ /dev/null
@@ -1,33 +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
-
-#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/ymdk/bface/info.json b/keyboards/ymdk/bface/info.json
index 09441c5dbdc2..f6646db9206a 100644
--- a/keyboards/ymdk/bface/info.json
+++ b/keyboards/ymdk/bface/info.json
@@ -17,6 +17,23 @@
     "pin": "D4",
     "levels": 6
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 12,
+    "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": {
     "driver": "i2c"
   },
diff --git a/keyboards/ymdk/id75/info.json b/keyboards/ymdk/id75/info.json
index 17b50e8e46d3..692ef7e8b754 100644
--- a/keyboards/ymdk/id75/info.json
+++ b/keyboards/ymdk/id75/info.json
@@ -67,7 +67,7 @@
             "solid_splash": true,
             "solid_multisplash": true
         },
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [4, 14], "x": 224, "y": 64},
             {"flags": 4, "matrix": [4, 13], "x": 208, "y": 64},
diff --git a/keyboards/ymdk/id75/rules.mk b/keyboards/ymdk/id75/rules.mk
index 47220e8853a9..edbd3dd71817 100644
--- a/keyboards/ymdk/id75/rules.mk
+++ b/keyboards/ymdk/id75/rules.mk
@@ -4,5 +4,3 @@ MCU_LDSCRIPT = STM32F103xB
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/ymdk/melody96/config.h b/keyboards/ymdk/melody96/config.h
index a62c64fb37bf..5f360813239b 100644
--- a/keyboards/ymdk/melody96/config.h
+++ b/keyboards/ymdk/melody96/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 18
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/ymdk/melody96/info.json b/keyboards/ymdk/melody96/info.json
index 83c45eaa6bee..f941c659702c 100644
--- a/keyboards/ymdk/melody96/info.json
+++ b/keyboards/ymdk/melody96/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "Melody96",
+    "keyboard_name": "Melody96 Soldered",
     "manufacturer": "YMDK",
     "url": "",
     "maintainer": "qmk",
@@ -17,6 +17,23 @@
         "pin": "B6",
         "levels": 5
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "E2"
     },
@@ -32,9 +49,9 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
-        "LAYOUT": "LAYOUT_all",
-        "LAYOUT_hotswap": "LAYOUT_96_ansi"
+        "LAYOUT": "LAYOUT_all"
     },
+    "community_layouts": ["96_ansi", "96_iso"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -91,7 +108,7 @@
                 {"matrix": [9, 7], "x": 10.5, "y": 2},
                 {"matrix": [9, 5], "x": 11.5, "y": 2},
                 {"matrix": [9, 4], "x": 12.5, "y": 2},
-                {"matrix": [9, 3], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
                 {"matrix": [9, 6], "x": 15, "y": 2},
                 {"matrix": [9, 2], "x": 16, "y": 2},
                 {"matrix": [9, 1], "x": 17, "y": 2},
@@ -109,7 +126,7 @@
                 {"matrix": [8, 8], "x": 9.75, "y": 3},
                 {"matrix": [8, 7], "x": 10.75, "y": 3},
                 {"matrix": [8, 5], "x": 11.75, "y": 3},
-                {"matrix": [8, 4], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
                 {"matrix": [8, 6], "x": 15, "y": 3},
                 {"matrix": [8, 2], "x": 16, "y": 3},
                 {"matrix": [8, 1], "x": 17, "y": 3},
@@ -203,7 +220,7 @@
                 {"matrix": [9, 7], "x": 10.5, "y": 2},
                 {"matrix": [9, 5], "x": 11.5, "y": 2},
                 {"matrix": [9, 4], "x": 12.5, "y": 2},
-                {"matrix": [9, 3], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
                 {"matrix": [9, 6], "x": 15, "y": 2},
                 {"matrix": [9, 2], "x": 16, "y": 2},
                 {"matrix": [9, 1], "x": 17, "y": 2},
@@ -221,7 +238,7 @@
                 {"matrix": [8, 8], "x": 9.75, "y": 3},
                 {"matrix": [8, 7], "x": 10.75, "y": 3},
                 {"matrix": [8, 5], "x": 11.75, "y": 3},
-                {"matrix": [8, 4], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
                 {"matrix": [8, 6], "x": 15, "y": 3},
                 {"matrix": [8, 2], "x": 16, "y": 3},
                 {"matrix": [8, 1], "x": 17, "y": 3},
@@ -313,7 +330,7 @@
                 {"matrix": [9, 7], "x": 10.5, "y": 2},
                 {"matrix": [9, 5], "x": 11.5, "y": 2},
                 {"matrix": [9, 4], "x": 12.5, "y": 2},
-                {"matrix": [9, 3], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
                 {"matrix": [9, 6], "x": 15, "y": 2},
                 {"matrix": [9, 2], "x": 16, "y": 2},
                 {"matrix": [9, 1], "x": 17, "y": 2},
@@ -331,7 +348,7 @@
                 {"matrix": [8, 8], "x": 9.75, "y": 3},
                 {"matrix": [8, 7], "x": 10.75, "y": 3},
                 {"matrix": [8, 5], "x": 11.75, "y": 3},
-                {"matrix": [8, 4], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
                 {"matrix": [8, 6], "x": 15, "y": 3},
                 {"matrix": [8, 2], "x": 16, "y": 3},
                 {"matrix": [8, 1], "x": 17, "y": 3},
@@ -908,6 +925,115 @@
                 {"matrix": [6, 2], "x": 16, "y": 5},
                 {"matrix": [6, 1], "x": 17, "y": 5}
             ]
+        },
+        "LAYOUT_hotswap": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "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": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [9, 3], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [8, 4], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5},
+                {"matrix": [0, 7], "x": 11, "y": 5},
+                {"matrix": [0, 5], "x": 12, "y": 5},
+                {"matrix": [0, 4], "x": 13, "y": 5},
+                {"matrix": [0, 3], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5},
+                {"matrix": [6, 2], "x": 16, "y": 5},
+                {"matrix": [6, 1], "x": 17, "y": 5}
+            ]
         }
     }
 }
diff --git a/keyboards/ymdk/melody96/matrix_diagram.md b/keyboards/ymdk/melody96/matrix_diagram.md
new file mode 100644
index 000000000000..e589bcc469de
--- /dev/null
+++ b/keyboards/ymdk/melody96/matrix_diagram.md
@@ -0,0 +1,35 @@
+# Matrix Diagram for YMDK Melody96
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│50 │51 │52 │53 │54 │55 │56 │57 │58 │B8 │B7 │B5 │B4 │B3 │B6 │B2 │B1 │B0 │63 │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤    ┌───────┐
+│40 │41 │42 │43 │44 │45 │56 │47 │48 │A8 │A7 │A5 │A4 │A3 │A6 │A2 │A1 │A0 │64 │    │A6     │ 2u Backpsace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┼───┼───┼───┤    └─┬─────┤                ┌───┐
+│30   │31 │32 │33 │34 │35 │36 │37 │38 │98 │97 │95 │94 │84   │96 │92 │91 │90 │      │     │                │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┼───┤   ┌──┴┐93  │ ISO Enter      │80 │ Numpad "+" 2u
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │88 │87 │85 │93      │86 │82 │81 │80 │   │84 │    │                │   │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤   └───┴────┘                ├───┤
+│10  │11 │12 │13 │14 │15 │16 │17 │18 │78 │77 │75 │74    │73 │76 │72 │71 │70 │                             │   │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┼───┼───┼───┤                 ┌───────┐   │60 │ Numpad Enter 2U
+│00  │01  │02  │06                      │08 │07 │05 │04 │03 │66 │62 │61 │60 │     Numpad 0 2u │62     │   │   │
+└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┴───┴───┴───┘                 └───────┘   └───┘
+┌────────┐                                       ┌──────────┐
+│10      │ 2.25u LShift             2.75u RShift │74        │
+└────────┘                                       └──────────┘
+┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
+│00  │01  │02  │06                      │08  │07  │04  │03  │ 4x1.25u Right Mod
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+┌─────┬─────┬───────────────────────────┬───┬───┬───┬───┬───┐
+│00   │01   │06                         │08 │07 │05 │04 │03 │ 2x1.5u Left Mod
+└─────┴─────┴───────────────────────────┴───┴───┴───┴───┴───┘
+┌─────┬───┬─────┬───────────────────────┬─────┬─────┬───┬───┐
+│00   │01 │02   │06                     │08   │05   │04 │03 │ Tsangan Left Mod, 2x1.5u-2x1u Right Mod
+└─────┴───┴─────┴───────────────────────┴─────┴─────┴───┴───┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│00   │01 │02   │06                         │07   │04 │03   │ Tsangan/WKL/HHKB
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+┌─────┬───┬─────┬───────────────────────────┬───┬───┬───┬───┐
+│00   │01 │02   │06                         │07 │05 │04 │03 │ 4x1u Right Mod
+└─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
+```
diff --git a/keyboards/ymdk/melody96/readme.md b/keyboards/ymdk/melody96/readme.md
index a6bf470b321b..e0e57a081ea9 100644
--- a/keyboards/ymdk/melody96/readme.md
+++ b/keyboards/ymdk/melody96/readme.md
@@ -1,11 +1,11 @@
-# YMDK Melody96
+# YMDK Melody96 Soldered
 
 ![melody96](https://i.imgur.com/9o0a6XFh.png)
 
 96-key Keyboard from YMDK. The PCB for this board is also commonly used in the NYM96.
 
 * Keyboard Maintainer: [superuser41](https://github.com/kaylanm)
-* Hardware Supported: melody96
+* Hardware Supported: Melody96 Soldered PCBs
 * Hardware Availability: [YMDK on Geekhack, group buy closed](https://geekhack.org/index.php?topic=93614.0),  [NYM96 on Massdrop](https://www.massdrop.com/buy/nym96-aluminum-mechanical-keyboard?mode=guest_open)
 
 Make example for this keyboard (after setting up your build environment):
@@ -14,6 +14,6 @@ Make example for this keyboard (after setting up your build environment):
 
 Flashing example for this keyboard:
 
-    make melody96:default:flash
+    make ymdk/melody96: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/ymdk/np21/config.h b/keyboards/ymdk/np21/config.h
index 6ad2d4bdf004..6c187131d441 100644
--- a/keyboards/ymdk/np21/config.h
+++ b/keyboards/ymdk/np21/config.h
@@ -17,22 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 5
-//#define RGBLIGHT_HUE_STEP 8
-//#define RGBLIGHT_SAT_STEP 8
-//#define RGBLIGHT_VAL_STEP 8
-//#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
-
 /* 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/np21/info.json b/keyboards/ymdk/np21/info.json
index 62fdf7e20c7c..f420023deef8 100644
--- a/keyboards/ymdk/np21/info.json
+++ b/keyboards/ymdk/np21/info.json
@@ -18,6 +18,21 @@
         "levels": 12,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 5,
+        "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": {
         "driver": "i2c"
     },
diff --git a/keyboards/ymdk/np24/u4rgb6/config.h b/keyboards/ymdk/np24/u4rgb6/config.h
deleted file mode 100644
index 0f6e31d199fb..000000000000
--- a/keyboards/ymdk/np24/u4rgb6/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Simon Arlott
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-# define RGBLED_NUM 6
-#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/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json
index 285baacdac0c..b804473300aa 100644
--- a/keyboards/ymdk/np24/u4rgb6/info.json
+++ b/keyboards/ymdk/np24/u4rgb6/info.json
@@ -16,6 +16,21 @@
         "pin": "B7",
         "levels": 31
     },
+    "rgblight": {
+        "led_count": 6,
+        "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": "E2"
     },
diff --git a/keyboards/ymdk/sp64/config.h b/keyboards/ymdk/sp64/config.h
index 35e9f6b5a68a..ae956e4207e9 100644
--- a/keyboards/ymdk/sp64/config.h
+++ b/keyboards/ymdk/sp64/config.h
@@ -22,20 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 15
 
 #define RIGHT_HALF
-
-/* RGB underglow */
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#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
diff --git a/keyboards/ymdk/sp64/info.json b/keyboards/ymdk/sp64/info.json
index dff795f0b9f9..a0091c8f3da2 100644
--- a/keyboards/ymdk/sp64/info.json
+++ b/keyboards/ymdk/sp64/info.json
@@ -17,7 +17,23 @@
         "driver": "i2c"
     },
     "rgblight": {
-        "max_brightness": 250
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "max_brightness": 250,
+        "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
+        }
     },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h
deleted file mode 100644
index c8cfa14161fa..000000000000
--- a/keyboards/ymdk/wings/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 alittlepeace
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGBLED_NUM 14
-#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  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/info.json
index 6a136f90d385..1e0a1995b656 100644
--- a/keyboards/ymdk/wings/info.json
+++ b/keyboards/ymdk/wings/info.json
@@ -17,6 +17,24 @@
         "pin": "B6",
         "levels": 5
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "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": "E2"
     },
diff --git a/keyboards/ymdk/wingshs/config.h b/keyboards/ymdk/wingshs/config.h
deleted file mode 100644
index fe80a59fe595..000000000000
--- a/keyboards/ymdk/wingshs/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021 alittlepeace
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGBLED_NUM 80
-#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  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
diff --git a/keyboards/ymdk/wingshs/info.json b/keyboards/ymdk/wingshs/info.json
index 4c536e7eadcc..4843e2d4c065 100644
--- a/keyboards/ymdk/wingshs/info.json
+++ b/keyboards/ymdk/wingshs/info.json
@@ -25,7 +25,23 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 160
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 80,
+        "max_brightness": 160,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/ymdk/yd60mq/12led/config.h b/keyboards/ymdk/yd60mq/12led/config.h
deleted file mode 100644
index edea795f7889..000000000000
--- a/keyboards/ymdk/yd60mq/12led/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 12
diff --git a/keyboards/ymdk/yd60mq/12led/info.json b/keyboards/ymdk/yd60mq/12led/info.json
index 90ac25f360b6..faa8ae570e0f 100644
--- a/keyboards/ymdk/yd60mq/12led/info.json
+++ b/keyboards/ymdk/yd60mq/12led/info.json
@@ -1,5 +1,22 @@
 {
     "usb": {
         "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "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
+        }
     }
 }
diff --git a/keyboards/ymdk/yd60mq/16led/config.h b/keyboards/ymdk/yd60mq/16led/config.h
deleted file mode 100644
index 00d3fcfc8cb5..000000000000
--- a/keyboards/ymdk/yd60mq/16led/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLED_NUM 16
diff --git a/keyboards/ymdk/yd60mq/16led/info.json b/keyboards/ymdk/yd60mq/16led/info.json
index e557e4d30763..47a3dbb0b528 100644
--- a/keyboards/ymdk/yd60mq/16led/info.json
+++ b/keyboards/ymdk/yd60mq/16led/info.json
@@ -1,5 +1,22 @@
 {
     "usb": {
         "device_version": "0.0.2"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "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
+        }
     }
 }
diff --git a/keyboards/ymdk/yd60mq/config.h b/keyboards/ymdk/yd60mq/config.h
index 135548b4ff02..6f34d5132a80 100644
--- a/keyboards/ymdk/yd60mq/config.h
+++ b/keyboards/ymdk/yd60mq/config.h
@@ -2,20 +2,3 @@
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
-
-/* prevent stuck modifiers */
-
-#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
-// RGBLED_NUM is defined in revisions
diff --git a/keyboards/ymdk/ym68/config.h b/keyboards/ymdk/ym68/config.h
deleted file mode 100644
index b35b9d3142aa..000000000000
--- a/keyboards/ymdk/ym68/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 James Young (@noroadsleft)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#if defined(RGBLIGHT_ENABLE)
-    #define RGBLED_NUM 20
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-#endif
diff --git a/keyboards/ymdk/ym68/info.json b/keyboards/ymdk/ym68/info.json
index 3daab4072aa0..132d431adb83 100644
--- a/keyboards/ymdk/ym68/info.json
+++ b/keyboards/ymdk/ym68/info.json
@@ -18,6 +18,24 @@
         "levels": 5,
         "breathing": true
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "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": "E2"
     },
diff --git a/keyboards/ymdk/ymd09/info.json b/keyboards/ymdk/ymd09/info.json
index d9cb9f508632..11552ae5b20e 100644
--- a/keyboards/ymdk/ymd09/info.json
+++ b/keyboards/ymdk/ymd09/info.json
@@ -46,7 +46,7 @@
         }
     },
     "rgb_matrix": {
-        "driver": "WS2812",
+        "driver": "ws2812",
         "layout": [
             {"flags": 4, "matrix": [0, 2], "x": 64, "y": 0},  //7
             {"flags": 4, "matrix": [0, 1], "x": 32, "y": 0},  //8
diff --git a/keyboards/ymdk/ymd21/v2/config.h b/keyboards/ymdk/ymd21/v2/config.h
deleted file mode 100644
index 955f702a8d30..000000000000
--- a/keyboards/ymdk/ymd21/v2/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 QMK / James Young (@noroadsleft)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#if defined(RGBLIGHT_ENABLE)
-    #define RGBLED_NUM 8
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-#endif
diff --git a/keyboards/ymdk/ymd21/v2/info.json b/keyboards/ymdk/ymd21/v2/info.json
index 18b0ef9e7b58..9bd8d6e37085 100644
--- a/keyboards/ymdk/ymd21/v2/info.json
+++ b/keyboards/ymdk/ymd21/v2/info.json
@@ -21,7 +21,23 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 180
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "max_brightness": 180,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/ymdk/ymd40/air40/info.json b/keyboards/ymdk/ymd40/air40/info.json
index cfa103de9a8f..daf104ebfec5 100644
--- a/keyboards/ymdk/ymd40/air40/info.json
+++ b/keyboards/ymdk/ymd40/air40/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
diff --git a/keyboards/ymdk/ymd40/v2/config.h b/keyboards/ymdk/ymd40/v2/config.h
deleted file mode 100644
index 1a061e530b6f..000000000000
--- a/keyboards/ymdk/ymd40/v2/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 James Young (@noroadsleft)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#if defined(RGBLIGHT_ENABLE)
-    #define RGBLED_NUM 8
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #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
-#endif
diff --git a/keyboards/ymdk/ymd40/v2/info.json b/keyboards/ymdk/ymd40/v2/info.json
index ab9648ff46a7..6686030166bf 100644
--- a/keyboards/ymdk/ymd40/v2/info.json
+++ b/keyboards/ymdk/ymd40/v2/info.json
@@ -21,7 +21,23 @@
         "pin": "E2"
     },
     "rgblight": {
-        "max_brightness": 150
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "max_brightness": 150,
+        "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
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/ymdk/ymd67/config.h b/keyboards/ymdk/ymd67/config.h
index 8a3612b8a556..6f34d5132a80 100644
--- a/keyboards/ymdk/ymd67/config.h
+++ b/keyboards/ymdk/ymd67/config.h
@@ -2,20 +2,3 @@
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
-
-/* prevent stuck modifiers */
-
-#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/ymdk/ymd67/info.json b/keyboards/ymdk/ymd67/info.json
index 39801fe04e98..65da379035fa 100644
--- a/keyboards/ymdk/ymd67/info.json
+++ b/keyboards/ymdk/ymd67/info.json
@@ -17,6 +17,23 @@
         "pin": "B7",
         "levels": 5
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "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": "E2"
     },
diff --git a/keyboards/ymdk/ymd75/config.h b/keyboards/ymdk/ymd75/config.h
deleted file mode 100644
index 32bdab247812..000000000000
--- a/keyboards/ymdk/ymd75/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 Wayne Jones (WarmCatUK) <waynekjones@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 RGBLED_NUM 16
-#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 12
-#define RGBLIGHT_SAT_STEP 15
-#define RGBLIGHT_VAL_STEP 18
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/ymdk/ymd75/info.json b/keyboards/ymdk/ymd75/info.json
deleted file mode 100644
index 930139be9061..000000000000
--- a/keyboards/ymdk/ymd75/info.json
+++ /dev/null
@@ -1,280 +0,0 @@
-{
-    "keyboard_name": "YMD75 / MT84",
-    "manufacturer": "YMDK",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x20A0",
-        "pid": "0x422D"
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label": "Esc", "x": 0, "y": 0},
-                {"label": "F1", "x": 1, "y": 0},
-                {"label": "F2", "x": 2, "y": 0},
-                {"label": "F3", "x": 3, "y": 0},
-                {"label": "F4", "x": 4, "y": 0},
-                {"label": "F5", "x": 5, "y": 0},
-                {"label": "F6", "x": 6, "y": 0},
-                {"label": "F7", "x": 7, "y": 0},
-                {"label": "F8", "x": 8, "y": 0},
-                {"label": "F9", "x": 9, "y": 0},
-                {"label": "F10", "x": 10, "y": 0},
-                {"label": "F11", "x": 11, "y": 0},
-                {"label": "F12", "x": 12, "y": 0},
-                {"label": "PrtSc", "x": 13, "y": 0},
-                {"label": "Del", "x": 14, "y": 0},
-                {"label": "Fn", "x": 15, "y": 0},
-                {"label": "~", "x": 0, "y": 1},
-                {"label": "!", "x": 1, "y": 1},
-                {"label": "@", "x": 2, "y": 1},
-                {"label": "#", "x": 3, "y": 1},
-                {"label": "$", "x": 4, "y": 1},
-                {"label": "%", "x": 5, "y": 1},
-                {"label": "^", "x": 6, "y": 1},
-                {"label": "&", "x": 7, "y": 1},
-                {"label": "*", "x": 8, "y": 1},
-                {"label": "(", "x": 9, "y": 1},
-                {"label": ")", "x": 10, "y": 1},
-                {"label": "_", "x": 11, "y": 1},
-                {"label": "+", "x": 12, "y": 1},
-                {"label": "Backspace", "x": 13, "y": 1, "w": 2},
-                {"label": "Home", "x": 15, "y": 1},
-                {"label": "Tab", "x": 0, "y": 2, "w": 1.5},
-                {"label": "Q", "x": 1.5, "y": 2},
-                {"label": "W", "x": 2.5, "y": 2},
-                {"label": "E", "x": 3.5, "y": 2},
-                {"label": "R", "x": 4.5, "y": 2},
-                {"label": "T", "x": 5.5, "y": 2},
-                {"label": "Y", "x": 6.5, "y": 2},
-                {"label": "U", "x": 7.5, "y": 2},
-                {"label": "I", "x": 8.5, "y": 2},
-                {"label": "O", "x": 9.5, "y": 2},
-                {"label": "P", "x": 10.5, "y": 2},
-                {"label": "{", "x": 11.5, "y": 2},
-                {"label": "}", "x": 12.5, "y": 2},
-                {"label": "|", "x": 13.5, "y": 2, "w": 1.5},
-                {"label": "End", "x": 15, "y": 2},
-                {"label": "Caps Lock", "x": 0, "y": 3, "w": 1.75},
-                {"label": "A", "x": 1.75, "y": 3},
-                {"label": "S", "x": 2.75, "y": 3},
-                {"label": "D", "x": 3.75, "y": 3},
-                {"label": "F", "x": 4.75, "y": 3},
-                {"label": "G", "x": 5.75, "y": 3},
-                {"label": "H", "x": 6.75, "y": 3},
-                {"label": "J", "x": 7.75, "y": 3},
-                {"label": "K", "x": 8.75, "y": 3},
-                {"label": "L", "x": 9.75, "y": 3},
-                {"label": ":", "x": 10.75, "y": 3},
-                {"label": "\"", "x": 11.75, "y": 3},
-                {"label": "Enter", "x": 12.75, "y": 3, "w": 2.25},
-                {"label": "Page Up", "x": 15, "y": 3},
-                {"label": "Shift", "x": 0, "y": 4, "w": 2.25},
-                {"label": "Z", "x": 2.25, "y": 4},
-                {"label": "X", "x": 3.25, "y": 4},
-                {"label": "C", "x": 4.25, "y": 4},
-                {"label": "V", "x": 5.25, "y": 4},
-                {"label": "B", "x": 6.25, "y": 4},
-                {"label": "N", "x": 7.25, "y": 4},
-                {"label": "M", "x": 8.25, "y": 4},
-                {"label": "<", "x": 9.25, "y": 4},
-                {"label": ">", "x": 10.25, "y": 4},
-                {"label": "?", "x": 11.25, "y": 4},
-                {"label": "Shift", "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "\u2191", "x": 14, "y": 4},
-                {"label": "Page Down", "x": 15, "y": 4},
-                {"label": "Ctrl", "x": 0, "y": 5, "w": 1.25},
-                {"label": "GUI", "x": 1.25, "y": 5, "w": 1.25},
-                {"label": "Alt", "x": 2.5, "y": 5, "w": 1.25},
-                {"x": 3.75, "y": 5, "w": 6.25},
-                {"label": "Alt", "x": 10, "y": 5},
-                {"label": "Fn", "x": 11, "y": 5},
-                {"label": "Ctrl", "x": 12, "y": 5},
-                {"label": "\u2190", "x": 13, "y": 5},
-                {"label": "\u2193", "x": 14, "y": 5},
-                {"label": "\u2192", "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_iso": {
-            "layout": [
-                {"label": "Esc", "x": 0, "y": 0},
-                {"label": "F1", "x": 1, "y": 0},
-                {"label": "F2", "x": 2, "y": 0},
-                {"label": "F3", "x": 3, "y": 0},
-                {"label": "F4", "x": 4, "y": 0},
-                {"label": "F5", "x": 5, "y": 0},
-                {"label": "F6", "x": 6, "y": 0},
-                {"label": "F7", "x": 7, "y": 0},
-                {"label": "F8", "x": 8, "y": 0},
-                {"label": "F9", "x": 9, "y": 0},
-                {"label": "F10", "x": 10, "y": 0},
-                {"label": "F11", "x": 11, "y": 0},
-                {"label": "F12", "x": 12, "y": 0},
-                {"label": "PrtSc", "x": 13, "y": 0},
-                {"label": "Pause", "x": 14, "y": 0},
-                {"label": "Delete", "x": 15, "y": 0},
-                {"label": "~", "x": 0, "y": 1},
-                {"label": "1", "x": 1, "y": 1},
-                {"label": "2", "x": 2, "y": 1},
-                {"label": "3", "x": 3, "y": 1},
-                {"label": "4", "x": 4, "y": 1},
-                {"label": "5", "x": 5, "y": 1},
-                {"label": "6", "x": 6, "y": 1},
-                {"label": "7", "x": 7, "y": 1},
-                {"label": "8", "x": 8, "y": 1},
-                {"label": "9", "x": 9, "y": 1},
-                {"label": "0", "x": 10, "y": 1},
-                {"label": "_", "x": 11, "y": 1},
-                {"label": "+", "x": 12, "y": 1},
-                {"label": "Backspace", "x": 13, "y": 1, "w": 2},
-                {"label": "Home", "x": 15, "y": 1},
-                {"label": "Tab", "x": 0, "y": 2, "w": 1.5},
-                {"label": "Q", "x": 1.5, "y": 2},
-                {"label": "W", "x": 2.5, "y": 2},
-                {"label": "E", "x": 3.5, "y": 2},
-                {"label": "R", "x": 4.5, "y": 2},
-                {"label": "T", "x": 5.5, "y": 2},
-                {"label": "Y", "x": 6.5, "y": 2},
-                {"label": "U", "x": 7.5, "y": 2},
-                {"label": "I", "x": 8.5, "y": 2},
-                {"label": "O", "x": 9.5, "y": 2},
-                {"label": "P", "x": 10.5, "y": 2},
-                {"label": "{", "x": 11.5, "y": 2},
-                {"label": "}", "x": 12.5, "y": 2},
-                {"label": "Page Up", "x": 15, "y": 2},
-                {"label": "Caps Lock", "x": 0, "y": 3, "w": 1.75},
-                {"label": "A", "x": 1.75, "y": 3},
-                {"label": "S", "x": 2.75, "y": 3},
-                {"label": "D", "x": 3.75, "y": 3},
-                {"label": "F", "x": 4.75, "y": 3},
-                {"label": "G", "x": 5.75, "y": 3},
-                {"label": "H", "x": 6.75, "y": 3},
-                {"label": "J", "x": 7.75, "y": 3},
-                {"label": "K", "x": 8.75, "y": 3},
-                {"label": "L", "x": 9.75, "y": 3},
-                {"label": ":", "x": 10.75, "y": 3},
-                {"label": "@", "x": 11.75, "y": 3},
-                {"label": "~", "x": 12.75, "y": 3},
-                {"label": "Enter", "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"label": "Page Down", "x": 15, "y": 3},
-                {"label": "Shift", "x": 0, "y": 4, "w": 1.25},
-                {"label": "|", "x": 1.25, "y": 4},
-                {"label": "Z", "x": 2.25, "y": 4},
-                {"label": "X", "x": 3.25, "y": 4},
-                {"label": "C", "x": 4.25, "y": 4},
-                {"label": "V", "x": 5.25, "y": 4},
-                {"label": "B", "x": 6.25, "y": 4},
-                {"label": "N", "x": 7.25, "y": 4},
-                {"label": "M", "x": 8.25, "y": 4},
-                {"label": "<", "x": 9.25, "y": 4},
-                {"label": ">", "x": 10.25, "y": 4},
-                {"label": "?", "x": 11.25, "y": 4},
-                {"label": "Shift", "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "Up", "x": 14, "y": 4},
-                {"label": "End", "x": 15, "y": 4},
-                {"label": "Ctrl", "x": 0, "y": 5, "w": 1.25},
-                {"label": "Win", "x": 1.25, "y": 5, "w": 1.25},
-                {"label": "Alt", "x": 2.5, "y": 5, "w": 1.25},
-                {"label": "Space", "x": 3.75, "y": 5, "w": 6.25},
-                {"label": "AltGr", "x": 10, "y": 5},
-                {"label": "Menu", "x": 11, "y": 5},
-                {"label": "Ctrl", "x": 12, "y": 5},
-                {"label": "Left", "x": 13, "y": 5},
-                {"label": "Down", "x": 14, "y": 5},
-                {"label": "Right", "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_iso_rwkl": {
-            "layout": [
-                {"label": "Esc", "x": 0, "y": 0},
-                {"label": "F1", "x": 1, "y": 0},
-                {"label": "F2", "x": 2, "y": 0},
-                {"label": "F3", "x": 3, "y": 0},
-                {"label": "F4", "x": 4, "y": 0},
-                {"label": "F5", "x": 5, "y": 0},
-                {"label": "F6", "x": 6, "y": 0},
-                {"label": "F7", "x": 7, "y": 0},
-                {"label": "F8", "x": 8, "y": 0},
-                {"label": "F9", "x": 9, "y": 0},
-                {"label": "F10", "x": 10, "y": 0},
-                {"label": "F11", "x": 11, "y": 0},
-                {"label": "F12", "x": 12, "y": 0},
-                {"label": "PrtSc", "x": 13, "y": 0},
-                {"label": "Pause", "x": 14, "y": 0},
-                {"label": "Delete", "x": 15, "y": 0},
-                {"label": "~", "x": 0, "y": 1},
-                {"label": "1", "x": 1, "y": 1},
-                {"label": "2", "x": 2, "y": 1},
-                {"label": "3", "x": 3, "y": 1},
-                {"label": "4", "x": 4, "y": 1},
-                {"label": "5", "x": 5, "y": 1},
-                {"label": "6", "x": 6, "y": 1},
-                {"label": "7", "x": 7, "y": 1},
-                {"label": "8", "x": 8, "y": 1},
-                {"label": "9", "x": 9, "y": 1},
-                {"label": "0", "x": 10, "y": 1},
-                {"label": "_", "x": 11, "y": 1},
-                {"label": "+", "x": 12, "y": 1},
-                {"label": "Backspace", "x": 13, "y": 1, "w": 2},
-                {"label": "Home", "x": 15, "y": 1},
-                {"label": "Tab", "x": 0, "y": 2, "w": 1.5},
-                {"label": "Q", "x": 1.5, "y": 2},
-                {"label": "W", "x": 2.5, "y": 2},
-                {"label": "E", "x": 3.5, "y": 2},
-                {"label": "R", "x": 4.5, "y": 2},
-                {"label": "T", "x": 5.5, "y": 2},
-                {"label": "Y", "x": 6.5, "y": 2},
-                {"label": "U", "x": 7.5, "y": 2},
-                {"label": "I", "x": 8.5, "y": 2},
-                {"label": "O", "x": 9.5, "y": 2},
-                {"label": "P", "x": 10.5, "y": 2},
-                {"label": "{", "x": 11.5, "y": 2},
-                {"label": "}", "x": 12.5, "y": 2},
-                {"label": "Page Up", "x": 15, "y": 2},
-                {"label": "Caps Lock", "x": 0, "y": 3, "w": 1.75},
-                {"label": "A", "x": 1.75, "y": 3},
-                {"label": "S", "x": 2.75, "y": 3},
-                {"label": "D", "x": 3.75, "y": 3},
-                {"label": "F", "x": 4.75, "y": 3},
-                {"label": "G", "x": 5.75, "y": 3},
-                {"label": "H", "x": 6.75, "y": 3},
-                {"label": "J", "x": 7.75, "y": 3},
-                {"label": "K", "x": 8.75, "y": 3},
-                {"label": "L", "x": 9.75, "y": 3},
-                {"label": ":", "x": 10.75, "y": 3},
-                {"label": "@", "x": 11.75, "y": 3},
-                {"label": "~", "x": 12.75, "y": 3},
-                {"label": "Enter", "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"label": "Page Down", "x": 15, "y": 3},
-                {"label": "Shift", "x": 0, "y": 4, "w": 1.25},
-                {"label": "|", "x": 1.25, "y": 4},
-                {"label": "Z", "x": 2.25, "y": 4},
-                {"label": "X", "x": 3.25, "y": 4},
-                {"label": "C", "x": 4.25, "y": 4},
-                {"label": "V", "x": 5.25, "y": 4},
-                {"label": "B", "x": 6.25, "y": 4},
-                {"label": "N", "x": 7.25, "y": 4},
-                {"label": "M", "x": 8.25, "y": 4},
-                {"label": "<", "x": 9.25, "y": 4},
-                {"label": ">", "x": 10.25, "y": 4},
-                {"label": "?", "x": 11.25, "y": 4},
-                {"label": "Shift", "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "Up", "x": 14, "y": 4},
-                {"label": "End", "x": 15, "y": 4},
-                {"label": "Ctrl", "x": 0, "y": 5, "w": 1.25},
-                {"label": "Win", "x": 1.25, "y": 5, "w": 1.25},
-                {"label": "Alt", "x": 2.5, "y": 5, "w": 1.25},
-                {"label": "Space", "x": 3.75, "y": 5, "w": 6.25},
-                {"label": "AltGr", "x": 10, "y": 5, "w": 1.5},
-                {"label": "Ctrl", "x": 11.5, "y": 5, "w": 1.5},
-                {"label": "Left", "x": 13, "y": 5},
-                {"label": "Down", "x": 14, "y": 5},
-                {"label": "Right", "x": 15, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ymdk/ymd75/keymaps/default/keymap.c b/keyboards/ymdk/ymd75/keymaps/default/keymap.c
deleted file mode 100644
index e51f88bb43b0..000000000000
--- a/keyboards/ymdk/ymd75/keymaps/default/keymap.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2018 Wayne K Jones <github.com/WarmCatUK>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received 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
-
-enum custom_keycodes {
-    P_MACRO = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    
-    /* 0: Main Layer
-     * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-     * │ ESC │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │PRSCR│ DEL │ FN  │
-     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┤
-     * │  `  │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │ BACKSPACE │HOME │
-     * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬────────┼─────┤
-     * │  TAB   │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │   \    │ END │
-     * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
-     * │  CAPS   │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │    RETURN   │PG_UP│
-     * ├─────────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
-     * │   LSHIFT   │  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │  RSHIFT  │ UP  │PG_DN│
-     * ├──────┬─────┴┬────┴─┬───┴─────┴─────┴─────┴─────┴─────┴────┬┴─────┴─┬───┴────┬─────┼─────┼─────┤
-     * │LCTRL │L_GUI │L_ALT │                SPACE                 │ R_ALT  │ R_CTRL │LEFT │DOWN │RIGHT│
-     * └──────┴──────┴──────┴──────────────────────────────────────┴────────┴────────┴─────┴─────┴─────┘
-     */
-    [_MAIN] = 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_DEL,  MO(_FN),
-        KC_GRV,   KC_1,     KC_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,  KC_RGUI,  KC_RCTL,          KC_LEFT,   KC_DOWN,   KC_RGHT
-    ),
-    
-    /* 1: Function Layer
-     * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-     * │R_TOG│R_MOD│R_HUI│R_SAI│R_VAI│R_HUD│R_SAD│R_VAD│     │     │     │VOL- │VOL+ │     │     │     │
-     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┤
-     * │BLTOG│BLINC│BLDEC│  £  │     │     │     │     │     │     │     │     │     │           │     │
-     * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬────────┼─────┤
-     * │        │     │     │     │     │     │     │     │     │     │     │     │     │        │     │
-     * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
-     * │         │     │     │     │     │     │     │     │     │     │     │     │             │     │
-     * ├─────────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
-     * │            │     │     │     │     │     │     │     │     │     │     │          │     │     │
-     * ├──────┬─────┴┬────┴─┬───┴─────┴─────┴─────┴─────┴─────┴────┬┴─────┴─┬───┴────┬─────┼─────┼─────┤
-     * │      │      │      │                                      │        │        │     │     │     │
-     * └──────┴──────┴──────┴──────────────────────────────────────┴────────┴────────┴─────┴─────┴─────┘
-     */
-    [_FN] = LAYOUT(
-        RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        BL_TOGG,  BL_UP,    BL_DOWN,  P_MACRO,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-        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,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,       KC_TRNS,                 KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS
-    ),
-};
-
-
-// GBP £ Macro (sends alt 156 - windows users only)
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch(keycode) {
-            case P_MACRO:
-                register_code(KC_LALT);
-                tap_code(KC_KP_1);
-                tap_code(KC_KP_5);
-                tap_code(KC_KP_6);
-                unregister_code(KC_LALT);
-                return false;
-        }
-    }
-    return true;
-};
diff --git a/keyboards/ymdk/ymd75/keymaps/default_iso/keymap.c b/keyboards/ymdk/ymd75/keymaps/default_iso/keymap.c
deleted file mode 100644
index 5041b72b9fa4..000000000000
--- a/keyboards/ymdk/ymd75/keymaps/default_iso/keymap.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    
-    [0] = LAYOUT_75_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_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_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_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,
-	/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
-		 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_75_iso(
-	/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-		 QK_BOOT,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MPLY,  KC_MPRV,  KC_MNXT,
-	/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */
-		 _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,       KC_VOLU,
-	/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
-		  RGB_MOD,      RGB_TOG,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,                 KC_VOLD,
-	/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────┤ */
-		 _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,   _______,
-	/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
-		 _______,    _______,  _______,  _______,  BL_DOWN,  BL_UP,    BL_STEP,  BL_TOGG,  _______,  _______,  _______,  _______,      _______,      _______,  _______,
-	/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤ */
-		 _______,    _______,    _______,                                _______,                            _______,  _______,  _______,  _______,  _______,  _______
-	/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-    )
-};
diff --git a/keyboards/ymdk/ymd75/keymaps/default_iso_rwkl/keymap.c b/keyboards/ymdk/ymd75/keymaps/default_iso_rwkl/keymap.c
deleted file mode 100644
index 0db1c8d288d3..000000000000
--- a/keyboards/ymdk/ymd75/keymaps/default_iso_rwkl/keymap.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    
-    [0] = LAYOUT_75_iso_rwkl(
-	/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-		 KC_ESC,    KC_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,   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_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,   MO(1),
-	/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┤ */
-		 KC_LCTL,    KC_LGUI,    KC_LALT,                                KC_SPC,                               KC_RALT,       KC_RCTL,     KC_LEFT,  KC_DOWN,  KC_RGHT
-	/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┘ */
-    ),
-
-	[1] = LAYOUT_75_iso_rwkl(
-	/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-		 _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MPLY,  KC_MPRV,  KC_MNXT,
-	/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */
-		 _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,       _______,
-	/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
-		 _______, 	    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 KC_VOLU,
-	/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────┤ */
-		 _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,   KC_VOLD,
-	/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
-		 _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,      _______,  _______,
-	/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┤ */
-		 _______,    _______,    _______,                                _______,                              _______,       _______,     _______,  _______,  _______
-	/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┘ */
-    )
-};
diff --git a/keyboards/ymdk/ymd75/keymaps/via/keymap.c b/keyboards/ymdk/ymd75/keymaps/via/keymap.c
deleted file mode 100644
index e1b91490c3f7..000000000000
--- a/keyboards/ymdk/ymd75/keymaps/via/keymap.c
+++ /dev/null
@@ -1,61 +0,0 @@
- /* Copyright 2021 kshpits 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along 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: Main 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  │  -  │  =  │ BACKSPACE │HOME │
-     * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬────────┼─────┤
-     * │  TAB   │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │   \    │ END │
-     * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
-     * │  CAPS   │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │    RETURN   │PG_UP│
-     * ├─────────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
-     * │   LSHIFT   │  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │  RSHIFT  │ UP  │PG_DN│
-     * ├──────┬─────┴┬────┴─┬───┴─────┴─────┴─────┴─────┴─────┴────┬┴────┬┴────┬┴────┬─────┼─────┼─────┤
-     * │LCTRL │L_GUI │L_ALT │                SPACE                 │R_ALT|  FN │R_CTR│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_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_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(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  KC_INS,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-        _______,  _______,  _______,  _______  ,_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,                 _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      KC_VOLU,  _______,
-        _______,  _______,  _______,                      _______,                                _______,  _______,  KC_APP,            KC_MPRV,  KC_VOLD,  KC_MNXT
-    ),
-	[2] = LAYOUT(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-        _______,  _______,  _______,  _______  ,_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,                 _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
-        _______,  _______,  _______,                      _______,                                _______,  _______,  _______,            _______,  _______,  _______
-    ),
-};
diff --git a/keyboards/ymdk/ymd75/readme.md b/keyboards/ymdk/ymd75/readme.md
index 78b4d089af33..3a66b428db78 100644
--- a/keyboards/ymdk/ymd75/readme.md
+++ b/keyboards/ymdk/ymd75/readme.md
@@ -2,23 +2,11 @@
 
 75% keyboard from YMDK. YMDK sell the board and name it "YMD75", however revision 1 of the PCB has "MT84" printed on both sides.
 
-This firmware can also be flashed onto the KBDFans KBD75 Round 2 Bootmapper Client boards sold during the mid-2018 timeframe.
-
-* Keyboard Maintainer: [Wayne K Jones](github.com/WarmCatUK)
-* Hardware Supported: 
-   - rev1 (ATmega32a) 
-   - rev2 (ATmega32a) 
-   - rev3 (ATmega32u4)
-* Hardware Availability: <https://www.aliexpress.com/item/32812690592.html>
-
-Make example for this keyboard (after setting up your build environment):
-
-    make ymdk/ymd75/rev1:default
-
-Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
-
-    make ymdk/ymd75/rev1:default:flash
-
-**Reset Key**: Hold down the key located at *Key below the top right key*, commonly programmed as *Backspace* while plugging in the keyboard. On PCB revision 2, enter the bootloader by holding `L_CTRL` while plugging in the keyboard.
+* Hardware Supported:
+    - rev1 (ATmega32a)
+        - This firmware can also be flashed onto the KBDFans KBD75 Round 2 Bootmapper Client boards sold during the mid-2018 timeframe.
+    - rev2 (ATmega32a)
+    - rev3 (ATmega32u4)
+    - rev4 (APM32F103)
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.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/ymdk/ymd75/rev1/info.json b/keyboards/ymdk/ymd75/rev1/info.json
index 0f280a2ecaa5..fb214285c152 100644
--- a/keyboards/ymdk/ymd75/rev1/info.json
+++ b/keyboards/ymdk/ymd75/rev1/info.json
@@ -1,5 +1,11 @@
 {
+    "keyboard_name": "YMD75 / MT84",
+    "manufacturer": "YMDK",
+    "url": "",
+    "maintainer": "qmk",
     "usb": {
+        "vid": "0x20A0",
+        "pid": "0x422D",
         "device_version": "1.0.0"
     },
     "matrix_pins": {
@@ -14,13 +20,35 @@
     "ws2812": {
         "driver": "i2c"
     },
+    "rgblight": {
+        "led_count": 16,
+        "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
+        }
+    },
     "indicators": {
         "caps_lock": "D1"
     },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
+    "layout_aliases":{
+        "LAYOUT": "LAYOUT_75_ansi"
+    },
+    "community_layouts": ["75_ansi", "75_iso"],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_75_ansi": {
             "layout": [
                 {"matrix": [5, 0], "x": 0, "y": 0},
                 {"matrix": [5, 2], "x": 1, "y": 0},
@@ -113,6 +141,98 @@
                 {"matrix": [6, 6], "x": 15, "y": 5}
             ]
         },
+        "LAYOUT_75_ansi_rwkl": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 1, "y": 0},
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [5, 5], "x": 4, "y": 0},
+                {"matrix": [6, 0], "x": 5, "y": 0},
+                {"matrix": [6, 10], "x": 6, "y": 0},
+                {"matrix": [7, 10], "x": 7, "y": 0},
+                {"matrix": [7, 0], "x": 8, "y": 0},
+                {"matrix": [5, 11], "x": 9, "y": 0},
+                {"matrix": [5, 12], "x": 10, "y": 0},
+                {"matrix": [5, 13], "x": 11, "y": 0},
+                {"matrix": [5, 14], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+                {"matrix": [2, 14], "x": 15, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [6, 1], "x": 6, "y": 1},
+                {"matrix": [6, 11], "x": 7, "y": 1},
+                {"matrix": [7, 11], "x": 8, "y": 1},
+                {"matrix": [7, 1], "x": 9, "y": 1},
+                {"matrix": [4, 10], "x": 10, "y": 1},
+                {"matrix": [4, 11], "x": 11, "y": 1},
+                {"matrix": [4, 12], "x": 12, "y": 1},
+                {"matrix": [4, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [0, 13], "x": 15, "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": [6, 2], "x": 6.5, "y": 2},
+                {"matrix": [6, 12], "x": 7.5, "y": 2},
+                {"matrix": [7, 12], "x": 8.5, "y": 2},
+                {"matrix": [7, 2], "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": [7, 6], "x": 15, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [6, 13], "x": 7.75, "y": 3},
+                {"matrix": [7, 13], "x": 8.75, "y": 3},
+                {"matrix": [7, 3], "x": 9.75, "y": 3},
+                {"matrix": [2, 10], "x": 10.75, "y": 3},
+                {"matrix": [2, 11], "x": 11.75, "y": 3},
+                {"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [7, 8], "x": 15, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 4},
+                {"matrix": [1, 2], "x": 3.25, "y": 4},
+                {"matrix": [1, 3], "x": 4.25, "y": 4},
+                {"matrix": [1, 4], "x": 5.25, "y": 4},
+                {"matrix": [1, 5], "x": 6.25, "y": 4},
+                {"matrix": [6, 4], "x": 7.25, "y": 4},
+                {"matrix": [6, 14], "x": 8.25, "y": 4},
+                {"matrix": [7, 14], "x": 9.25, "y": 4},
+                {"matrix": [7, 4], "x": 10.25, "y": 4},
+                {"matrix": [1, 10], "x": 11.25, "y": 4},
+                {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [6, 8], "x": 14, "y": 4},
+                {"matrix": [7, 7], "x": 15, "y": 4},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [7, 5], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [0, 12], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [6, 9], "x": 13, "y": 5},
+                {"matrix": [6, 7], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5}
+            ]
+        },
         "LAYOUT_75_iso": {
             "layout": [
                 {"matrix": [5, 0], "x": 0, "y": 0},
diff --git a/keyboards/ymdk/ymd75/rev1/keymaps/default/keymap.c b/keyboards/ymdk/ymd75/rev1/keymaps/default/keymap.c
new file mode 100644
index 000000000000..0df14f00321f
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev1/keymaps/default/keymap.c
@@ -0,0 +1,94 @@
+/*
+Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
+Modified 2018 Wayne K Jones <github.com/WarmCatUK>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received 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
+
+enum custom_keycodes {
+    P_MACRO = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+    /* 0: Main Layer
+     * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
+     * │ ESC │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │PRSCR│ DEL │ FN  │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┤
+     * │  `  │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │ BACKSPACE │HOME │
+     * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬────────┼─────┤
+     * │  TAB   │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │   \    │ END │
+     * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
+     * │  CAPS   │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │    RETURN   │PG_UP│
+     * ├─────────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
+     * │   LSHIFT   │  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │  RSHIFT  │ UP  │PG_DN│
+     * ├──────┬─────┴┬────┴─┬───┴─────┴─────┴─────┴─────┴─────┴────┬┴─────┴─┬───┴────┬─────┼─────┼─────┤
+     * │LCTRL │L_GUI │L_ALT │                SPACE                 │ R_ALT  │ R_CTRL │LEFT │DOWN │RIGHT│
+     * └──────┴──────┴──────┴──────────────────────────────────────┴────────┴────────┴─────┴─────┴─────┘
+     */
+    [_MAIN] = LAYOUT_75_ansi(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,  MO(_FN),
+        KC_GRV,   KC_1,     KC_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,  KC_RGUI,  KC_RCTL,          KC_LEFT,   KC_DOWN,   KC_RGHT
+    ),
+    
+    /* 1: Function Layer
+     * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
+     * │R_TOG│R_MOD│R_HUI│R_SAI│R_VAI│R_HUD│R_SAD│R_VAD│     │     │     │VOL- │VOL+ │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┤
+     * │BLTOG│BLINC│BLDEC│  £  │     │     │     │     │     │     │     │     │     │           │     │
+     * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬────────┼─────┤
+     * │        │     │     │     │     │     │     │     │     │     │     │     │     │        │     │
+     * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
+     * │         │     │     │     │     │     │     │     │     │     │     │     │             │     │
+     * ├─────────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
+     * │            │     │     │     │     │     │     │     │     │     │     │          │     │     │
+     * ├──────┬─────┴┬────┴─┬───┴─────┴─────┴─────┴─────┴─────┴────┬┴─────┴─┬───┴────┬─────┼─────┼─────┤
+     * │      │      │      │                                      │        │        │     │     │     │
+     * └──────┴──────┴──────┴──────────────────────────────────────┴────────┴────────┴─────┴─────┴─────┘
+     */
+    [_FN] = LAYOUT_75_ansi(
+        RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+        BL_TOGG,  BL_UP,    BL_DOWN,  P_MACRO,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        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,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,       KC_TRNS,                 KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS
+    ),
+};
+
+
+// GBP £ Macro (sends alt 156 - windows users only)
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        switch(keycode) {
+            case P_MACRO:
+                register_code(KC_LALT);
+                tap_code(KC_KP_1);
+                tap_code(KC_KP_5);
+                tap_code(KC_KP_6);
+                unregister_code(KC_LALT);
+                return false;
+        }
+    }
+    return true;
+};
diff --git a/keyboards/ymdk/ymd75/rev1/keymaps/default_iso/keymap.c b/keyboards/ymdk/ymd75/rev1/keymaps/default_iso/keymap.c
new file mode 100644
index 000000000000..6e14c7ceb0fa
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev1/keymaps/default_iso/keymap.c
@@ -0,0 +1,54 @@
+/*
+Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
+Modified 2018 Wayne K Jones <github.com/WarmCatUK>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+    [0] = LAYOUT_75_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_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_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_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,
+	/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
+		 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_75_iso(
+	/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+		 QK_BOOT,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MPLY,  KC_MPRV,  KC_MNXT,
+	/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */
+		 _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,       KC_VOLU,
+	/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
+		  RGB_MOD,      RGB_TOG,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,                 KC_VOLD,
+	/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────┤ */
+		 _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,   _______,
+	/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
+		 _______,    _______,  _______,  _______,  BL_DOWN,  BL_UP,    BL_STEP,  BL_TOGG,  _______,  _______,  _______,  _______,      _______,      _______,  _______,
+	/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤ */
+		 _______,    _______,    _______,                                _______,                            _______,  _______,  _______,  _______,  _______,  _______
+	/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
+    )
+};
diff --git a/keyboards/ymdk/ymd75/rev1/keymaps/default_iso_rwkl/keymap.c b/keyboards/ymdk/ymd75/rev1/keymaps/default_iso_rwkl/keymap.c
new file mode 100644
index 000000000000..ba3fde9cbe9c
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev1/keymaps/default_iso_rwkl/keymap.c
@@ -0,0 +1,54 @@
+/*
+Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
+Modified 2018 Wayne K Jones <github.com/WarmCatUK>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+    [0] = LAYOUT_75_iso_rwkl(
+	/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+		 KC_ESC,    KC_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,   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_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,   MO(1),
+	/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┤ */
+		 KC_LCTL,    KC_LGUI,    KC_LALT,                                KC_SPC,                               KC_RALT,       KC_RCTL,     KC_LEFT,  KC_DOWN,  KC_RGHT
+	/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┘ */
+    ),
+
+	[1] = LAYOUT_75_iso_rwkl(
+	/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+		 _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MPLY,  KC_MPRV,  KC_MNXT,
+	/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */
+		 _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,       _______,
+	/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
+		 _______, 	    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 KC_VOLU,
+	/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────┤ */
+		 _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,   KC_VOLD,
+	/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
+		 _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,      _______,  _______,
+	/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┤ */
+		 _______,    _______,    _______,                                _______,                              _______,       _______,     _______,  _______,  _______
+	/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┘ */
+    )
+};
diff --git a/keyboards/ymdk/ymd75/rev1/keymaps/via/keymap.c b/keyboards/ymdk/ymd75/rev1/keymaps/via/keymap.c
new file mode 100644
index 000000000000..9c1c4fe697fa
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev1/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2021 kshpits 
+ * 
+ * This program is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 2 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along 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: Main 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  │  -  │  =  │ BACKSPACE │HOME │
+     * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬────────┼─────┤
+     * │  TAB   │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │   \    │ END │
+     * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
+     * │  CAPS   │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │    RETURN   │PG_UP│
+     * ├─────────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
+     * │   LSHIFT   │  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │  RSHIFT  │ UP  │PG_DN│
+     * ├──────┬─────┴┬────┴─┬───┴─────┴─────┴─────┴─────┴─────┴────┬┴────┬┴────┬┴────┬─────┼─────┼─────┤
+     * │LCTRL │L_GUI │L_ALT │                SPACE                 │R_ALT|  FN │R_CTR│LEFT │DOWN │RIGHT│
+     * └──────┴──────┴──────┴──────────────────────────────────────┴─────┴─────┴─────┴─────┴─────┘─────┘
+     */
+    [0] = LAYOUT_75_ansi(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_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_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_75_ansi(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  KC_INS,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,  _______,  _______,  _______  ,_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,                 _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      KC_VOLU,  _______,
+        _______,  _______,  _______,                      _______,                                _______,  _______,  KC_APP,            KC_MPRV,  KC_VOLD,  KC_MNXT
+    )
+};
diff --git a/keyboards/ymdk/ymd75/keymaps/via/rules.mk b/keyboards/ymdk/ymd75/rev1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/ymdk/ymd75/keymaps/via/rules.mk
rename to keyboards/ymdk/ymd75/rev1/keymaps/via/rules.mk
diff --git a/keyboards/ymdk/ymd75/rev1/readme.md b/keyboards/ymdk/ymd75/rev1/readme.md
new file mode 100644
index 000000000000..e4784d4eb984
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev1/readme.md
@@ -0,0 +1,27 @@
+# YMD75 / MT84
+
+75% keyboard from YMDK. YMDK sell the board and name it "YMD75", however revision 1 of the PCB has "MT84" printed on both sides.
+
+This firmware can also be flashed onto the KBDFans KBD75 Round 2 Bootmapper Client boards sold during the mid-2018 timeframe.
+
+* Keyboard Maintainer: [Wayne K Jones](github.com/WarmCatUK)
+* Hardware Supported: rev1 (ATmega32a)
+* Hardware Availability: <https://www.aliexpress.com/item/32812690592.html>
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ymdk/ymd75/rev1:default
+
+Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
+
+    make ymdk/ymd75/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
+* **Reset Key**: Hold down the key located at *Key below the top right key*, commonly programmed as *Backspace* while plugging in the keyboard.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/ymdk/ymd75/rev2/info.json b/keyboards/ymdk/ymd75/rev2/info.json
index f51a7ed33074..2e2e38ce44d5 100644
--- a/keyboards/ymdk/ymd75/rev2/info.json
+++ b/keyboards/ymdk/ymd75/rev2/info.json
@@ -1,5 +1,11 @@
 {
+    "keyboard_name": "YMD75 / MT84",
+    "manufacturer": "YMDK",
+    "url": "",
+    "maintainer": "qmk",
     "usb": {
+        "vid": "0x20A0",
+        "pid": "0x422D",
         "device_version": "2.0.0"
     },
     "matrix_pins": {
@@ -14,13 +20,35 @@
     "ws2812": {
         "driver": "i2c"
     },
+    "rgblight": {
+        "led_count": 16,
+        "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
+        }
+    },
     "indicators": {
         "caps_lock": "D1"
     },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
+    "layout_aliases":{
+        "LAYOUT": "LAYOUT_75_ansi"
+    },
+    "community_layouts": ["75_ansi", "75_iso"],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_75_ansi": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -113,6 +141,98 @@
                 {"matrix": [5, 11], "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": [5, 14], "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": [5, 13], "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, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "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, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "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, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 6], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 9], "x": 13, "y": 5},
+                {"matrix": [5, 10], "x": 14, "y": 5},
+                {"matrix": [5, 11], "x": 15, "y": 5}
+            ]
+        },
         "LAYOUT_75_iso": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/ymdk/ymd75/rev2/keymaps/default/keymap.c b/keyboards/ymdk/ymd75/rev2/keymaps/default/keymap.c
new file mode 100644
index 000000000000..0df14f00321f
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev2/keymaps/default/keymap.c
@@ -0,0 +1,94 @@
+/*
+Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
+Modified 2018 Wayne K Jones <github.com/WarmCatUK>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received 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
+
+enum custom_keycodes {
+    P_MACRO = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+    /* 0: Main Layer
+     * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
+     * │ ESC │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │PRSCR│ DEL │ FN  │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┤
+     * │  `  │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │ BACKSPACE │HOME │
+     * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬────────┼─────┤
+     * │  TAB   │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │   \    │ END │
+     * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
+     * │  CAPS   │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │    RETURN   │PG_UP│
+     * ├─────────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
+     * │   LSHIFT   │  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │  RSHIFT  │ UP  │PG_DN│
+     * ├──────┬─────┴┬────┴─┬───┴─────┴─────┴─────┴─────┴─────┴────┬┴─────┴─┬───┴────┬─────┼─────┼─────┤
+     * │LCTRL │L_GUI │L_ALT │                SPACE                 │ R_ALT  │ R_CTRL │LEFT │DOWN │RIGHT│
+     * └──────┴──────┴──────┴──────────────────────────────────────┴────────┴────────┴─────┴─────┴─────┘
+     */
+    [_MAIN] = LAYOUT_75_ansi(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,  MO(_FN),
+        KC_GRV,   KC_1,     KC_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,  KC_RGUI,  KC_RCTL,          KC_LEFT,   KC_DOWN,   KC_RGHT
+    ),
+    
+    /* 1: Function Layer
+     * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
+     * │R_TOG│R_MOD│R_HUI│R_SAI│R_VAI│R_HUD│R_SAD│R_VAD│     │     │     │VOL- │VOL+ │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┤
+     * │BLTOG│BLINC│BLDEC│  £  │     │     │     │     │     │     │     │     │     │           │     │
+     * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬────────┼─────┤
+     * │        │     │     │     │     │     │     │     │     │     │     │     │     │        │     │
+     * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
+     * │         │     │     │     │     │     │     │     │     │     │     │     │             │     │
+     * ├─────────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
+     * │            │     │     │     │     │     │     │     │     │     │     │          │     │     │
+     * ├──────┬─────┴┬────┴─┬───┴─────┴─────┴─────┴─────┴─────┴────┬┴─────┴─┬───┴────┬─────┼─────┼─────┤
+     * │      │      │      │                                      │        │        │     │     │     │
+     * └──────┴──────┴──────┴──────────────────────────────────────┴────────┴────────┴─────┴─────┴─────┘
+     */
+    [_FN] = LAYOUT_75_ansi(
+        RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+        BL_TOGG,  BL_UP,    BL_DOWN,  P_MACRO,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        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,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,       KC_TRNS,                 KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS
+    ),
+};
+
+
+// GBP £ Macro (sends alt 156 - windows users only)
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        switch(keycode) {
+            case P_MACRO:
+                register_code(KC_LALT);
+                tap_code(KC_KP_1);
+                tap_code(KC_KP_5);
+                tap_code(KC_KP_6);
+                unregister_code(KC_LALT);
+                return false;
+        }
+    }
+    return true;
+};
diff --git a/keyboards/ymdk/ymd75/rev2/keymaps/default_iso/keymap.c b/keyboards/ymdk/ymd75/rev2/keymaps/default_iso/keymap.c
new file mode 100644
index 000000000000..6e14c7ceb0fa
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev2/keymaps/default_iso/keymap.c
@@ -0,0 +1,54 @@
+/*
+Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
+Modified 2018 Wayne K Jones <github.com/WarmCatUK>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+    [0] = LAYOUT_75_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_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_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_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,
+	/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
+		 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_75_iso(
+	/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+		 QK_BOOT,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MPLY,  KC_MPRV,  KC_MNXT,
+	/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */
+		 _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,       KC_VOLU,
+	/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
+		  RGB_MOD,      RGB_TOG,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,                 KC_VOLD,
+	/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────┤ */
+		 _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,   _______,
+	/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
+		 _______,    _______,  _______,  _______,  BL_DOWN,  BL_UP,    BL_STEP,  BL_TOGG,  _______,  _______,  _______,  _______,      _______,      _______,  _______,
+	/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤ */
+		 _______,    _______,    _______,                                _______,                            _______,  _______,  _______,  _______,  _______,  _______
+	/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
+    )
+};
diff --git a/keyboards/ymdk/ymd75/rev2/keymaps/default_iso_rwkl/keymap.c b/keyboards/ymdk/ymd75/rev2/keymaps/default_iso_rwkl/keymap.c
new file mode 100644
index 000000000000..ba3fde9cbe9c
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev2/keymaps/default_iso_rwkl/keymap.c
@@ -0,0 +1,54 @@
+/*
+Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
+Modified 2018 Wayne K Jones <github.com/WarmCatUK>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+    [0] = LAYOUT_75_iso_rwkl(
+	/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+		 KC_ESC,    KC_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,   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_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,   MO(1),
+	/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┤ */
+		 KC_LCTL,    KC_LGUI,    KC_LALT,                                KC_SPC,                               KC_RALT,       KC_RCTL,     KC_LEFT,  KC_DOWN,  KC_RGHT
+	/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┘ */
+    ),
+
+	[1] = LAYOUT_75_iso_rwkl(
+	/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+		 _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MPLY,  KC_MPRV,  KC_MNXT,
+	/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */
+		 _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,       _______,
+	/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
+		 _______, 	    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 KC_VOLU,
+	/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────┤ */
+		 _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,   KC_VOLD,
+	/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
+		 _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,      _______,  _______,
+	/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┤ */
+		 _______,    _______,    _______,                                _______,                              _______,       _______,     _______,  _______,  _______
+	/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┘ */
+    )
+};
diff --git a/keyboards/ymdk/ymd75/rev2/keymaps/via/keymap.c b/keyboards/ymdk/ymd75/rev2/keymaps/via/keymap.c
new file mode 100644
index 000000000000..9c1c4fe697fa
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev2/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2021 kshpits 
+ * 
+ * This program is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 2 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along 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: Main 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  │  -  │  =  │ BACKSPACE │HOME │
+     * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬────────┼─────┤
+     * │  TAB   │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │   \    │ END │
+     * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
+     * │  CAPS   │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │    RETURN   │PG_UP│
+     * ├─────────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
+     * │   LSHIFT   │  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │  RSHIFT  │ UP  │PG_DN│
+     * ├──────┬─────┴┬────┴─┬───┴─────┴─────┴─────┴─────┴─────┴────┬┴────┬┴────┬┴────┬─────┼─────┼─────┤
+     * │LCTRL │L_GUI │L_ALT │                SPACE                 │R_ALT|  FN │R_CTR│LEFT │DOWN │RIGHT│
+     * └──────┴──────┴──────┴──────────────────────────────────────┴─────┴─────┴─────┴─────┴─────┘─────┘
+     */
+    [0] = LAYOUT_75_ansi(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_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_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_75_ansi(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  KC_INS,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,  _______,  _______,  _______  ,_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,                 _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      KC_VOLU,  _______,
+        _______,  _______,  _______,                      _______,                                _______,  _______,  KC_APP,            KC_MPRV,  KC_VOLD,  KC_MNXT
+    )
+};
diff --git a/keyboards/ymdk/ymd75/rev2/keymaps/via/rules.mk b/keyboards/ymdk/ymd75/rev2/keymaps/via/rules.mk
new file mode 100644
index 000000000000..152460f30478
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev2/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+KEY_LOCK_ENABLE = no
diff --git a/keyboards/ymdk/ymd75/rev2/readme.md b/keyboards/ymdk/ymd75/rev2/readme.md
new file mode 100644
index 000000000000..7d70ed3a50a5
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev2/readme.md
@@ -0,0 +1,26 @@
+# YMD75
+
+75% keyboard from YMDK. YMDK sell the board and name it "YMD75".
+
+* Keyboard Maintainer: [Wayne K Jones](github.com/WarmCatUK)
+* Hardware Supported: rev2 (ATmega32a)
+* Hardware Availability: <https://www.aliexpress.com/item/32812690592.html>
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ymdk/ymd75/rev2:default
+
+Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
+
+    make ymdk/ymd75/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
+* **Reset Key**: Enter the bootloader by holding `L_CTRL` while plugging in the keyboard.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/ymdk/ymd75/rev3/config.h b/keyboards/ymdk/ymd75/rev3/config.h
index 968045a7c9b8..1b2bbb1da0a5 100644
--- a/keyboards/ymdk/ymd75/rev3/config.h
+++ b/keyboards/ymdk/ymd75/rev3/config.h
@@ -1,3 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 4
diff --git a/keyboards/ymdk/ymd75/rev3/info.json b/keyboards/ymdk/ymd75/rev3/info.json
index 23922b1f6886..f3ee46edbd4d 100644
--- a/keyboards/ymdk/ymd75/rev3/info.json
+++ b/keyboards/ymdk/ymd75/rev3/info.json
@@ -1,5 +1,11 @@
 {
+    "keyboard_name": "YMD75 / MT84",
+    "manufacturer": "YMDK",
+    "url": "",
+    "maintainer": "qmk",
     "usb": {
+        "vid": "0x20A0",
+        "pid": "0x422D",
         "device_version": "3.0.0"
     },
     "matrix_pins": {
@@ -11,13 +17,35 @@
         "pin": "B6",
         "levels": 12
     },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgblight": {
+        "led_count": 16,
+        "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
+        }
+    },
     "indicators": {
         "caps_lock": "C7"
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases":{
+        "LAYOUT": "LAYOUT_75_ansi"
+    },
+    "community_layouts": ["75_ansi", "75_iso"],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_75_ansi": {
             "layout": [
                 {"matrix": [5, 0], "x": 0, "y": 0},
                 {"matrix": [5, 1], "x": 1, "y": 0},
@@ -110,6 +138,98 @@
                 {"matrix": [6, 6], "x": 15, "y": 5}
             ]
         },
+        "LAYOUT_75_ansi_rwkl": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [10, 2], "x": 15, "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": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [9, 3], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [8, 4], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [0, 5], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [0, 4], "x": 13, "y": 5},
+                {"matrix": [0, 3], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5}
+            ]
+        },
         "LAYOUT_75_iso": {
             "layout": [
                 {"matrix": [5, 0], "x": 0, "y": 0},
diff --git a/keyboards/ymdk/ymd75/rev3/keymaps/default/keymap.c b/keyboards/ymdk/ymd75/rev3/keymaps/default/keymap.c
new file mode 100644
index 000000000000..0df14f00321f
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev3/keymaps/default/keymap.c
@@ -0,0 +1,94 @@
+/*
+Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
+Modified 2018 Wayne K Jones <github.com/WarmCatUK>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received 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
+
+enum custom_keycodes {
+    P_MACRO = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+    /* 0: Main Layer
+     * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
+     * │ ESC │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │PRSCR│ DEL │ FN  │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┤
+     * │  `  │  1  │  2  │  3  │  4  │  5  │  6  │  7  │  8  │  9  │  0  │  -  │  =  │ BACKSPACE │HOME │
+     * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬────────┼─────┤
+     * │  TAB   │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │   \    │ END │
+     * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
+     * │  CAPS   │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │    RETURN   │PG_UP│
+     * ├─────────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
+     * │   LSHIFT   │  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │  RSHIFT  │ UP  │PG_DN│
+     * ├──────┬─────┴┬────┴─┬───┴─────┴─────┴─────┴─────┴─────┴────┬┴─────┴─┬───┴────┬─────┼─────┼─────┤
+     * │LCTRL │L_GUI │L_ALT │                SPACE                 │ R_ALT  │ R_CTRL │LEFT │DOWN │RIGHT│
+     * └──────┴──────┴──────┴──────────────────────────────────────┴────────┴────────┴─────┴─────┴─────┘
+     */
+    [_MAIN] = LAYOUT_75_ansi(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_DEL,  MO(_FN),
+        KC_GRV,   KC_1,     KC_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,  KC_RGUI,  KC_RCTL,          KC_LEFT,   KC_DOWN,   KC_RGHT
+    ),
+    
+    /* 1: Function Layer
+     * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
+     * │R_TOG│R_MOD│R_HUI│R_SAI│R_VAI│R_HUD│R_SAD│R_VAD│     │     │     │VOL- │VOL+ │     │     │     │
+     * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┴─────┼─────┤
+     * │BLTOG│BLINC│BLDEC│  £  │     │     │     │     │     │     │     │     │     │           │     │
+     * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬────────┼─────┤
+     * │        │     │     │     │     │     │     │     │     │     │     │     │     │        │     │
+     * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
+     * │         │     │     │     │     │     │     │     │     │     │     │     │             │     │
+     * ├─────────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
+     * │            │     │     │     │     │     │     │     │     │     │     │          │     │     │
+     * ├──────┬─────┴┬────┴─┬───┴─────┴─────┴─────┴─────┴─────┴────┬┴─────┴─┬───┴────┬─────┼─────┼─────┤
+     * │      │      │      │                                      │        │        │     │     │     │
+     * └──────┴──────┴──────┴──────────────────────────────────────┴────────┴────────┴─────┴─────┴─────┘
+     */
+    [_FN] = LAYOUT_75_ansi(
+        RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_SAI,  RGB_VAI,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+        BL_TOGG,  BL_UP,    BL_DOWN,  P_MACRO,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        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,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,       KC_TRNS,                 KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS
+    ),
+};
+
+
+// GBP £ Macro (sends alt 156 - windows users only)
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        switch(keycode) {
+            case P_MACRO:
+                register_code(KC_LALT);
+                tap_code(KC_KP_1);
+                tap_code(KC_KP_5);
+                tap_code(KC_KP_6);
+                unregister_code(KC_LALT);
+                return false;
+        }
+    }
+    return true;
+};
diff --git a/keyboards/ymdk/ymd75/rev3/keymaps/default_iso/keymap.c b/keyboards/ymdk/ymd75/rev3/keymaps/default_iso/keymap.c
new file mode 100644
index 000000000000..6e14c7ceb0fa
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev3/keymaps/default_iso/keymap.c
@@ -0,0 +1,54 @@
+/*
+Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
+Modified 2018 Wayne K Jones <github.com/WarmCatUK>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+    [0] = LAYOUT_75_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_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_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_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,
+	/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
+		 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_75_iso(
+	/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+		 QK_BOOT,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MPLY,  KC_MPRV,  KC_MNXT,
+	/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */
+		 _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,       KC_VOLU,
+	/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
+		  RGB_MOD,      RGB_TOG,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,                 KC_VOLD,
+	/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────┤ */
+		 _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,   _______,
+	/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
+		 _______,    _______,  _______,  _______,  BL_DOWN,  BL_UP,    BL_STEP,  BL_TOGG,  _______,  _______,  _______,  _______,      _______,      _______,  _______,
+	/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤ */
+		 _______,    _______,    _______,                                _______,                            _______,  _______,  _______,  _______,  _______,  _______
+	/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
+    )
+};
diff --git a/keyboards/ymdk/ymd75/rev3/keymaps/default_iso_rwkl/keymap.c b/keyboards/ymdk/ymd75/rev3/keymaps/default_iso_rwkl/keymap.c
new file mode 100644
index 000000000000..ba3fde9cbe9c
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev3/keymaps/default_iso_rwkl/keymap.c
@@ -0,0 +1,54 @@
+/*
+Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
+Modified 2018 Wayne K Jones <github.com/WarmCatUK>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+    [0] = LAYOUT_75_iso_rwkl(
+	/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+		 KC_ESC,    KC_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,   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_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,   MO(1),
+	/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┤ */
+		 KC_LCTL,    KC_LGUI,    KC_LALT,                                KC_SPC,                               KC_RALT,       KC_RCTL,     KC_LEFT,  KC_DOWN,  KC_RGHT
+	/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┘ */
+    ),
+
+	[1] = LAYOUT_75_iso_rwkl(
+	/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+		 _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MPLY,  KC_MPRV,  KC_MNXT,
+	/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */
+		 _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,       _______,
+	/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
+		 _______, 	    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 KC_VOLU,
+	/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────┤ */
+		 _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,   KC_VOLD,
+	/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
+		 _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,      _______,  _______,
+	/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┤ */
+		 _______,    _______,    _______,                                _______,                              _______,       _______,     _______,  _______,  _______
+	/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┘ */
+    )
+};
diff --git a/keyboards/ymdk/ymd75/rev3/keymaps/via/keymap.c b/keyboards/ymdk/ymd75/rev3/keymaps/via/keymap.c
new file mode 100644
index 000000000000..9c1c4fe697fa
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev3/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2021 kshpits 
+ * 
+ * This program is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 2 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along 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: Main 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  │  -  │  =  │ BACKSPACE │HOME │
+     * ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬────────┼─────┤
+     * │  TAB   │  Q  │  W  │  E  │  R  │  T  │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │   \    │ END │
+     * ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴────────┼─────┤
+     * │  CAPS   │  A  │  S  │  D  │  F  │  G  │  H  │  J  │  K  │  L  │  ;  │  '  │    RETURN   │PG_UP│
+     * ├─────────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴───────┬─────┼─────┤
+     * │   LSHIFT   │  Z  │  X  │  C  │  V  │  B  │  N  │  M  │  ,  │  .  │  /  │  RSHIFT  │ UP  │PG_DN│
+     * ├──────┬─────┴┬────┴─┬───┴─────┴─────┴─────┴─────┴─────┴────┬┴────┬┴────┬┴────┬─────┼─────┼─────┤
+     * │LCTRL │L_GUI │L_ALT │                SPACE                 │R_ALT|  FN │R_CTR│LEFT │DOWN │RIGHT│
+     * └──────┴──────┴──────┴──────────────────────────────────────┴─────┴─────┴─────┴─────┴─────┘─────┘
+     */
+    [0] = LAYOUT_75_ansi(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_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_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_75_ansi(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  KC_INS,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,  _______,  _______,  _______  ,_______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,                 _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      KC_VOLU,  _______,
+        _______,  _______,  _______,                      _______,                                _______,  _______,  KC_APP,            KC_MPRV,  KC_VOLD,  KC_MNXT
+    )
+};
diff --git a/keyboards/ymdk/ymd75/rev3/keymaps/via/rules.mk b/keyboards/ymdk/ymd75/rev3/keymaps/via/rules.mk
new file mode 100644
index 000000000000..152460f30478
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev3/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+KEY_LOCK_ENABLE = no
diff --git a/keyboards/ymdk/ymd75/rev3/readme.md b/keyboards/ymdk/ymd75/rev3/readme.md
new file mode 100644
index 000000000000..0e705d40ffa4
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev3/readme.md
@@ -0,0 +1,24 @@
+# YMD75
+
+75% keyboard from YMDK. YMDK sell the board and name it "YMD75".
+
+* Keyboard Maintainer: [Wayne K Jones](github.com/WarmCatUK)
+* Hardware Supported: rev3 (ATmega32u4)
+* Hardware Availability: <https://www.aliexpress.com/item/32812690592.html>
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ymdk/ymd75/rev3:default
+
+Flashing example for this keyboard:
+
+    make ymdk/ymd75/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).
+
+## 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
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/ymdk/ymd75/rev3/rules.mk b/keyboards/ymdk/ymd75/rev3/rules.mk
index e3b96df9c271..58ad1837e0ad 100644
--- a/keyboards/ymdk/ymd75/rev3/rules.mk
+++ b/keyboards/ymdk/ymd75/rev3/rules.mk
@@ -9,5 +9,5 @@ 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
+
 KEY_LOCK_ENABLE = yes
diff --git a/keyboards/ymdk/ymd75/rev4/iso/board.h b/keyboards/ymdk/ymd75/rev4/iso/board.h
new file mode 100644
index 000000000000..3cd180210288
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev4/iso/board.h
@@ -0,0 +1,8 @@
+// Copyright 2023 zvecr<git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000
diff --git a/keyboards/ymdk/ymd75/rev4/iso/config.h b/keyboards/ymdk/ymd75/rev4/iso/config.h
new file mode 100644
index 000000000000..317c0ec2362c
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev4/iso/config.h
@@ -0,0 +1,11 @@
+// Copyright 2023 zvecr<git@zvecr.com>
+// 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
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_DMA_CHANNEL 7
diff --git a/keyboards/ymdk/ymd75/rev4/iso/halconf.h b/keyboards/ymdk/ymd75/rev4/iso/halconf.h
new file mode 100644
index 000000000000..782eea99a40d
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev4/iso/halconf.h
@@ -0,0 +1,7 @@
+// Copyright 2023 zvecr<git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/ymdk/ymd75/rev4/iso/info.json b/keyboards/ymdk/ymd75/rev4/iso/info.json
new file mode 100644
index 000000000000..d7e27dbdeb19
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev4/iso/info.json
@@ -0,0 +1,277 @@
+{
+    "keyboard_name": "YMD75 V4",
+    "manufacturer": "YMDK",
+    "url": "",
+    "maintainer": "zvecr",
+    "processor": "STM32F103",
+    "bootloader": "uf2boot",
+    "board": "STM32_F103_STM32DUINO",
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        "cols": ["A7","B0","B1","B2","B10","B11","A5","A15","B3"],
+        "rows": ["A6","A4","A3","A2","A1","A0","A8","B15","B14","B13","B12","A9"]
+    },
+    "usb": {
+        "vid": "0x594D",
+        "pid": "0x7549",
+        "device_version": "4.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "B9"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 200,
+        "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": 15,  "y": 0 },
+            { "flags": 4, "matrix": [0, 2],  "x": 30,  "y": 0 },
+            { "flags": 4, "matrix": [0, 3],  "x": 45,  "y": 0 },
+            { "flags": 4, "matrix": [0, 4],  "x": 60,  "y": 0 },
+            { "flags": 4, "matrix": [0, 5],  "x": 75,  "y": 0 },
+            { "flags": 4, "matrix": [0, 6],  "x": 90,  "y": 0 },
+            { "flags": 4, "matrix": [0, 7],  "x": 105, "y": 0 },
+            { "flags": 4, "matrix": [0, 8],  "x": 119, "y": 0 },
+            { "flags": 4, "matrix": [6, 8],  "x": 134, "y": 0 },
+            { "flags": 4, "matrix": [6, 7],  "x": 149, "y": 0 },
+            { "flags": 4, "matrix": [6, 5],  "x": 164, "y": 0 },
+            { "flags": 4, "matrix": [6, 4],  "x": 179, "y": 0 },
+            { "flags": 4, "matrix": [6, 3],  "x": 194, "y": 0 },
+            { "flags": 4, "matrix": [6, 6],  "x": 209, "y": 0 },
+            { "flags": 4, "matrix": [6, 2],  "x": 224, "y": 0 },
+            { "flags": 4, "matrix": [1, 0],  "x": 0,   "y": 13 },
+            { "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": [7, 8],  "x": 134, "y": 13 },
+            { "flags": 4, "matrix": [7, 7],  "x": 149, "y": 13 },
+            { "flags": 4, "matrix": [7, 5],  "x": 164, "y": 13 },
+            { "flags": 4, "matrix": [7, 4],  "x": 179, "y": 13 },
+            { "flags": 4, "matrix": [7, 6],  "x": 202, "y": 13 },
+            { "flags": 4, "matrix": [7, 2],  "x": 224, "y": 13 },
+            { "flags": 4, "matrix": [2, 0],  "x": 4,   "y": 26 },
+            { "flags": 4, "matrix": [2, 1],  "x": 22,  "y": 26 },
+            { "flags": 4, "matrix": [2, 2],  "x": 37,  "y": 26 },
+            { "flags": 4, "matrix": [2, 3],  "x": 52,  "y": 26 },
+            { "flags": 4, "matrix": [2, 4],  "x": 67,  "y": 26 },
+            { "flags": 4, "matrix": [2, 5],  "x": 82,  "y": 26 },
+            { "flags": 4, "matrix": [2, 6],  "x": 97,  "y": 26 },
+            { "flags": 4, "matrix": [2, 7],  "x": 112, "y": 26 },
+            { "flags": 4, "matrix": [2, 8],  "x": 127, "y": 26 },
+            { "flags": 4, "matrix": [8, 8],  "x": 142, "y": 26 },
+            { "flags": 4, "matrix": [8, 7],  "x": 157, "y": 26 },
+            { "flags": 4, "matrix": [8, 5],  "x": 172, "y": 26 },
+            { "flags": 4, "matrix": [8, 4],  "x": 187, "y": 26 },
+            { "flags": 4, "matrix": [8, 3],  "x": 207, "y": 32 },
+            { "flags": 4, "matrix": [8, 6],  "x": 224, "y": 26 },
+            { "flags": 4, "matrix": [3, 0],  "x": 6,   "y": 38 },
+            { "flags": 4, "matrix": [3, 1],  "x": 26,  "y": 38 },
+            { "flags": 4, "matrix": [3, 2],  "x": 41,  "y": 38 },
+            { "flags": 4, "matrix": [3, 3],  "x": 56,  "y": 38 },
+            { "flags": 4, "matrix": [3, 4],  "x": 71,  "y": 38 },
+            { "flags": 4, "matrix": [3, 5],  "x": 86,  "y": 38 },
+            { "flags": 4, "matrix": [3, 6],  "x": 101, "y": 38 },
+            { "flags": 4, "matrix": [3, 7],  "x": 116, "y": 38 },
+            { "flags": 4, "matrix": [3, 8],  "x": 131, "y": 38 },
+            { "flags": 4, "matrix": [9, 8],  "x": 146, "y": 38 },
+            { "flags": 4, "matrix": [9, 7],  "x": 161, "y": 38 },
+            { "flags": 4, "matrix": [9, 5],  "x": 175, "y": 38 },
+            { "flags": 4, "matrix": [9, 4],  "x": 190, "y": 38 },
+            { "flags": 4, "matrix": [9, 6],  "x": 224, "y": 38 },
+            { "flags": 4, "matrix": [4, 0],  "x": 2,   "y": 51 },
+            { "flags": 4, "matrix": [4, 1],  "x": 19,  "y": 51 },
+            { "flags": 4, "matrix": [4, 2],  "x": 34,  "y": 51 },
+            { "flags": 4, "matrix": [4, 3],  "x": 49,  "y": 51 },
+            { "flags": 4, "matrix": [4, 4],  "x": 63,  "y": 51 },
+            { "flags": 4, "matrix": [4, 5],  "x": 78,  "y": 51 },
+            { "flags": 4, "matrix": [4, 6],  "x": 93,  "y": 51 },
+            { "flags": 4, "matrix": [4, 7],  "x": 108, "y": 51 },
+            { "flags": 4, "matrix": [4, 8],  "x": 123, "y": 51 },
+            { "flags": 4, "matrix": [10, 8], "x": 138, "y": 51 },
+            { "flags": 4, "matrix": [10, 7], "x": 153, "y": 51 },
+            { "flags": 4, "matrix": [10, 5], "x": 168, "y": 51 },
+            { "flags": 4, "matrix": [10, 4], "x": 189, "y": 51 },
+            { "flags": 4, "matrix": [10, 3], "x": 209, "y": 51 },
+            { "flags": 4, "matrix": [10, 6], "x": 224, "y": 51 },
+            { "flags": 4, "matrix": [5, 0],  "x": 2,   "y": 64 },
+            { "flags": 4, "matrix": [5, 1],  "x": 21,  "y": 64 },
+            { "flags": 4, "matrix": [5, 2],  "x": 39,  "y": 64 },
+            { "flags": 4, "matrix": [5, 6],  "x": 95,  "y": 64 },
+            { "flags": 4, "matrix": [5, 8],  "x": 149, "y": 64 },
+            { "flags": 4, "matrix": [5, 7],  "x": 164, "y": 64 },
+            { "flags": 4, "matrix": [5, 5],  "x": 179, "y": 64 },
+            { "flags": 4, "matrix": [5, 4],  "x": 194, "y": 64 },
+            { "flags": 4, "matrix": [5, 3],  "x": 209, "y": 64 },
+            { "flags": 4, "matrix": [11, 6], "x": 224, "y": 64 },
+            { "flags": 2, "x": 1,  "y": 5 },
+            { "flags": 2, "x": 38, "y": 5 },
+            { "flags": 2, "x": 75, "y": 5 },
+            { "flags": 2, "x": 112, "y": 5 },
+            { "flags": 2, "x": 149, "y": 5 },
+            { "flags": 2, "x": 186, "y": 5 },
+            { "flags": 2, "x": 223, "y": 5 },
+            { "flags": 2, "x": 223, "y": 32 },
+            { "flags": 2, "x": 223, "y": 60 },
+            { "flags": 2, "x": 186, "y": 60 },
+            { "flags": 2, "x": 149, "y": 60 },
+            { "flags": 2, "x": 112, "y": 60 },
+            { "flags": 2, "x": 75, "y": 60 },
+            { "flags": 2, "x": 38, "y": 60 },
+            { "flags": 2, "x": 1, "y": 60 },
+            { "flags": 2, "x": 1, "y": 32 }
+        ]
+    },
+    "community_layouts": ["75_iso"],
+    "layouts": {
+        "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": [6, 8], "x":9, "y":0},
+                {"matrix": [6, 7], "x":10, "y":0},
+                {"matrix": [6, 5], "x":11, "y":0},
+                {"matrix": [6, 4], "x":12, "y":0},
+                {"matrix": [6, 3], "x":13, "y":0},
+                {"matrix": [6, 6], "x":14, "y":0},
+                {"matrix": [6, 2], "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": [7, 8], "x":9, "y":1},
+                {"matrix": [7, 7], "x":10, "y":1},
+                {"matrix": [7, 5], "x":11, "y":1},
+                {"matrix": [7, 4], "x":12, "y":1},
+                {"matrix": [7, 6], "x":13, "y":1, "w":2},
+                {"matrix": [7, 2], "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": [8, 8], "x":9.5, "y":2},
+                {"matrix": [8, 7], "x":10.5, "y":2},
+                {"matrix": [8, 5], "x":11.5, "y":2},
+                {"matrix": [8, 4], "x":12.5, "y":2},
+                {"matrix": [8, 6], "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": [9, 8], "x":9.75, "y":3},
+                {"matrix": [9, 7], "x":10.75, "y":3},
+                {"matrix": [9, 5], "x":11.75, "y":3},
+                {"matrix": [9, 4], "x":12.75, "y":3},
+                {"matrix": [8, 3], "x":13.75, "y":2, "w":1.25, "h":2},
+                {"matrix": [9, 6], "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": [10, 8], "x":9.25, "y":4},
+                {"matrix": [10, 7], "x":10.25, "y":4},
+                {"matrix": [10, 5], "x":11.25, "y":4},
+                {"matrix": [10, 4], "x":12.25, "y":4, "w":1.75},
+                {"matrix": [10, 3], "x":14, "y":4},
+                {"matrix": [10, 6], "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, 8], "x":10, "y":5},
+                {"matrix": [5, 7], "x":11, "y":5},
+                {"matrix": [5, 5], "x":12, "y":5},
+                {"matrix": [5, 4], "x":13, "y":5},
+                {"matrix": [5, 3], "x":14, "y":5},
+                {"matrix": [11, 6], "x":15, "y":5}
+            ]
+        }
+    }
+}
+
diff --git a/keyboards/ymdk/ymd75/rev4/iso/keymaps/default/keymap.c b/keyboards/ymdk/ymd75/rev4/iso/keymaps/default/keymap.c
new file mode 100644
index 000000000000..15dc1dc8b70e
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev4/iso/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+// Copyright 2023 zvecr<git@zvecr.com>
+// 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│Pse│Del│
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
+     * │ ` │ 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│GUI│Ctl│ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_75_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_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_BSPC,          KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_PGDN,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_75_iso(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/keyboards/ymdk/ymd75/rev4/iso/keymaps/via/keymap.c b/keyboards/ymdk/ymd75/rev4/iso/keymaps/via/keymap.c
new file mode 100644
index 000000000000..15dc1dc8b70e
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev4/iso/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+// Copyright 2023 zvecr<git@zvecr.com>
+// 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│Pse│Del│
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
+     * │ ` │ 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│GUI│Ctl│ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_75_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_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_BSPC,          KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_PGDN,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_75_iso(
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/keyboards/ymdk/ymd75/rev4/iso/keymaps/via/rules.mk b/keyboards/ymdk/ymd75/rev4/iso/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev4/iso/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/ymdk/ymd75/rev4/iso/mcuconf.h b/keyboards/ymdk/ymd75/rev4/iso/mcuconf.h
new file mode 100644
index 000000000000..a7e5a1c0588c
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev4/iso/mcuconf.h
@@ -0,0 +1,11 @@
+// Copyright 2023 zvecr<git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM4
+#define STM32_PWM_USE_TIM4 TRUE
+
+#undef STM32_PLLXTPRE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2
diff --git a/keyboards/ymdk/ymd75/rev4/iso/readme.md b/keyboards/ymdk/ymd75/rev4/iso/readme.md
new file mode 100644
index 000000000000..43b0c9222493
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev4/iso/readme.md
@@ -0,0 +1,24 @@
+# YMD75 V4
+
+75% per key RGB hotswap PCB with North Facing LED.
+
+* Keyboard Maintainer: [zvecr](https://github.com/zvecr)
+* Hardware Availability: <https://ymdkey.com/products/ymd-75-84-v4-rgb-hotswap-pcb-plate-north-facing-via-vial-fully-programmable>
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ymdk/ymd75/rev4/iso:default
+
+Flashing example for this keyboard:
+
+    make ymdk/ymd75/rev4/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
+
+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**: Quickly double tap 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/ymdk/ymd75/rev4/iso/rules.mk b/keyboards/ymdk/ymd75/rev4/iso/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/ymdk/ymd75/rev4/iso/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/ymdk/ymd75/rules.mk b/keyboards/ymdk/ymd75/rules.mk
deleted file mode 100644
index ec66e0734a6a..000000000000
--- a/keyboards/ymdk/ymd75/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = ymdk/ymd75/rev1
diff --git a/keyboards/ymdk/ymd96/config.h b/keyboards/ymdk/ymd96/config.h
deleted file mode 100644
index ecb03b59175e..000000000000
--- a/keyboards/ymdk/ymd96/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 Harshit Goel <Harshitgoel96@yahoo.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have 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
-
-/* RGB underglow */
-#define RGBLED_NUM 18
-#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_VAL_STEP 20*/
diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymdk/ymd96/info.json
index f603439d3985..d947050f3da3 100644
--- a/keyboards/ymdk/ymd96/info.json
+++ b/keyboards/ymdk/ymd96/info.json
@@ -19,6 +19,21 @@
         "levels": 12,
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 18,
+        "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": {
         "driver": "i2c"
     },
@@ -29,6 +44,9 @@
     },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
+    "tapping": {
+        "toggle": 3
+    },
     "layouts": {
         "LAYOUT_default": {
             "layout": [
diff --git a/keyboards/yncognito/batpad/info.json b/keyboards/yncognito/batpad/info.json
index ec57403a66db..4ec1dc045ff6 100644
--- a/keyboards/yncognito/batpad/info.json
+++ b/keyboards/yncognito/batpad/info.json
@@ -12,7 +12,7 @@
         "pin": "B5"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "matrix_pins": {
         "cols": ["F1", "F0", "D5", "D3"],
diff --git a/keyboards/yoichiro/lunakey_macro/config.h b/keyboards/yoichiro/lunakey_macro/config.h
index ec059fd01efb..4c3ced2c4267 100644
--- a/keyboards/yoichiro/lunakey_macro/config.h
+++ b/keyboards/yoichiro/lunakey_macro/config.h
@@ -30,23 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Layer Count */
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 
-  #define RGBLED_NUM 5
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-//  #define RGBLIGHT_LAYERS
-#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
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/yoichiro/lunakey_macro/info.json b/keyboards/yoichiro/lunakey_macro/info.json
index f892a9db7fe3..46b7ca26f45a 100644
--- a/keyboards/yoichiro/lunakey_macro/info.json
+++ b/keyboards/yoichiro/lunakey_macro/info.json
@@ -13,6 +13,24 @@
         "rows": ["E6", "B4", "B5"]
     },
     "diode_direction": "COL2ROW",
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 5,
+        "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": "D3"
     },
diff --git a/keyboards/yoichiro/lunakey_mini/config.h b/keyboards/yoichiro/lunakey_mini/config.h
index 8040e082a372..079dd3e3d73c 100644
--- a/keyboards/yoichiro/lunakey_mini/config.h
+++ b/keyboards/yoichiro/lunakey_mini/config.h
@@ -17,26 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-  #define RGBLED_NUM 12
-  #define RGBLIGHT_SPLIT
-  #define RGBLED_SPLIT { 6, 6 }
-  #define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, \
-                             11, 10, 9, 8, 7, 6 }
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
-  #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
-
 /* Audio Support */
 #define AUDIO_PIN C6
 
diff --git a/keyboards/yoichiro/lunakey_mini/info.json b/keyboards/yoichiro/lunakey_mini/info.json
index 1347f73cb080..aa00e7e69e3c 100644
--- a/keyboards/yoichiro/lunakey_mini/info.json
+++ b/keyboards/yoichiro/lunakey_mini/info.json
@@ -16,6 +16,26 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "sleep": true,
+        "led_map": [0, 1, 2, 3, 4, 5, 11, 10, 9, 8, 7, 6],
+        "split_count": [6, 6],
+        "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": "D3"
     },
diff --git a/keyboards/yoichiro/lunakey_pico/config.h b/keyboards/yoichiro/lunakey_pico/config.h
index cf819293be9a..a95edc0358b7 100644
--- a/keyboards/yoichiro/lunakey_pico/config.h
+++ b/keyboards/yoichiro/lunakey_pico/config.h
@@ -15,9 +15,6 @@
 
 #define WS2812_PIO_USE_PIO1
 
-#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, \
-                           11, 10, 9, 8, 7, 6 }
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/yoichiro/lunakey_pico/info.json b/keyboards/yoichiro/lunakey_pico/info.json
index 2b477e726c25..bf4b2a251094 100644
--- a/keyboards/yoichiro/lunakey_pico/info.json
+++ b/keyboards/yoichiro/lunakey_pico/info.json
@@ -26,6 +26,7 @@
     },
     "rgblight": {
         "led_count": 12,
+        "led_map": [0, 1, 2, 3, 4, 5, 11, 10, 9, 8, 7, 6],
         "sleep": true,
         "split": true,
         "split_count": [6, 6],
diff --git a/keyboards/yosino58/keymaps/default/keymap.c b/keyboards/yosino58/keymaps/default/keymap.c
index 45ee46f7ceb3..512c0ec4b194 100644
--- a/keyboards/yosino58/keymaps/default/keymap.c
+++ b/keyboards/yosino58/keymaps/default/keymap.c
@@ -200,8 +200,9 @@ bool oled_task_user(void) {
     int rowa = 0;
 
     //Set Indicator icon
-    if (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) { rown = 1; } else { rown = 0; }
-    if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) { rowc = 1; } else { rowc = 0; }
+    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; }
diff --git a/keyboards/yosino58/keymaps/sakura/keymap.c b/keyboards/yosino58/keymaps/sakura/keymap.c
index 53d4f9b077e2..e3c8c52d7de9 100644
--- a/keyboards/yosino58/keymaps/sakura/keymap.c
+++ b/keyboards/yosino58/keymaps/sakura/keymap.c
@@ -200,8 +200,9 @@ bool oled_task_user(void) {
     int rowa = 0;
 
     //Set Indicator icon
-    if (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) { rown = 1; } else { rown = 0; }
-    if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) { rowc = 1; } else { rowc = 0; }
+    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; }
diff --git a/keyboards/yosino58/lib/host_led_state_reader.c b/keyboards/yosino58/lib/host_led_state_reader.c
index abcfefffb4a7..87249d8d4fc8 100644
--- a/keyboards/yosino58/lib/host_led_state_reader.c
+++ b/keyboards/yosino58/lib/host_led_state_reader.c
@@ -4,11 +4,11 @@ char host_led_state_str[24];
 
 const char *read_host_led_state(void)
 {
-  uint8_t leds = host_keyboard_leds();
+  led_t led_state = host_keyboard_led_state();
   snprintf(host_led_state_str, sizeof(host_led_state_str), "NL:%s CL:%s SL:%s",
-           (leds & (1 << USB_LED_NUM_LOCK)) ? "on" : "- ",
-           (leds & (1 << USB_LED_CAPS_LOCK)) ? "on" : "- ",
-           (leds & (1 << USB_LED_SCROLL_LOCK)) ? "on" : "- ");
+           led_state.num_lock ? "on" : "- ",
+           led_state.caps_lock ? "on" : "- ",
+           led_state.scroll_lock ? "on" : "- ");
 
   return host_led_state_str;
 }
diff --git a/keyboards/yosino58/rev1/config.h b/keyboards/yosino58/rev1/config.h
deleted file mode 100644
index 4930c35c60e8..000000000000
--- a/keyboards/yosino58/rev1/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-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
-
-/* ws2812 RGB LED */
-#define RGBLED_NUM 12    // Number of LEDs
-
-/*
- * 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/yosino58/rev1/info.json b/keyboards/yosino58/rev1/info.json
index 730c82faa48a..c0dc03831faa 100644
--- a/keyboards/yosino58/rev1/info.json
+++ b/keyboards/yosino58/rev1/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "led_count": 12
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/yosino58/rev1/rules.mk b/keyboards/yosino58/rev1/rules.mk
index a51a58c5ead9..2fcc81da0f63 100644
--- a/keyboards/yosino58/rev1/rules.mk
+++ b/keyboards/yosino58/rev1/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SPLIT_KEYBOARD = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/yushakobo/navpad/10/config.h b/keyboards/yushakobo/navpad/10/config.h
index bb842334befc..23285a342dd2 100644
--- a/keyboards/yushakobo/navpad/10/config.h
+++ b/keyboards/yushakobo/navpad/10/config.h
@@ -17,26 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#    define RGBLED_NUM 9
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* disable action features */
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
 #define QUICK_TAP_TERM 0
-#define TAPPING_TERM 132
 #define TAPPING_LAYER_TERM 90
diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json
index 81b2740f3241..ef0cdf5cbed1 100644
--- a/keyboards/yushakobo/navpad/10/info.json
+++ b/keyboards/yushakobo/navpad/10/info.json
@@ -12,11 +12,22 @@
             {"pin_a": "B5", "pin_b": "B6"}
         ]
     },
+    "tapping": {
+        "term": 132
+    },
     "ws2812": {
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 120
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 9,
+        "max_brightness": 120,
+        "sleep": true,
+        "animations": {
+            "rainbow_swirl": true,
+            "rgb_test": true
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina"
diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c b/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
index 790ac9dd838b..0f9065a63485 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
+++ b/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
@@ -53,17 +53,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) { /* First encoder */
-    if (clockwise) {
-      tap_code16(KC_WH_U);
-    } else {
-      tap_code16(KC_WH_D);
-    }
-  }
-  return false;
-}
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_BASE] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
+    [_FN1] = { ENCODER_CCW_CW(KC_NO, KC_NO) },
+    [_FN2] = { ENCODER_CCW_CW(KC_NO, KC_NO) },
+    [_FN3] = { ENCODER_CCW_CW(KC_NO, KC_NO) },
+};
 #endif
 
 #ifdef RGBLIGHT_LAYERS
diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/rules.mk b/keyboards/yushakobo/navpad/10/keymaps/via/rules.mk
index 036bd6d1c3ec..715838ecc5d9 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/via/rules.mk
+++ b/keyboards/yushakobo/navpad/10/keymaps/via/rules.mk
@@ -1 +1,2 @@
-VIA_ENABLE = yes
\ No newline at end of file
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/yushakobo/navpad/10/rev1/config.h b/keyboards/yushakobo/navpad/10/rev1/config.h
deleted file mode 100644
index d4a4e48d776e..000000000000
--- a/keyboards/yushakobo/navpad/10/rev1/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2021 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/>.
-*/
-
-#pragma once
-
-#    define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7 }
diff --git a/keyboards/yushakobo/navpad/10/rev1/info.json b/keyboards/yushakobo/navpad/10/rev1/info.json
index bd20c0d0b479..a35dc4d5e977 100644
--- a/keyboards/yushakobo/navpad/10/rev1/info.json
+++ b/keyboards/yushakobo/navpad/10/rev1/info.json
@@ -2,6 +2,9 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "led_map": [0, 1, 2, 3, 4, 5, 6, 8, 7]
+    },
     "matrix_pins": {
         "cols": ["F5", "F6", "B2", "B3", "B1", "F7"],
         "rows": ["D4", "C6", "D7", "E6", "B4", "F4"]
diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h
index 95c70244a419..028791d717c8 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/config.h
+++ b/keyboards/yushakobo/navpad/10_helix_r/config.h
@@ -19,34 +19,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EE_HANDS
 
-#    define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7, \
-                                   9, 10, 11, 12, 13, 14, \
-                                  20, 19, 18, 17, 16, 15, \
-                                  21, 22, 23, 24, 25, 26, \
-                              33, 32, 31, 30, 29, 28, 27, \
-                              34, 35, 36, 37, 38, 39, 40 }
-
-#    define RGBLED_NUM 9+32
-#    define RGBLED_SPLIT { 9, 32 }
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* disable action features */
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
 #define QUICK_TAP_TERM 0
-#define TAPPING_TERM 132
 #define TAPPING_LAYER_TERM 90
diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json
index f086173867cb..1f01ffde5f98 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/info.json
+++ b/keyboards/yushakobo/navpad/10_helix_r/info.json
@@ -34,11 +34,24 @@
             }
         }
     },
+    "tapping": {
+        "term": 132
+    },
     "ws2812": {
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 120
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 41,
+        "max_brightness": 120,
+        "led_map": [0, 1, 2, 3, 4, 5, 6, 8, 7, 9, 10, 11, 12, 13, 14, 20, 19, 18, 17, 16, 15, 21, 22, 23, 24, 25, 26, 33, 32, 31, 30, 29, 28, 27, 34, 35, 36, 37, 38, 39, 40],
+        "sleep": true,
+        "split_count": [9, 32],
+        "animations": {
+            "rainbow_swirl": true,
+            "rgb_test": true
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h
index 00018d319c4c..8fb9e393ee33 100644
--- a/keyboards/yushakobo/quick17/config.h
+++ b/keyboards/yushakobo/quick17/config.h
@@ -17,10 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 18
-
 #ifdef RGB_MATRIX_ENABLE
-#   define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#   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
@@ -32,40 +30,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //        #define RGB_MATRIX_DEFAULT_HUE 128
 //        #define RGB_MATRIX_DEFAULT_SAT 255
         #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#    define RGB_MATRIX_HUE_STEP 8
-#    define RGB_MATRIX_SAT_STEP 8
-#    define RGB_MATRIX_VAL_STEP 8
-#    define RGB_MATRIX_SPD_STEP 10
 #endif
 
-
-
-
-#ifdef RGBLIGHT_ENABLE
-#    define RGBLIGHT_LED_MAP {\
-        6,  7, 12, 13, 14, 15,\
-       16, 17, 11, 10,  9,  8,\
-        0,  1,  2,  3,  4,  5\
-     }
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-//#    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_LAYERS
 #define RGBLIGHT_MAX_LAYERS 8
 
-#endif
-
 /* disable action features */
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json
index 1889a006438c..58374a7de78b 100644
--- a/keyboards/yushakobo/quick17/info.json
+++ b/keyboards/yushakobo/quick17/info.json
@@ -9,10 +9,24 @@
         "device_version": "0.0.1"
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812",
+        "sat_steps": 8,
+        "val_steps": 8,
+        "speed_steps": 10
     },
     "rgblight": {
-        "max_brightness": 150
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "max_brightness": 150,
+        "led_map": [6, 7, 12, 13, 14, 15, 16, 17, 11, 10, 9, 8, 0, 1, 2, 3, 4, 5],
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true
+        }
     },
     "matrix_pins": {
         "cols": ["F5", "D4", "E6", "F7", "C6", "D7"],
diff --git a/keyboards/yushakobo/quick7/config.h b/keyboards/yushakobo/quick7/config.h
index 0a35045845e4..1c8764879492 100644
--- a/keyboards/yushakobo/quick7/config.h
+++ b/keyboards/yushakobo/quick7/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef RGBLIGHT_ENABLE
-#    define RGBLED_NUM 13
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-
 /* 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/yushakobo/quick7/info.json b/keyboards/yushakobo/quick7/info.json
index 79458d1564ff..54d365d07751 100644
--- a/keyboards/yushakobo/quick7/info.json
+++ b/keyboards/yushakobo/quick7/info.json
@@ -14,6 +14,18 @@
             {"pin_a": "F5", "pin_b": "F6"}
         ]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 13,
+        "sleep": true,
+        "animations": {
+            "rainbow_mood": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true
+        }
+    },
     "ws2812": {
         "pin": "D3"
     },
diff --git a/keyboards/yynmt/dozen0/config.h b/keyboards/yynmt/dozen0/config.h
index e94b19675f31..eb679ebba0a7 100644
--- a/keyboards/yynmt/dozen0/config.h
+++ b/keyboards/yynmt/dozen0/config.h
@@ -17,21 +17,6 @@ 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 RGBLED_NUM 2
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* 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/yynmt/dozen0/info.json b/keyboards/yynmt/dozen0/info.json
index 9a2417f0393f..a4f3800f889d 100644
--- a/keyboards/yynmt/dozen0/info.json
+++ b/keyboards/yynmt/dozen0/info.json
@@ -8,6 +8,23 @@
     "pid": "0xEA4F",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 2,
+    "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": "D3"
   },
diff --git a/keyboards/yynmt/dozen0/keymaps/f12/keymap.c b/keyboards/yynmt/dozen0/keymaps/f12/keymap.c
index 167e29e10620..33512faa6781 100644
--- a/keyboards/yynmt/dozen0/keymaps/f12/keymap.c
+++ b/keyboards/yynmt/dozen0/keymaps/f12/keymap.c
@@ -22,19 +22,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12
   ),
 };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/yynmt/kagamidget/config.h b/keyboards/yynmt/kagamidget/config.h
index f50a2c72c3a3..eb679ebba0a7 100644
--- a/keyboards/yynmt/kagamidget/config.h
+++ b/keyboards/yynmt/kagamidget/config.h
@@ -17,21 +17,6 @@ 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 RGBLED_NUM 4
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
 /* 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/yynmt/kagamidget/info.json b/keyboards/yynmt/kagamidget/info.json
index 4165c966bf44..e9bc92dea338 100644
--- a/keyboards/yynmt/kagamidget/info.json
+++ b/keyboards/yynmt/kagamidget/info.json
@@ -8,6 +8,23 @@
     "pid": "0x0000",
     "device_version": "0.0.1"
   },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 4,
+    "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": "D3"
   },
diff --git a/keyboards/z12/rules.mk b/keyboards/z12/rules.mk
index 65ce7f2dea5a..102b2e62a3c0 100644
--- a/keyboards/z12/rules.mk
+++ b/keyboards/z12/rules.mk
@@ -13,5 +13,3 @@ RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no          # Audio output
 LTO_ENABLE = yes           # Enables Link Time Optimization (LTO) which reduces the compiled size
 OLED_ENABLE = yes          # Enables the use of OLED displays
-OLED_DRIVER = SSD1306      # Enables the use of OLED displays
-
diff --git a/keyboards/zeix/eden/config.h b/keyboards/zeix/eden/config.h
new file mode 100644
index 000000000000..77970ce4d344
--- /dev/null
+++ b/keyboards/zeix/eden/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/zeix/eden/info.json b/keyboards/zeix/eden/info.json
new file mode 100644
index 000000000000..2b5fd6eae7c7
--- /dev/null
+++ b/keyboards/zeix/eden/info.json
@@ -0,0 +1,1017 @@
+{
+    "keyboard_name": "Eden",
+    "maintainer": "itsme-zeix",
+    "manufacturer": "dnworks",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "usb": {
+        "vid": "0x4C27",
+        "pid": "0x2901",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "GP29",
+        "on_state": 1
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "rows": ["GP6", "GP5", "GP4", "GP0", "GP12"],
+        "cols": ["GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP3", "GP2", "GP1", "GP8", "GP9", "GP10", "GP11", "GP7"]
+    },
+    "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": [
+                {"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},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.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}
+            ]
+        },
+        "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, 14], "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": [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, 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, 14], "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": [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, 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_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, 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_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, 14], "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": [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, 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": {
+            "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": [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": 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": [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": [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.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, 14], "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": 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": [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": [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": {
+            "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": [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": 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": [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": [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/zeix/eden/keymaps/default/keymap.c b/keyboards/zeix/eden/keymaps/default/keymap.c
new file mode 100644
index 000000000000..c209675b3783
--- /dev/null
+++ b/keyboards/zeix/eden/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/*
+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_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_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_RALT, KC_RGUI, MO(1),   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_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),
+};
diff --git a/keyboards/zeix/eden/keymaps/via/keymap.c b/keyboards/zeix/eden/keymaps/via/keymap.c
new file mode 100644
index 000000000000..c209675b3783
--- /dev/null
+++ b/keyboards/zeix/eden/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+/*
+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_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_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_RALT, KC_RGUI, MO(1),   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_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),
+};
diff --git a/keyboards/zeix/eden/keymaps/via/rules.mk b/keyboards/zeix/eden/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/zeix/eden/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/zeix/eden/matrix_diagram.md b/keyboards/zeix/eden/matrix_diagram.md
new file mode 100644
index 000000000000..4686e997b29a
--- /dev/null
+++ b/keyboards/zeix/eden/matrix_diagram.md
@@ -0,0 +1,23 @@
+# Matrix Diagram for Eden
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0E     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      ┌─────┐
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤   ┌──┴┐2D  │ ISO Enter
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │   │2C │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   └───┴────┘
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+│40  │41  │42  │46                      │4A  │4B  │4C  │4D  │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+┌────────┐                                       ┌──────────┐
+│30      │ 2.25u LShift             2.75u RShift │3C        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40   │41 │42   │46                         │4B   │4C │4D   │ Tsangan/WKL/HHKB
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
diff --git a/keyboards/zeix/eden/readme.md b/keyboards/zeix/eden/readme.md
new file mode 100644
index 000000000000..85f1ff66ded8
--- /dev/null
+++ b/keyboards/zeix/eden/readme.md
@@ -0,0 +1,27 @@
+# Eden
+
+![Eden](https://i.imgur.com/5He99nkh.jpg)
+
+A 60% mounted with tadpoles designed by The Flying Penguin.
+
+* Keyboard Maintainer: [Zeix](https://github.com/itsme-zeix)
+* Hardware Supported: Eden Solder PCB rev1
+* Hardware Availability: mecha.store
+
+Make example for this keyboard (after setting up your build environment):
+
+    make zeix/eden:default
+
+Flashing example for this keyboard:
+
+    make zeix/eden: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 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/zeix/eden/rules.mk b/keyboards/zeix/eden/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/zeix/eden/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/zeix/qwertyqop60hs/config.h b/keyboards/zeix/qwertyqop60hs/config.h
new file mode 100644
index 000000000000..77970ce4d344
--- /dev/null
+++ b/keyboards/zeix/qwertyqop60hs/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/zeix/qwertyqop60hs/info.json b/keyboards/zeix/qwertyqop60hs/info.json
new file mode 100644
index 000000000000..8a3e06f2eb47
--- /dev/null
+++ b/keyboards/zeix/qwertyqop60hs/info.json
@@ -0,0 +1,452 @@
+{
+    "keyboard_name": "QQ 60% Hotswap",
+    "maintainer": "itsme-zeix",
+    "manufacturer": "qwertyqop",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "usb": {
+        "vid": "0x4C27",
+        "pid": "0x2900",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {    
+        "rows": ["GP6","GP5","GP4","GP0","GP12"],
+        "cols": ["GP28","GP27","GP26","GP25","GP24","GP23","GP22","GP3","GP2","GP1","GP8","GP9","GP10","GP11","GP7"]
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_hhkb"
+    ],
+    "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": [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": [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, 13], "w": 2.25, "x": 12.75, "y": 2 },
+
+                { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "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], "w": 1.75, "x": 12.25, "y": 3 },
+                { "matrix": [3, 13], "x": 14, "y": 3 },
+
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "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, 14], "x": 13, "y": 0, "w": 2 },
+
+                { "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": [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, 13], "w": 2.25, "x": 12.75, "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": 2.75, "x": 12.25, "y": 3 },
+
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "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": [0, 14], "x": 14, "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": [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, 13], "w": 2.25, "x": 12.75, "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": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "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, 14], "x": 13, "y": 0, "w": 2 },
+
+                { "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": [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, 13], "w": 2.25, "x": 12.75, "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": 2.75, "x": 12.25, "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": 12.5, "y": 4 },
+                { "matrix": [4, 13], "w": 1.5, "x": 13.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": [0, 14], "x": 14, "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": [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, 13], "w": 2.25, "x": 12.75, "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": [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": 12.5, "y": 4 },
+                { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        },
+        "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], "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": [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, 13], "w": 2.25, "x": 12.75, "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": [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": 12.5, "y": 4 }
+            ]
+        }       
+    }
+}
diff --git a/keyboards/zeix/qwertyqop60hs/keymaps/default/keymap.c b/keyboards/zeix/qwertyqop60hs/keymaps/default/keymap.c
new file mode 100644
index 000000000000..14d759965a65
--- /dev/null
+++ b/keyboards/zeix/qwertyqop60hs/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/*
+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_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_RALT, KC_RGUI, MO(1),   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_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),
+};
diff --git a/keyboards/zeix/qwertyqop60hs/keymaps/via/keymap.c b/keyboards/zeix/qwertyqop60hs/keymaps/via/keymap.c
new file mode 100644
index 000000000000..14d759965a65
--- /dev/null
+++ b/keyboards/zeix/qwertyqop60hs/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+/*
+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_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_RALT, KC_RGUI, MO(1),   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_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),
+};
diff --git a/keyboards/zeix/qwertyqop60hs/keymaps/via/rules.mk b/keyboards/zeix/qwertyqop60hs/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/zeix/qwertyqop60hs/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/zeix/qwertyqop60hs/matrix_diagram.md b/keyboards/zeix/qwertyqop60hs/matrix_diagram.md
new file mode 100644
index 000000000000..37644edc7fc8
--- /dev/null
+++ b/keyboards/zeix/qwertyqop60hs/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for Zeix Qwertyqop60hs
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │0E     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+│10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ 
+│20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+│30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+│40  │41  │42  │46                      │4A  │4B  │4C  │4D  │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+┌────────┐                                       ┌──────────┐
+│30      │ 2.25u LShift             2.75u RShift │3C        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40   │41 │42   │46                         │4B   │4C │4D   │ Tsangan/WKL/HHKB
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```
diff --git a/keyboards/zeix/qwertyqop60hs/readme.md b/keyboards/zeix/qwertyqop60hs/readme.md
new file mode 100644
index 000000000000..1a36951fd16e
--- /dev/null
+++ b/keyboards/zeix/qwertyqop60hs/readme.md
@@ -0,0 +1,27 @@
+# qwertyqop hotswap 60% PCB
+
+![qwertyqop hotswap 60% PCB](https://i.imgur.com/OJXzZSEh.jpg)
+
+A generic hotswap 60% PCB with cutouts akin to h60 and 2 positions for JST port.
+
+* Keyboard Maintainer: [Zeix](https://github.com/itsme-zeix)
+* Hardware Supported: Qwertyqop QQ60 Hotswap PCB Rev1
+* Hardware Availability: https://qwertyqop.com/products/60-pcb-1
+
+Make example for this keyboard (after setting up your build environment):
+
+    make zeix/qwertyqop60hs:default
+
+Flashing example for this keyboard:
+
+    make zeix/qwertyqop60hs: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 the 'USB_BOOT' button and plug in keyboard or briefly short the `RESET` and `GND` pads on the SWD header twice
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/zeix/qwertyqop60hs/rules.mk b/keyboards/zeix/qwertyqop60hs/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/zeix/qwertyqop60hs/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/zfrontier/big_switch/config.h b/keyboards/zfrontier/big_switch/config.h
index eecce57fe6a3..e4aebce30c53 100644
--- a/keyboards/zfrontier/big_switch/config.h
+++ b/keyboards/zfrontier/big_switch/config.h
@@ -17,22 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* RGB light config */
-#define RGBLED_NUM 4
-#define RGBLIGHT_VAL_STEP 17
-#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_BREATHE_CENTER 2.0
 #define RGBLIGHT_EFFECT_BREATHE_MAX 255
 
-/* long tapping config */
-#define TAPPING_TERM 500
 #define PERMISSIVE_HOLD
diff --git a/keyboards/zfrontier/big_switch/info.json b/keyboards/zfrontier/big_switch/info.json
index 02c40f612572..9f19a030d16b 100644
--- a/keyboards/zfrontier/big_switch/info.json
+++ b/keyboards/zfrontier/big_switch/info.json
@@ -12,6 +12,24 @@
         "cols": ["F1"],
         "rows": ["F0"]
     },
+    "rgblight": {
+        "led_count": 4,
+        "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
+        }
+    },
+    "tapping": {
+        "term": 500
+    },
     "ws2812": {
         "pin": "B6"
     },
diff --git a/keyboards/zj68/config.h b/keyboards/zj68/config.h
index eff7fc2d491d..f97ce7b0f841 100644
--- a/keyboards/zj68/config.h
+++ b/keyboards/zj68/config.h
@@ -22,18 +22,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 14
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/zj68/info.json b/keyboards/zj68/info.json
index 6d0df4a0c5ff..e2916ce4e224 100644
--- a/keyboards/zj68/info.json
+++ b/keyboards/zj68/info.json
@@ -16,6 +16,23 @@
         "pin": "B6",
         "levels": 5
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "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": "E2"
     },
diff --git a/keyboards/zlant/config.h b/keyboards/zlant/config.h
index 8471167fcd95..5f360813239b 100755
--- a/keyboards/zlant/config.h
+++ b/keyboards/zlant/config.h
@@ -5,18 +5,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_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 RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/zlant/info.json b/keyboards/zlant/info.json
index 9f01b095185d..7fba339db1c3 100644
--- a/keyboards/zlant/info.json
+++ b/keyboards/zlant/info.json
@@ -12,6 +12,23 @@
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B7", "D1", "D2", "D3", "B3", "B2"],
         "rows": ["B0", "B1", "D4", "D5"]
     },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "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": "D6"
     },
diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h
index 310b4f575685..eafc776bef95 100644
--- a/keyboards/zoo/wampus/config.h
+++ b/keyboards/zoo/wampus/config.h
@@ -21,18 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_CHANNEL 1
 #define BACKLIGHT_PAL_MODE      1
 
-// RGB Underglow WS2812 Matrix defines
-#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
 // SPI RGB Driver
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/info.json
index ee3c3dfe4789..6478e67a80c1 100644
--- a/keyboards/zoo/wampus/info.json
+++ b/keyboards/zoo/wampus/info.json
@@ -17,6 +17,21 @@
         "pin": "A6",
         "breathing": true
     },
+    "rgblight": {
+        "led_count": 20,
+        "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"
diff --git a/keyboards/zoo/wampus/rules.mk b/keyboards/zoo/wampus/rules.mk
index 34d5f258fc75..fe3c88063d2f 100644
--- a/keyboards/zoo/wampus/rules.mk
+++ b/keyboards/zoo/wampus/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = no     # Enables the use of OLED displays
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h
index 3cb23cdcc58f..41739356422b 100644
--- a/keyboards/zvecr/split_blackpill/config.h
+++ b/keyboards/zvecr/split_blackpill/config.h
@@ -15,24 +15,9 @@
  */
 #pragma once
 
-#define MATRIX_IO_DELAY 5
-
 #define SPLIT_HAND_PIN B3
 #define SELECT_SOFT_SERIAL_SPEED 0
 
-#define RGBLED_NUM 24
-#define RGBLED_SPLIT { 12, 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 WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 1
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM3
diff --git a/keyboards/zvecr/split_blackpill/info.json b/keyboards/zvecr/split_blackpill/info.json
index f657556db9a7..377ec44f97ea 100644
--- a/keyboards/zvecr/split_blackpill/info.json
+++ b/keyboards/zvecr/split_blackpill/info.json
@@ -10,7 +10,8 @@
     },
     "matrix_pins": {
         "cols": ["B11", "B10", "B1", "B0", "A7", "A6"],
-        "rows": ["B15", "B14", "B13", "B12"]
+        "rows": ["B15", "B14", "B13", "B12"],
+        "io_delay": 5
     },
     "diode_direction": "COL2ROW",
     "split": {
@@ -25,6 +26,22 @@
             }
         }
     },
+    "rgblight": {
+        "led_count": 24,
+        "split_count": [12, 12],
+        "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": "B4",
         "driver": "pwm"
diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h
index 25caa13057d5..e503f07b801f 100644
--- a/keyboards/zvecr/zv48/config.h
+++ b/keyboards/zvecr/zv48/config.h
@@ -15,25 +15,10 @@
  */
 #pragma once
 
-#define MATRIX_IO_DELAY 5
-
 #define SPLIT_HAND_PIN B9
 //#define SELECT_SOFT_SERIAL_SPEED 0
 #define SERIAL_USART_SPEED 921600
 
-#define RGBLED_NUM 48
-#define RGBLED_SPLIT {24, 24}
-#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 WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 2
diff --git a/keyboards/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json
index 942a089b649e..e58651499a9b 100644
--- a/keyboards/zvecr/zv48/info.json
+++ b/keyboards/zvecr/zv48/info.json
@@ -10,7 +10,8 @@
     },
     "matrix_pins": {
         "cols": ["B15", "B10", "B0", "A5", "A4", "A3"],
-        "rows": ["A10", "A15", "B3", "B4"]
+        "rows": ["A10", "A15", "B3", "B4"],
+        "io_delay": 5
     },
     "diode_direction": "COL2ROW",
     "encoder": {
@@ -23,7 +24,21 @@
         "driver": "pwm"
     },
     "rgblight": {
-        "max_brightness": 120
+        "led_count": 48,
+        "max_brightness": 120,
+        "split_count": [24, 24],
+        "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
+        }
     },
     "split": {
         "soft_serial_pin": "B6",
diff --git a/keyboards/zykrah/fuyu/config.h b/keyboards/zykrah/fuyu/config.h
index 92fdcaa58692..0f24dfe7e356 100644
--- a/keyboards/zykrah/fuyu/config.h
+++ b/keyboards/zykrah/fuyu/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* The number of LEDs connected (7 Snowflake, 34 Underglow) */
 #define DRIVER_LED_TOTAL 41
-#define RGBLED_NUM 41
 #define RGB_MATRIX_LED_COUNT 41
 
 /* Caps locks LED index default is 0 (LED1 on PCB) */
diff --git a/keyboards/zykrah/fuyu/info.json b/keyboards/zykrah/fuyu/info.json
index 5ac93424dbe8..874114bfcae5 100644
--- a/keyboards/zykrah/fuyu/info.json
+++ b/keyboards/zykrah/fuyu/info.json
@@ -24,7 +24,7 @@
         "cols": ["GP29", "GP28", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP27", "GP9", "GP1", "GP0"]
     },
     "rgb_matrix": {
-        "driver": "WS2812"
+        "driver": "ws2812"
     },
     "ws2812": {
         "pin": "GP2",
diff --git a/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c b/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
index 3af6af509133..37e459893caa 100644
--- a/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
+++ b/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
@@ -109,9 +109,9 @@ void update_led(void) {
     }
 }
 
-void led_set_user(uint8_t usb_led) {
+bool led_update_user(led_t led_state) {
     // Caps Lock Indicator
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+    if (led_state.caps_lock) {
         writePinLow(B2);
         rgblight_setrgb(255, 110, 0);
     }
@@ -133,6 +133,7 @@ void led_set_user(uint8_t usb_led) {
         }
         update_led();
     }
+    return false;
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
diff --git a/layouts/community/60_iso/bifbofii/keymap.c b/layouts/community/60_iso/bifbofii/keymap.c
index d9d7383c3d55..890bdb4c5692 100755
--- a/layouts/community/60_iso/bifbofii/keymap.c
+++ b/layouts/community/60_iso/bifbofii/keymap.c
@@ -123,9 +123,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [UNICODE] = LAYOUT_60_iso(
         _______, _______,      _______, _______, _______, _______, _______, _______,      _______, _______,      _______, _______, _______, KC_BSPC,
-        _______, _______,      _______, X(EUR),  _______, _______, _______, XP(SUE, BUE), _______, XP(SOE, BOE), _______, _______, _______,
-        KC_TRNS, XP(SAE, BAE), X(SS),   _______, _______, _______, _______, _______,      _______, _______,      _______, _______, _______, KC_ENT,
-        KC_LSFT, _______,      _______, _______, X(CPR),  _______, _______, _______,      _______, _______,      _______, _______, KC_RSFT,
+        _______, _______,      _______, UM(EUR),  _______, _______, _______, UP(SUE, BUE), _______, UP(SOE, BOE), _______, _______, _______,
+        KC_TRNS, UP(SAE, BAE), UM(SS),   _______, _______, _______, _______, _______,      _______, _______,      _______, _______, _______, KC_ENT,
+        KC_LSFT, _______,      _______, _______, UM(CPR),  _______, _______, _______,      _______, _______,      _______, _______, KC_RSFT,
         KC_LCTL, KC_LGUI,      KC_LALT,                            KC_SPC,                                       KC_RALT, KC_RGUI, KC_RCTL, _______
     ),
 
diff --git a/layouts/community/60_iso/unxmaal/rules.mk b/layouts/community/60_iso/unxmaal/rules.mk
index c2d3c6b07589..5c9eb2a26d90 100644
--- a/layouts/community/60_iso/unxmaal/rules.mk
+++ b/layouts/community/60_iso/unxmaal/rules.mk
@@ -1,7 +1,7 @@
 # Only enable RGBLIGHT on avr boards
 ifeq ($(strip $(PLATFORM_KEY)),avr)
     # ...that are at least prepared for it
-    ifdef RGBLIGHT_DRIVER
+    ifeq ($(strip $(RGBLIGHT_SUPPORTED)),yes)
         RGBLIGHT_ENABLE = yes          # Enable RGB Underglow
     endif
 endif
diff --git a/layouts/community/65_ansi_blocker/spidey3/keymap.c b/layouts/community/65_ansi_blocker/spidey3/keymap.c
index 5f8080d4711c..81ee2bf3a7d6 100644
--- a/layouts/community/65_ansi_blocker/spidey3/keymap.c
+++ b/layouts/community/65_ansi_blocker/spidey3/keymap.c
@@ -32,10 +32,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     // Glyph Transformation
     [_GLYPH] = LAYOUT_65_ansi_blocker(
-        QK_BOOT,    X(SAD),     X(MEH),     X(HAPPY),   X(ANGRY),   X(THUMBDN), X(THUMBUP), X(SPIDER),  X_BUL,      X(LOL),     X(SURPRISE),X_DASH,     SPI_GFLOCK,             XXXXXXX,    XXXXXXX,
+        QK_BOOT,    UM(SAD),    UM(MEH),    UM(HAPPY),  UM(ANGRY),  UM(THUMBDN),UM(THUMBUP),UM(SPIDER), X_BUL,      UM(LOL),    UM(SURPRISE),X_DASH,     SPI_GFLOCK,             XXXXXXX,    XXXXXXX,
         EE_CLR,     SPI_NORMAL, SPI_WIDE,   SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD,   SPI_MATH,   XXXXXXX,    XXXXXXX,                XXXXXXX,    XXXXXXX,
         _______,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    XXXXXXX,
-        XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    X(LARR),    X(RARR),    XXXXXXX,                            XXXXXXX,    XXXXXXX,    XXXXXXX,
+        XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    UM(LARR),   UM(RARR),   XXXXXXX,                            XXXXXXX,    XXXXXXX,    XXXXXXX,
         XXXXXXX,    XXXXXXX,    XXXXXXX,                                    XXXXXXX,                                            XXXXXXX,    _______,                XXXXXXX,    XXXXXXX,    XXXXXXX
     )
 };
diff --git a/layouts/community/75_ansi/spidey3/keymap.c b/layouts/community/75_ansi/spidey3/keymap.c
index 5c2f6a150b81..4e251b41dbeb 100644
--- a/layouts/community/75_ansi/spidey3/keymap.c
+++ b/layouts/community/75_ansi/spidey3/keymap.c
@@ -24,10 +24,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // FN
     [_FN] = LAYOUT_75_ansi(
         QK_BOOT,    SPI_NORMAL, SPI_WIDE,   SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD,   SPI_MATH,   XXXXXXX,    SPI_GFLOCK, KC_SLEP,    CH_SUSP,    KC_PWR,
-        EE_CLR,     X(SAD),     X(MEH),     X(HAPPY),   X(ANGRY),   X(THUMBDN), X(THUMBUP), X(SPIDER),  X_BUL,      X(LOL),     X(SURPRISE),X_DASH,     XXXXXXX,                KC_PAUS,    KC_SCRL,
+        EE_CLR,     UM(SAD),    UM(MEH),    UM(HAPPY),  UM(ANGRY),  UM(THUMBDN),UM(THUMBUP),UM(SPIDER), X_BUL,      UM(LOL),    UM(SURPRISE),X_DASH,     XXXXXXX,                KC_PAUS,    KC_SCRL,
         XXXXXXX,    RGB_TOG,    RGB_MOD,    RGB_HUD,    RGB_HUI,    RGB_SAD,    RGB_SAI,    RGB_VAD,    RGB_VAI,    SPI_GLO,    VK_TOGG,    XXXXXXX,    XXXXXXX,                XXXXXXX,    KC_BRIU,
         XXXXXXX,    RGB_M_P,    RGB_M_B,    RGB_M_R,    RGB_M_SW,   RGB_M_SN,   RGB_M_K,    RGB_M_G,    RGB_M_TW,   UC_LINX,    XXXXXXX,    XXXXXXX,                            XXXXXXX,    KC_BRID,
-        _______,    XXXXXXX,    UC_EMAC,    UC_WINC,    UC_NEXT,    NK_TOGG,    TG(_NUMPAD),UC_MAC,     X(LARR),    X(RARR),    DB_TOGG,    _______,                            KC_VOLU,    KC_MUTE,
+        _______,    XXXXXXX,    UC_EMAC,    UC_WINC,    UC_NEXT,    NK_TOGG,    TG(_NUMPAD),UC_MAC,     UM(LARR),   UM(RARR),   DB_TOGG,    _______,                            KC_VOLU,    KC_MUTE,
         _______,    _______,    _______,                                    KC_MPLY,                                            KC_ASST,    _______,    KC_CPNL,    KC_MPRV,    KC_VOLD,    KC_MNXT
     )
 };
diff --git a/layouts/community/ergodox/colemak_code_friendly/keymap.c b/layouts/community/ergodox/colemak_code_friendly/keymap.c
index ae5bdcc5b8cf..d9e3c9fa6107 100644
--- a/layouts/community/ergodox/colemak_code_friendly/keymap.c
+++ b/layouts/community/ergodox/colemak_code_friendly/keymap.c
@@ -310,9 +310,6 @@ void matrix_init_user(void) {
 void matrix_scan_user(void) {
   uint8_t layer = get_highest_layer(layer_state);
 
-  //led 1, RED, Caps-Lock ON
-  //if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ergodox_right_led_1_on();
-
   //led 2, GREEN
   if (layer == LAYER_NUM)
       ergodox_right_led_2_on();
@@ -327,9 +324,10 @@ void matrix_scan_user(void) {
 };
 
 // Runs constantly in the background, in a loop.
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK))
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock)
         ergodox_right_led_1_on();
     else
         ergodox_right_led_1_off();
+    return false;
 }
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 1853b7007138..8d1449486a08 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -212,9 +212,9 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
 
 void housekeeping_task_keymap(void) {  // runs frequently to update info
 #ifdef KEYBOARD_ergodox_ez
-    uint8_t modifiers     = get_mods();
-    uint8_t led_usb_state = host_keyboard_leds();
-    uint8_t one_shot      = get_oneshot_mods();
+    uint8_t modifiers = get_mods();
+    led_t   led_state = host_keyboard_led_state();
+    uint8_t one_shot  = get_oneshot_mods();
 
     if (!skip_leds) {
         ergodox_board_led_off();
@@ -225,7 +225,7 @@ void housekeeping_task_keymap(void) {  // runs frequently to update info
         // Since we're not using the LEDs here for layer indication anymore,
         // then lets use them for modifier indicators.  Shame we don't have 4...
         // Also, no "else", since we want to know each, independently.
-        if ((modifiers | one_shot) & MOD_MASK_SHIFT || led_usb_state & (1 << USB_LED_CAPS_LOCK)) {
+        if ((modifiers | one_shot) & MOD_MASK_SHIFT || led_state.caps_lock) {
             ergodox_right_led_2_on();
             ergodox_right_led_2_set(50);
         }
diff --git a/layouts/community/ergodox/dvorak_emacs/keymap.c b/layouts/community/ergodox/dvorak_emacs/keymap.c
index 5c310593be4b..8bd22bc17e6c 100644
--- a/layouts/community/ergodox/dvorak_emacs/keymap.c
+++ b/layouts/community/ergodox/dvorak_emacs/keymap.c
@@ -19,13 +19,6 @@
 /* #define CBRACK 3 // key ] or left alt */
 /* #define CAPS   4 // caps lock */
 
-// LEDS
-#define USB_LED_NUM_LOCK    0
-#define USB_LED_CAPS_LOCK   1
-#define USB_LED_SCROLL_LOCK 2
-#define USB_LED_COMPOSE     3
-#define USB_LED_KANA        4
-
 // TIMERS
 #define KEY_TAP_FAST 85
 #define KEY_TAP_SLOW 95
diff --git a/layouts/community/ergodox/dvorak_emacs_software/keymap.c b/layouts/community/ergodox/dvorak_emacs_software/keymap.c
index c2bc1ef8f29c..188347607faa 100644
--- a/layouts/community/ergodox/dvorak_emacs_software/keymap.c
+++ b/layouts/community/ergodox/dvorak_emacs_software/keymap.c
@@ -20,13 +20,6 @@
 /* #define CBRACK 3 // key ] or left alt */
 /* #define CAPS   4 // caps lock */
 
-// LEDS
-#define USB_LED_NUM_LOCK    0
-#define USB_LED_CAPS_LOCK   1
-#define USB_LED_SCROLL_LOCK 2
-#define USB_LED_COMPOSE     3
-#define USB_LED_KANA        4
-
 // TIMERS
 #define KEY_TAP_FAST 85
 #define KEY_TAP_SLOW 95
diff --git a/layouts/community/ergodox/jjerrell/keymap.c b/layouts/community/ergodox/jjerrell/keymap.c
index 110a8aba63fd..48572d2de3ab 100644
--- a/layouts/community/ergodox/jjerrell/keymap.c
+++ b/layouts/community/ergodox/jjerrell/keymap.c
@@ -94,12 +94,12 @@ layer_state_t layer_state_set_keymap(layer_state_t state) {
 
 void matrix_scan_keymap(void) {
     uint8_t modifiers = get_mods();
-    uint8_t led_usb_state = host_keyboard_leds();
+    led_t   led_state = host_keyboard_led_state();
     uint8_t one_shot = get_oneshot_mods();
     uint8_t layer_is_workman = layer_state_is(_WORKMAN);
 
     if ((modifiers) && (layer_is_workman)) {
-        if (modifiers & MOD_MASK_SHIFT || led_usb_state & (1<<USB_LED_CAPS_LOCK) || one_shot & MOD_MASK_SHIFT) {
+        if (modifiers & MOD_MASK_SHIFT || led_state.caps_lock || one_shot & MOD_MASK_SHIFT) {
             ergodox_right_led_1_on();
             ergodox_right_led_1_set( 25 );
         } else {
diff --git a/layouts/community/ergodox/ordinary/keymap.c b/layouts/community/ergodox/ordinary/keymap.c
index 6c7586034c7d..c828c6fb97ac 100644
--- a/layouts/community/ergodox/ordinary/keymap.c
+++ b/layouts/community/ergodox/ordinary/keymap.c
@@ -238,7 +238,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
     // shift or caps lock turns on red light
-    if ((keyboard_report->mods & MOD_BIT(KC_LSFT)) || (keyboard_report->mods & MOD_BIT(KC_RSFT)) || (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK))) {
+    if ((keyboard_report->mods & MOD_BIT(KC_LSFT)) || (keyboard_report->mods & MOD_BIT(KC_RSFT)) || host_keyboard_led_state().caps_lock) {
         ergodox_right_led_1_on();
     } else {
         ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/ordinary_osx/keymap.c b/layouts/community/ergodox/ordinary_osx/keymap.c
index f67a6d6da03f..3de64f4994ae 100644
--- a/layouts/community/ergodox/ordinary_osx/keymap.c
+++ b/layouts/community/ergodox/ordinary_osx/keymap.c
@@ -238,7 +238,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
     // shift or caps lock turns on red light
-    if ((keyboard_report->mods & MOD_BIT(KC_LSFT)) || (keyboard_report->mods & MOD_BIT(KC_RSFT)) || (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK))) {
+    if ((keyboard_report->mods & MOD_BIT(KC_LSFT)) || (keyboard_report->mods & MOD_BIT(KC_RSFT)) || host_keyboard_led_state().caps_lock) {
         ergodox_right_led_1_on();
     } else {
         ergodox_right_led_1_off();
diff --git a/layouts/community/ergodox/osx_neo2/keymap.c b/layouts/community/ergodox/osx_neo2/keymap.c
index 5b279073cc87..079a92a97e7b 100644
--- a/layouts/community/ergodox/osx_neo2/keymap.c
+++ b/layouts/community/ergodox/osx_neo2/keymap.c
@@ -686,7 +686,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
   if ((capslock_state & MOD_MASK_SHIFT) == MOD_MASK_SHIFT) {
     // CAPSLOCK is currently active, disable it
-    if (host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK)) {
+    if (host_keyboard_led_state().caps_lock) {
       unregister_code(KC_LOCKING_CAPS_LOCK);
     } else {
       register_code(KC_LOCKING_CAPS_LOCK);
@@ -697,11 +697,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   return process_record_user_shifted(keycode, record);
 };
 
-// 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);
diff --git a/layouts/community/ergodox/software_neo2/keymap.c b/layouts/community/ergodox/software_neo2/keymap.c
index c191a034f20b..1c68a68b0fbb 100644
--- a/layouts/community/ergodox/software_neo2/keymap.c
+++ b/layouts/community/ergodox/software_neo2/keymap.c
@@ -106,7 +106,7 @@ void matrix_scan_user(void) {
     ergodox_right_led_3_off();
     ergodox_board_led_off();
 
-    if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
+    if (host_keyboard_led_state().caps_lock) {
         ergodox_right_led_3_on();
     }
 
diff --git a/layouts/community/ergodox/swedish-lindhe/keymap.c b/layouts/community/ergodox/swedish-lindhe/keymap.c
index 1644512de78e..376574f69045 100644
--- a/layouts/community/ergodox/swedish-lindhe/keymap.c
+++ b/layouts/community/ergodox/swedish-lindhe/keymap.c
@@ -154,11 +154,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 };
 
-// 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) {
 
@@ -185,7 +180,7 @@ void matrix_scan_user(void) {
             break;
     }
 
-    if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
+    if (host_keyboard_led_state().caps_lock) {
         // if capslk is on, set led 1 on
         ergodox_right_led_1_on();
     } else {
diff --git a/layouts/community/numpad_5x6/bjohnson/keymap.c b/layouts/community/numpad_5x6/bjohnson/keymap.c
index 71c8829d022f..63b358f226fc 100644
--- a/layouts/community/numpad_5x6/bjohnson/keymap.c
+++ b/layouts/community/numpad_5x6/bjohnson/keymap.c
@@ -35,12 +35,13 @@ void keyboard_post_init_user(void) {
 #endif
 }
 
-void led_set_user(uint8_t usb_led) {
-  if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.num_lock) {
     rgblight_sethsv_noeeprom(HSV_CYAN);
   } else {
     rgblight_sethsv_noeeprom(HSV_MAGENTA);
   }
+  return false;
 }
 
 void shutdown_user (void) {
diff --git a/layouts/community/ortho_4x12/bifbofii/keymap.c b/layouts/community/ortho_4x12/bifbofii/keymap.c
index 7c25fed016f6..e7f427127ee0 100644
--- a/layouts/community/ortho_4x12/bifbofii/keymap.c
+++ b/layouts/community/ortho_4x12/bifbofii/keymap.c
@@ -146,9 +146,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
  */
 [UNICODE] = LAYOUT_ortho_4x12(
-    _______, _______,      _______, X(EUR),  _______, _______, _______, XP(SUE, BUE), _______, XP(SOE, BOE), _______, _______,
-    _______, XP(SAE, BAE), X(SS),   _______, _______, _______, _______, _______,      _______, _______,      _______, _______,
-    _______, _______,      _______, X(CPR),  _______, _______, _______, _______,      _______, _______,      _______, _______,
+    _______, _______,      _______, UM(EUR), _______, _______, _______, UP(SUE, BUE), _______, UP(SOE, BOE), _______, _______,
+    _______, UP(SAE, BAE), UM(SS),  _______, _______, _______, _______, _______,      _______, _______,      _______, _______,
+    _______, _______,      _______, UM(CPR), _______, _______, _______, _______,      _______, _______,      _______, _______,
     _______, _______,      _______, _______, _______, _______, _______, _______,      _______, _______,      _______, _______
 ),
 
diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c
index 7361de1a0399..04c83de9e9b6 100644
--- a/layouts/community/ortho_4x12/brandonschlack/keymap.c
+++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c
@@ -100,12 +100,13 @@ void keyboard_post_init_keymap(void) {
 }
 
 // Use Green LED for Caps Lock
-void led_set_user(uint8_t usb_led) {
-    if (IS_LED_OFF(usb_led, USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         writePinLow(LED_GREEN);
     } else {
         writePinHigh(LED_GREEN);
     }
+    return false;
 }
 #endif
 
diff --git a/layouts/community/ortho_4x12/drashna/config.h b/layouts/community/ortho_4x12/drashna/config.h
index 8443ff054fd2..7db0afa40f2d 100644
--- a/layouts/community/ortho_4x12/drashna/config.h
+++ b/layouts/community/ortho_4x12/drashna/config.h
@@ -105,49 +105,49 @@
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 2
 
-#define FB_ERM_LRA 1     /* For ERM:0 or LRA:1*/
-#define FB_BRAKEFACTOR 6 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
-#define FB_LOOPGAIN 1    /* For  Low:0, Medium:1, High:2, Very High:3 */
+#define DRV2605L_FB_ERM_LRA 1     /* For ERM:0 or LRA:1*/
+#define DRV2605L_FB_BRAKEFACTOR 6 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
+#define DRV2605L_FB_LOOPGAIN 1    /* For  Low:0, Medium:1, High:2, Very High:3 */
 
 /* default 3V ERM vibration motor voltage and library*/
-#if FB_ERM_LRA == 0
-#    define RATED_VOLTAGE 3
-#    define V_RMS 2.3
-#    define V_PEAK 3.30
+#if DRV2605L_FB_ERM_LRA == 0
+#    define DRV2605L_RATED_VOLTAGE 3
+#    define DRV2605L_V_RMS 2.3
+#    define DRV2605L_V_PEAK 3.30
 /* Library Selection */
-#    define LIB_SELECTION 4 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
+#    define DRV2605L_LIBRARY 4 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
 
 /* default 2V LRA voltage and library */
-#elif FB_ERM_LRA == 1
-#    define RATED_VOLTAGE 2
-#    define V_RMS 2.0
-#    define V_PEAK 2.85
-#    define F_LRA 200
+#elif DRV2605L_FB_ERM_LRA == 1
+#    define DRV2605L_RATED_VOLTAGE 2
+#    define DRV2605L_V_RMS 2.0
+#    define DRV2605L_V_PEAK 2.85
+#    define DRV2605L_F_LRA 200
 /* Library Selection */
-#    define LIB_SELECTION 6 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
+#    define DRV2605L_LIBRARY 6 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
 
 #endif
 
 /* Control 1 register settings */
-#define DRIVE_TIME 25
-#define AC_COUPLE 0
-#define STARTUP_BOOST 1
+#define DRV2605L_DRIVE_TIME 25
+#define DRV2605L_AC_COUPLE 0
+#define DRV2605L_STARTUP_BOOST 1
 
 /* Control 2 Settings */
-#define BIDIR_INPUT 1
-#define BRAKE_STAB 1 /* Loopgain is reduced when braking is almost complete to improve stability */
-#define SAMPLE_TIME 3
-#define BLANKING_TIME 1
-#define IDISS_TIME 1
+#define DRV2605L_BIDIR_INPUT 1
+#define DRV2605L_BRAKE_STAB 1 /* Loopgain is reduced when braking is almost complete to improve stability */
+#define DRV2605L_SAMPLE_TIME 3
+#define DRV2605L_BLANKING_TIME 1
+#define DRV2605L_IDISS_TIME 1
 
 /* Control 3 settings */
-#define NG_THRESH 2
-#define ERM_OPEN_LOOP 1
-#define SUPPLY_COMP_DIS 0
-#define DATA_FORMAT_RTO 0
-#define LRA_DRIVE_MODE 0
-#define N_PWM_ANALOG 0
-#define LRA_OPEN_LOOP 0
+#define DRV2605L_NG_THRESH 2
+#define DRV2605L_ERM_OPEN_LOOP 1
+#define DRV2605L_SUPPLY_COMP_DIS 0
+#define DRV2605L_DATA_FORMAT_RTO 0
+#define DRV2605L_LRA_DRIVE_MODE 0
+#define DRV2605L_N_PWM_ANALOG 0
+#define DRV2605L_LRA_OPEN_LOOP 0
 /* Control 4 settings */
-#define ZC_DET_TIME 0
-#define AUTO_CAL_TIME 3
+#define DRV2605L_ZC_DET_TIME 0
+#define DRV2605L_AUTO_CAL_TIME 3
diff --git a/layouts/community/ortho_4x12/drashna/keymap.c b/layouts/community/ortho_4x12/drashna/keymap.c
index 475ccc5c3ab4..cdf41fc5dc22 100644
--- a/layouts/community/ortho_4x12/drashna/keymap.c
+++ b/layouts/community/ortho_4x12/drashna/keymap.c
@@ -184,7 +184,7 @@ led_config_t g_led_config = {
 
 bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
     uint8_t this_mod = get_mods();
-    uint8_t this_led = host_keyboard_leds();
+    led_t   this_led = host_keyboard_led_state();
     uint8_t this_osm = get_oneshot_mods();
 #    ifdef KEYBOARD_planck_ez
 #        define THUMB_LED 41
@@ -208,7 +208,7 @@ bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
             break;
     }
 
-    if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led & (1 << USB_LED_CAPS_LOCK)) {
+    if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led.caps_lock) {
         if (!layer_state_cmp(layer_state, _ADJUST)) {
             RGB_MATRIX_INDICATOR_SET_COLOR(24, 0x00, 0xFF, 0x00);
         }
diff --git a/layouts/community/ortho_4x12/drashna/rules.mk b/layouts/community/ortho_4x12/drashna/rules.mk
index a2278e931dd3..15775bcbe3d2 100644
--- a/layouts/community/ortho_4x12/drashna/rules.mk
+++ b/layouts/community/ortho_4x12/drashna/rules.mk
@@ -8,7 +8,7 @@ CONSOLE_ENABLE     = no
 COMMAND_ENABLE     = no
 BACKLIGHT_ENABLE   = no
 
-ifeq ($(strip $(LAYOUT_HAS_RGB)), yes)
+ifeq ($(strip $(LAYOUTS_HAS_RGB)), yes)
     RGBLIGHT_ENABLE            = yes
 endif
 
diff --git a/layouts/community/split_3x6_3/bcat/rules.mk b/layouts/community/split_3x6_3/bcat/rules.mk
index 29e52b92db5a..e0ce760a7912 100644
--- a/layouts/community/split_3x6_3/bcat/rules.mk
+++ b/layouts/community/split_3x6_3/bcat/rules.mk
@@ -4,6 +4,5 @@ ifeq ($(strip $(KEYBOARD)), crkbd/rev1)
 	BOOTLOADER = atmel-dfu  # Elite-C
 
 	OLED_ENABLE = yes  # dual 128x32 OLED screens
-	OLED_DRIVER = SSD1306
 	RGB_MATRIX_ENABLE = yes  # per-key RGB and underglow
 endif
diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h
index 92065e8f314f..cfed26931bb1 100644
--- a/layouts/community/split_3x6_3/drashna/config.h
+++ b/layouts/community/split_3x6_3/drashna/config.h
@@ -24,7 +24,6 @@
 #define SPLIT_MODS_ENABLE
 
 #undef USE_I2C
-#undef SSD1306OLED
 
 // #define QUICK_TAP_TERM 0
 // #define TAPPING_TERM 100
diff --git a/layouts/community/tkl_ansi/brandonschlack/keymap.c b/layouts/community/tkl_ansi/brandonschlack/keymap.c
index 8e5743136caf..9b425c477af7 100644
--- a/layouts/community/tkl_ansi/brandonschlack/keymap.c
+++ b/layouts/community/tkl_ansi/brandonschlack/keymap.c
@@ -96,7 +96,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/layouts/default/60_ansi_wkl/default_60_ansi_wkl/keymap.c b/layouts/default/60_ansi_wkl/default_60_ansi_wkl/keymap.c
new file mode 100644
index 000000000000..1307ae1600da
--- /dev/null
+++ b/layouts/default/60_ansi_wkl/default_60_ansi_wkl/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+     * │ ` │ 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 │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤
+     * │Ctrl │   │ Alt │                           │ Alt │   │ Ctrl│
+     * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+     */
+    [0] = LAYOUT_60_ansi_wkl(
+        KC_GRV,  KC_1,    KC_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
+    )
+};
diff --git a/layouts/default/60_ansi_wkl/info.json b/layouts/default/60_ansi_wkl/info.json
new file mode 100644
index 000000000000..9d502e41687c
--- /dev/null
+++ b/layouts/default/60_ansi_wkl/info.json
@@ -0,0 +1,73 @@
+{
+    "keyboard_name": "60% ANSI Winkeyless layout",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":13.5, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/60_ansi_wkl/layout.json b/layouts/default/60_ansi_wkl/layout.json
new file mode 100644
index 000000000000..19f5466dde29
--- /dev/null
+++ b/layouts/default/60_ansi_wkl/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","","",{w:2},""],
+[{w:1.5},"","","","","","","","","","","","","",{w:1.5},""],
+[{w:1.75},"","","","","","","","","","","","",{w:2.25},""],
+[{w:2.25},"","","","","","","","","","","",{w:2.75},""],
+[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},""]
diff --git a/layouts/default/60_ansi_wkl/readme.md b/layouts/default/60_ansi_wkl/readme.md
new file mode 100644
index 000000000000..c4c7e5541f3e
--- /dev/null
+++ b/layouts/default/60_ansi_wkl/readme.md
@@ -0,0 +1,3 @@
+# 60_ansi_wkl
+
+    LAYOUT_60_ansi_wkl
diff --git a/layouts/default/60_ansi_wkl_split_bs_rshift/default_60_ansi_wkl_split_bs_rshift/keymap.c b/layouts/default/60_ansi_wkl_split_bs_rshift/default_60_ansi_wkl_split_bs_rshift/keymap.c
new file mode 100644
index 000000000000..4fddeeb4c5df
--- /dev/null
+++ b/layouts/default/60_ansi_wkl_split_bs_rshift/default_60_ansi_wkl_split_bs_rshift/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ` │ 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 │Sft│
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+     * │Ctrl │   │ Alt │                           │ Alt │   │ Ctrl│
+     * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+     */
+    [0] = LAYOUT_60_ansi_wkl_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, 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_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL
+    )
+};
diff --git a/layouts/default/60_ansi_wkl_split_bs_rshift/info.json b/layouts/default/60_ansi_wkl_split_bs_rshift/info.json
new file mode 100644
index 000000000000..8cc625781654
--- /dev/null
+++ b/layouts/default/60_ansi_wkl_split_bs_rshift/info.json
@@ -0,0 +1,75 @@
+{
+    "keyboard_name": "60% ANSI Winkeyless layout with split Backspace and split Right Shift",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":13.5, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/60_ansi_wkl_split_bs_rshift/layout.json b/layouts/default/60_ansi_wkl_split_bs_rshift/layout.json
new file mode 100644
index 000000000000..e333df5e0b37
--- /dev/null
+++ b/layouts/default/60_ansi_wkl_split_bs_rshift/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","","","",""],
+[{w:1.5},"","","","","","","","","","","","","",{w:1.5},""],
+[{w:1.75},"","","","","","","","","","","","",{w:2.25},""],
+[{w:2.25},"","","","","","","","","","","",{w:1.75},"",""],
+[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},""]
diff --git a/layouts/default/60_ansi_wkl_split_bs_rshift/readme.md b/layouts/default/60_ansi_wkl_split_bs_rshift/readme.md
new file mode 100644
index 000000000000..c34c18a0ec0a
--- /dev/null
+++ b/layouts/default/60_ansi_wkl_split_bs_rshift/readme.md
@@ -0,0 +1,3 @@
+# 60_ansi_wkl_split_bs_rshift
+
+    LAYOUT_60_ansi_wkl_split_bs_rshift
diff --git a/layouts/default/60_iso_tsangan_split_bs_rshift/default_60_iso_tsangan_split_bs_rshift/keymap.c b/layouts/default/60_iso_tsangan_split_bs_rshift/default_60_iso_tsangan_split_bs_rshift/keymap.c
new file mode 100644
index 000000000000..2f63749755bf
--- /dev/null
+++ b/layouts/default/60_iso_tsangan_split_bs_rshift/default_60_iso_tsangan_split_bs_rshift/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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 │ [ │ ] │     │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
+     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Sft│
+     * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+     * │Ctrl │GUI│ Alt │                           │ Alt │GUI│ Ctrl│
+     * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+     */
+    [0] = LAYOUT_60_iso_tsangan_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, KC_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_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL
+    )
+};
diff --git a/layouts/default/60_iso_tsangan_split_bs_rshift/info.json b/layouts/default/60_iso_tsangan_split_bs_rshift/info.json
new file mode 100644
index 000000000000..277afd9d5c86
--- /dev/null
+++ b/layouts/default/60_iso_tsangan_split_bs_rshift/info.json
@@ -0,0 +1,78 @@
+{
+    "keyboard_name": "60% ISO layout with split Backspace, split Right Shift, and Tsangan Bottom Row",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":12.5, "y":4},
+                {"x":13.5, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/60_iso_tsangan_split_bs_rshift/layout.json b/layouts/default/60_iso_tsangan_split_bs_rshift/layout.json
new file mode 100644
index 000000000000..99f729bda1a5
--- /dev/null
+++ b/layouts/default/60_iso_tsangan_split_bs_rshift/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","","","",""],
+[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},""],
+[{w:1.75},"","","","","","","","","","","","",""],
+[{w:1.25},"","","","","","","","","","","","",{w:1.75},"",""],
+[{w:1.5},"","",{w:1.5},"",{w:7},"",{w:1.5},"","",{w:1.5},""]
diff --git a/layouts/default/60_iso_tsangan_split_bs_rshift/readme.md b/layouts/default/60_iso_tsangan_split_bs_rshift/readme.md
new file mode 100644
index 000000000000..4313926ca191
--- /dev/null
+++ b/layouts/default/60_iso_tsangan_split_bs_rshift/readme.md
@@ -0,0 +1,3 @@
+# 60_iso_tsangan_split_bs_rshift
+
+    LAYOUT_60_iso_tsangan_split_bs_rshift
diff --git a/layouts/default/60_iso_wkl/default_60_iso_wkl/keymap.c b/layouts/default/60_iso_wkl/default_60_iso_wkl/keymap.c
new file mode 100644
index 000000000000..a46aaf226c72
--- /dev/null
+++ b/layouts/default/60_iso_wkl/default_60_iso_wkl/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+     * │ ` │ 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 │
+     * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤
+     * │Ctrl │   │ Alt │                           │ Alt │   │ Ctrl│
+     * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+     */
+    [0] = LAYOUT_60_iso_wkl(
+        KC_GRV,  KC_1,    KC_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_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL
+    )
+};
diff --git a/layouts/default/60_iso_wkl/info.json b/layouts/default/60_iso_wkl/info.json
new file mode 100644
index 000000000000..2dab40bd818f
--- /dev/null
+++ b/layouts/default/60_iso_wkl/info.json
@@ -0,0 +1,74 @@
+{
+    "keyboard_name": "60% ISO Winkeyless layout",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_60_iso_wkl": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":13.5, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/60_iso_wkl/layout.json b/layouts/default/60_iso_wkl/layout.json
new file mode 100644
index 000000000000..84e7431988e6
--- /dev/null
+++ b/layouts/default/60_iso_wkl/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","","",{w:2},""],
+[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},""],
+[{w:1.75},"","","","","","","","","","","","",""],
+[{w:1.25},"","","","","","","","","","","","",{w:2.75},""],
+[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},""]
diff --git a/layouts/default/60_iso_wkl/readme.md b/layouts/default/60_iso_wkl/readme.md
new file mode 100644
index 000000000000..f109450c9bc4
--- /dev/null
+++ b/layouts/default/60_iso_wkl/readme.md
@@ -0,0 +1,3 @@
+# 60_iso_wkl
+
+    LAYOUT_60_iso_wkl
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
new file mode 100644
index 000000000000..b07d56ea2062
--- /dev/null
+++ b/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│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 │Sft│
+     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+     * │Ctrl │   │ Alt │                           │ Alt │   │ Ctrl│
+     * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+     */
+    [0] = LAYOUT_60_iso_wkl_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, 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, 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_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL
+    )
+};
diff --git a/layouts/default/60_iso_wkl_split_bs_rshift/info.json b/layouts/default/60_iso_wkl_split_bs_rshift/info.json
new file mode 100644
index 000000000000..b5a745dd4526
--- /dev/null
+++ b/layouts/default/60_iso_wkl_split_bs_rshift/info.json
@@ -0,0 +1,76 @@
+{
+    "keyboard_name": "60% ISO Winkeyless with split Backspace and split Right Shift",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":13.5, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/60_iso_wkl_split_bs_rshift/layout.json b/layouts/default/60_iso_wkl_split_bs_rshift/layout.json
new file mode 100644
index 000000000000..92837c330b72
--- /dev/null
+++ b/layouts/default/60_iso_wkl_split_bs_rshift/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","","","",""],
+[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},""],
+[{w:1.75},"","","","","","","","","","","","",""],
+[{w:1.25},"","","","","","","","","","","","",{w:1.75},"",""],
+[{w:1.5},"",{x:1,w:1.5},"",{w:7},"",{w:1.5},"",{x:1,w:1.5},""]
diff --git a/layouts/default/60_iso_wkl_split_bs_rshift/readme.md b/layouts/default/60_iso_wkl_split_bs_rshift/readme.md
new file mode 100644
index 000000000000..c1f4df013bd1
--- /dev/null
+++ b/layouts/default/60_iso_wkl_split_bs_rshift/readme.md
@@ -0,0 +1,3 @@
+# 60_iso_wkl_split_bs_rshift
+
+    LAYOUT_60_iso_wkl_split_bs_rshift
diff --git a/layouts/default/60_jis/default_60_jis/keymap.c b/layouts/default/60_jis/default_60_jis/keymap.c
index a35e3f0f795e..caaa82d38a72 100644
--- a/layouts/default/60_jis/default_60_jis/keymap.c
+++ b/layouts/default/60_jis/default_60_jis/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,  KC_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_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_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_LCTL, KC_LGUI, KC_LALT, KC_INT5,                  KC_SPC,                     KC_INT4, KC_INT2, KC_RALT, KC_RGUI, KC_RCTL
     )
 };
diff --git a/layouts/default/readme.md b/layouts/default/readme.md
index 439613911aca..361fa86792cb 100644
--- a/layouts/default/readme.md
+++ b/layouts/default/readme.md
@@ -94,6 +94,36 @@ LAYOUT_60_ansi_tsangan
 └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
 ```
 
+```
+LAYOUT_60_ansi_wkl
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │       │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+│      │   │   │   │   │   │   │   │   │   │   │   │        │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+│        │   │   │   │   │   │   │   │   │   │   │          │
+├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤
+│     │   │     │                           │     │   │     │
+└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+```
+
+```
+LAYOUT_60_ansi_wkl_split_bs_rshift
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+│      │   │   │   │   │   │   │   │   │   │   │   │        │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+│        │   │   │   │   │   │   │   │   │   │   │      │   │
+├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+│     │   │     │                           │     │   │     │
+└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+```
+
 ```
 LAYOUT_60_hhkb
 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
@@ -154,6 +184,51 @@ LAYOUT_60_iso_tsangan
 └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
 ```
 
+```
+LAYOUT_60_iso_tsangan_split_bs_rshift
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+│      │   │   │   │   │   │   │   │   │   │   │   │   │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
+│    │   │   │   │   │   │   │   │   │   │   │   │      │   │
+├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+│     │   │     │                           │     │   │     │
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```
+
+```
+LAYOUT_60_iso_wkl
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │       │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+│      │   │   │   │   │   │   │   │   │   │   │   │   │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+│    │   │   │   │   │   │   │   │   │   │   │   │          │
+├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤
+│     │   │     │                           │     │   │     │
+└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+```
+
+```
+LAYOUT_60_iso_wkl_split_bs_rshift
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+│      │   │   │   │   │   │   │   │   │   │   │   │   │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
+│    │   │   │   │   │   │   │   │   │   │   │   │      │   │
+├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+│     │   │     │                           │     │   │     │
+└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
+```
+
 ```
 LAYOUT_60_jis
 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
diff --git a/lib/chibios-contrib b/lib/chibios-contrib
index a224be155ae1..da78eb3759b8 160000
--- a/lib/chibios-contrib
+++ b/lib/chibios-contrib
@@ -1 +1 @@
-Subproject commit a224be155ae18d38deccf33a6c1d259b9a5ad8d3
+Subproject commit da78eb3759b8d1779b237657c7667baa4aa95ca1
diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index 9c3decf4f76a..695a18006614 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -31,6 +31,7 @@
 ]
 
 subcommands = [
+    'qmk.cli.ci.validate_aliases',
     'qmk.cli.bux',
     'qmk.cli.c2json',
     'qmk.cli.cd',
@@ -68,6 +69,7 @@
     'qmk.cli.import.keymap',
     'qmk.cli.info',
     'qmk.cli.json2c',
+    'qmk.cli.license_check',
     'qmk.cli.lint',
     'qmk.cli.kle2json',
     'qmk.cli.list.keyboards',
diff --git a/lib/python/qmk/cli/ci/__init__.py b/lib/python/qmk/cli/ci/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/lib/python/qmk/cli/ci/validate_aliases.py b/lib/python/qmk/cli/ci/validate_aliases.py
new file mode 100644
index 000000000000..a205d03cff90
--- /dev/null
+++ b/lib/python/qmk/cli/ci/validate_aliases.py
@@ -0,0 +1,46 @@
+"""Validates the list of keyboard aliases.
+"""
+from pathlib import Path
+
+from milc import cli
+
+from qmk.json_schema import json_load
+from qmk.keyboard import resolve_keyboard, keyboard_folder
+
+
+def _safe_keyboard_folder(target):
+    try:
+        return keyboard_folder(target)  # throws ValueError if it's invalid
+    except Exception:
+        return None
+
+
+def _target_keyboard_exists(target):
+    # If there's no target, then we can't build it.
+    if not target:
+        return False
+
+    # If the target directory existed but there was no rules.mk or rules.mk was incorrectly parsed, then we can't build it.
+    if not resolve_keyboard(target):
+        return False
+
+    # If the target directory exists but it itself has an invalid alias or invalid rules.mk, then we can't build it either.
+    if not _safe_keyboard_folder(target):
+        return False
+
+    # As far as we can tell, we can build it!
+    return True
+
+
+@cli.subcommand('Validates the list of keyboard aliases.', hidden=True)
+def ci_validate_aliases(cli):
+    aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
+
+    success = True
+    for alias in aliases.keys():
+        target = aliases[alias].get('target', None)
+        if not _target_keyboard_exists(target):
+            cli.log.error(f'Keyboard alias {alias} has a target that doesn\'t exist: {target}')
+            success = False
+
+    return success
diff --git a/lib/python/qmk/cli/compile.py b/lib/python/qmk/cli/compile.py
index f43e5f32dea9..2478ea1fed74 100755
--- a/lib/python/qmk/cli/compile.py
+++ b/lib/python/qmk/cli/compile.py
@@ -7,10 +7,12 @@
 from milc import cli
 
 import qmk.path
+from qmk.constants import QMK_FIRMWARE
 from qmk.decorators import automagic_keyboard, automagic_keymap
 from qmk.commands import compile_configurator_json, create_make_command, parse_configurator_json, build_environment
-from qmk.keyboard import keyboard_completer, keyboard_folder
+from qmk.keyboard import keyboard_completer, keyboard_folder_or_all, is_all_keyboards
 from qmk.keymap import keymap_completer, locate_keymap
+from qmk.cli.generate.compilation_database import write_compilation_database
 
 
 def _is_keymap_target(keyboard, keymap):
@@ -24,12 +26,13 @@ def _is_keymap_target(keyboard, keymap):
 
 
 @cli.argument('filename', nargs='?', arg_only=True, type=qmk.path.FileType('r'), completer=FilesCompleter('.json'), help='The configurator export to compile')
-@cli.argument('-kb', '--keyboard', type=keyboard_folder, completer=keyboard_completer, help='The keyboard to build a firmware for. Ignored when a configurator export is supplied.')
+@cli.argument('-kb', '--keyboard', type=keyboard_folder_or_all, completer=keyboard_completer, help='The keyboard to build a firmware for. Ignored when a configurator export is supplied.')
 @cli.argument('-km', '--keymap', completer=keymap_completer, help='The keymap to build a firmware for. Ignored when a configurator export is supplied.')
 @cli.argument('-n', '--dry-run', arg_only=True, action='store_true', help="Don't actually build, just show the make command to be run.")
 @cli.argument('-j', '--parallel', type=int, default=1, help="Set the number of parallel make jobs; 0 means unlimited.")
 @cli.argument('-e', '--env', arg_only=True, action='append', default=[], help="Set a variable to be passed to make. May be passed multiple times.")
 @cli.argument('-c', '--clean', arg_only=True, action='store_true', help="Remove object files before compiling.")
+@cli.argument('--compiledb', arg_only=True, action='store_true', help="Generates the clang compile_commands.json file during build. Implies --clean.")
 @cli.subcommand('Compile a QMK Firmware.')
 @automagic_keyboard
 @automagic_keymap
@@ -40,12 +43,22 @@ def compile(cli):
 
     If a keyboard and keymap are provided this command will build a firmware based on that.
     """
+    if is_all_keyboards(cli.args.keyboard):
+        from .mass_compile import mass_compile
+        cli.args.builds = []
+        cli.args.filter = []
+        cli.args.no_temp = False
+        return mass_compile(cli)
+
     # Build the environment vars
     envs = build_environment(cli.args.env)
 
     # Determine the compile command
     commands = []
 
+    current_keyboard = None
+    current_keymap = None
+
     if cli.args.filename:
         # If a configurator JSON was provided generate a keymap and compile it
         user_keymap = parse_configurator_json(cli.args.filename)
@@ -62,11 +75,21 @@ def compile(cli):
             commands.append(create_make_command(cli.config.compile.keyboard, cli.config.compile.keymap, 'clean', **envs))
         commands.append(create_make_command(cli.config.compile.keyboard, cli.config.compile.keymap, parallel=cli.config.compile.parallel, **envs))
 
+        current_keyboard = cli.config.compile.keyboard
+        current_keymap = cli.config.compile.keymap
+
     if not commands:
         cli.log.error('You must supply a configurator export, both `--keyboard` and `--keymap`, or be in a directory for a keyboard or keymap.')
         cli.print_help()
         return False
 
+    if cli.args.compiledb:
+        if current_keyboard is None or current_keymap is None:
+            cli.log.error('You must supply both `--keyboard` and `--keymap` or be in a directory with a keymap to generate a compile_commands.json file.')
+            cli.print_help()
+            return False
+        write_compilation_database(current_keyboard, current_keymap, QMK_FIRMWARE / 'compile_commands.json')
+
     cli.log.info('Compiling keymap with {fg_cyan}%s', ' '.join(commands[-1]))
     if not cli.args.dry_run:
         cli.echo('\n')
diff --git a/lib/python/qmk/cli/find.py b/lib/python/qmk/cli/find.py
index 2836eb8a5421..f2135bbc16c8 100644
--- a/lib/python/qmk/cli/find.py
+++ b/lib/python/qmk/cli/find.py
@@ -23,7 +23,7 @@ def find(cli):
     if len(cli.args.filter) == 0 and len(cli.args.print) > 0:
         cli.log.warning('No filters supplied -- keymaps not parsed, unable to print requested values.')
 
-    targets = search_keymap_targets(cli.args.keymap, cli.args.filter, cli.args.print)
+    targets = search_keymap_targets([('all', cli.config.find.keymap)], cli.args.filter, cli.args.print)
     for keyboard, keymap, print_vals in targets:
         print(f'{keyboard}:{keymap}')
 
diff --git a/lib/python/qmk/cli/format/json.py b/lib/python/qmk/cli/format/json.py
index 058b61329424..3299a0d80704 100755
--- a/lib/python/qmk/cli/format/json.py
+++ b/lib/python/qmk/cli/format/json.py
@@ -15,6 +15,8 @@
 
 @cli.argument('json_file', arg_only=True, type=normpath, help='JSON file to format')
 @cli.argument('-f', '--format', choices=['auto', 'keyboard', 'keymap'], default='auto', arg_only=True, help='JSON formatter to use (Default: autodetect)')
+@cli.argument('-i', '--inplace', action='store_true', arg_only=True, help='If set, will operate in-place on the input file')
+@cli.argument('-p', '--print', action='store_true', arg_only=True, help='If set, will print the formatted json to stdout ')
 @cli.subcommand('Generate an info.json file for a keyboard.', hidden=False if cli.config.user.developer else True)
 def format_json(cli):
     """Format a json file.
@@ -61,5 +63,14 @@ def format_json(cli):
 
                 json_file['layers'][layer_num] = current_layer
 
-    # Display the results
-    print(json.dumps(json_file, cls=json_encoder, sort_keys=True))
+    output = json.dumps(json_file, 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)
+
+    # Display the results if print was set
+    # We don't operate in-place by default, so also display to stdout
+    # if in-place is not set.
+    if cli.args.print or not cli.args.inplace:
+        print(output)
diff --git a/lib/python/qmk/cli/generate/compilation_database.py b/lib/python/qmk/cli/generate/compilation_database.py
index 5e1a18a69b27..9e5c266516d0 100755
--- a/lib/python/qmk/cli/generate/compilation_database.py
+++ b/lib/python/qmk/cli/generate/compilation_database.py
@@ -76,33 +76,9 @@ def parse_make_n(f: Iterator[str]) -> List[Dict[str, str]]:
     return records
 
 
-@cli.argument('-kb', '--keyboard', type=keyboard_folder, completer=keyboard_completer, help='The keyboard\'s name')
-@cli.argument('-km', '--keymap', completer=keymap_completer, help='The keymap\'s name')
-@cli.subcommand('Create a compilation database.')
-@automagic_keyboard
-@automagic_keymap
-def generate_compilation_database(cli: MILC) -> Union[bool, int]:
-    """Creates a compilation database for the given keyboard build.
-
-    Does a make clean, then a make -n for this target and uses the dry-run output to create
-    a compilation database (compile_commands.json). This file can help some IDEs and
-    IDE-like editors work better. For more information about this:
-
-        https://clang.llvm.org/docs/JSONCompilationDatabase.html
-    """
-    command = None
-    # check both config domains: the magic decorator fills in `generate_compilation_database` but the user is
-    # more likely to have set `compile` in their config file.
-    current_keyboard = cli.config.generate_compilation_database.keyboard or cli.config.user.keyboard
-    current_keymap = cli.config.generate_compilation_database.keymap or cli.config.user.keymap
-
-    if current_keyboard and current_keymap:
-        # Generate the make command for a specific keyboard/keymap.
-        command = create_make_command(current_keyboard, current_keymap, dry_run=True)
-    elif not current_keyboard:
-        cli.log.error('Could not determine keyboard!')
-    elif not current_keymap:
-        cli.log.error('Could not determine keymap!')
+def write_compilation_database(keyboard: str, keymap: str, output_path: Path) -> bool:
+    # Generate the make command for a specific keyboard/keymap.
+    command = create_make_command(keyboard, keymap, dry_run=True)
 
     if not command:
         cli.log.error('You must supply both `--keyboard` and `--keymap`, or be in a directory for a keyboard or keymap.')
@@ -128,9 +104,34 @@ def generate_compilation_database(cli: MILC) -> Union[bool, int]:
 
     cli.log.info("Found %s compile commands", len(db))
 
-    dbpath = QMK_FIRMWARE / 'compile_commands.json'
-
-    cli.log.info(f"Writing build database to {dbpath}")
-    dbpath.write_text(json.dumps(db, indent=4))
+    cli.log.info(f"Writing build database to {output_path}")
+    output_path.write_text(json.dumps(db, indent=4))
 
     return True
+
+
+@cli.argument('-kb', '--keyboard', type=keyboard_folder, completer=keyboard_completer, help='The keyboard\'s name')
+@cli.argument('-km', '--keymap', completer=keymap_completer, help='The keymap\'s name')
+@cli.subcommand('Create a compilation database.')
+@automagic_keyboard
+@automagic_keymap
+def generate_compilation_database(cli: MILC) -> Union[bool, int]:
+    """Creates a compilation database for the given keyboard build.
+
+    Does a make clean, then a make -n for this target and uses the dry-run output to create
+    a compilation database (compile_commands.json). This file can help some IDEs and
+    IDE-like editors work better. For more information about this:
+
+        https://clang.llvm.org/docs/JSONCompilationDatabase.html
+    """
+    # check both config domains: the magic decorator fills in `generate_compilation_database` but the user is
+    # more likely to have set `compile` in their config file.
+    current_keyboard = cli.config.generate_compilation_database.keyboard or cli.config.user.keyboard
+    current_keymap = cli.config.generate_compilation_database.keymap or cli.config.user.keymap
+
+    if not current_keyboard:
+        cli.log.error('Could not determine keyboard!')
+    elif not current_keymap:
+        cli.log.error('Could not determine keymap!')
+
+    return write_compilation_database(current_keyboard, current_keymap, QMK_FIRMWARE / 'compile_commands.json')
diff --git a/lib/python/qmk/cli/generate/keyboard_h.py b/lib/python/qmk/cli/generate/keyboard_h.py
index fa4036e39a68..b9e89032b9e2 100755
--- a/lib/python/qmk/cli/generate/keyboard_h.py
+++ b/lib/python/qmk/cli/generate/keyboard_h.py
@@ -37,14 +37,19 @@ def _generate_layouts(keyboard, kb_info_json):
             row, col = key_data['matrix']
             identifier = f'k{ROW_LETTERS[row]}{COL_LETTERS[col]}'
 
-            try:
-                layout_matrix[row][col] = identifier
-                layout_keys.append(identifier)
-            except IndexError:
+            if row >= row_num or col >= col_num:
                 key_name = key_data.get('label', identifier)
-                cli.log.error(f'{keyboard}/{layout_name}: Matrix data out of bounds at index {index} ({key_name}): [{row}, {col}]')
+                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}')
+
                 return []
 
+            layout_matrix[row][col] = identifier
+            layout_keys.append(identifier)
+
         lines.append('')
         lines.append(f'#define {layout_name}({", ".join(layout_keys)}) {{ \\')
 
diff --git a/lib/python/qmk/cli/generate/keycodes.py b/lib/python/qmk/cli/generate/keycodes.py
index 3b69b17ed1cd..ed8b6827bdfe 100644
--- a/lib/python/qmk/cli/generate/keycodes.py
+++ b/lib/python/qmk/cli/generate/keycodes.py
@@ -96,6 +96,11 @@ def _generate_helpers(lines, keycodes):
 
 
 def _generate_aliases(lines, keycodes):
+    # Work around ChibiOS ch.h include guard
+    if 'CH_H' in [value['key'] for value in keycodes['aliases'].values()]:
+        lines.append('')
+        lines.append('#undef CH_H')
+
     lines.append('')
     lines.append('// Aliases')
     for key, value in keycodes["aliases"].items():
diff --git a/lib/python/qmk/cli/info.py b/lib/python/qmk/cli/info.py
index 02cc6051ecc3..e662407474e9 100755
--- a/lib/python/qmk/cli/info.py
+++ b/lib/python/qmk/cli/info.py
@@ -38,6 +38,10 @@ def _strip_api_content(info_json):
     if 'matrix_pins' in info_json:
         info_json.pop('matrix_size', None)
 
+    for feature in ['rgb_matrix', 'led_matrix']:
+        if info_json.get(feature, {}).get("layout", None):
+            info_json[feature].pop('led_count', None)
+
     return info_json
 
 
diff --git a/lib/python/qmk/cli/license_check.py b/lib/python/qmk/cli/license_check.py
new file mode 100644
index 000000000000..4bda272ec9bb
--- /dev/null
+++ b/lib/python/qmk/cli/license_check.py
@@ -0,0 +1,116 @@
+# Copyright 2023 Nick Brassel (@tzarc)
+# SPDX-License-Identifier: GPL-2.0-or-later
+import re
+from pathlib import Path
+from milc import cli
+from qmk.constants import LICENSE_TEXTS
+
+L_PAREN = re.compile(r'\(\[\{\<')
+R_PAREN = re.compile(r'\)\]\}\>')
+PUNCTUATION = re.compile(r'[\.,;:]+')
+TRASH_PREFIX = re.compile(r'^(\s|/|\*|#)+')
+TRASH_SUFFIX = re.compile(r'(\s|/|\*|#|\\)+$')
+SPACE = re.compile(r'\s+')
+SUFFIXES = ['.c', '.h', '.cpp', '.cxx', '.hpp', '.hxx']
+
+
+def _simplify_text(input):
+    lines = input.lower().split('\n')
+    lines = [PUNCTUATION.sub('', line) for line in lines]
+    lines = [TRASH_PREFIX.sub('', line) for line in lines]
+    lines = [TRASH_SUFFIX.sub('', line) for line in lines]
+    lines = [SPACE.sub(' ', line) for line in lines]
+    lines = [L_PAREN.sub('(', line) for line in lines]
+    lines = [R_PAREN.sub(')', line) for line in lines]
+    lines = [line.strip() for line in lines]
+    lines = [line for line in lines if line is not None and line != '']
+    return ' '.join(lines)
+
+
+def _detect_license_from_file_contents(filename, absolute=False):
+    data = filename.read_text(encoding='utf-8', errors='ignore')
+    filename_out = str(filename.absolute()) if absolute else str(filename)
+
+    if 'SPDX-License-Identifier:' in data:
+        res = data.split('SPDX-License-Identifier:')
+        license = re.split(r'\s|//|\*', res[1].strip())[0].strip()
+        found = False
+        for short_license, _ in LICENSE_TEXTS:
+            if license.lower() == short_license.lower():
+                license = short_license
+                found = True
+                break
+
+        if not found:
+            if cli.args.short:
+                print(f'{filename_out} UNKNOWN')
+            else:
+                cli.log.error(f'{{fg_cyan}}{filename_out}{{fg_reset}} -- unknown license, or no license detected!')
+            return False
+
+        if cli.args.short:
+            print(f'{filename_out} {license}')
+        else:
+            cli.log.info(f'{{fg_cyan}}{filename_out}{{fg_reset}} -- license detected: {license} (SPDX License Identifier)')
+        return True
+
+    else:
+        simple_text = _simplify_text(data)
+        for short_license, long_licenses in LICENSE_TEXTS:
+            for long_license in long_licenses:
+                if long_license in simple_text:
+                    if cli.args.short:
+                        print(f'{filename_out} {short_license}')
+                    else:
+                        cli.log.info(f'{{fg_cyan}}{filename_out}{{fg_reset}} -- license detected: {short_license} (Full text)')
+                    return True
+
+        if cli.args.short:
+            print(f'{filename_out} UNKNOWN')
+        else:
+            cli.log.error(f'{{fg_cyan}}{filename_out}{{fg_reset}} -- unknown license, or no license detected!')
+
+    return False
+
+
+@cli.argument('inputs', nargs='*', arg_only=True, type=Path, help='List of input files or directories.')
+@cli.argument('-s', '--short', action='store_true', help='Short output.')
+@cli.argument('-a', '--absolute', action='store_true', help='Print absolute paths.')
+@cli.argument('-e', '--extension', arg_only=True, action='append', default=[], help='Override list of extensions. Can be specified multiple times for multiple extensions.')
+@cli.subcommand('File license check.', hidden=False if cli.config.user.developer else True)
+def license_check(cli):
+    def _default_suffix_condition(s):
+        return s in SUFFIXES
+
+    conditional = _default_suffix_condition
+
+    if len(cli.args.extension) > 0:
+        suffixes = [f'.{s}' if not s.startswith('.') else s for s in cli.args.extension]
+
+        def _specific_suffix_condition(s):
+            return s in suffixes
+
+        conditional = _specific_suffix_condition
+
+    # Pre-format all the licenses
+    for _, long_licenses in LICENSE_TEXTS:
+        for i in range(len(long_licenses)):
+            long_licenses[i] = _simplify_text(long_licenses[i])
+
+    check_list = set()
+    for filename in sorted(cli.args.inputs):
+        if filename.is_dir():
+            for file in sorted(filename.rglob('*')):
+                if file.is_file() and conditional(file.suffix):
+                    check_list.add(file)
+        elif filename.is_file():
+            if conditional(filename.suffix):
+                check_list.add(filename)
+
+    failed = False
+    for filename in sorted(check_list):
+        if not _detect_license_from_file_contents(filename, absolute=cli.args.absolute):
+            failed = True
+
+    if failed:
+        return False
diff --git a/lib/python/qmk/cli/lint.py b/lib/python/qmk/cli/lint.py
index 897a6c4c0d0d..a7c85b5643d9 100644
--- a/lib/python/qmk/cli/lint.py
+++ b/lib/python/qmk/cli/lint.py
@@ -20,6 +20,9 @@ def _list_defaultish_keymaps(kb):
     """
     defaultish = ['ansi', 'iso', 'via']
 
+    # This is only here to flag it as "testable", so it doesn't fly under the radar during PR
+    defaultish.append('vial')
+
     keymaps = set()
     for x in list_keymaps(kb):
         if x in defaultish or x.startswith('default'):
diff --git a/lib/python/qmk/cli/mass_compile.py b/lib/python/qmk/cli/mass_compile.py
index 52c1cae4c2d9..06e6e411a72a 100755
--- a/lib/python/qmk/cli/mass_compile.py
+++ b/lib/python/qmk/cli/mass_compile.py
@@ -9,14 +9,76 @@
 
 from qmk.constants import QMK_FIRMWARE
 from qmk.commands import _find_make, get_make_parallel_args
-from qmk.keyboard import resolve_keyboard
-from qmk.search import search_keymap_targets
+from qmk.search import search_keymap_targets, search_make_targets
+
+
+def mass_compile_targets(targets, clean, dry_run, no_temp, parallel, env):
+    if len(targets) == 0:
+        return
+
+    make_cmd = _find_make()
+    builddir = Path(QMK_FIRMWARE) / '.build'
+    makefile = builddir / 'parallel_kb_builds.mk'
+
+    if dry_run:
+        cli.log.info('Compilation targets:')
+        for target in sorted(targets):
+            cli.log.info(f"{{fg_cyan}}qmk compile -kb {target[0]} -km {target[1]}{{fg_reset}}")
+    else:
+        if clean:
+            cli.run([make_cmd, 'clean'], capture_output=False, stdin=DEVNULL)
+
+        builddir.mkdir(parents=True, exist_ok=True)
+        with open(makefile, "w") as f:
+            for target in sorted(targets):
+                keyboard_name = target[0]
+                keymap_name = target[1]
+                keyboard_safe = keyboard_name.replace('/', '_')
+                build_log = f"{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}.{keymap_name}"
+                failed_log = f"{QMK_FIRMWARE}/.build/failed.log.{os.getpid()}.{keyboard_safe}.{keymap_name}"
+                # yapf: disable
+                f.write(
+                    f"""\
+all: {keyboard_safe}_{keymap_name}_binary
+{keyboard_safe}_{keymap_name}_binary:
+	@rm -f "{build_log}" || true
+	@echo "Compiling QMK Firmware for target: '{keyboard_name}:{keymap_name}'..." >>"{build_log}"
+	+@$(MAKE) -C "{QMK_FIRMWARE}" -f "{QMK_FIRMWARE}/builddefs/build_keyboard.mk" KEYBOARD="{keyboard_name}" KEYMAP="{keymap_name}" COLOR=true SILENT=false {' '.join(env)} \\
+		>>"{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}"
+	@rm -f "{build_log}" || true
+"""# noqa
+                )
+                # yapf: enable
+
+                if no_temp:
+                    # yapf: disable
+                    f.write(
+                        f"""\
+	@rm -rf "{QMK_FIRMWARE}/.build/{keyboard_safe}_{keymap_name}.elf" 2>/dev/null || true
+	@rm -rf "{QMK_FIRMWARE}/.build/{keyboard_safe}_{keymap_name}.map" 2>/dev/null || true
+	@rm -rf "{QMK_FIRMWARE}/.build/obj_{keyboard_safe}_{keymap_name}" || true
+"""# noqa
+                    )
+                    # yapf: enable
+                f.write('\n')
+
+        cli.run([make_cmd, *get_make_parallel_args(parallel), '-f', makefile.as_posix(), 'all'], capture_output=False, stdin=DEVNULL)
+
+        # Check for failures
+        failures = [f for f in builddir.glob(f'failed.log.{os.getpid()}.*')]
+        if len(failures) > 0:
+            return False
 
 
 @cli.argument('builds', nargs='*', arg_only=True, help="List of builds in form <keyboard>:<keymap> to compile in parallel. Specifying this overrides all other target search options.")
 @cli.argument('-t', '--no-temp', arg_only=True, action='store_true', help="Remove temporary files during build.")
 @cli.argument('-j', '--parallel', type=int, default=1, help="Set the number of parallel make jobs; 0 means unlimited.")
 @cli.argument('-c', '--clean', arg_only=True, action='store_true', help="Remove object files before compiling.")
+@cli.argument('-n', '--dry-run', arg_only=True, action='store_true', help="Don't actually build, just show the commands to be run.")
 @cli.argument(
     '-f',
     '--filter',
@@ -32,61 +94,9 @@
 def mass_compile(cli):
     """Compile QMK Firmware against all keyboards.
     """
-    make_cmd = _find_make()
-    if cli.args.clean:
-        cli.run([make_cmd, 'clean'], capture_output=False, stdin=DEVNULL)
-
-    builddir = Path(QMK_FIRMWARE) / '.build'
-    makefile = builddir / 'parallel_kb_builds.mk'
-
     if len(cli.args.builds) > 0:
-        targets = list(sorted(set([(resolve_keyboard(e[0]), e[1]) for e in [b.split(':') for b in cli.args.builds]])))
+        targets = search_make_targets(cli.args.builds, cli.args.filter)
     else:
-        targets = search_keymap_targets(cli.args.keymap, cli.args.filter)
-
-    if len(targets) == 0:
-        return
-
-    builddir.mkdir(parents=True, exist_ok=True)
-    with open(makefile, "w") as f:
-        for target in sorted(targets):
-            keyboard_name = target[0]
-            keymap_name = target[1]
-            keyboard_safe = keyboard_name.replace('/', '_')
-            # yapf: disable
-            f.write(
-                f"""\
-all: {keyboard_safe}_{keymap_name}_binary
-{keyboard_safe}_{keymap_name}_binary:
-	@rm -f "{QMK_FIRMWARE}/.build/failed.log.{keyboard_safe}.{keymap_name}" || true
-	@echo "Compiling QMK Firmware for target: '{keyboard_name}:{keymap_name}'..." >>"{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}"
-	+@$(MAKE) -C "{QMK_FIRMWARE}" -f "{QMK_FIRMWARE}/builddefs/build_keyboard.mk" KEYBOARD="{keyboard_name}" KEYMAP="{keymap_name}" COLOR=true SILENT=false {' '.join(cli.args.env)} \\
-		>>"{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}.{keymap_name}" 2>&1 \\
-		|| cp "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}.{keymap_name}" "{QMK_FIRMWARE}/.build/failed.log.{os.getpid()}.{keyboard_safe}.{keymap_name}"
-	@{{ grep '\[ERRORS\]' "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}.{keymap_name}" >/dev/null 2>&1 && printf "Build %-64s \e[1;31m[ERRORS]\e[0m\\n" "{keyboard_name}:{keymap_name}" ; }} \\
-		|| {{ grep '\[WARNINGS\]' "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}.{keymap_name}" >/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 "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}.{keymap_name}" || true
-"""# noqa
-            )
-            # yapf: enable
-
-            if cli.args.no_temp:
-                # yapf: disable
-                f.write(
-                    f"""\
-	@rm -rf "{QMK_FIRMWARE}/.build/{keyboard_safe}_{keymap_name}.elf" 2>/dev/null || true
-	@rm -rf "{QMK_FIRMWARE}/.build/{keyboard_safe}_{keymap_name}.map" 2>/dev/null || true
-	@rm -rf "{QMK_FIRMWARE}/.build/obj_{keyboard_safe}" || true
-	@rm -rf "{QMK_FIRMWARE}/.build/obj_{keyboard_safe}_{keymap_name}" || true
-"""# noqa
-                )
-                # yapf: enable
-            f.write('\n')
-
-    cli.run([make_cmd, *get_make_parallel_args(cli.args.parallel), '-f', makefile.as_posix(), 'all'], capture_output=False, stdin=DEVNULL)
+        targets = search_keymap_targets([('all', cli.config.mass_compile.keymap)], cli.args.filter)
 
-    # Check for failures
-    failures = [f for f in builddir.glob(f'failed.log.{os.getpid()}.*')]
-    if len(failures) > 0:
-        return False
+    return mass_compile_targets(targets, cli.args.clean, cli.args.dry_run, cli.config.mass_compile.no_temp, cli.config.mass_compile.parallel, cli.args.env)
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index b1eac1395764..34696e37930c 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -9,7 +9,7 @@
 from milc import cli
 import jsonschema
 
-from qmk.constants import KEYBOARD_OUTPUT_PREFIX
+from qmk.constants import INTERMEDIATE_OUTPUT_PREFIX
 from qmk.json_schema import json_load, validate
 
 
@@ -134,16 +134,13 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, clean=Fa
 
     keyboard_filesafe = user_keymap['keyboard'].replace('/', '_')
     target = f'{keyboard_filesafe}_{user_keymap["keymap"]}'
-    keyboard_output = Path(f'{KEYBOARD_OUTPUT_PREFIX}{keyboard_filesafe}')
-    keymap_output = Path(f'{keyboard_output}_{user_keymap["keymap"]}')
-    keymap_dir = keymap_output / 'src'
+    intermediate_output = Path(f'{INTERMEDIATE_OUTPUT_PREFIX}{keyboard_filesafe}_{user_keymap["keymap"]}')
+    keymap_dir = intermediate_output / 'src'
     keymap_json = keymap_dir / 'keymap.json'
 
     if clean:
-        if keyboard_output.exists():
-            shutil.rmtree(keyboard_output)
-        if keymap_output.exists():
-            shutil.rmtree(keymap_output)
+        if intermediate_output.exists():
+            shutil.rmtree(intermediate_output)
 
     # begin with making the deepest folder in the tree
     keymap_dir.mkdir(exist_ok=True, parents=True)
@@ -183,13 +180,12 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, clean=Fa
         f'KEYMAP={user_keymap["keymap"]}',
         f'KEYBOARD_FILESAFE={keyboard_filesafe}',
         f'TARGET={target}',
-        f'KEYBOARD_OUTPUT={keyboard_output}',
-        f'KEYMAP_OUTPUT={keymap_output}',
-        f'MAIN_KEYMAP_PATH_1={keymap_output}',
-        f'MAIN_KEYMAP_PATH_2={keymap_output}',
-        f'MAIN_KEYMAP_PATH_3={keymap_output}',
-        f'MAIN_KEYMAP_PATH_4={keymap_output}',
-        f'MAIN_KEYMAP_PATH_5={keymap_output}',
+        f'INTERMEDIATE_OUTPUT={intermediate_output}',
+        f'MAIN_KEYMAP_PATH_1={intermediate_output}',
+        f'MAIN_KEYMAP_PATH_2={intermediate_output}',
+        f'MAIN_KEYMAP_PATH_3={intermediate_output}',
+        f'MAIN_KEYMAP_PATH_4={intermediate_output}',
+        f'MAIN_KEYMAP_PATH_5={intermediate_output}',
         f'KEYMAP_JSON={keymap_json}',
         f'KEYMAP_PATH={keymap_dir}',
         f'VERBOSE={verbose}',
@@ -216,16 +212,16 @@ def parse_configurator_json(configurator_file):
         cli.log.error(f'Invalid JSON keymap: {configurator_file} : {e.message}')
         exit(1)
 
-    orig_keyboard = user_keymap['keyboard']
+    keyboard = user_keymap['keyboard']
     aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
 
-    if orig_keyboard in aliases:
-        if 'target' in aliases[orig_keyboard]:
-            user_keymap['keyboard'] = aliases[orig_keyboard]['target']
-
-        if 'layouts' in aliases[orig_keyboard] and user_keymap['layout'] in aliases[orig_keyboard]['layouts']:
-            user_keymap['layout'] = aliases[orig_keyboard]['layouts'][user_keymap['layout']]
+    while keyboard in aliases:
+        last_keyboard = keyboard
+        keyboard = aliases[keyboard].get('target', keyboard)
+        if keyboard == last_keyboard:
+            break
 
+    user_keymap['keyboard'] = keyboard
     return user_keymap
 
 
diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py
index 8a13029a8a8f..1967441fc89a 100644
--- a/lib/python/qmk/constants.py
+++ b/lib/python/qmk/constants.py
@@ -14,7 +14,7 @@
 MAX_KEYBOARD_SUBFOLDERS = 5
 
 # Supported processor types
-CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'MK64FX512', 'MK66FX1M0', 'RP2040', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F405', 'STM32F407', 'STM32F411', 'STM32F446', 'STM32G431', 'STM32G474', 'STM32L412', 'STM32L422', 'STM32L432', 'STM32L433', 'STM32L442', 'STM32L443', 'GD32VF103', 'WB32F3G71', 'WB32FQ95'
+CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'MK64FX512', 'MK66FX1M0', 'RP2040', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F405', 'STM32F407', 'STM32F411', 'STM32F446', 'STM32G431', 'STM32G474', 'STM32H723', 'STM32H733', 'STM32L412', 'STM32L422', 'STM32L432', 'STM32L433', 'STM32L442', 'STM32L443', 'GD32VF103', 'WB32F3G71', 'WB32FQ95'
 LUFA_PROCESSORS = 'at90usb162', 'atmega16u2', 'atmega32u2', 'atmega16u4', 'atmega32u4', 'at90usb646', 'at90usb647', 'at90usb1286', 'at90usb1287', None
 VUSB_PROCESSORS = 'atmega32a', 'atmega328p', 'atmega328', 'attiny85'
 
@@ -36,6 +36,8 @@
     "STM32F446": "stm32-dfu",
     "STM32G431": "stm32-dfu",
     "STM32G474": "stm32-dfu",
+    "STM32H723": "stm32-dfu",
+    "STM32H733": "stm32-dfu",
     "STM32L412": "stm32-dfu",
     "STM32L422": "stm32-dfu",
     "STM32L432": "stm32-dfu",
@@ -82,6 +84,7 @@
     },
     'apm32-dfu': {("314b", "0106")},
     'gd32v-dfu': {("28e9", "0189")},
+    'wb32-dfu': {("342d", "dfa0")},
     'bootloadhid': {("16c0", "05df")},
     'usbasploader': {("16c0", "05dc")},
     'usbtinyisp': {("1782", "0c9f")},
@@ -123,7 +126,7 @@
 
 # Constants that should match their counterparts in make
 BUILD_DIR = environ.get('BUILD_DIR', '.build')
-KEYBOARD_OUTPUT_PREFIX = f'{BUILD_DIR}/obj_'
+INTERMEDIATE_OUTPUT_PREFIX = f'{BUILD_DIR}/obj_'
 
 # Headers for generated files
 GPL2_HEADER_C_LIKE = f'''\
@@ -186,3 +189,126 @@
 #
 ################################################################################
 '''
+
+LICENSE_TEXTS = [
+    (
+        'GPL-2.0-or-later', [
+            """\
+        This program is free software; you can redistribute it and/or
+        modify it under the terms of the GNU General Public License
+        as published by the Free Software Foundation; either version 2
+        of the License, or (at your option) any later version.
+        """, """\
+        This program is free software; you can redistribute it and/or
+        modify it under the terms of the GNU General Public License
+        as published by the Free Software Foundation; either version 2
+        of the License, or any later version.
+        """
+        ]
+    ),
+    ('GPL-2.0-only', ["""\
+        This program is free software; you can redistribute it and/or
+        modify it under the terms of the GNU General Public License as
+        published by the Free Software Foundation; version 2.
+        """]),
+    (
+        'GPL-3.0-or-later', [
+            """\
+        This program is free software: you can 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 free software: you can 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 any later version.
+        """
+        ]
+    ),
+    ('GPL-3.0-only', ["""\
+        This program is free software: you can redistribute it and/or
+        modify it under the terms of the GNU General Public License as
+        published by the Free Software Foundation, version 3.
+        """]),
+    (
+        'LGPL-2.1-or-later', [
+            """\
+        This program is free software; you can redistribute it and/or
+        modify it under the terms of the GNU Lesser General Public License
+        as published by the Free Software Foundation; either version 2.1
+        of the License, or (at your option) any later version.
+        """, """\
+        This program is free software; you can redistribute it and/or
+        modify it under the terms of the GNU Lesser General Public License
+        as published by the Free Software Foundation; either version 2.1
+        of the License, or any later version.
+        """, """\
+        This library is free software; you can redistribute it and/or
+        modify it under the terms of the GNU Lesser General Public License
+        as published by the Free Software Foundation; either version 2.1
+        of the License, or (at your option) any later version.
+        """, """\
+        This library is free software; you can redistribute it and/or
+        modify it under the terms of the GNU Lesser General Public License
+        as published by the Free Software Foundation; either version 2.1
+        of the License, or any later version.
+        """
+        ]
+    ),
+    (
+        'LGPL-2.1-only', [
+            """\
+        This program is free software; you can redistribute it and/or
+        modify it under the terms of the GNU Lesser General Public License as
+        published by the Free Software Foundation; version 2.1.
+        """, """\
+        This library is free software; you can redistribute it and/or
+        modify it under the terms of the GNU Lesser General Public License as
+        published by the Free Software Foundation; version 2.1.
+        """
+        ]
+    ),
+    (
+        'LGPL-3.0-or-later', [
+            """\
+        This program is free software; you can redistribute it and/or
+        modify it under the terms of the GNU Lesser 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 free software; you can redistribute it and/or
+        modify it under the terms of the GNU Lesser General Public License
+        as published by the Free Software Foundation; either version 3
+        of the License, or any later version.
+        """, """\
+        This library is free software; you can redistribute it and/or
+        modify it under the terms of the GNU Lesser General Public License
+        as published by the Free Software Foundation; either version 3
+        of the License, or (at your option) any later version.
+        """, """\
+        This library is free software; you can redistribute it and/or
+        modify it under the terms of the GNU Lesser General Public License
+        as published by the Free Software Foundation; either version 3
+        of the License, or any later version.
+        """
+        ]
+    ),
+    (
+        'LGPL-3.0-only', [
+            """\
+        This program is free software; you can redistribute it and/or
+        modify it under the terms of the GNU Lesser General Public License as
+        published by the Free Software Foundation; version 3.
+        """, """\
+        This library is free software; you can redistribute it and/or
+        modify it under the terms of the GNU Lesser General Public License as
+        published by the Free Software Foundation; version 3.
+        """
+        ]
+    ),
+    ('Apache-2.0', ["""\
+        Licensed under the Apache License, Version 2.0 (the "License");
+        you may not use this file except in compliance with the License.
+        """]),
+]
diff --git a/lib/python/qmk/flashers.py b/lib/python/qmk/flashers.py
index f83665d9accf..9ecb5e4b9c8f 100644
--- a/lib/python/qmk/flashers.py
+++ b/lib/python/qmk/flashers.py
@@ -96,7 +96,7 @@ def _find_bootloader():
                             details = 'halfkay'
                         else:
                             details = 'qmk-hid'
-                    elif bl == 'stm32-dfu' or bl == 'apm32-dfu' or bl == 'gd32v-dfu' or bl == 'kiibohd':
+                    elif bl in {'apm32-dfu', 'gd32v-dfu', 'kiibohd', 'stm32-dfu'}:
                         details = (vid, pid)
                     else:
                         details = None
@@ -181,9 +181,18 @@ def _flash_dfu_util(details, file):
         cli.run(['dfu-util', '-a', '0', '-d', f'{details[0]}:{details[1]}', '-s', '0x08000000:leave', '-D', file], capture_output=False)
 
 
+def _flash_wb32_dfu_updater(file):
+    if shutil.which('wb32-dfu-updater_cli'):
+        cmd = 'wb32-dfu-updater_cli'
+    else:
+        return True
+
+    cli.run([cmd, '-t', '-s', '0x08000000', '-D', file], capture_output=False)
+
+
 def _flash_isp(mcu, programmer, file):
     programmer = 'usbasp' if programmer == 'usbasploader' else 'usbtiny'
-    # Check if the provide mcu has an avrdude-specific name, otherwise pass on what the user provided
+    # Check if the provided mcu has an avrdude-specific name, otherwise pass on what the user provided
     mcu = AVRDUDE_MCU.get(mcu, mcu)
     cli.run(['avrdude', '-p', mcu, '-c', programmer, '-U', f'flash:w:{file}:i'], capture_output=False)
 
@@ -211,8 +220,11 @@ def flasher(mcu, file):
                 return (True, "Please make sure 'teensy_loader_cli' or 'hid_bootloader_cli' is available on your system.")
         else:
             return (True, "Specifying the MCU with '-m' is necessary for HalfKay/HID bootloaders!")
-    elif bl == 'stm32-dfu' or bl == 'apm32-dfu' or bl == 'gd32v-dfu' or bl == 'kiibohd':
+    elif bl in {'apm32-dfu', 'gd32v-dfu', 'kiibohd', 'stm32-dfu'}:
         _flash_dfu_util(details, file)
+    elif bl == 'wb32-dfu':
+        if _flash_wb32_dfu_updater(file):
+            return (True, "Please make sure 'wb32-dfu-updater_cli' is available on your system.")
     elif bl == 'usbasploader' or bl == 'usbtinyisp':
         if mcu:
             _flash_isp(mcu, bl, file)
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index dbd26153d84f..9c8521a2a3ee 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -706,6 +706,9 @@ def _extract_led_config(info_data, keyboard):
             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/keyboard.py b/lib/python/qmk/keyboard.py
index 235b62640c20..9826f3f8876b 100644
--- a/lib/python/qmk/keyboard.py
+++ b/lib/python/qmk/keyboard.py
@@ -1,6 +1,7 @@
 """Functions that help us work with keyboards.
 """
 from array import array
+from functools import lru_cache
 from math import ceil
 from pathlib import Path
 import os
@@ -30,9 +31,29 @@
     },
 }
 
+
+class AllKeyboards:
+    """Represents all keyboards.
+    """
+    def __str__(self):
+        return 'all'
+
+    def __repr__(self):
+        return 'all'
+
+    def __eq__(self, other):
+        return isinstance(other, AllKeyboards)
+
+
 base_path = os.path.join(os.getcwd(), "keyboards") + os.path.sep
 
 
+def is_all_keyboards(keyboard):
+    """Returns True if the keyboard is an AllKeyboards object.
+    """
+    return isinstance(keyboard, AllKeyboards)
+
+
 def find_keyboard_from_dir():
     """Returns a keyboard name based on the user's current directory.
     """
@@ -71,8 +92,11 @@ def keyboard_folder(keyboard):
     """
     aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
 
-    if keyboard in aliases:
+    while keyboard in aliases:
+        last_keyboard = keyboard
         keyboard = aliases[keyboard].get('target', keyboard)
+        if keyboard == last_keyboard:
+            break
 
     rules_mk_file = Path(base_path, keyboard, 'rules.mk')
 
@@ -86,6 +110,18 @@ def keyboard_folder(keyboard):
     return keyboard
 
 
+def keyboard_folder_or_all(keyboard):
+    """Returns the actual keyboard folder.
+
+    This checks aliases and DEFAULT_FOLDER to resolve the actual path for a keyboard.
+    If the supplied argument is "all", it returns an AllKeyboards object.
+    """
+    if keyboard == 'all':
+        return AllKeyboards()
+
+    return keyboard_folder(keyboard)
+
+
 def _find_name(path):
     """Determine the keyboard name by stripping off the base_path and rules.mk.
     """
@@ -112,6 +148,7 @@ def list_keyboards(resolve_defaults=True):
     return sorted(set(found))
 
 
+@lru_cache(maxsize=None)
 def resolve_keyboard(keyboard):
     cur_dir = Path('keyboards')
     rules = parse_rules_mk_file(cur_dir / keyboard / 'rules.mk')
diff --git a/lib/python/qmk/search.py b/lib/python/qmk/search.py
index 2bbbc7806fc6..a74450ca87d9 100644
--- a/lib/python/qmk/search.py
+++ b/lib/python/qmk/search.py
@@ -1,13 +1,15 @@
 """Functions for searching through QMK keyboards and keymaps.
 """
 import contextlib
+import functools
 import fnmatch
 import logging
-import multiprocessing
 import re
+from typing import List, Tuple
 from dotty_dict import dotty
 from milc import cli
 
+from qmk.util import parallel_map
 from qmk.info import keymap_json
 import qmk.keyboard
 import qmk.keymap
@@ -31,95 +33,157 @@ def ignore_logging():
 
 
 def _all_keymaps(keyboard):
+    """Returns a list of tuples of (keyboard, keymap) for all keymaps for the given keyboard.
+    """
     with ignore_logging():
-        return (keyboard, qmk.keymap.list_keymaps(keyboard))
+        keyboard = qmk.keyboard.resolve_keyboard(keyboard)
+        return [(keyboard, keymap) for keymap in qmk.keymap.list_keymaps(keyboard)]
 
 
 def _keymap_exists(keyboard, keymap):
+    """Returns the keyboard name if the keyboard+keymap combination exists, otherwise None.
+    """
     with ignore_logging():
         return keyboard if qmk.keymap.locate_keymap(keyboard, keymap) is not None else None
 
 
-def _load_keymap_info(keyboard, keymap):
+def _load_keymap_info(kb_km):
+    """Returns a tuple of (keyboard, keymap, info.json) for the given keyboard/keymap combination.
+    """
     with ignore_logging():
-        return (keyboard, keymap, keymap_json(keyboard, keymap))
+        return (kb_km[0], kb_km[1], keymap_json(kb_km[0], kb_km[1]))
 
 
-def search_keymap_targets(keymap='default', filters=[], print_vals=[]):
-    targets = []
+def expand_make_targets(targets: List[str]) -> List[Tuple[str, str]]:
+    """Expand a list of make targets into a list of (keyboard, keymap) tuples.
 
-    with multiprocessing.Pool() as pool:
-        cli.log.info(f'Retrieving list of keyboards with keymap "{keymap}"...')
-        target_list = []
+    Caters for 'all' in either keyboard or keymap, or both.
+    """
+    split_targets = []
+    for target in targets:
+        split_target = target.split(':')
+        if len(split_target) != 2:
+            cli.log.error(f"Invalid build target: {target}")
+            return []
+        split_targets.append((split_target[0], split_target[1]))
+    return expand_keymap_targets(split_targets)
+
+
+def _expand_keymap_target(keyboard: str, keymap: str, all_keyboards: List[str] = None) -> List[Tuple[str, str]]:
+    """Expand a keyboard input and keymap input into a list of (keyboard, keymap) tuples.
+
+    Caters for 'all' in either keyboard or keymap, or both.
+    """
+    if all_keyboards is None:
+        all_keyboards = qmk.keyboard.list_keyboards()
+
+    if keyboard == 'all':
         if keymap == 'all':
-            kb_to_kms = pool.map(_all_keymaps, qmk.keyboard.list_keyboards())
-            for targets in kb_to_kms:
-                keyboard = targets[0]
-                keymaps = targets[1]
-                target_list.extend([(keyboard, keymap) for keymap in keymaps])
+            cli.log.info('Retrieving list of all keyboards and keymaps...')
+            targets = []
+            for kb in parallel_map(_all_keymaps, all_keyboards):
+                targets.extend(kb)
+            return targets
         else:
-            target_list = [(kb, keymap) for kb in filter(lambda kb: kb is not None, pool.starmap(_keymap_exists, [(kb, keymap) for kb in qmk.keyboard.list_keyboards()]))]
-
-        if len(filters) == 0:
-            targets = [(kb, km, {}) for kb, km in target_list]
+            cli.log.info(f'Retrieving list of keyboards with keymap "{keymap}"...')
+            keyboard_filter = functools.partial(_keymap_exists, keymap=keymap)
+            return [(kb, keymap) for kb in filter(lambda e: e is not None, parallel_map(keyboard_filter, all_keyboards))]
+    else:
+        if keymap == 'all':
+            keyboard = qmk.keyboard.resolve_keyboard(keyboard)
+            cli.log.info(f'Retrieving list of keymaps for keyboard "{keyboard}"...')
+            return _all_keymaps(keyboard)
         else:
-            cli.log.info('Parsing data for all matching keyboard/keymap combinations...')
-            valid_keymaps = [(e[0], e[1], dotty(e[2])) for e in pool.starmap(_load_keymap_info, target_list)]
-
-            function_re = re.compile(r'^(?P<function>[a-zA-Z]+)\((?P<key>[a-zA-Z0-9_\.]+)(,\s*(?P<value>[^#]+))?\)$')
-            equals_re = re.compile(r'^(?P<key>[a-zA-Z0-9_\.]+)\s*=\s*(?P<value>[^#]+)$')
-
-            for filter_expr in filters:
-                function_match = function_re.match(filter_expr)
-                equals_match = equals_re.match(filter_expr)
-
-                if function_match is not None:
-                    func_name = function_match.group('function').lower()
-                    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}})...')
+            return [(qmk.keyboard.resolve_keyboard(keyboard), keymap)]
+
+
+def expand_keymap_targets(targets: List[Tuple[str, str]]) -> List[Tuple[str, str]]:
+    """Expand a list of (keyboard, keymap) tuples inclusive of 'all', into a list of explicit (keyboard, keymap) tuples.
+    """
+    overall_targets = []
+    all_keyboards = qmk.keyboard.list_keyboards()
+    for target in targets:
+        overall_targets.extend(_expand_keymap_target(target[0], target[1], all_keyboards))
+    return list(sorted(set(overall_targets)))
+
+
+def _filter_keymap_targets(target_list: List[Tuple[str, str]], filters: List[str] = [], print_vals: List[str] = []) -> List[Tuple[str, str, List[Tuple[str, str]]]]:
+    """Filter a list of (keyboard, keymap) tuples based on the supplied filters.
+
+    Optionally includes the values of the queried info.json keys.
+    """
+    if len(filters) == 0 and len(print_vals) == 0:
+        targets = [(kb, km, {}) for kb, km in target_list]
+    else:
+        cli.log.info('Parsing data for all matching keyboard/keymap combinations...')
+        valid_keymaps = [(e[0], e[1], dotty(e[2])) for e in parallel_map(_load_keymap_info, target_list)]
+
+        function_re = re.compile(r'^(?P<function>[a-zA-Z]+)\((?P<key>[a-zA-Z0-9_\.]+)(,\s*(?P<value>[^#]+))?\)$')
+        equals_re = re.compile(r'^(?P<key>[a-zA-Z0-9_\.]+)\s*=\s*(?P<value>[^#]+)$')
+
+        for filter_expr in filters:
+            function_match = function_re.match(filter_expr)
+            equals_match = equals_re.match(filter_expr)
+
+            if function_match is not None:
+                func_name = function_match.group('function').lower()
+                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:
-                        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.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}})...')
+                    cli.log.info(f'Filtering on condition: {{fg_green}}{func_name}{{fg_reset}}({{fg_cyan}}{key}{{fg_reset}})...')
 
-                elif equals_match is not None:
-                    key = equals_match.group('key')
-                    value = equals_match.group('value')
-                    cli.log.info(f'Filtering on condition: {{fg_cyan}}{key}{{fg_reset}} == {{fg_cyan}}{value}{{fg_reset}}...')
+            elif equals_match is not None:
+                key = equals_match.group('key')
+                value = equals_match.group('value')
+                cli.log.info(f'Filtering on condition: {{fg_cyan}}{key}{{fg_reset}} == {{fg_cyan}}{value}{{fg_reset}}...')
 
-                    def _make_filter(k, v):
-                        expr = fnmatch.translate(v)
-                        rule = re.compile(f'^{expr}$', re.IGNORECASE)
+                def _make_filter(k, v):
+                    expr = fnmatch.translate(v)
+                    rule = re.compile(f'^{expr}$', re.IGNORECASE)
 
-                        def f(e):
-                            lhs = e[2].get(k)
-                            lhs = str(False if lhs is None else lhs)
-                            return rule.search(lhs) is not None
+                    def f(e):
+                        lhs = e[2].get(k)
+                        lhs = str(False if lhs is None else lhs)
+                        return rule.search(lhs) is not None
 
-                        return f
+                    return f
 
-                    valid_keymaps = filter(_make_filter(key, value), valid_keymaps)
-                else:
-                    cli.log.warning(f'Unrecognized filter expression: {filter_expr}')
-                    continue
+                valid_keymaps = filter(_make_filter(key, value), valid_keymaps)
+            else:
+                cli.log.warning(f'Unrecognized filter expression: {filter_expr}')
+                continue
 
             targets = [(e[0], e[1], [(p, e[2].get(p)) for p in print_vals]) for e in valid_keymaps]
 
     return targets
+
+
+def search_keymap_targets(targets: List[Tuple[str, str]] = [('all', 'default')], filters: List[str] = [], print_vals: List[str] = []) -> List[Tuple[str, str, List[Tuple[str, str]]]]:
+    """Search for build targets matching the supplied criteria.
+    """
+    return list(sorted(_filter_keymap_targets(expand_keymap_targets(targets), filters, print_vals), key=lambda e: (e[0], e[1])))
+
+
+def search_make_targets(targets: List[str], filters: List[str] = [], print_vals: List[str] = []) -> List[Tuple[str, str, List[Tuple[str, str]]]]:
+    """Search for build targets matching the supplied criteria.
+    """
+    return list(sorted(_filter_keymap_targets(expand_make_targets(targets), filters, print_vals), key=lambda e: (e[0], e[1])))
diff --git a/lib/python/qmk/util.py b/lib/python/qmk/util.py
new file mode 100644
index 000000000000..db7debd5788f
--- /dev/null
+++ b/lib/python/qmk/util.py
@@ -0,0 +1,56 @@
+"""Utility functions.
+"""
+import contextlib
+import multiprocessing
+
+from milc import cli
+
+
+@contextlib.contextmanager
+def parallelize():
+    """Returns a function that can be used in place of a map() call.
+
+    Attempts to use `mpire`, falling back to `multiprocessing` if it's not
+    available. If parallelization is not requested, returns the original map()
+    function.
+    """
+
+    # Work out if we've already got a config value for parallel searching
+    if cli.config.user.parallel_search is None:
+        parallel_search = True
+    else:
+        parallel_search = cli.config.user.parallel_search
+
+    # Non-parallel searches use `map()`
+    if not parallel_search:
+        yield map
+        return
+
+    # Prefer mpire's `WorkerPool` if it's available
+    with contextlib.suppress(ImportError):
+        from mpire import WorkerPool
+        from mpire.utils import make_single_arguments
+        with WorkerPool() as pool:
+
+            def _worker(func, *args):
+                # Ensure we don't unpack tuples -- mpire's `WorkerPool` tries to do so normally so we tell it not to.
+                for r in pool.imap_unordered(func, make_single_arguments(*args, generator=False), progress_bar=True):
+                    yield r
+
+            yield _worker
+        return
+
+    # Otherwise fall back to multiprocessing's `Pool`
+    with multiprocessing.Pool() as pool:
+        yield pool.imap_unordered
+
+
+def parallel_map(*args, **kwargs):
+    """Effectively runs `map()` but executes it in parallel if necessary.
+    """
+    with parallelize() as map_fn:
+        # This needs to be enclosed in a `list()` as some implementations return
+        # a generator function, which means the scope of the pool is closed off
+        # before the results are returned. Returning a list ensures results are
+        # materialised before any worker pool is shut down.
+        return list(map_fn(*args, **kwargs))
diff --git a/platforms/avr/drivers/audio_pwm_hardware.c b/platforms/avr/drivers/audio_pwm_hardware.c
index 2fc448ea5808..6799cf2fddef 100644
--- a/platforms/avr/drivers/audio_pwm_hardware.c
+++ b/platforms/avr/drivers/audio_pwm_hardware.c
@@ -15,13 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if defined(__AVR__)
-#    include <avr/pgmspace.h>
-#    include <avr/interrupt.h>
-#    include <avr/io.h>
-#endif
-
 #include "audio.h"
+#include "gpio.h"
+#include <avr/interrupt.h>
 
 extern bool    playing_note;
 extern bool    playing_melody;
diff --git a/platforms/avr/drivers/backlight_pwm.c b/platforms/avr/drivers/backlight_pwm.c
new file mode 100644
index 000000000000..74d25753a4e6
--- /dev/null
+++ b/platforms/avr/drivers/backlight_pwm.c
@@ -0,0 +1,327 @@
+#include "backlight.h"
+#include "gpio.h"
+#include "progmem.h"
+#include <avr/io.h>
+#include <avr/interrupt.h>
+
+// Maximum duty cycle limit
+#ifndef BACKLIGHT_LIMIT_VAL
+#    define BACKLIGHT_LIMIT_VAL 255
+#endif
+
+#if (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__)) && (BACKLIGHT_PIN == B5 || BACKLIGHT_PIN == B6 || BACKLIGHT_PIN == B7)
+#    define ICRx ICR1
+#    define TCCRxA TCCR1A
+#    define TCCRxB TCCR1B
+#    define TIMERx_OVF_vect TIMER1_OVF_vect
+#    define TIMSKx TIMSK1
+#    define TOIEx TOIE1
+
+#    if BACKLIGHT_PIN == B5
+#        define COMxx0 COM1A0
+#        define COMxx1 COM1A1
+#        define OCRxx OCR1A
+#    elif BACKLIGHT_PIN == B6
+#        define COMxx0 COM1B0
+#        define COMxx1 COM1B1
+#        define OCRxx OCR1B
+#    elif BACKLIGHT_PIN == B7
+#        define COMxx0 COM1C0
+#        define COMxx1 COM1C1
+#        define OCRxx OCR1C
+#    endif
+#elif (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__)) && (BACKLIGHT_PIN == C4 || BACKLIGHT_PIN == C5 || BACKLIGHT_PIN == C6)
+#    define ICRx ICR3
+#    define TCCRxA TCCR3A
+#    define TCCRxB TCCR3B
+#    define TIMERx_OVF_vect TIMER3_OVF_vect
+#    define TIMSKx TIMSK3
+#    define TOIEx TOIE3
+
+#    if BACKLIGHT_PIN == C4
+#        if (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))
+#            error This MCU has no C4 pin!
+#        else
+#            define COMxx0 COM3C0
+#            define COMxx1 COM3C1
+#            define OCRxx OCR3C
+#        endif
+#    elif BACKLIGHT_PIN == C5
+#        if (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))
+#            error This MCU has no C5 pin!
+#        else
+#            define COMxx0 COM3B0
+#            define COMxx1 COM3B1
+#            define OCRxx OCR3B
+#        endif
+#    elif BACKLIGHT_PIN == C6
+#        define COMxx0 COM3A0
+#        define COMxx1 COM3A1
+#        define OCRxx OCR3A
+#    endif
+#elif (defined(__AVR_AT90USB162__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__)) && (BACKLIGHT_PIN == B7 || BACKLIGHT_PIN == C5 || BACKLIGHT_PIN == C6)
+#    define ICRx ICR1
+#    define TCCRxA TCCR1A
+#    define TCCRxB TCCR1B
+#    define TIMERx_OVF_vect TIMER1_OVF_vect
+#    define TIMSKx TIMSK1
+#    define TOIEx TOIE1
+
+#    if BACKLIGHT_PIN == B7
+#        define COMxx0 COM1C0
+#        define COMxx1 COM1C1
+#        define OCRxx OCR1C
+#    elif BACKLIGHT_PIN == C5
+#        define COMxx0 COM1B0
+#        define COMxx1 COM1B1
+#        define OCRxx OCR1B
+#    elif BACKLIGHT_PIN == C6
+#        define COMxx0 COM1A0
+#        define COMxx1 COM1A1
+#        define OCRxx OCR1A
+#    endif
+#elif defined(__AVR_ATmega32A__) && (BACKLIGHT_PIN == D4 || BACKLIGHT_PIN == D5)
+#    define ICRx ICR1
+#    define TCCRxA TCCR1A
+#    define TCCRxB TCCR1B
+#    define TIMERx_OVF_vect TIMER1_OVF_vect
+#    define TIMSKx TIMSK
+#    define TOIEx TOIE1
+
+#    if BACKLIGHT_PIN == D4
+#        define COMxx0 COM1B0
+#        define COMxx1 COM1B1
+#        define OCRxx OCR1B
+#    elif BACKLIGHT_PIN == D5
+#        define COMxx0 COM1A0
+#        define COMxx1 COM1A1
+#        define OCRxx OCR1A
+#    endif
+#elif (defined(__AVR_ATmega328P__) || defined(__AVR_ATmega328__)) && (BACKLIGHT_PIN == B1 || BACKLIGHT_PIN == B2)
+#    define ICRx ICR1
+#    define TCCRxA TCCR1A
+#    define TCCRxB TCCR1B
+#    define TIMERx_OVF_vect TIMER1_OVF_vect
+#    define TIMSKx TIMSK1
+#    define TOIEx TOIE1
+
+#    if BACKLIGHT_PIN == B1
+#        define COMxx0 COM1A0
+#        define COMxx1 COM1A1
+#        define OCRxx OCR1A
+#    elif BACKLIGHT_PIN == B2
+#        define COMxx0 COM1B0
+#        define COMxx1 COM1B1
+#        define OCRxx OCR1B
+#    endif
+#endif
+
+#ifndef BACKLIGHT_RESOLUTION
+#    define BACKLIGHT_RESOLUTION 0xFFFFU
+#endif
+
+#if (BACKLIGHT_RESOLUTION > 0xFFFF || BACKLIGHT_RESOLUTION < 0x00FF)
+#    error "Backlight resolution must be between 0x00FF and 0xFFFF"
+#endif
+
+#define BREATHING_SCALE_FACTOR F_CPU / BACKLIGHT_RESOLUTION / 120
+
+static inline void enable_pwm(void) {
+#if BACKLIGHT_ON_STATE == 1
+    TCCRxA |= _BV(COMxx1);
+#else
+    TCCRxA |= _BV(COMxx1) | _BV(COMxx0);
+#endif
+}
+
+static inline void disable_pwm(void) {
+#if BACKLIGHT_ON_STATE == 1
+    TCCRxA &= ~(_BV(COMxx1));
+#else
+    TCCRxA &= ~(_BV(COMxx1) | _BV(COMxx0));
+#endif
+}
+
+// See http://jared.geek.nz/2013/feb/linear-led-pwm
+static uint16_t cie_lightness(uint16_t v) {
+    if (v <= (uint32_t)ICRx / 12) // If the value is less than or equal to ~8% of max
+    {
+        return v / 9; // Same as dividing by 900%
+    } else {
+        // In the next two lines values are bit-shifted. This is to avoid loosing decimals in integer math.
+        uint32_t y   = (((uint32_t)v + (uint32_t)ICRx / 6) << 5) / ((uint32_t)ICRx / 6 + ICRx); // If above 8%, add ~16% of max, and normalize with (max + ~16% max)
+        uint32_t out = (y * y * y * ICRx) >> 15;                                                // Cube it and undo the bit-shifting. (which is now three times as much due to the cubing)
+
+        if (out > ICRx) // Avoid overflows
+        {
+            out = ICRx;
+        }
+        return (uint16_t)out;
+    }
+}
+
+// rescale the supplied backlight value to be in terms of the value limit	// range for val is [0..ICRx]. PWM pin is high while the timer count is below val.
+static uint32_t rescale_limit_val(uint32_t val) {
+    return (val * (BACKLIGHT_LIMIT_VAL + 1)) / 256;
+}
+
+// range for val is [0..ICRx]. PWM pin is high while the timer count is below val.
+static inline void set_pwm(uint16_t val) {
+    OCRxx = val;
+}
+
+void backlight_set(uint8_t level) {
+    if (level > BACKLIGHT_LEVELS) level = BACKLIGHT_LEVELS;
+
+    if (level == 0) {
+        // Turn off PWM control on backlight pin
+        disable_pwm();
+    } else {
+        // Turn on PWM control of backlight pin
+        enable_pwm();
+    }
+    // Set the brightness
+    set_pwm(cie_lightness(rescale_limit_val(ICRx * (uint32_t)level / BACKLIGHT_LEVELS)));
+}
+
+void backlight_task(void) {}
+
+#ifdef BACKLIGHT_BREATHING
+#    define BREATHING_NO_HALT 0
+#    define BREATHING_HALT_OFF 1
+#    define BREATHING_HALT_ON 2
+#    define BREATHING_STEPS 128
+
+static uint8_t  breathing_halt    = BREATHING_NO_HALT;
+static uint16_t breathing_counter = 0;
+
+static uint8_t breath_scale_counter = 1;
+/* Run the breathing loop at ~120Hz*/
+const uint8_t breathing_ISR_frequency = 120;
+
+bool is_breathing(void) {
+    return !!(TIMSKx & _BV(TOIEx));
+}
+
+#    define breathing_interrupt_enable() \
+        do {                             \
+            TIMSKx |= _BV(TOIEx);        \
+        } while (0)
+#    define breathing_interrupt_disable() \
+        do {                              \
+            TIMSKx &= ~_BV(TOIEx);        \
+        } while (0)
+
+#    define breathing_min()        \
+        do {                       \
+            breathing_counter = 0; \
+        } while (0)
+#    define breathing_max()                                                           \
+        do {                                                                          \
+            breathing_counter = get_breathing_period() * breathing_ISR_frequency / 2; \
+        } while (0)
+
+void breathing_enable(void) {
+    breathing_counter = 0;
+    breathing_halt    = BREATHING_NO_HALT;
+    breathing_interrupt_enable();
+}
+
+void breathing_pulse(void) {
+    if (get_backlight_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(get_backlight_level());
+}
+
+void breathing_self_disable(void) {
+    if (get_backlight_level() == 0)
+        breathing_halt = BREATHING_HALT_OFF;
+    else
+        breathing_halt = BREATHING_HALT_ON;
+}
+
+/* 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] PROGMEM = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 17, 20, 24, 28, 32, 36, 41, 46, 51, 57, 63, 70, 76, 83, 91, 98, 106, 113, 121, 129, 138, 146, 154, 162, 170, 178, 185, 193, 200, 207, 213, 220, 225, 231, 235, 240, 244, 247, 250, 252, 253, 254, 255, 254, 253, 252, 250, 247, 244, 240, 235, 231, 225, 220, 213, 207, 200, 193, 185, 178, 170, 162, 154, 146, 138, 129, 121, 113, 106, 98, 91, 83, 76, 70, 63, 57, 51, 46, 41, 36, 32, 28, 24, 20, 17, 15, 12, 10, 8, 6, 5, 4, 3, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+// Use this before the cie_lightness function.
+static inline uint16_t scale_backlight(uint16_t v) {
+    return v / BACKLIGHT_LEVELS * get_backlight_level();
+}
+
+/* Assuming a 16MHz CPU clock and a timer that resets at 64k (ICR1), the following interrupt handler will run
+ * about 244 times per second.
+ *
+ * The following ISR runs at F_CPU/ISRx. With a 16MHz clock and default pwm resolution, that means 244Hz
+ */
+ISR(TIMERx_OVF_vect) {
+    // Only run this ISR at ~120 Hz
+    if (breath_scale_counter++ == BREATHING_SCALE_FACTOR) {
+        breath_scale_counter = 1;
+    } else {
+        return;
+    }
+    uint16_t interval = (uint16_t)get_breathing_period() * breathing_ISR_frequency / BREATHING_STEPS;
+    // resetting after one period to prevent ugly reset at overflow.
+    breathing_counter = (breathing_counter + 1) % (get_breathing_period() * breathing_ISR_frequency);
+    uint8_t index     = breathing_counter / interval;
+    // limit index to max step value
+    if (index >= BREATHING_STEPS) {
+        index = BREATHING_STEPS - 1;
+    }
+
+    if (((breathing_halt == BREATHING_HALT_ON) && (index == BREATHING_STEPS / 2)) || ((breathing_halt == BREATHING_HALT_OFF) && (index == BREATHING_STEPS - 1))) {
+        breathing_interrupt_disable();
+    }
+
+    // Set PWM to a brightnessvalue scaled to the configured resolution
+    set_pwm(cie_lightness(rescale_limit_val(scale_backlight((uint32_t)pgm_read_byte(&breathing_table[index]) * ICRx / 255))));
+}
+
+#endif // BACKLIGHT_BREATHING
+
+void backlight_init_ports(void) {
+    setPinOutput(BACKLIGHT_PIN);
+#if BACKLIGHT_ON_STATE == 1
+    writePinLow(BACKLIGHT_PIN);
+#else
+    writePinHigh(BACKLIGHT_PIN);
+#endif
+
+    // I could write a wall of text here to explain... but TL;DW
+    // Go read the ATmega32u4 datasheet.
+    // And this: http://blog.saikoled.com/post/43165849837/secret-konami-cheat-code-to-high-resolution-pwm-on
+
+    // Pin PB7 = OCR1C (Timer 1, Channel C)
+    // Compare Output Mode = Clear on compare match, Channel C = COM1C1=1 COM1C0=0
+    // (i.e. start high, go low when counter matches.)
+    // WGM Mode 14 (Fast PWM) = WGM13=1 WGM12=1 WGM11=1 WGM10=0
+    // Clock Select = clk/1 (no prescaling) = CS12=0 CS11=0 CS10=1
+
+    /*
+    14.8.3:
+    "In fast PWM mode, the compare units allow generation of PWM waveforms on the OCnx pins. Setting the COMnx1:0 bits to two will produce a non-inverted PWM [..]."
+    "In fast PWM mode the counter is incremented until the counter value matches either one of the fixed values 0x00FF, 0x01FF, or 0x03FF (WGMn3:0 = 5, 6, or 7), the value in ICRn (WGMn3:0 = 14), or the value in OCRnA (WGMn3:0 = 15)."
+    */
+    TCCRxA = _BV(COMxx1) | _BV(WGM11);            // = 0b00001010;
+    TCCRxB = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001;
+    ICRx   = BACKLIGHT_RESOLUTION;
+
+    backlight_init();
+
+#ifdef BACKLIGHT_BREATHING
+    if (is_backlight_breathing()) {
+        breathing_enable();
+    }
+#endif
+}
diff --git a/platforms/avr/drivers/backlight_timer.c b/platforms/avr/drivers/backlight_timer.c
new file mode 100644
index 000000000000..e1f4286557f4
--- /dev/null
+++ b/platforms/avr/drivers/backlight_timer.c
@@ -0,0 +1,267 @@
+#include "backlight.h"
+#include "backlight_driver_common.h"
+#include "progmem.h"
+#include <avr/io.h>
+#include <avr/interrupt.h>
+
+// Maximum duty cycle limit
+#ifndef BACKLIGHT_LIMIT_VAL
+#    define BACKLIGHT_LIMIT_VAL 255
+#endif
+
+#ifndef BACKLIGHT_PWM_TIMER
+#    define BACKLIGHT_PWM_TIMER 1
+#endif
+
+#if BACKLIGHT_PWM_TIMER == 1
+#    define ICRx ICR1
+#    define TCCRxA TCCR1A
+#    define TCCRxB TCCR1B
+#    define TIMERx_COMPA_vect TIMER1_COMPA_vect
+#    define TIMERx_OVF_vect TIMER1_OVF_vect
+#    if defined(__AVR_ATmega32A__) // This MCU has only one TIMSK register
+#        define TIMSKx TIMSK
+#    else
+#        define TIMSKx TIMSK1
+#    endif
+#    define TOIEx TOIE1
+
+#    define OCIExA OCIE1A
+#    define OCRxx OCR1A
+#elif BACKLIGHT_PWM_TIMER == 3
+#    define ICRx ICR1
+#    define TCCRxA TCCR3A
+#    define TCCRxB TCCR3B
+#    define TIMERx_COMPA_vect TIMER3_COMPA_vect
+#    define TIMERx_OVF_vect TIMER3_OVF_vect
+#    define TIMSKx TIMSK3
+#    define TOIEx TOIE3
+
+#    define OCIExA OCIE3A
+#    define OCRxx OCR3A
+#else
+#    error Invalid backlight PWM timer!
+#endif
+
+#ifndef BACKLIGHT_RESOLUTION
+#    define BACKLIGHT_RESOLUTION 0xFFFFU
+#endif
+
+#if (BACKLIGHT_RESOLUTION > 0xFFFF || BACKLIGHT_RESOLUTION < 0x00FF)
+#    error "Backlight resolution must be between 0x00FF and 0xFFFF"
+#endif
+
+#define BREATHING_SCALE_FACTOR F_CPU / BACKLIGHT_RESOLUTION / 120
+
+// The idea of software PWM assisted by hardware timers is the following
+// we use the hardware timer in fast PWM mode like for hardware PWM, but
+// instead of letting the Output Match Comparator control the led pin
+// (which is not possible since the backlight is not wired to PWM pins on the
+// CPU), we do the LED on/off by oursleves.
+// The timer is setup to count up to 0xFFFF, and we set the Output Compare
+// register to the current 16bits backlight level (after CIE correction).
+// This means the CPU will trigger a compare match interrupt when the counter
+// reaches the backlight level, where we turn off the LEDs,
+// but also an overflow interrupt when the counter rolls back to 0,
+// in which we're going to turn on the LEDs.
+// The LED will then be on for OCRxx/0xFFFF time, adjusted every 244Hz,
+// or F_CPU/BACKLIGHT_RESOLUTION if used.
+
+// Triggered when the counter reaches the OCRx value
+ISR(TIMERx_COMPA_vect) {
+    backlight_pins_off();
+}
+
+// Triggered when the counter reaches the TOP value
+// this one triggers at F_CPU/ICRx = 16MHz/65536 =~ 244 Hz
+ISR(TIMERx_OVF_vect) {
+#ifdef BACKLIGHT_BREATHING
+    if (is_breathing()) {
+        breathing_task();
+    }
+#endif
+    // for very small values of OCRxx (or backlight level)
+    // we can't guarantee this whole code won't execute
+    // at the same time as the compare match interrupt
+    // which means that we might turn on the leds while
+    // trying to turn them off, leading to flickering
+    // artifacts (especially while breathing, because breathing_task
+    // takes many computation cycles).
+    // so better not turn them on while the counter TOP is very low.
+    if (OCRxx > ICRx / 250 + 5) {
+        backlight_pins_on();
+    }
+}
+
+// See http://jared.geek.nz/2013/feb/linear-led-pwm
+static uint16_t cie_lightness(uint16_t v) {
+    if (v <= (uint32_t)ICRx / 12) // If the value is less than or equal to ~8% of max
+    {
+        return v / 9; // Same as dividing by 900%
+    } else {
+        // In the next two lines values are bit-shifted. This is to avoid loosing decimals in integer math.
+        uint32_t y   = (((uint32_t)v + (uint32_t)ICRx / 6) << 5) / ((uint32_t)ICRx / 6 + ICRx); // If above 8%, add ~16% of max, and normalize with (max + ~16% max)
+        uint32_t out = (y * y * y * ICRx) >> 15;                                                // Cube it and undo the bit-shifting. (which is now three times as much due to the cubing)
+
+        if (out > ICRx) // Avoid overflows
+        {
+            out = ICRx;
+        }
+        return (uint16_t)out;
+    }
+}
+
+// rescale the supplied backlight value to be in terms of the value limit	// range for val is [0..ICRx]. PWM pin is high while the timer count is below val.
+static uint32_t rescale_limit_val(uint32_t val) {
+    return (val * (BACKLIGHT_LIMIT_VAL + 1)) / 256;
+}
+
+// range for val is [0..ICRx]. PWM pin is high while the timer count is below val.
+static inline void set_pwm(uint16_t val) {
+    OCRxx = val;
+}
+
+void backlight_set(uint8_t level) {
+    if (level > BACKLIGHT_LEVELS) level = BACKLIGHT_LEVELS;
+
+    if (level == 0) {
+        if (OCRxx) {
+            TIMSKx &= ~(_BV(OCIExA));
+            TIMSKx &= ~(_BV(TOIEx));
+        }
+        backlight_pins_off();
+    } else {
+        if (!OCRxx) {
+            TIMSKx |= _BV(OCIExA);
+            TIMSKx |= _BV(TOIEx);
+        }
+    }
+    // Set the brightness
+    set_pwm(cie_lightness(rescale_limit_val(ICRx * (uint32_t)level / BACKLIGHT_LEVELS)));
+}
+
+void backlight_task(void) {}
+
+#ifdef BACKLIGHT_BREATHING
+#    define BREATHING_NO_HALT 0
+#    define BREATHING_HALT_OFF 1
+#    define BREATHING_HALT_ON 2
+#    define BREATHING_STEPS 128
+
+static uint8_t  breathing_halt    = BREATHING_NO_HALT;
+static uint16_t breathing_counter = 0;
+
+static uint8_t breath_scale_counter = 1;
+/* Run the breathing loop at ~120Hz*/
+const uint8_t breathing_ISR_frequency = 120;
+
+static bool breathing = false;
+
+bool is_breathing(void) {
+    return breathing;
+}
+
+#    define breathing_interrupt_enable() \
+        do {                             \
+            breathing = true;            \
+        } while (0)
+#    define breathing_interrupt_disable() \
+        do {                              \
+            breathing = false;            \
+        } while (0)
+
+#    define breathing_min()        \
+        do {                       \
+            breathing_counter = 0; \
+        } while (0)
+#    define breathing_max()                                                           \
+        do {                                                                          \
+            breathing_counter = get_breathing_period() * breathing_ISR_frequency / 2; \
+        } while (0)
+
+void breathing_enable(void) {
+    breathing_counter = 0;
+    breathing_halt    = BREATHING_NO_HALT;
+    breathing_interrupt_enable();
+}
+
+void breathing_pulse(void) {
+    if (get_backlight_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(get_backlight_level());
+}
+
+void breathing_self_disable(void) {
+    if (get_backlight_level() == 0)
+        breathing_halt = BREATHING_HALT_OFF;
+    else
+        breathing_halt = BREATHING_HALT_ON;
+}
+
+/* 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] PROGMEM = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 17, 20, 24, 28, 32, 36, 41, 46, 51, 57, 63, 70, 76, 83, 91, 98, 106, 113, 121, 129, 138, 146, 154, 162, 170, 178, 185, 193, 200, 207, 213, 220, 225, 231, 235, 240, 244, 247, 250, 252, 253, 254, 255, 254, 253, 252, 250, 247, 244, 240, 235, 231, 225, 220, 213, 207, 200, 193, 185, 178, 170, 162, 154, 146, 138, 129, 121, 113, 106, 98, 91, 83, 76, 70, 63, 57, 51, 46, 41, 36, 32, 28, 24, 20, 17, 15, 12, 10, 8, 6, 5, 4, 3, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+// Use this before the cie_lightness function.
+static inline uint16_t scale_backlight(uint16_t v) {
+    return v / BACKLIGHT_LEVELS * get_backlight_level();
+}
+
+void breathing_task(void) {
+    // Only run this ISR at ~120 Hz
+    if (breath_scale_counter++ == BREATHING_SCALE_FACTOR) {
+        breath_scale_counter = 1;
+    } else {
+        return;
+    }
+    uint16_t interval = (uint16_t)get_breathing_period() * breathing_ISR_frequency / BREATHING_STEPS;
+    // resetting after one period to prevent ugly reset at overflow.
+    breathing_counter = (breathing_counter + 1) % (get_breathing_period() * breathing_ISR_frequency);
+    uint8_t index     = breathing_counter / interval;
+    // limit index to max step value
+    if (index >= BREATHING_STEPS) {
+        index = BREATHING_STEPS - 1;
+    }
+
+    if (((breathing_halt == BREATHING_HALT_ON) && (index == BREATHING_STEPS / 2)) || ((breathing_halt == BREATHING_HALT_OFF) && (index == BREATHING_STEPS - 1))) {
+        breathing_interrupt_disable();
+    }
+
+    // Set PWM to a brightnessvalue scaled to the configured resolution
+    set_pwm(cie_lightness(rescale_limit_val(scale_backlight((uint32_t)pgm_read_byte(&breathing_table[index]) * ICRx / 255))));
+}
+
+#endif // BACKLIGHT_BREATHING
+
+void backlight_init_ports(void) {
+    // Setup backlight pin as output and output to on state.
+    backlight_pins_init();
+
+    // I could write a wall of text here to explain... but TL;DW
+    // Go read the ATmega32u4 datasheet.
+    // And this: http://blog.saikoled.com/post/43165849837/secret-konami-cheat-code-to-high-resolution-pwm-on
+
+    // TimerX setup, Fast PWM mode count to TOP set in ICRx
+    TCCRxA = _BV(WGM11); // = 0b00000010;
+    // clock select clk/1
+    TCCRxB = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001;
+    ICRx   = BACKLIGHT_RESOLUTION;
+
+    backlight_init();
+
+#ifdef BACKLIGHT_BREATHING
+    if (is_backlight_breathing()) {
+        breathing_enable();
+    }
+#endif
+}
diff --git a/platforms/avr/platform.mk b/platforms/avr/platform.mk
index 39a11b28e47f..09028d80af36 100644
--- a/platforms/avr/platform.mk
+++ b/platforms/avr/platform.mk
@@ -12,8 +12,7 @@ HEX = $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature
 EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT)
 BIN =
 
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523
-ifneq ($(findstring 12.,$(shell avr-gcc --version 2>/dev/null)),)
+ifeq ("$(shell echo "int main(){}" | $(CC) --param=min-pagesize=0 -x c - -o /dev/null 2>&1)", "")
 COMPILEFLAGS += --param=min-pagesize=0
 endif
 
diff --git a/platforms/avr/printf.mk b/platforms/avr/printf.mk
index 060ad88c57c9..c6490169d83d 100644
--- a/platforms/avr/printf.mk
+++ b/platforms/avr/printf.mk
@@ -1,2 +1,2 @@
-TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S
-TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c
+SRC += $(PLATFORM_COMMON_DIR)/xprintf.S
+SRC += $(PLATFORM_COMMON_DIR)/printf.c
diff --git a/platforms/avr/sleep_led.c b/platforms/avr/sleep_led.c
index b05431633ba3..ad6253be93f4 100644
--- a/platforms/avr/sleep_led.c
+++ b/platforms/avr/sleep_led.c
@@ -109,16 +109,19 @@ ISR(TIMERx_COMPA_vect) {
             uint8_t duration : 2;
             uint8_t index : 6;
         } pwm;
-    } timer = {.row = 0};
+    } timer                = {.row = 0};
+    static led_t led_state = {0};
 
     timer.row++;
 
     // LED on
     if (timer.pwm.count == 0) {
-        led_set(1 << USB_LED_CAPS_LOCK);
+        led_state.caps_lock = true;
+        led_set(led_state.raw);
     }
     // LED off
     if (timer.pwm.count == pgm_read_byte(&breathing_table[timer.pwm.index])) {
-        led_set(0);
+        led_state.caps_lock = false;
+        led_set(led_state.raw);
     }
 }
diff --git a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/mcuconf.h
index ab293c0b4045..8621807cbbc6 100644
--- a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/mcuconf.h
+++ b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/mcuconf.h
@@ -106,7 +106,6 @@
 #define RP_USB_USE_USBD0                    TRUE
 #define RP_USB_FORCE_VBUS_DETECT            TRUE
 #define RP_USE_EXTERNAL_VBUS_DETECT         FALSE
-#define RP_USB_USE_SOF_INTR                 TRUE
 #define RP_USB_USE_ERROR_DATA_SEQ_INTR      FALSE
 
 #endif /* MCUCONF_H */
diff --git a/platforms/chibios/boards/GENERIC_RP_RP2040/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_RP_RP2040/configs/mcuconf.h
index b91d76241994..902f9b5005b7 100644
--- a/platforms/chibios/boards/GENERIC_RP_RP2040/configs/mcuconf.h
+++ b/platforms/chibios/boards/GENERIC_RP_RP2040/configs/mcuconf.h
@@ -106,7 +106,6 @@
 #define RP_USB_USE_USBD0                    TRUE
 #define RP_USB_FORCE_VBUS_DETECT            TRUE
 #define RP_USE_EXTERNAL_VBUS_DETECT         FALSE
-#define RP_USB_USE_SOF_INTR                 TRUE
 #define RP_USB_USE_ERROR_DATA_SEQ_INTR      FALSE
 
 #endif /* MCUCONF_H */
diff --git a/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/config.h
index 90a41326a16e..cbb98f90980e 100644
--- a/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/config.h
+++ b/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/config.h
@@ -14,10 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* Address for jumping to bootloader on STM32 chips. */
-/* It is chip dependent, the correct number can be looked up by checking against ST's application note AN2606.
- */
-
 #ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
 #    define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 #endif
diff --git a/platforms/chibios/boards/GENERIC_STM32_G431XB/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_G431XB/configs/config.h
new file mode 100644
index 000000000000..2f23d400bb03
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_STM32_G431XB/configs/config.h
@@ -0,0 +1,7 @@
+// Copyright 2023 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
+#    define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+#endif
diff --git a/platforms/chibios/boards/GENERIC_STM32_H723XG/board/board.mk b/platforms/chibios/boards/GENERIC_STM32_H723XG/board/board.mk
new file mode 100644
index 000000000000..3511f752a91d
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_STM32_H723XG/board/board.mk
@@ -0,0 +1,12 @@
+# List of all the board related files.
+BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H723ZG/board.c
+
+# Extra files
+BOARDSRC += $(BOARD_PATH)/board/extra.c
+
+# Required include directories
+BOARDINC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H723ZG
+
+# Shared variables
+ALLCSRC += $(BOARDSRC)
+ALLINC  += $(BOARDINC)
diff --git a/platforms/chibios/boards/GENERIC_STM32_H723XG/board/extra.c b/platforms/chibios/boards/GENERIC_STM32_H723XG/board/extra.c
new file mode 100755
index 000000000000..fce0b4abad1c
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_STM32_H723XG/board/extra.c
@@ -0,0 +1,36 @@
+// Copyright 2023 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include <hal.h>
+#define BOOTLOADER_MAGIC 0xDEADBEEF
+
+////////////////////////////////////////////////////////////////////////////////
+// Different signalling for bootloader entry
+// - RAM is cleared on reset, so we can't use the usual __ram0_end__ symbol.
+// - Use backup registers in the RTC peripheral to store the magic value instead.
+
+static inline void enable_backup_register_access(void) {
+    PWR->CR1 |= PWR_CR1_DBP;
+}
+
+static inline void disable_backup_register_access(void) {
+    PWR->CR1 &= ~PWR_CR1_DBP;
+}
+
+void bootloader_marker_enable(void) {
+    enable_backup_register_access();
+    RTC->BKP0R = BOOTLOADER_MAGIC;
+    disable_backup_register_access();
+}
+
+bool bootloader_marker_active(void) {
+    enable_backup_register_access();
+    bool ret = RTC->BKP0R == BOOTLOADER_MAGIC;
+    disable_backup_register_access();
+    return ret;
+}
+
+void bootloader_marker_disable(void) {
+    enable_backup_register_access();
+    RTC->BKP0R = 0;
+    disable_backup_register_access();
+}
diff --git a/platforms/chibios/boards/GENERIC_STM32_H723XG/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_H723XG/configs/config.h
new file mode 100644
index 000000000000..f43df29b54a6
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_STM32_H723XG/configs/config.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define USB_DRIVER USBD2
+
+#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
+#    define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+#endif
diff --git a/platforms/chibios/boards/GENERIC_STM32_H723XG/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_STM32_H723XG/configs/mcuconf.h
new file mode 100644
index 000000000000..0239ec5273b5
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_STM32_H723XG/configs/mcuconf.h
@@ -0,0 +1,511 @@
+/*
+    ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef MCUCONF_H
+#define MCUCONF_H
+
+/*
+ * STM32H723/33/25/35 drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 15...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+#define STM32H7xx_MCUCONF
+#define STM32H723_MCUCONF
+#define STM32H733_MCUCONF
+#define STM32H725_MCUCONF
+#define STM32H735_MCUCONF
+
+/*
+ * General settings.
+ */
+#define STM32_NO_INIT                       FALSE
+
+/*
+ * Memory attributes settings.
+ */
+#define STM32_NOCACHE_ENABLE                FALSE
+#define STM32_NOCACHE_MPU_REGION            MPU_REGION_6
+#define STM32_NOCACHE_RBAR                  0x24000000U
+#define STM32_NOCACHE_RASR                  MPU_RASR_SIZE_16K
+
+/*
+ * PWR system settings.
+ * Reading STM32 Reference Manual is required, settings in PWR_CR3 are
+ * very critical.
+ * Register constants are taken from the ST header.
+ */
+#define STM32_VOS                           STM32_VOS_SCALE0
+#define STM32_PWR_CR1                       (PWR_CR1_SVOS_1 | PWR_CR1_SVOS_0)
+#define STM32_PWR_CR2                       (PWR_CR2_BREN)
+#define STM32_PWR_CR3                       (PWR_CR3_LDOEN | PWR_CR3_USB33DEN)
+#define STM32_PWR_CPUCR                     0
+
+/*
+ * Clock tree static settings.
+ * Reading STM32 Reference Manual is required.
+ */
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_LSI_ENABLED                   FALSE
+#define STM32_CSI_ENABLED                   FALSE
+#define STM32_HSI48_ENABLED                 TRUE
+#define STM32_HSE_ENABLED                   TRUE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_HSIDIV                        STM32_HSIDIV_DIV1
+
+/*
+ * PLLs static settings.
+ * Reading STM32 Reference Manual is required.
+ */
+#define STM32_PLLSRC                        STM32_PLLSRC_HSE_CK
+#define STM32_PLLCFGR_MASK                  ~0
+#define STM32_PLL1_ENABLED                  TRUE
+#define STM32_PLL1_P_ENABLED                TRUE
+#define STM32_PLL1_Q_ENABLED                TRUE
+#define STM32_PLL1_R_ENABLED                TRUE
+#define STM32_PLL1_DIVM_VALUE               4
+#define STM32_PLL1_DIVN_VALUE               275
+#define STM32_PLL1_FRACN_VALUE              0
+#define STM32_PLL1_DIVP_VALUE               1
+#define STM32_PLL1_DIVQ_VALUE               10
+#define STM32_PLL1_DIVR_VALUE               4
+#define STM32_PLL2_ENABLED                  TRUE
+#define STM32_PLL2_P_ENABLED                TRUE
+#define STM32_PLL2_Q_ENABLED                TRUE
+#define STM32_PLL2_R_ENABLED                TRUE
+#define STM32_PLL2_DIVM_VALUE               4
+#define STM32_PLL2_DIVN_VALUE               400
+#define STM32_PLL2_FRACN_VALUE              0
+#define STM32_PLL2_DIVP_VALUE               40
+#define STM32_PLL2_DIVQ_VALUE               8
+#define STM32_PLL2_DIVR_VALUE               8
+#define STM32_PLL3_ENABLED                  TRUE
+#define STM32_PLL3_P_ENABLED                TRUE
+#define STM32_PLL3_Q_ENABLED                TRUE
+#define STM32_PLL3_R_ENABLED                TRUE
+#define STM32_PLL3_DIVM_VALUE               4
+#define STM32_PLL3_DIVN_VALUE               240
+#define STM32_PLL3_FRACN_VALUE              0
+#define STM32_PLL3_DIVP_VALUE               10
+#define STM32_PLL3_DIVQ_VALUE               10
+#define STM32_PLL3_DIVR_VALUE               10
+
+/*
+ * Core clocks dynamic settings (can be changed at runtime).
+ * Reading STM32 Reference Manual is required.
+ */
+#define STM32_SW                            STM32_SW_PLL1_P_CK
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI_CK
+#define STM32_D1CPRE                        STM32_D1CPRE_DIV1
+#define STM32_D1HPRE                        STM32_D1HPRE_DIV2
+#define STM32_D1PPRE3                       STM32_D1PPRE3_DIV2
+#define STM32_D2PPRE1                       STM32_D2PPRE1_DIV2
+#define STM32_D2PPRE2                       STM32_D2PPRE2_DIV2
+#define STM32_D3PPRE4                       STM32_D3PPRE4_DIV2
+
+/*
+ * Peripherals clocks static settings.
+ * Reading STM32 Reference Manual is required.
+ */
+#define STM32_MCO1SEL                       STM32_MCO1SEL_HSI_CK
+#define STM32_MCO1PRE_VALUE                 4
+#define STM32_MCO2SEL                       STM32_MCO2SEL_SYS_CK
+#define STM32_MCO2PRE_VALUE                 4
+#define STM32_TIMPRE_ENABLE                 TRUE
+#define STM32_HRTIMSEL                      0
+#define STM32_STOPKERWUCK                   0
+#define STM32_STOPWUCK                      0
+#define STM32_RTCPRE_VALUE                  8
+#define STM32_CKPERSEL                      STM32_CKPERSEL_HSE_CK
+#define STM32_SDMMCSEL                      STM32_SDMMCSEL_PLL1_Q_CK
+#define STM32_OCTOSPISEL                    STM32_OCTOSPISEL_HCLK
+#define STM32_FMCSEL                        STM32_FMCSEL_HCLK
+#define STM32_SWPSEL                        STM32_SWPSEL_PCLK1
+#define STM32_FDCANSEL                      STM32_FDCANSEL_HSE_CK
+#define STM32_DFSDM1SEL                     STM32_DFSDM1SEL_PCLK2
+#define STM32_SPDIFSEL                      STM32_SPDIFSEL_PLL1_Q_CK
+#define STM32_SPI45SEL                      STM32_SPI45SEL_PCLK2
+#define STM32_SPI123SEL                     STM32_SPI123SEL_PLL1_Q_CK
+#define STM32_SAI1SEL                       STM32_SAI1SEL_PLL1_Q_CK
+#define STM32_LPTIM1SEL                     STM32_LPTIM1SEL_PCLK1
+#define STM32_CECSEL                        STM32_CECSEL_LSE_CK
+#define STM32_USBSEL                        STM32_USBSEL_PLL3_Q_CK
+#define STM32_I2C1235SEL                    STM32_I2C1235SEL_PCLK1
+#define STM32_RNGSEL                        STM32_RNGSEL_PLL1_Q_CK
+#define STM32_USART16910SEL                 STM32_USART16910SEL_PCLK2
+#define STM32_USART234578SEL                STM32_USART234578SEL_PCLK1
+#define STM32_SPI6SEL                       STM32_SPI6SEL_PCLK4
+#define STM32_SAI4BSEL                      STM32_SAI4BSEL_PLL1_Q_CK
+#define STM32_SAI4ASEL                      STM32_SAI4ASEL_PLL1_Q_CK
+#define STM32_ADCSEL                        STM32_ADCSEL_PLL2_P_CK
+#define STM32_LPTIM345SEL                   STM32_LPTIM345SEL_PCLK4
+#define STM32_LPTIM2SEL                     STM32_LPTIM2SEL_PCLK4
+#define STM32_I2C4SEL                       STM32_I2C4SEL_PCLK4
+#define STM32_LPUART1SEL                    STM32_LPUART1SEL_PCLK4
+
+/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_PRIORITY            6
+#define STM32_IRQ_EXTI1_PRIORITY            6
+#define STM32_IRQ_EXTI2_PRIORITY            6
+#define STM32_IRQ_EXTI3_PRIORITY            6
+#define STM32_IRQ_EXTI4_PRIORITY            6
+#define STM32_IRQ_EXTI5_9_PRIORITY          6
+#define STM32_IRQ_EXTI10_15_PRIORITY        6
+#define STM32_IRQ_EXTI16_PRIORITY           6
+#define STM32_IRQ_EXTI17_PRIORITY           6
+#define STM32_IRQ_EXTI18_PRIORITY           6
+#define STM32_IRQ_EXTI19_PRIORITY           6
+#define STM32_IRQ_EXTI20_21_PRIORITY        6
+
+#define STM32_IRQ_FDCAN1_PRIORITY           10
+#define STM32_IRQ_FDCAN2_PRIORITY           10
+
+#define STM32_IRQ_MDMA_PRIORITY             9
+
+#define STM32_IRQ_OCTOSPI1_PRIORITY         10
+#define STM32_IRQ_OCTOSPI2_PRIORITY         10
+
+#define STM32_IRQ_SDMMC1_PRIORITY           9
+#define STM32_IRQ_SDMMC2_PRIORITY           9
+
+#define STM32_IRQ_TIM1_UP_PRIORITY          7
+#define STM32_IRQ_TIM1_CC_PRIORITY          7
+#define STM32_IRQ_TIM2_PRIORITY             7
+#define STM32_IRQ_TIM3_PRIORITY             7
+#define STM32_IRQ_TIM4_PRIORITY             7
+#define STM32_IRQ_TIM5_PRIORITY             7
+#define STM32_IRQ_TIM6_PRIORITY             7
+#define STM32_IRQ_TIM7_PRIORITY             7
+#define STM32_IRQ_TIM8_BRK_TIM12_PRIORITY   7
+#define STM32_IRQ_TIM8_UP_TIM13_PRIORITY    7
+#define STM32_IRQ_TIM8_TRGCO_TIM14_PRIORITY 7
+#define STM32_IRQ_TIM8_CC_PRIORITY          7
+#define STM32_IRQ_TIM15_PRIORITY            7
+#define STM32_IRQ_TIM16_PRIORITY            7
+#define STM32_IRQ_TIM17_PRIORITY            7
+
+#define STM32_IRQ_USART1_PRIORITY           12
+#define STM32_IRQ_USART2_PRIORITY           12
+#define STM32_IRQ_USART3_PRIORITY           12
+#define STM32_IRQ_UART4_PRIORITY            12
+#define STM32_IRQ_UART5_PRIORITY            12
+#define STM32_IRQ_USART6_PRIORITY           12
+#define STM32_IRQ_UART7_PRIORITY            12
+#define STM32_IRQ_UART8_PRIORITY            12
+#define STM32_IRQ_UART9_PRIORITY            12
+#define STM32_IRQ_USART10_PRIORITY          12
+#define STM32_IRQ_LPUART1_PRIORITY          12
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_DUAL_MODE                 FALSE
+#define STM32_ADC_SAMPLES_SIZE              16
+#define STM32_ADC_USE_ADC12                 FALSE
+#define STM32_ADC_ADC12_DMA_STREAM          STM32_DMA_STREAM_ID_ANY
+#define STM32_ADC_ADC12_DMA_PRIORITY        2
+#define STM32_ADC_ADC12_IRQ_PRIORITY        5
+#define STM32_ADC_ADC12_CLOCK_MODE          ADC_CCR_CKMODE_AHB_DIV4
+
+/*
+ * CAN driver system settings.
+ */
+#define STM32_CAN_USE_FDCAN1                FALSE
+#define STM32_CAN_USE_FDCAN2                FALSE
+
+/*
+ * DAC driver system settings.
+ */
+#define STM32_DAC_DUAL_MODE                 FALSE
+#define STM32_DAC_USE_DAC1_CH1              FALSE
+#define STM32_DAC_USE_DAC1_CH2              FALSE
+#define STM32_DAC_DAC1_CH1_IRQ_PRIORITY     10
+#define STM32_DAC_DAC1_CH2_IRQ_PRIORITY     10
+#define STM32_DAC_DAC1_CH1_DMA_PRIORITY     2
+#define STM32_DAC_DAC1_CH2_DMA_PRIORITY     2
+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID_ANY
+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID_ANY
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM4                  FALSE
+#define STM32_GPT_USE_TIM5                  FALSE
+#define STM32_GPT_USE_TIM6                  FALSE
+#define STM32_GPT_USE_TIM7                  FALSE
+#define STM32_GPT_USE_TIM8                  FALSE
+#define STM32_GPT_USE_TIM12                 FALSE
+#define STM32_GPT_USE_TIM13                 FALSE
+#define STM32_GPT_USE_TIM14                 FALSE
+#define STM32_GPT_USE_TIM15                 FALSE
+#define STM32_GPT_USE_TIM16                 FALSE
+#define STM32_GPT_USE_TIM17                 FALSE
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  FALSE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_USE_I2C3                  FALSE
+#define STM32_I2C_USE_I2C4                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID_ANY
+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID_ANY
+#define STM32_I2C_I2C2_RX_DMA_STREAM        STM32_DMA_STREAM_ID_ANY
+#define STM32_I2C_I2C2_TX_DMA_STREAM        STM32_DMA_STREAM_ID_ANY
+#define STM32_I2C_I2C3_RX_DMA_STREAM        STM32_DMA_STREAM_ID_ANY
+#define STM32_I2C_I2C3_TX_DMA_STREAM        STM32_DMA_STREAM_ID_ANY
+#define STM32_I2C_I2C4_RX_BDMA_STREAM       STM32_BDMA_STREAM_ID_ANY
+#define STM32_I2C_I2C4_TX_BDMA_STREAM       STM32_BDMA_STREAM_ID_ANY
+#define STM32_I2C_I2C1_IRQ_PRIORITY         5
+#define STM32_I2C_I2C2_IRQ_PRIORITY         5
+#define STM32_I2C_I2C3_IRQ_PRIORITY         5
+#define STM32_I2C_I2C4_IRQ_PRIORITY         5
+#define STM32_I2C_I2C1_DMA_PRIORITY         3
+#define STM32_I2C_I2C2_DMA_PRIORITY         3
+#define STM32_I2C_I2C3_DMA_PRIORITY         3
+#define STM32_I2C_I2C4_DMA_PRIORITY         3
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_USE_TIM4                  FALSE
+#define STM32_ICU_USE_TIM5                  FALSE
+#define STM32_ICU_USE_TIM8                  FALSE
+#define STM32_ICU_USE_TIM12                 FALSE
+#define STM32_ICU_USE_TIM13                 FALSE
+#define STM32_ICU_USE_TIM14                 FALSE
+#define STM32_ICU_USE_TIM15                 FALSE
+#define STM32_ICU_USE_TIM16                 FALSE
+#define STM32_ICU_USE_TIM17                 FALSE
+
+/*
+ * MAC driver system settings.
+ */
+#define STM32_MAC_TRANSMIT_BUFFERS          2
+#define STM32_MAC_RECEIVE_BUFFERS           4
+#define STM32_MAC_BUFFERS_SIZE              1522
+#define STM32_MAC_PHY_TIMEOUT               100
+#define STM32_MAC_ETH1_CHANGE_PHY_STATE     TRUE
+#define STM32_MAC_ETH1_IRQ_PRIORITY         13
+#define STM32_MAC_IP_CHECKSUM_OFFLOAD       0
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM3                  FALSE
+#define STM32_PWM_USE_TIM4                  FALSE
+#define STM32_PWM_USE_TIM5                  FALSE
+#define STM32_PWM_USE_TIM8                  FALSE
+#define STM32_PWM_USE_TIM12                 FALSE
+#define STM32_PWM_USE_TIM13                 FALSE
+#define STM32_PWM_USE_TIM14                 FALSE
+#define STM32_PWM_USE_TIM15                 FALSE
+#define STM32_PWM_USE_TIM16                 FALSE
+#define STM32_PWM_USE_TIM17                 FALSE
+
+/*
+ * RTC driver system settings.
+ */
+#define STM32_RTC_PRESA_VALUE               32
+#define STM32_RTC_PRESS_VALUE               1024
+#define STM32_RTC_CR_INIT                   0
+#define STM32_RTC_TAMPCR_INIT               0
+
+/*
+ * SDC driver system settings.
+ */
+#define STM32_SDC_USE_SDMMC1                FALSE
+#define STM32_SDC_USE_SDMMC2                FALSE
+#define STM32_SDC_SDMMC_UNALIGNED_SUPPORT   TRUE
+#define STM32_SDC_SDMMC_WRITE_TIMEOUT       10000
+#define STM32_SDC_SDMMC_READ_TIMEOUT        10000
+#define STM32_SDC_SDMMC_CLOCK_DELAY         10
+#define STM32_SDC_SDMMC_PWRSAV              TRUE
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USE_USART3             FALSE
+#define STM32_SERIAL_USE_UART4              FALSE
+#define STM32_SERIAL_USE_UART5              FALSE
+#define STM32_SERIAL_USE_USART6             FALSE
+#define STM32_SERIAL_USE_UART7              FALSE
+#define STM32_SERIAL_USE_UART8              FALSE
+#define STM32_SERIAL_USE_UART9              FALSE
+#define STM32_SERIAL_USE_USART10            FALSE
+#define STM32_SERIAL_USE_LPUART1            FALSE
+
+/*
+ * SIO driver system settings.
+ */
+#define STM32_SIO_USE_USART1                FALSE
+#define STM32_SIO_USE_USART2                FALSE
+#define STM32_SIO_USE_USART3                FALSE
+#define STM32_SIO_USE_UART4                 FALSE
+#define STM32_SIO_USE_UART5                 FALSE
+#define STM32_SIO_USE_USART6                FALSE
+#define STM32_SIO_USE_UART7                 FALSE
+#define STM32_SIO_USE_UART8                 FALSE
+#define STM32_SIO_USE_UART9                 FALSE
+#define STM32_SIO_USE_USART10               FALSE
+#define STM32_SIO_USE_LPUART1               FALSE
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  FALSE
+#define STM32_SPI_USE_SPI2                  FALSE
+#define STM32_SPI_USE_SPI3                  FALSE
+#define STM32_SPI_USE_SPI4                  FALSE
+#define STM32_SPI_USE_SPI5                  FALSE
+#define STM32_SPI_USE_SPI6                  FALSE
+#define STM32_SPI_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID_ANY
+#define STM32_SPI_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID_ANY
+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID_ANY
+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID_ANY
+#define STM32_SPI_SPI3_RX_DMA_STREAM        STM32_DMA_STREAM_ID_ANY
+#define STM32_SPI_SPI3_TX_DMA_STREAM        STM32_DMA_STREAM_ID_ANY
+#define STM32_SPI_SPI4_RX_DMA_STREAM        STM32_DMA_STREAM_ID_ANY
+#define STM32_SPI_SPI4_TX_DMA_STREAM        STM32_DMA_STREAM_ID_ANY
+#define STM32_SPI_SPI5_RX_DMA_STREAM        STM32_DMA_STREAM_ID_ANY
+#define STM32_SPI_SPI5_TX_DMA_STREAM        STM32_DMA_STREAM_ID_ANY
+#define STM32_SPI_SPI6_RX_BDMA_STREAM       STM32_BDMA_STREAM_ID_ANY
+#define STM32_SPI_SPI6_TX_BDMA_STREAM       STM32_BDMA_STREAM_ID_ANY
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI3_DMA_PRIORITY         1
+#define STM32_SPI_SPI4_DMA_PRIORITY         1
+#define STM32_SPI_SPI5_DMA_PRIORITY         1
+#define STM32_SPI_SPI6_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         10
+#define STM32_SPI_SPI2_IRQ_PRIORITY         10
+#define STM32_SPI_SPI3_IRQ_PRIORITY         10
+#define STM32_SPI_SPI4_IRQ_PRIORITY         10
+#define STM32_SPI_SPI5_IRQ_PRIORITY         10
+#define STM32_SPI_SPI6_IRQ_PRIORITY         10
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               8
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * TRNG driver system settings.
+ */
+#define STM32_TRNG_USE_RNG1                 FALSE
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USE_USART3               FALSE
+#define STM32_UART_USE_UART4                FALSE
+#define STM32_UART_USE_UART5                FALSE
+#define STM32_UART_USE_USART6               FALSE
+#define STM32_UART_USE_UART7                FALSE
+#define STM32_UART_USE_UART8                FALSE
+#define STM32_UART_USE_UART9                FALSE
+#define STM32_UART_USE_USART10              FALSE
+#define STM32_UART_USART1_RX_DMA_STREAM     STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_USART1_TX_DMA_STREAM     STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_USART2_RX_DMA_STREAM     STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_USART3_RX_DMA_STREAM     STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_USART3_TX_DMA_STREAM     STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_UART4_RX_DMA_STREAM      STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_UART4_TX_DMA_STREAM      STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_UART5_RX_DMA_STREAM      STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_UART5_TX_DMA_STREAM      STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_USART6_RX_DMA_STREAM     STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_USART6_TX_DMA_STREAM     STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_UART7_RX_DMA_STREAM      STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_UART7_TX_DMA_STREAM      STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_UART8_RX_DMA_STREAM      STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_UART8_TX_DMA_STREAM      STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_UART9_RX_DMA_STREAM      STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_UART9_TX_DMA_STREAM      STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_USART10_RX_DMA_STREAM    STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_USART10_TX_DMA_STREAM    STM32_DMA_STREAM_ID_ANY
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_USART3_DMA_PRIORITY      0
+#define STM32_UART_UART4_DMA_PRIORITY       0
+#define STM32_UART_UART5_DMA_PRIORITY       0
+#define STM32_UART_USART6_DMA_PRIORITY      0
+#define STM32_UART_UART7_DMA_PRIORITY       0
+#define STM32_UART_UART8_DMA_PRIORITY       0
+#define STM32_UART_UART9_DMA_PRIORITY       0
+#define STM32_UART_USART10_DMA_PRIORITY     0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_OTG2                  TRUE
+#define STM32_USB_OTG2_IRQ_PRIORITY         14
+#define STM32_USB_OTG2_RX_FIFO_SIZE         1024
+#define STM32_USB_HOST_WAKEUP_DURATION      2
+
+/*
+ * WDG driver system settings.
+ */
+#define STM32_WDG_USE_IWDG                  FALSE
+
+/*
+ * WSPI driver system settings.
+ */
+#define STM32_WSPI_USE_OCTOSPI1             FALSE
+#define STM32_WSPI_USE_OCTOSPI2             FALSE
+#define STM32_WSPI_OCTOSPI1_PRESCALER_VALUE 1
+#define STM32_WSPI_OCTOSPI2_PRESCALER_VALUE 1
+#define STM32_WSPI_OCTOSPI1_SSHIFT          FALSE
+#define STM32_WSPI_OCTOSPI2_SSHIFT          FALSE
+#define STM32_WSPI_OCTOSPI1_DHQC            FALSE
+#define STM32_WSPI_OCTOSPI2_DHQC            FALSE
+#define STM32_WSPI_OCTOSPI1_MDMA_CHANNEL    STM32_MDMA_CHANNEL_ID_ANY
+#define STM32_WSPI_OCTOSPI2_MDMA_CHANNEL    STM32_MDMA_CHANNEL_ID_ANY
+#define STM32_WSPI_OCTOSPI1_MDMA_PRIORITY   1
+#define STM32_WSPI_OCTOSPI2_MDMA_PRIORITY   1
+#define STM32_WSPI_OCTOSPI1_MDMA_IRQ_PRIORITY 10
+#define STM32_WSPI_OCTOSPI2_MDMA_IRQ_PRIORITY 10
+#define STM32_WSPI_DMA_ERROR_HOOK(wspip)    osalSysHalt("MDMA failure")
+
+#endif /* MCUCONF_H */
diff --git a/platforms/chibios/boards/IC_TEENSY_3_1/board/board.c b/platforms/chibios/boards/IC_TEENSY_3_1/board/board.c
index 424e0c975b40..189d90952d8d 100644
--- a/platforms/chibios/boards/IC_TEENSY_3_1/board/board.c
+++ b/platforms/chibios/boards/IC_TEENSY_3_1/board/board.c
@@ -147,5 +147,5 @@ void boardInit(void) {}
 
 
 void restart_usb_driver(USBDriver *usbp) {
-    // Do nothing. Restarting the USB driver on these boards breaks it.
+  // Do nothing. Restarting the USB driver on these boards breaks it.
 }
diff --git a/platforms/chibios/boards/QMK_BLOK/configs/mcuconf.h b/platforms/chibios/boards/QMK_BLOK/configs/mcuconf.h
index eb51e251718c..0c2ef592d6f6 100644
--- a/platforms/chibios/boards/QMK_BLOK/configs/mcuconf.h
+++ b/platforms/chibios/boards/QMK_BLOK/configs/mcuconf.h
@@ -106,7 +106,6 @@
 #define RP_USB_USE_USBD0                    TRUE
 #define RP_USB_FORCE_VBUS_DETECT            TRUE
 #define RP_USE_EXTERNAL_VBUS_DETECT         FALSE
-#define RP_USB_USE_SOF_INTR                 TRUE
 #define RP_USB_USE_ERROR_DATA_SEQ_INTR      FALSE
 
 #endif /* MCUCONF_H */
diff --git a/platforms/chibios/boards/QMK_PM2040/configs/mcuconf.h b/platforms/chibios/boards/QMK_PM2040/configs/mcuconf.h
index f19f08e93c0f..493dcf643427 100644
--- a/platforms/chibios/boards/QMK_PM2040/configs/mcuconf.h
+++ b/platforms/chibios/boards/QMK_PM2040/configs/mcuconf.h
@@ -106,7 +106,6 @@
 #define RP_USB_USE_USBD0                    TRUE
 #define RP_USB_FORCE_VBUS_DETECT            TRUE
 #define RP_USE_EXTERNAL_VBUS_DETECT         FALSE
-#define RP_USB_USE_SOF_INTR                 TRUE
 #define RP_USB_USE_ERROR_DATA_SEQ_INTR      FALSE
 
 #endif /* MCUCONF_H */
diff --git a/platforms/chibios/bootloaders/rp2040.c b/platforms/chibios/bootloaders/rp2040.c
index bedc00f32ea5..524d13e636f0 100644
--- a/platforms/chibios/bootloaders/rp2040.c
+++ b/platforms/chibios/bootloaders/rp2040.c
@@ -1,9 +1,10 @@
 // Copyright 2022 Stefan Kerkmann
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "quantum.h"
 #include "hal.h"
 #include "bootloader.h"
+#include "gpio.h"
+#include "wait.h"
 #include "pico/bootrom.h"
 
 #if !defined(RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED)
diff --git a/platforms/chibios/bootloaders/stm32_dfu.c b/platforms/chibios/bootloaders/stm32_dfu.c
index f845bf21e921..fba3086e7af6 100644
--- a/platforms/chibios/bootloaders/stm32_dfu.c
+++ b/platforms/chibios/bootloaders/stm32_dfu.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 QMK
+/* Copyright 2021-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
@@ -15,12 +15,17 @@
  */
 
 #include "bootloader.h"
+#include "util.h"
 
 #include <ch.h>
 #include <hal.h>
 #include "wait.h"
 
-extern uint32_t __ram0_end__;
+#ifndef STM32_BOOTLOADER_RAM_SYMBOL
+#    define STM32_BOOTLOADER_RAM_SYMBOL __ram0_end__
+#endif
+
+extern uint32_t STM32_BOOTLOADER_RAM_SYMBOL;
 
 #ifndef STM32_BOOTLOADER_DUAL_BANK
 #    define STM32_BOOTLOADER_DUAL_BANK FALSE
@@ -72,10 +77,25 @@ void enter_bootloader_mode_if_requested(void) {}
 /* This code should be checked whether it runs correctly on platforms */
 #    define SYMVAL(sym) (uint32_t)(((uint8_t *)&(sym)) - ((uint8_t *)0))
 #    define BOOTLOADER_MAGIC 0xDEADBEEF
-#    define MAGIC_ADDR (unsigned long *)(SYMVAL(__ram0_end__) - 4)
+#    define MAGIC_ADDR (unsigned long *)(SYMVAL(STM32_BOOTLOADER_RAM_SYMBOL) - 4)
+
+__attribute__((weak)) void bootloader_marker_enable(void) {
+    uint32_t *marker = (uint32_t *)MAGIC_ADDR;
+    *marker          = BOOTLOADER_MAGIC; // set magic flag => reset handler will jump into boot loader
+}
+
+__attribute__((weak)) bool bootloader_marker_active(void) {
+    const uint32_t *marker = (const uint32_t *)MAGIC_ADDR;
+    return (*marker == BOOTLOADER_MAGIC) ? true : false;
+}
+
+__attribute__((weak)) void bootloader_marker_disable(void) {
+    uint32_t *marker = (uint32_t *)MAGIC_ADDR;
+    *marker          = 0;
+}
 
 __attribute__((weak)) void bootloader_jump(void) {
-    *MAGIC_ADDR = BOOTLOADER_MAGIC; // set magic flag => reset handler will jump into boot loader
+    bootloader_marker_enable();
     NVIC_SystemReset();
 }
 
@@ -84,18 +104,44 @@ __attribute__((weak)) void mcu_reset(void) {
 }
 
 void enter_bootloader_mode_if_requested(void) {
-    unsigned long *check = MAGIC_ADDR;
-    if (*check == BOOTLOADER_MAGIC) {
-        *check = 0;
+    if (bootloader_marker_active()) {
+        bootloader_marker_disable();
+
+        struct system_memory_vector_t {
+            uint32_t stack_top;
+            void (*entrypoint)(void);
+        };
+        const struct system_memory_vector_t *bootloader = (const struct system_memory_vector_t *)(STM32_BOOTLOADER_ADDRESS);
+
+        __disable_irq();
+
+#    if defined(QMK_MCU_ARCH_CORTEX_M7)
+        SCB_DisableDCache();
+        SCB_DisableICache();
+#    endif
+
+#    if defined(__MPU_PRESENT) && (__MPU_PRESENT == 1U)
+        ARM_MPU_Disable();
+#    endif
+
+        SysTick->CTRL = 0;
+        SysTick->VAL  = 0;
+        SysTick->LOAD = 0;
+
+        // Clear interrupt enable and interrupt pending registers
+        for (int i = 0; i < ARRAY_SIZE(NVIC->ICER); i++) {
+            NVIC->ICER[i] = 0xFFFFFFFF;
+            NVIC->ICPR[i] = 0xFFFFFFFF;
+        }
+
         __set_CONTROL(0);
-        __set_MSP(*(__IO uint32_t *)STM32_BOOTLOADER_ADDRESS);
+        __set_MSP(bootloader->stack_top);
         __enable_irq();
 
-        typedef void (*BootJump_t)(void);
-        BootJump_t boot_jump = *(BootJump_t *)(STM32_BOOTLOADER_ADDRESS + 4);
-        boot_jump();
-        while (1)
-            ;
+        // Jump to bootloader
+        bootloader->entrypoint();
+        while (true) {
+        }
     }
 }
 #endif
diff --git a/platforms/chibios/chibios_config.h b/platforms/chibios/chibios_config.h
index 52632a051ed2..1f8a7842fe2d 100644
--- a/platforms/chibios/chibios_config.h
+++ b/platforms/chibios/chibios_config.h
@@ -71,7 +71,11 @@
 
 // STM32 compatibility
 #if defined(MCU_STM32)
-#    define CPU_CLOCK STM32_SYSCLK
+#    if defined(STM32_CORE_CK)
+#        define CPU_CLOCK STM32_CORE_CK
+#    else
+#        define CPU_CLOCK STM32_SYSCLK
+#    endif
 
 #    if defined(STM32F1XX)
 #        define USE_GPIOV1
diff --git a/platforms/chibios/config.h b/platforms/chibios/config.h
new file mode 100644
index 000000000000..006415a5dc52
--- /dev/null
+++ b/platforms/chibios/config.h
@@ -0,0 +1,7 @@
+// Copyright 2023 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#ifndef CORTEX_ENABLE_WFI_IDLE
+#    define CORTEX_ENABLE_WFI_IDLE TRUE
+#endif // CORTEX_ENABLE_WFI_IDLE
diff --git a/platforms/chibios/drivers/audio_dac_additive.c b/platforms/chibios/drivers/audio_dac_additive.c
index d29147ca3b9e..22e4fa2608f0 100644
--- a/platforms/chibios/drivers/audio_dac_additive.c
+++ b/platforms/chibios/drivers/audio_dac_additive.c
@@ -16,8 +16,9 @@
  */
 
 #include "audio.h"
-#include <ch.h>
-#include <hal.h>
+#include "gpio.h"
+#include <math.h>
+#include "util.h"
 
 // Need to disable GCC's "tautological-compare" warning for this file, as it causes issues when running `KEEP_INTERMEDIATES=yes`. Corresponding pop at the end of the file.
 #pragma GCC diagnostic push
@@ -65,7 +66,7 @@ static const dacsample_t dac_buffer_triangle[AUDIO_DAC_BUFFER_SIZE] = {
 #endif // AUDIO_DAC_SAMPLE_WAVEFORM_TRIANGLE
 #ifdef AUDIO_DAC_SAMPLE_WAVEFORM_SQUARE
 static const dacsample_t dac_buffer_square[AUDIO_DAC_BUFFER_SIZE] = {
-    [0 ... AUDIO_DAC_BUFFER_SIZE / 2 - 1]                     = 0,                    // first and
+    [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
 };
 #endif // AUDIO_DAC_SAMPLE_WAVEFORM_SQUARE
@@ -88,7 +89,7 @@ static dacsample_t dac_buffer_empty[AUDIO_DAC_BUFFER_SIZE] = {AUDIO_DAC_OFF_VALU
 /* keep track of the sample position for for each frequency */
 static float dac_if[AUDIO_MAX_SIMULTANEOUS_TONES] = {0.0};
 
-static float   active_tones_snapshot[AUDIO_MAX_SIMULTANEOUS_TONES] = {0, 0};
+static float   active_tones_snapshot[AUDIO_MAX_SIMULTANEOUS_TONES] = {0};
 static uint8_t active_tones_snapshot_length                        = 0;
 
 typedef enum {
@@ -134,7 +135,7 @@ __attribute__((weak)) uint16_t dac_value_generate(void) {
          *      timer runs with 3*AUDIO_DAC_SAMPLE_RATE; and the DAC callback
          *      is called twice per conversion.*/
 
-        dac_if[i] = fmod(dac_if[i], AUDIO_DAC_BUFFER_SIZE);
+        dac_if[i] = fmodf(dac_if[i], AUDIO_DAC_BUFFER_SIZE);
 
         // Wavetable generation/lookup
         uint16_t dac_i = (uint16_t)dac_if[i];
diff --git a/platforms/chibios/drivers/audio_dac_basic.c b/platforms/chibios/drivers/audio_dac_basic.c
index 4ea23a2158e7..9a3f3fea1f39 100644
--- a/platforms/chibios/drivers/audio_dac_basic.c
+++ b/platforms/chibios/drivers/audio_dac_basic.c
@@ -16,8 +16,7 @@
  */
 
 #include "audio.h"
-#include "ch.h"
-#include "hal.h"
+#include "gpio.h"
 
 // Need to disable GCC's "tautological-compare" warning for this file, as it causes issues when running `KEEP_INTERMEDIATES=yes`. Corresponding pop at the end of the file.
 #pragma GCC diagnostic push
diff --git a/platforms/chibios/drivers/audio_pwm_hardware.c b/platforms/chibios/drivers/audio_pwm_hardware.c
index 54dac4660582..40d891326fd5 100644
--- a/platforms/chibios/drivers/audio_pwm_hardware.c
+++ b/platforms/chibios/drivers/audio_pwm_hardware.c
@@ -12,8 +12,7 @@
 // function.
 
 #include "audio.h"
-#include "ch.h"
-#include "hal.h"
+#include "gpio.h"
 
 #if !defined(AUDIO_PIN)
 #    error "Audio feature enabled, but no pin selected - see docs/feature_audio under the ARM PWM settings"
diff --git a/platforms/chibios/drivers/audio_pwm_software.c b/platforms/chibios/drivers/audio_pwm_software.c
index e01f86ea5265..663a9eca165a 100644
--- a/platforms/chibios/drivers/audio_pwm_software.c
+++ b/platforms/chibios/drivers/audio_pwm_software.c
@@ -25,8 +25,7 @@ this driver uses the chibios-PWM system to produce a square-wave on any given ou
 
  */
 #include "audio.h"
-#include "ch.h"
-#include "hal.h"
+#include "gpio.h"
 
 #if !defined(AUDIO_PIN)
 #    error "Audio feature enabled, but no pin selected - see docs/feature_audio under the ARM PWM settings"
diff --git a/platforms/chibios/drivers/backlight_pwm.c b/platforms/chibios/drivers/backlight_pwm.c
new file mode 100644
index 000000000000..01e6f71307a4
--- /dev/null
+++ b/platforms/chibios/drivers/backlight_pwm.c
@@ -0,0 +1,173 @@
+#include "backlight.h"
+#include "gpio.h"
+#include "wait.h"
+#include <hal.h>
+
+// Maximum duty cycle limit
+#ifndef BACKLIGHT_LIMIT_VAL
+#    define BACKLIGHT_LIMIT_VAL 255
+#endif
+
+#ifndef BACKLIGHT_PAL_MODE
+#    if defined(USE_GPIOV1)
+#        define BACKLIGHT_PAL_MODE PAL_MODE_ALTERNATE_PUSHPULL
+#    else
+// GPIOV2 && GPIOV3
+#        define BACKLIGHT_PAL_MODE 2
+#    endif
+#endif
+
+// GENERIC
+#ifndef BACKLIGHT_PWM_DRIVER
+#    define BACKLIGHT_PWM_DRIVER PWMD4
+#endif
+#ifndef BACKLIGHT_PWM_CHANNEL
+#    define BACKLIGHT_PWM_CHANNEL 3
+#endif
+
+// Support for pins which are on TIM1_CH1N - requires STM32_PWM_USE_ADVANCED
+#ifdef BACKLIGHT_PWM_COMPLEMENTARY_OUTPUT
+#    if BACKLIGHT_ON_STATE == 1
+#        define PWM_OUTPUT_MODE PWM_COMPLEMENTARY_OUTPUT_ACTIVE_LOW;
+#    else
+#        define PWM_OUTPUT_MODE PWM_COMPLEMENTARY_OUTPUT_ACTIVE_HIGH;
+#    endif
+#else
+#    if BACKLIGHT_ON_STATE == 1
+#        define PWM_OUTPUT_MODE PWM_OUTPUT_ACTIVE_HIGH;
+#    else
+#        define PWM_OUTPUT_MODE PWM_OUTPUT_ACTIVE_LOW;
+#    endif
+#endif
+
+#ifndef BACKLIGHT_PWM_COUNTER_FREQUENCY
+#    define BACKLIGHT_PWM_COUNTER_FREQUENCY 0xFFFF
+#endif
+
+#ifndef BACKLIGHT_PWM_PERIOD
+#    define BACKLIGHT_PWM_PERIOD 256
+#endif
+
+static PWMConfig pwmCFG = {
+    .frequency = BACKLIGHT_PWM_COUNTER_FREQUENCY, /* PWM clock frequency  */
+    .period    = BACKLIGHT_PWM_PERIOD,            /* PWM period in counter ticks. e.g. clock frequency is 10KHz, period is 256 ticks then t_period is 25.6ms */
+};
+
+#ifdef BACKLIGHT_BREATHING
+static virtual_timer_t breathing_vt;
+#endif
+
+// 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;
+        }
+    }
+}
+
+static uint32_t rescale_limit_val(uint32_t val) {
+    // rescale the supplied backlight value to be in terms of the value limit
+    return (val * (BACKLIGHT_LIMIT_VAL + 1)) / 256;
+}
+
+void backlight_init_ports(void) {
+#ifdef USE_GPIOV1
+    palSetPadMode(PAL_PORT(BACKLIGHT_PIN), PAL_PAD(BACKLIGHT_PIN), BACKLIGHT_PAL_MODE);
+#else
+    palSetPadMode(PAL_PORT(BACKLIGHT_PIN), PAL_PAD(BACKLIGHT_PIN), PAL_MODE_ALTERNATE(BACKLIGHT_PAL_MODE));
+#endif
+
+    pwmCFG.channels[BACKLIGHT_PWM_CHANNEL - 1].mode = PWM_OUTPUT_MODE;
+    pwmStart(&BACKLIGHT_PWM_DRIVER, &pwmCFG);
+
+    backlight_set(get_backlight_level());
+
+#ifdef BACKLIGHT_BREATHING
+    chVTObjectInit(&breathing_vt);
+    if (is_backlight_breathing()) {
+        breathing_enable();
+    }
+#endif
+}
+
+void backlight_set(uint8_t level) {
+    if (level > BACKLIGHT_LEVELS) {
+        level = BACKLIGHT_LEVELS;
+    }
+
+    if (level == 0) {
+        // Turn backlight off
+        pwmDisableChannel(&BACKLIGHT_PWM_DRIVER, BACKLIGHT_PWM_CHANNEL - 1);
+    } else {
+        // Turn backlight on
+        uint32_t duty = (uint32_t)(cie_lightness(rescale_limit_val(0xFFFF * (uint32_t)level / BACKLIGHT_LEVELS)));
+        pwmEnableChannel(&BACKLIGHT_PWM_DRIVER, BACKLIGHT_PWM_CHANNEL - 1, PWM_FRACTION_TO_WIDTH(&BACKLIGHT_PWM_DRIVER, 0xFFFF, duty));
+    }
+}
+
+void backlight_task(void) {}
+
+#ifdef BACKLIGHT_BREATHING
+
+#    define BREATHING_STEPS 128
+
+/* 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};
+
+static void breathing_callback(virtual_timer_t *vtp, void *p);
+
+bool is_breathing(void) {
+    return chVTIsArmed(&breathing_vt);
+}
+
+void breathing_enable(void) {
+    /* Update frequency is 256Hz -> 3906us intervals */
+    chVTSetContinuous(&breathing_vt, TIME_US2I(3906), breathing_callback, NULL);
+}
+
+void breathing_disable(void) {
+    chVTReset(&breathing_vt);
+
+    // Restore backlight level
+    backlight_set(get_backlight_level());
+}
+
+// Use this before the cie_lightness function.
+static inline uint16_t scale_backlight(uint16_t v) {
+    return v / BACKLIGHT_LEVELS * get_backlight_level();
+}
+
+static void breathing_callback(virtual_timer_t *vtp, void *p) {
+    uint8_t  breathing_period = get_breathing_period();
+    uint16_t interval         = (uint16_t)breathing_period * 256 / BREATHING_STEPS;
+
+    // resetting after one period to prevent ugly reset at overflow.
+    static uint16_t breathing_counter = 0;
+    breathing_counter                 = (breathing_counter + 1) % (breathing_period * 256);
+    uint8_t  index                    = breathing_counter / interval % BREATHING_STEPS;
+    uint32_t duty                     = cie_lightness(rescale_limit_val(scale_backlight(breathing_table[index] * 256)));
+
+    chSysLockFromISR();
+    pwmEnableChannelI(&BACKLIGHT_PWM_DRIVER, BACKLIGHT_PWM_CHANNEL - 1, PWM_FRACTION_TO_WIDTH(&BACKLIGHT_PWM_DRIVER, 0xFFFF, duty));
+    chSysUnlockFromISR();
+}
+
+// TODO: integrate generic pulse solution
+void breathing_pulse(void) {
+    backlight_set(is_backlight_enabled() ? 0 : BACKLIGHT_LEVELS);
+    wait_ms(10);
+    backlight_set(is_backlight_enabled() ? get_backlight_level() : 0);
+}
+
+#endif
diff --git a/platforms/chibios/drivers/backlight_timer.c b/platforms/chibios/drivers/backlight_timer.c
new file mode 100644
index 000000000000..0fabee93b1c8
--- /dev/null
+++ b/platforms/chibios/drivers/backlight_timer.c
@@ -0,0 +1,178 @@
+#include "backlight.h"
+#include "backlight_driver_common.h"
+#include "wait.h"
+
+#ifndef BACKLIGHT_GPT_DRIVER
+#    define BACKLIGHT_GPT_DRIVER GPTD15
+#endif
+
+// Platform specific implementations
+static void     backlight_timer_configure(bool enable);
+static void     backlight_timer_set_duty(uint16_t duty);
+static uint16_t backlight_timer_get_duty(void);
+
+// See http://jared.geek.nz/2013/feb/linear-led-pwm
+static uint16_t cie_lightness(uint16_t v) {
+    if (v <= 5243)    // if below 8% of max
+        return v / 9; // same as dividing by 900%
+    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) {
+    backlight_pins_init();
+
+    backlight_set(get_backlight_level());
+
+#ifdef BACKLIGHT_BREATHING
+    if (is_backlight_breathing()) {
+        breathing_enable();
+    }
+#endif
+}
+
+void backlight_set(uint8_t level) {
+    if (level > BACKLIGHT_LEVELS) level = BACKLIGHT_LEVELS;
+
+    backlight_pins_off();
+
+    backlight_timer_set_duty(cie_lightness(0xFFFFU / BACKLIGHT_LEVELS * level));
+    backlight_timer_configure(level != 0);
+}
+
+static void backlight_timer_top(void) {
+#ifdef BACKLIGHT_BREATHING
+    if (is_breathing()) {
+        breathing_task();
+    }
+#endif
+
+    if (backlight_timer_get_duty() > 256) {
+        backlight_pins_on();
+    }
+}
+
+static void backlight_timer_cmp(void) {
+    backlight_pins_off();
+}
+
+void backlight_task(void) {}
+
+#ifdef BACKLIGHT_BREATHING
+#    define BREATHING_STEPS 128
+
+static bool     breathing         = false;
+static uint16_t breathing_counter = 0;
+
+/* 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 * get_backlight_level();
+}
+
+void breathing_task(void) {
+    uint8_t  breathing_period = get_breathing_period();
+    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;
+
+    // printf("index:%u\n", index);
+
+    backlight_timer_set_duty(cie_lightness(scale_backlight((uint16_t)breathing_table[index] * 256)));
+}
+
+bool is_breathing(void) {
+    return breathing;
+}
+
+void breathing_enable(void) {
+    breathing_counter = 0;
+    breathing         = true;
+}
+void breathing_disable(void) {
+    breathing = false;
+}
+
+void breathing_pulse(void) {
+    backlight_set(is_backlight_enabled() ? 0 : BACKLIGHT_LEVELS);
+    wait_ms(10);
+    backlight_set(is_backlight_enabled() ? get_backlight_level() : 0);
+}
+#endif
+
+#ifdef PROTOCOL_CHIBIOS
+// On Platforms where timers fire every tick and have no capture/top events
+//   - fake event in the normal timer callback
+uint16_t s_duty = 0;
+
+static void timerCallback(void) {
+    /* Software PWM
+     * timer:1111 1111 1111 1111
+     *       \______/| \_______/____  count(0-255)
+     *          \    \______________  unused(1)
+     *           \__________________  index of step table(0-127)
+     */
+
+    // this works for cca 65536 irqs/sec
+    static union {
+        uint16_t raw;
+        struct {
+            uint16_t count : 8;
+            uint8_t  dummy : 1;
+            uint8_t  index : 7;
+        } pwm;
+    } timer = {.raw = 0};
+
+    timer.raw++;
+
+    if (timer.pwm.count == 0) {
+        // LED on
+        backlight_timer_top();
+    } else if (timer.pwm.count == (s_duty / 256)) {
+        // LED off
+        backlight_timer_cmp();
+    }
+}
+
+static void backlight_timer_set_duty(uint16_t duty) {
+    s_duty = duty;
+}
+static uint16_t backlight_timer_get_duty(void) {
+    return s_duty;
+}
+
+// ChibiOS - Map GPT timer onto Software PWM
+static void gptTimerCallback(GPTDriver *gptp) {
+    (void)gptp;
+    timerCallback();
+}
+
+static void backlight_timer_configure(bool enable) {
+    static const GPTConfig gptcfg = {1000000, gptTimerCallback, 0, 0};
+
+    static bool s_init = false;
+    if (!s_init) {
+        gptStart(&BACKLIGHT_GPT_DRIVER, &gptcfg);
+        s_init = true;
+    }
+
+    if (enable) {
+        gptStartContinuous(&BACKLIGHT_GPT_DRIVER, gptcfg.frequency / 0xFFFF);
+    } else {
+        gptStopTimer(&BACKLIGHT_GPT_DRIVER);
+    }
+}
+#endif
diff --git a/platforms/chibios/drivers/i2c_master.c b/platforms/chibios/drivers/i2c_master.c
index 4c7a5daa1712..7c49f9d00594 100644
--- a/platforms/chibios/drivers/i2c_master.c
+++ b/platforms/chibios/drivers/i2c_master.c
@@ -24,8 +24,10 @@
  * STM32_I2C_USE_I2C1 is TRUE in the mcuconf.h file. Pins B6 and B7 are used
  * but using any other I2C pins should be trivial.
  */
-#include "quantum.h"
+
 #include "i2c_master.h"
+#include "gpio.h"
+#include "chibios_config.h"
 #include <string.h>
 #include <ch.h>
 #include <hal.h>
diff --git a/platforms/chibios/drivers/serial.c b/platforms/chibios/drivers/serial.c
index 0dd8e71ae823..f087d0c2edf6 100644
--- a/platforms/chibios/drivers/serial.c
+++ b/platforms/chibios/drivers/serial.c
@@ -2,8 +2,8 @@
  * WARNING: be careful changing this code, it is very timing dependent
  */
 
-#include "quantum.h"
 #include "serial.h"
+#include "gpio.h"
 #include "wait.h"
 #include "synchronization_util.h"
 
diff --git a/platforms/chibios/drivers/serial_protocol.c b/platforms/chibios/drivers/serial_protocol.c
index ccaf73282dd2..e0f583ccde65 100644
--- a/platforms/chibios/drivers/serial_protocol.c
+++ b/platforms/chibios/drivers/serial_protocol.c
@@ -3,10 +3,8 @@
 
 #include <ch.h>
 
-#include "quantum.h"
 #include "serial.h"
 #include "serial_protocol.h"
-#include "printf.h"
 #include "synchronization_util.h"
 
 static inline bool initiate_transaction(uint8_t transaction_id);
diff --git a/platforms/chibios/drivers/serial_usart.c b/platforms/chibios/drivers/serial_usart.c
index 6ebbf7c8ca1f..767ef8726fc3 100644
--- a/platforms/chibios/drivers/serial_usart.c
+++ b/platforms/chibios/drivers/serial_usart.c
@@ -5,6 +5,7 @@
 #include "serial_usart.h"
 #include "serial_protocol.h"
 #include "synchronization_util.h"
+#include "chibios_config.h"
 
 #if defined(SERIAL_USART_CONFIG)
 static QMKSerialConfig serial_config = SERIAL_USART_CONFIG;
diff --git a/platforms/chibios/drivers/serial_usart.h b/platforms/chibios/drivers/serial_usart.h
index fa062cd736b4..dec8a292e98b 100644
--- a/platforms/chibios/drivers/serial_usart.h
+++ b/platforms/chibios/drivers/serial_usart.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "quantum.h"
 #include "serial.h"
 #include <hal.h>
 
diff --git a/platforms/chibios/drivers/uart.c b/platforms/chibios/drivers/uart.c
index 34f77232b6c8..39a59dd44508 100644
--- a/platforms/chibios/drivers/uart.c
+++ b/platforms/chibios/drivers/uart.c
@@ -16,8 +16,6 @@
 
 #include "uart.h"
 
-#include "quantum.h"
-
 #if defined(MCU_KINETIS)
 static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE};
 #elif defined(WB32F3G71xx) || defined(WB32FQ95xx)
diff --git a/platforms/chibios/drivers/uart.h b/platforms/chibios/drivers/uart.h
index e9e3b0855b3f..16983072cecc 100644
--- a/platforms/chibios/drivers/uart.h
+++ b/platforms/chibios/drivers/uart.h
@@ -17,9 +17,13 @@
 #pragma once
 
 #include <stdint.h>
+#include <stdbool.h>
 
 #include <hal.h>
 
+#include "gpio.h"
+#include "chibios_config.h"
+
 #ifndef SERIAL_DRIVER
 #    define SERIAL_DRIVER SD1
 #endif
diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/ps2_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/ps2_vendor.c
index 937fa5de6f2a..1c61f196bde0 100644
--- a/platforms/chibios/drivers/vendor/RP/RP2040/ps2_vendor.c
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/ps2_vendor.c
@@ -1,12 +1,11 @@
 // Copyright 2022 Marek Kraus (@gamelaster)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "quantum.h"
-
+#include "gpio.h"
 #include "hardware/pio.h"
 #include "hardware/clocks.h"
 #include "ps2.h"
-#include "print.h"
+#include "debug.h"
 
 #if !defined(MCU_RP)
 #    error PIO Driver is only available for Raspberry Pi 2040 MCUs!
@@ -23,7 +22,7 @@
 #endif
 
 #if PS2_DATA_PIN + 1 != PS2_CLOCK_PIN
-#    error PS/2 Clock pin must be followed by data pin!
+#    error PS/2 clock pin must be data pin + 1!
 #endif
 
 static inline void pio_serve_interrupt(void);
diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
index dd4723a086d9..3aa8e1165fac 100644
--- a/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
@@ -1,11 +1,12 @@
 // Copyright 2022 Stefan Kerkmann
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "quantum.h"
 #include "serial_usart.h"
 #include "serial_protocol.h"
 #include "hardware/pio.h"
 #include "hardware/clocks.h"
+#include "wait.h"
+#include "debug.h"
 
 #if !defined(MCU_RP)
 #    error PIO Driver is only available for Raspberry Pi 2040 MCUs!
diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
index 99a6cfaba9c9..8d59e13bb252 100644
--- a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
@@ -2,13 +2,19 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "ws2812.h"
-#include "hardware/timer.h"
-#include "hardware/clocks.h"
+
 // Keep this exact include order otherwise we run into naming conflicts between
 // pico-sdk and rp2040.h which we don't control.
-#include "quantum.h"
+#include "hardware/timer.h"
+#include "hardware/clocks.h"
+#include <hal.h>
 #include "hardware/pio.h"
 
+#include "gpio.h"
+#include "debug.h"
+#include "wait.h"
+#include "util.h"
+
 #if !defined(MCU_RP)
 #    error PIO Driver is only available for Raspberry Pi 2040 MCUs!
 #endif
diff --git a/platforms/chibios/drivers/ws2812_bitbang.c b/platforms/chibios/drivers/ws2812_bitbang.c
index d05deb1a50e1..c55e0f654c29 100644
--- a/platforms/chibios/drivers/ws2812_bitbang.c
+++ b/platforms/chibios/drivers/ws2812_bitbang.c
@@ -1,7 +1,7 @@
-#include "quantum.h"
 #include "ws2812.h"
-#include <ch.h>
-#include <hal.h>
+
+#include "gpio.h"
+#include "chibios_config.h"
 
 /* Adapted from https://github.com/bigjosh/SimpleNeoPixelDemo/ */
 
diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c
index 04c8279a970e..cfee547a822d 100644
--- a/platforms/chibios/drivers/ws2812_pwm.c
+++ b/platforms/chibios/drivers/ws2812_pwm.c
@@ -1,6 +1,6 @@
 #include "ws2812.h"
-#include "quantum.h"
-#include <hal.h>
+#include "gpio.h"
+#include "chibios_config.h"
 
 /* Adapted from https://github.com/joewa/WS2812-LED-Driver_ChibiOS/ */
 
diff --git a/platforms/chibios/drivers/ws2812_spi.c b/platforms/chibios/drivers/ws2812_spi.c
index c28f5007f150..f188576e046c 100644
--- a/platforms/chibios/drivers/ws2812_spi.c
+++ b/platforms/chibios/drivers/ws2812_spi.c
@@ -1,5 +1,7 @@
-#include "quantum.h"
 #include "ws2812.h"
+#include "gpio.h"
+#include "util.h"
+#include "chibios_config.h"
 
 /* Adapted from https://github.com/gamazeps/ws2812b-chibios-SPIDMA/ */
 
diff --git a/platforms/chibios/mcu_selection.mk b/platforms/chibios/mcu_selection.mk
index f14b16b169d2..5122ed4634e4 100644
--- a/platforms/chibios/mcu_selection.mk
+++ b/platforms/chibios/mcu_selection.mk
@@ -705,6 +705,45 @@ ifneq (,$(filter $(MCU),STM32L412 STM32L422))
   STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
 endif
 
+ifneq (,$(filter $(MCU),STM32H723 STM32H733))
+  # Cortex version
+  MCU = cortex-m7
+
+  # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
+  ARMV = 7
+
+  ## chip/board settings
+  # - the next two should match the directories in
+  #   <chibios[-contrib]>/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)
+  #   OR
+  #   <chibios[-contrib]>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
+  MCU_FAMILY = STM32
+  MCU_SERIES = STM32H7xx
+
+  # Linker script to use
+  # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
+  #   or <keyboard_dir>/ld/
+  MCU_LDSCRIPT ?= STM32H723xG_ITCM64k
+
+  # Startup code to use
+  #  - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
+  MCU_STARTUP ?= stm32h7xx
+
+  # Board: it should exist either in <chibios>/os/hal/boards/,
+  # <keyboard_dir>/boards/, or drivers/boards/
+  BOARD ?= GENERIC_STM32_H723XG
+
+  PLATFORM_NAME ?= platform_type2
+
+  USE_FPU ?= yes
+
+  # UF2 settings
+  UF2_FAMILY ?= STM32H7
+
+  # Bootloader address for STM32 DFU
+  STM32_BOOTLOADER_ADDRESS ?= 0x1FF09800
+endif
+
 ifneq ($(findstring WB32F3G71, $(MCU)),)
   # Cortex version
   MCU = cortex-m3
diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk
index 6304b42d8737..081b001e6da9 100644
--- a/platforms/chibios/platform.mk
+++ b/platforms/chibios/platform.mk
@@ -432,6 +432,15 @@ else
     endif
 endif
 
+# Extra config.h files for the platform
+ifneq ("$(wildcard $(PLATFORM_COMMON_DIR)/vendors/$(MCU_FAMILY)/$(MCU_SERIES)/config.h)","")
+    CONFIG_H += $(PLATFORM_COMMON_DIR)/vendors/$(MCU_FAMILY)/$(MCU_SERIES)/config.h
+endif
+ifneq ("$(wildcard $(PLATFORM_COMMON_DIR)/vendors/$(MCU_FAMILY)/config.h)","")
+    CONFIG_H += $(PLATFORM_COMMON_DIR)/vendors/$(MCU_FAMILY)/config.h
+endif
+CONFIG_H += $(PLATFORM_COMMON_DIR)/config.h
+
 # Assembler flags
 ASFLAGS  += $(SHARED_ASFLAGS) $(TOOLCHAIN_ASFLAGS)
 
diff --git a/platforms/chibios/sleep_led.c b/platforms/chibios/sleep_led.c
index a777d60468bb..a35514bf2e9c 100644
--- a/platforms/chibios/sleep_led.c
+++ b/platforms/chibios/sleep_led.c
@@ -41,17 +41,20 @@ void sleep_led_timer_callback(void) {
             uint8_t duration : 2;
             uint8_t index : 6;
         } pwm;
-    } timer = {.row = 0};
+    } timer                = {.row = 0};
+    static led_t led_state = {0};
 
     timer.row++;
 
     // LED on
     if (timer.pwm.count == 0) {
-        led_set(1 << USB_LED_CAPS_LOCK);
+        led_state.caps_lock = true;
+        led_set(led_state.raw);
     }
     // LED off
     if (timer.pwm.count == breathing_table[timer.pwm.index]) {
-        led_set(0);
+        led_state.caps_lock = false;
+        led_set(led_state.raw);
     }
 }
 
@@ -190,7 +193,7 @@ void sleep_led_toggle(void) {
 void sleep_led_init(void) {}
 
 void sleep_led_enable(void) {
-    led_set(1 << USB_LED_CAPS_LOCK);
+    led_set(2); // Caps Lock
 }
 
 void sleep_led_disable(void) {
diff --git a/platforms/chibios/vendors/RP/pico_sdk_shims.c b/platforms/chibios/vendors/RP/pico_sdk_shims.c
index 239155c08653..caab4005316c 100644
--- a/platforms/chibios/vendors/RP/pico_sdk_shims.c
+++ b/platforms/chibios/vendors/RP/pico_sdk_shims.c
@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <stdbool.h>
-#include <ch.h>
+
+extern void chSysHalt(const char *reason) __attribute__((noreturn));
 
 void panic(const char *fmt, ...) {
     chSysHalt(fmt);
diff --git a/platforms/chibios/wait.c b/platforms/chibios/wait.c
index 88cb5e6d549d..7fe6d477b8c9 100644
--- a/platforms/chibios/wait.c
+++ b/platforms/chibios/wait.c
@@ -21,7 +21,7 @@
 
 #ifdef WAIT_US_TIMER
 void wait_us(uint16_t duration) {
-    static const GPTConfig gpt_cfg = {1000000, NULL, 0, 0}; /* 1MHz timer, no callback */
+    static const GPTConfig gpt_cfg = {.frequency = 1000000}; /* 1MHz timer, no callback */
 
     if (duration == 0) {
         duration = 1;
diff --git a/platforms/common.mk b/platforms/common.mk
index da0697e3b097..bbbe71ea1262 100644
--- a/platforms/common.mk
+++ b/platforms/common.mk
@@ -1,6 +1,6 @@
 PLATFORM_COMMON_DIR = $(PLATFORM_PATH)/$(PLATFORM_KEY)
 
-TMK_COMMON_SRC +=	\
+SRC +=	\
 	$(PLATFORM_PATH)/suspend.c \
 	$(PLATFORM_PATH)/synchronization_util.c \
 	$(PLATFORM_PATH)/timer.c \
diff --git a/platforms/test/drivers/audio_pwm.h b/platforms/test/drivers/audio_pwm.h
new file mode 100644
index 000000000000..9a3fa88cec30
--- /dev/null
+++ b/platforms/test/drivers/audio_pwm.h
@@ -0,0 +1,16 @@
+// Copyright 2023 Google LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should 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/platforms/test/drivers/audio_pwm_hardware.c b/platforms/test/drivers/audio_pwm_hardware.c
new file mode 100644
index 000000000000..336e4f58449d
--- /dev/null
+++ b/platforms/test/drivers/audio_pwm_hardware.c
@@ -0,0 +1,20 @@
+// Copyright 2023 Google LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "audio.h"
+
+void audio_driver_initialize(void) {}
+void audio_driver_start() {}
+void audio_driver_stop() {}
diff --git a/quantum/action.c b/quantum/action.c
index a45e70c55729..6368f7398c61 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -528,6 +528,13 @@ void process_action(keyrecord_t *record, action_t action) {
                             unregister_code(action.key.code);
                         } else {
                             ac_dprintf("MODS_TAP: No tap: add_mods\n");
+#    if defined(RETRO_TAPPING) && defined(DUMMY_MOD_NEUTRALIZER_KEYCODE)
+                            // Send a dummy keycode to neutralize flashing modifiers
+                            // if the key was held and then released with no interruptions.
+                            if (retro_tapping_counter == 2) {
+                                neutralize_flashing_modifiers(get_mods());
+                            }
+#    endif
                             unregister_mods(mods);
                         }
                     }
@@ -882,7 +889,7 @@ __attribute__((weak)) void register_code(uint8_t code) {
     } else if (KC_LOCKING_CAPS_LOCK == code) {
 #    ifdef LOCKING_RESYNC_ENABLE
         // Resync: ignore if caps lock already is on
-        if (host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK)) return;
+        if (host_keyboard_led_state().caps_lock) return;
 #    endif
         add_key(KC_CAPS_LOCK);
         send_keyboard_report();
@@ -892,7 +899,7 @@ __attribute__((weak)) void register_code(uint8_t code) {
 
     } else if (KC_LOCKING_NUM_LOCK == code) {
 #    ifdef LOCKING_RESYNC_ENABLE
-        if (host_keyboard_leds() & (1 << USB_LED_NUM_LOCK)) return;
+        if (host_keyboard_led_state().num_lock) return;
 #    endif
         add_key(KC_NUM_LOCK);
         send_keyboard_report();
@@ -902,7 +909,7 @@ __attribute__((weak)) void register_code(uint8_t code) {
 
     } else if (KC_LOCKING_SCROLL_LOCK == code) {
 #    ifdef LOCKING_RESYNC_ENABLE
-        if (host_keyboard_leds() & (1 << USB_LED_SCROLL_LOCK)) return;
+        if (host_keyboard_led_state().scroll_lock) return;
 #    endif
         add_key(KC_SCROLL_LOCK);
         send_keyboard_report();
@@ -952,7 +959,7 @@ __attribute__((weak)) void unregister_code(uint8_t code) {
     } else if (KC_LOCKING_CAPS_LOCK == code) {
 #    ifdef LOCKING_RESYNC_ENABLE
         // Resync: ignore if caps lock already is off
-        if (!(host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK))) return;
+        if (!host_keyboard_led_state().caps_lock) return;
 #    endif
         add_key(KC_CAPS_LOCK);
         send_keyboard_report();
@@ -961,7 +968,7 @@ __attribute__((weak)) void unregister_code(uint8_t code) {
 
     } else if (KC_LOCKING_NUM_LOCK == code) {
 #    ifdef LOCKING_RESYNC_ENABLE
-        if (!(host_keyboard_leds() & (1 << USB_LED_NUM_LOCK))) return;
+        if (!host_keyboard_led_state().num_lock) return;
 #    endif
         add_key(KC_NUM_LOCK);
         send_keyboard_report();
@@ -970,7 +977,7 @@ __attribute__((weak)) void unregister_code(uint8_t code) {
 
     } else if (KC_LOCKING_SCROLL_LOCK == code) {
 #    ifdef LOCKING_RESYNC_ENABLE
-        if (!(host_keyboard_leds() & (1 << USB_LED_SCROLL_LOCK))) return;
+        if (!host_keyboard_led_state().scroll_lock) return;
 #    endif
         add_key(KC_SCROLL_LOCK);
         send_keyboard_report();
diff --git a/quantum/action_layer.h b/quantum/action_layer.h
index ff783bb3e7fc..a2410d49a5ea 100644
--- a/quantum/action_layer.h
+++ b/quantum/action_layer.h
@@ -20,6 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdint.h>
 #include "keyboard.h"
 #include "action.h"
+#include "bitwise.h"
 
 #ifdef DYNAMIC_KEYMAP_ENABLE
 #    ifndef DYNAMIC_KEYMAP_LAYER_COUNT
diff --git a/quantum/action_util.c b/quantum/action_util.c
index 361f410d2ddf..909dea059594 100644
--- a/quantum/action_util.c
+++ b/quantum/action_util.c
@@ -500,3 +500,28 @@ __attribute__((weak)) void oneshot_layer_changed_kb(uint8_t layer) {
 uint8_t has_anymod(void) {
     return bitpop(real_mods);
 }
+
+#ifdef DUMMY_MOD_NEUTRALIZER_KEYCODE
+/** \brief Send a dummy keycode in between the register and unregister event of a modifier key, to neutralize the "flashing modifiers" phenomenon.
+ *
+ * \param active_mods 8-bit packed bit-array describing the currently active modifiers (in the format GASCGASC).
+ *
+ * Certain QMK features like  key overrides or retro tap must unregister a previously
+ * registered modifier before sending another keycode but this can trigger undesired
+ * keyboard shortcuts if the clean tap of a single modifier key is bound to an action
+ * on the host OS, as is for example the case for the left GUI key on Windows, which
+ * opens the Start Menu when tapped.
+ */
+void neutralize_flashing_modifiers(uint8_t active_mods) {
+    // In most scenarios, the flashing modifiers phenomenon is a problem
+    // only for a subset of modifier masks.
+    const static uint8_t mods_to_neutralize[] = MODS_TO_NEUTRALIZE;
+    const static uint8_t n_mods               = ARRAY_SIZE(mods_to_neutralize);
+    for (uint8_t i = 0; i < n_mods; ++i) {
+        if (active_mods == mods_to_neutralize[i]) {
+            tap_code(DUMMY_MOD_NEUTRALIZER_KEYCODE);
+            break;
+        }
+    }
+}
+#endif
diff --git a/quantum/action_util.h b/quantum/action_util.h
index 02f6e9e6df2e..831caf3c0a16 100644
--- a/quantum/action_util.h
+++ b/quantum/action_util.h
@@ -102,6 +102,19 @@ void use_oneshot_swaphands(void);
 void clear_oneshot_swaphands(void);
 #endif
 
+#ifdef DUMMY_MOD_NEUTRALIZER_KEYCODE
+// KC_A is used as the lowerbound instead of QK_BASIC because the range QK_BASIC...KC_A includes
+// internal keycodes like KC_NO and KC_TRANSPARENT which are unsuitable for use with `tap_code(kc)`.
+#    if !(KC_A <= DUMMY_MOD_NEUTRALIZER_KEYCODE && DUMMY_MOD_NEUTRALIZER_KEYCODE <= QK_BASIC_MAX)
+#        error "DUMMY_MOD_NEUTRALIZER_KEYCODE must be a basic, unmodified, HID keycode!"
+#    endif
+void neutralize_flashing_modifiers(uint8_t active_mods);
+#endif
+#ifndef MODS_TO_NEUTRALIZE
+#    define MODS_TO_NEUTRALIZE \
+        { MOD_BIT(KC_LEFT_ALT), MOD_BIT(KC_LEFT_GUI) }
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c
index 2570ad9cd1ec..28c826751723 100644
--- a/quantum/audio/audio.c
+++ b/quantum/audio/audio.c
@@ -311,6 +311,10 @@ void audio_play_melody(float (*np)[][2], uint16_t n_count, bool n_repeat) {
         return;
     }
 
+    if (n_count == 0) {
+        return;
+    }
+
     if (!audio_initialized) {
         audio_init();
     }
@@ -547,20 +551,42 @@ void audio_decrease_tempo(uint8_t tempo_change) {
         note_tempo -= tempo_change;
 }
 
-// TODO in the int-math version are some bugs; songs sometimes abruptly end - maybe an issue with the timer/system-tick wrapping around?
+/**
+ * Converts from units of 1/64ths of a beat to milliseconds.
+ *
+ * Round-off error is at most 1 millisecond.
+ *
+ * Conversion will never overflow for duration_bpm <= 699, provided that
+ * note_tempo is at least 10. This is quite a long duration, over ten beats.
+ *
+ * Beware that for duration_bpm > 699, the result may overflow uint16_t range
+ * when duration_bpm is large compared to note_tempo:
+ *
+ *    duration_bpm * 60 * 1000 / (64 * note_tempo) > UINT16_MAX
+ *
+ *    duration_bpm > (2 * 65535 / 1875) * note_tempo
+ *                 = 69.904 * note_tempo.
+ */
 uint16_t audio_duration_to_ms(uint16_t duration_bpm) {
-#if defined(__AVR__)
-    // doing int-math saves us some bytes in the overall firmware size, but the intermediate result is less accurate before being cast to/returned as uint
-    return ((uint32_t)duration_bpm * 60 * 1000) / (64 * note_tempo);
-    // NOTE: beware of uint16_t overflows when note_tempo is low and/or the duration is long
-#else
-    return ((float)duration_bpm * 60) / (64 * note_tempo) * 1000;
-#endif
+    return ((uint32_t)duration_bpm * 1875) / ((uint_fast16_t)note_tempo * 2);
 }
+
+/**
+ * Converts from units of milliseconds to 1/64ths of a beat.
+ *
+ * Round-off error is at most 1/64th of a beat.
+ *
+ * This conversion never overflows: since duration_ms <= UINT16_MAX = 65535
+ * and note_tempo <= 255, the result is always in uint16_t range:
+ *
+ *     duration_ms * 64 * note_tempo / 60 / 1000
+ *     <= 65535 * 2 * 255 / 1875
+ *      = 17825.52
+ *     <= UINT16_MAX.
+ */
 uint16_t audio_ms_to_duration(uint16_t duration_ms) {
-#if defined(__AVR__)
-    return ((uint32_t)duration_ms * 64 * note_tempo) / 60 / 1000;
-#else
-    return ((float)duration_ms * 64 * note_tempo) / 60 / 1000;
-#endif
+    return ((uint32_t)duration_ms * 2 * note_tempo) / 1875;
 }
+
+__attribute__((weak)) void audio_on_user(void) {}
+__attribute__((weak)) void audio_off_user(void) {}
diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h
index 75016a1100b2..a4a908b43c5b 100644
--- a/quantum/audio/audio.h
+++ b/quantum/audio/audio.h
@@ -21,12 +21,6 @@
 #include "musical_notes.h"
 #include "song_list.h"
 #include "voices.h"
-#include "quantum.h"
-#include <math.h>
-
-#if defined(__AVR__)
-#    include <avr/io.h>
-#endif
 
 #if defined(AUDIO_DRIVER_PWM)
 #    include "audio_pwm.h"
@@ -280,3 +274,6 @@ bool audio_update_state(void);
 #define increase_tempo(t) audio_increase_tempo(t)
 #define decrease_tempo(t) audio_decrease_tempo(t)
 // vibrato functions are not used in any keyboards
+
+void audio_on_user(void);
+void audio_off_user(void);
diff --git a/quantum/audio/muse.c b/quantum/audio/muse.c
index 01b95671fdca..4c23cd734840 100644
--- a/quantum/audio/muse.c
+++ b/quantum/audio/muse.c
@@ -1,5 +1,7 @@
 #include "muse.h"
 
+#include <stdbool.h>
+
 enum { MUSE_OFF, MUSE_ON, MUSE_C_1_2, MUSE_C1, MUSE_C2, MUSE_C4, MUSE_C8, MUSE_C3, MUSE_C6, MUSE_B1, MUSE_B2, MUSE_B3, MUSE_B4, MUSE_B5, MUSE_B6, MUSE_B7, MUSE_B8, MUSE_B9, MUSE_B10, MUSE_B11, MUSE_B12, MUSE_B13, MUSE_B14, MUSE_B15, MUSE_B16, MUSE_B17, MUSE_B18, MUSE_B19, MUSE_B20, MUSE_B21, MUSE_B22, MUSE_B23, MUSE_B24, MUSE_B25, MUSE_B26, MUSE_B27, MUSE_B28, MUSE_B29, MUSE_B30, MUSE_B31 };
 
 bool number_of_ones_to_bool[16] = {1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1};
diff --git a/quantum/audio/muse.h b/quantum/audio/muse.h
index ad2f96e43af6..7b289cac6c1e 100644
--- a/quantum/audio/muse.h
+++ b/quantum/audio/muse.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "quantum.h"
-#include "process_audio.h"
+#include <stdint.h>
 
 uint8_t muse_clock_pulse(void);
diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c
index 01f257f4d4e1..4f511c93bade 100644
--- a/quantum/audio/voices.c
+++ b/quantum/audio/voices.c
@@ -16,7 +16,9 @@
  */
 #include "voices.h"
 #include "audio.h"
+#include "timer.h"
 #include <stdlib.h>
+#include <math.h>
 
 uint8_t note_timbre      = TIMBRE_DEFAULT;
 bool    glissando        = false;
diff --git a/quantum/backlight/backlight.c b/quantum/backlight/backlight.c
index 52ec086bb093..9d9f944f5db4 100644
--- a/quantum/backlight/backlight.c
+++ b/quantum/backlight/backlight.c
@@ -15,7 +15,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/>.
 */
 
-#include "quantum.h"
 #include "backlight.h"
 #include "eeprom.h"
 #include "eeconfig.h"
diff --git a/quantum/backlight/backlight_avr.c b/quantum/backlight/backlight_avr.c
deleted file mode 100644
index 474e0a86f5e0..000000000000
--- a/quantum/backlight/backlight_avr.c
+++ /dev/null
@@ -1,473 +0,0 @@
-#include "quantum.h"
-#include "backlight.h"
-#include "backlight_driver_common.h"
-#include "debug.h"
-
-// Maximum duty cycle limit
-#ifndef BACKLIGHT_LIMIT_VAL
-#    define BACKLIGHT_LIMIT_VAL 255
-#endif
-
-// This logic is a bit complex, we support 3 setups:
-//
-//   1. Hardware PWM when backlight is wired to a PWM pin.
-//      Depending on this pin, we use a different output compare unit.
-//   2. Software PWM with hardware timers, but the used timer
-//      depends on the Audio setup (Audio wins over Backlight).
-//   3. Full software PWM, driven by the matrix scan, if both timers are used by Audio.
-
-#if (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__)) && (BACKLIGHT_PIN == B5 || BACKLIGHT_PIN == B6 || BACKLIGHT_PIN == B7)
-#    define HARDWARE_PWM
-#    define ICRx ICR1
-#    define TCCRxA TCCR1A
-#    define TCCRxB TCCR1B
-#    define TIMERx_OVF_vect TIMER1_OVF_vect
-#    define TIMSKx TIMSK1
-#    define TOIEx TOIE1
-
-#    if BACKLIGHT_PIN == B5
-#        define COMxx0 COM1A0
-#        define COMxx1 COM1A1
-#        define OCRxx OCR1A
-#    elif BACKLIGHT_PIN == B6
-#        define COMxx0 COM1B0
-#        define COMxx1 COM1B1
-#        define OCRxx OCR1B
-#    elif BACKLIGHT_PIN == B7
-#        define COMxx0 COM1C0
-#        define COMxx1 COM1C1
-#        define OCRxx OCR1C
-#    endif
-#elif (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__)) && (BACKLIGHT_PIN == C4 || BACKLIGHT_PIN == C5 || BACKLIGHT_PIN == C6)
-#    define HARDWARE_PWM
-#    define ICRx ICR3
-#    define TCCRxA TCCR3A
-#    define TCCRxB TCCR3B
-#    define TIMERx_OVF_vect TIMER3_OVF_vect
-#    define TIMSKx TIMSK3
-#    define TOIEx TOIE3
-
-#    if BACKLIGHT_PIN == C4
-#        if (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))
-#            error This MCU has no C4 pin!
-#        else
-#            define COMxx0 COM3C0
-#            define COMxx1 COM3C1
-#            define OCRxx OCR3C
-#        endif
-#    elif BACKLIGHT_PIN == C5
-#        if (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))
-#            error This MCU has no C5 pin!
-#        else
-#            define COMxx0 COM3B0
-#            define COMxx1 COM3B1
-#            define OCRxx OCR3B
-#        endif
-#    elif BACKLIGHT_PIN == C6
-#        define COMxx0 COM3A0
-#        define COMxx1 COM3A1
-#        define OCRxx OCR3A
-#    endif
-#elif (defined(__AVR_AT90USB162__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__)) && (BACKLIGHT_PIN == B7 || BACKLIGHT_PIN == C5 || BACKLIGHT_PIN == C6)
-#    define HARDWARE_PWM
-#    define ICRx ICR1
-#    define TCCRxA TCCR1A
-#    define TCCRxB TCCR1B
-#    define TIMERx_OVF_vect TIMER1_OVF_vect
-#    define TIMSKx TIMSK1
-#    define TOIEx TOIE1
-
-#    if BACKLIGHT_PIN == B7
-#        define COMxx0 COM1C0
-#        define COMxx1 COM1C1
-#        define OCRxx OCR1C
-#    elif BACKLIGHT_PIN == C5
-#        define COMxx0 COM1B0
-#        define COMxx1 COM1B1
-#        define OCRxx OCR1B
-#    elif BACKLIGHT_PIN == C6
-#        define COMxx0 COM1A0
-#        define COMxx1 COM1A1
-#        define OCRxx OCR1A
-#    endif
-#elif defined(__AVR_ATmega32A__) && (BACKLIGHT_PIN == D4 || BACKLIGHT_PIN == D5)
-#    define HARDWARE_PWM
-#    define ICRx ICR1
-#    define TCCRxA TCCR1A
-#    define TCCRxB TCCR1B
-#    define TIMERx_OVF_vect TIMER1_OVF_vect
-#    define TIMSKx TIMSK
-#    define TOIEx TOIE1
-
-#    if BACKLIGHT_PIN == D4
-#        define COMxx0 COM1B0
-#        define COMxx1 COM1B1
-#        define OCRxx OCR1B
-#    elif BACKLIGHT_PIN == D5
-#        define COMxx0 COM1A0
-#        define COMxx1 COM1A1
-#        define OCRxx OCR1A
-#    endif
-#elif (defined(__AVR_ATmega328P__) || defined(__AVR_ATmega328__)) && (BACKLIGHT_PIN == B1 || BACKLIGHT_PIN == B2)
-#    define HARDWARE_PWM
-#    define ICRx ICR1
-#    define TCCRxA TCCR1A
-#    define TCCRxB TCCR1B
-#    define TIMERx_OVF_vect TIMER1_OVF_vect
-#    define TIMSKx TIMSK1
-#    define TOIEx TOIE1
-
-#    if BACKLIGHT_PIN == B1
-#        define COMxx0 COM1A0
-#        define COMxx1 COM1A1
-#        define OCRxx OCR1A
-#    elif BACKLIGHT_PIN == B2
-#        define COMxx0 COM1B0
-#        define COMxx1 COM1B1
-#        define OCRxx OCR1B
-#    endif
-#elif (AUDIO_PIN != B5) && (AUDIO_PIN != B6) && (AUDIO_PIN != B7) && (AUDIO_PIN_ALT != B5) && (AUDIO_PIN_ALT != B6) && (AUDIO_PIN_ALT != B7)
-// Timer 1 is not in use by Audio feature, Backlight can use it
-#    pragma message "Using hardware timer 1 with software PWM"
-#    define HARDWARE_PWM
-#    define BACKLIGHT_PWM_TIMER
-#    define ICRx ICR1
-#    define TCCRxA TCCR1A
-#    define TCCRxB TCCR1B
-#    define TIMERx_COMPA_vect TIMER1_COMPA_vect
-#    define TIMERx_OVF_vect TIMER1_OVF_vect
-#    if defined(__AVR_ATmega32A__) // This MCU has only one TIMSK register
-#        define TIMSKx TIMSK
-#    else
-#        define TIMSKx TIMSK1
-#    endif
-#    define TOIEx TOIE1
-
-#    define OCIExA OCIE1A
-#    define OCRxx OCR1A
-#elif (AUDIO_PIN != C4) && (AUDIO_PIN != C5) && (AUDIO_PIN != C6)
-#    pragma message "Using hardware timer 3 with software PWM"
-// Timer 3 is not in use by Audio feature, Backlight can use it
-#    define HARDWARE_PWM
-#    define BACKLIGHT_PWM_TIMER
-#    define ICRx ICR1
-#    define TCCRxA TCCR3A
-#    define TCCRxB TCCR3B
-#    define TIMERx_COMPA_vect TIMER3_COMPA_vect
-#    define TIMERx_OVF_vect TIMER3_OVF_vect
-#    define TIMSKx TIMSK3
-#    define TOIEx TOIE3
-
-#    define OCIExA OCIE3A
-#    define OCRxx OCR3A
-#elif defined(BACKLIGHT_CUSTOM_DRIVER)
-error("Please set 'BACKLIGHT_DRIVER = custom' within rules.mk")
-#else
-error("Please set 'BACKLIGHT_DRIVER = software' within rules.mk")
-#endif
-
-#ifndef BACKLIGHT_PWM_TIMER // pwm through software
-
-static inline void enable_pwm(void) {
-#    if BACKLIGHT_ON_STATE == 1
-    TCCRxA |= _BV(COMxx1);
-#    else
-    TCCRxA |= _BV(COMxx1) | _BV(COMxx0);
-#    endif
-}
-
-static inline void disable_pwm(void) {
-#    if BACKLIGHT_ON_STATE == 1
-    TCCRxA &= ~(_BV(COMxx1));
-#    else
-    TCCRxA &= ~(_BV(COMxx1) | _BV(COMxx0));
-#    endif
-}
-
-#endif
-
-#ifdef BACKLIGHT_PWM_TIMER
-
-// The idea of software PWM assisted by hardware timers is the following
-// we use the hardware timer in fast PWM mode like for hardware PWM, but
-// instead of letting the Output Match Comparator control the led pin
-// (which is not possible since the backlight is not wired to PWM pins on the
-// CPU), we do the LED on/off by oursleves.
-// The timer is setup to count up to 0xFFFF, and we set the Output Compare
-// register to the current 16bits backlight level (after CIE correction).
-// This means the CPU will trigger a compare match interrupt when the counter
-// reaches the backlight level, where we turn off the LEDs,
-// but also an overflow interrupt when the counter rolls back to 0,
-// in which we're going to turn on the LEDs.
-// The LED will then be on for OCRxx/0xFFFF time, adjusted every 244Hz,
-// or F_CPU/BACKLIGHT_CUSTOM_RESOLUTION if used.
-
-// Triggered when the counter reaches the OCRx value
-ISR(TIMERx_COMPA_vect) {
-    backlight_pins_off();
-}
-
-// Triggered when the counter reaches the TOP value
-// this one triggers at F_CPU/ICRx = 16MHz/65536 =~ 244 Hz
-ISR(TIMERx_OVF_vect) {
-#    ifdef BACKLIGHT_BREATHING
-    if (is_breathing()) {
-        breathing_task();
-    }
-#    endif
-    // for very small values of OCRxx (or backlight level)
-    // we can't guarantee this whole code won't execute
-    // at the same time as the compare match interrupt
-    // which means that we might turn on the leds while
-    // trying to turn them off, leading to flickering
-    // artifacts (especially while breathing, because breathing_task
-    // takes many computation cycles).
-    // so better not turn them on while the counter TOP is very low.
-    if (OCRxx > ICRx / 250 + 5) {
-        backlight_pins_on();
-    }
-}
-
-#endif
-
-#define TIMER_TOP 0xFFFFU
-
-// See http://jared.geek.nz/2013/feb/linear-led-pwm
-static uint16_t cie_lightness(uint16_t v) {
-    if (v <= (uint32_t)ICRx / 12) // If the value is less than or equal to ~8% of max
-    {
-        return v / 9; // Same as dividing by 900%
-    } else {
-        // In the next two lines values are bit-shifted. This is to avoid loosing decimals in integer math.
-        uint32_t y   = (((uint32_t)v + (uint32_t)ICRx / 6) << 5) / ((uint32_t)ICRx / 6 + ICRx); // If above 8%, add ~16% of max, and normalize with (max + ~16% max)
-        uint32_t out = (y * y * y * ICRx) >> 15;                                                // Cube it and undo the bit-shifting. (which is now three times as much due to the cubing)
-
-        if (out > ICRx) // Avoid overflows
-        {
-            out = ICRx;
-        }
-        return (uint16_t)out;
-    }
-}
-
-// rescale the supplied backlight value to be in terms of the value limit	// range for val is [0..ICRx]. PWM pin is high while the timer count is below val.
-static uint32_t rescale_limit_val(uint32_t val) {
-    return (val * (BACKLIGHT_LIMIT_VAL + 1)) / 256;
-}
-
-// range for val is [0..ICRx]. PWM pin is high while the timer count is below val.
-static inline void set_pwm(uint16_t val) {
-    OCRxx = val;
-}
-
-void backlight_set(uint8_t level) {
-    if (level > BACKLIGHT_LEVELS) level = BACKLIGHT_LEVELS;
-
-    if (level == 0) {
-#ifdef BACKLIGHT_PWM_TIMER
-        if (OCRxx) {
-            TIMSKx &= ~(_BV(OCIExA));
-            TIMSKx &= ~(_BV(TOIEx));
-        }
-#else
-        // Turn off PWM control on backlight pin
-        disable_pwm();
-#endif
-        backlight_pins_off();
-    } else {
-#ifdef BACKLIGHT_PWM_TIMER
-        if (!OCRxx) {
-            TIMSKx |= _BV(OCIExA);
-            TIMSKx |= _BV(TOIEx);
-        }
-#else
-        // Turn on PWM control of backlight pin
-        enable_pwm();
-#endif
-    }
-    // Set the brightness
-    set_pwm(cie_lightness(rescale_limit_val(ICRx * (uint32_t)level / BACKLIGHT_LEVELS)));
-}
-
-void backlight_task(void) {}
-
-#ifdef BACKLIGHT_BREATHING
-
-#    define BREATHING_NO_HALT 0
-#    define BREATHING_HALT_OFF 1
-#    define BREATHING_HALT_ON 2
-#    define BREATHING_STEPS 128
-
-static uint8_t  breathing_halt    = BREATHING_NO_HALT;
-static uint16_t breathing_counter = 0;
-
-static uint8_t breath_scale_counter = 1;
-/* Run the breathing loop at ~120Hz*/
-const uint8_t   breathing_ISR_frequency     = 120;
-static uint16_t breathing_freq_scale_factor = 2;
-
-#    ifdef BACKLIGHT_PWM_TIMER
-static bool breathing = false;
-
-bool is_breathing(void) {
-    return breathing;
-}
-
-#        define breathing_interrupt_enable() \
-            do {                             \
-                breathing = true;            \
-            } while (0)
-#        define breathing_interrupt_disable() \
-            do {                              \
-                breathing = false;            \
-            } while (0)
-#    else
-
-bool is_breathing(void) {
-    return !!(TIMSKx & _BV(TOIEx));
-}
-
-#        define breathing_interrupt_enable() \
-            do {                             \
-                TIMSKx |= _BV(TOIEx);        \
-            } while (0)
-#        define breathing_interrupt_disable() \
-            do {                              \
-                TIMSKx &= ~_BV(TOIEx);        \
-            } while (0)
-#    endif
-
-#    define breathing_min()        \
-        do {                       \
-            breathing_counter = 0; \
-        } while (0)
-#    define breathing_max()                                                           \
-        do {                                                                          \
-            breathing_counter = get_breathing_period() * breathing_ISR_frequency / 2; \
-        } while (0)
-
-void breathing_enable(void) {
-    breathing_counter = 0;
-    breathing_halt    = BREATHING_NO_HALT;
-    breathing_interrupt_enable();
-}
-
-void breathing_pulse(void) {
-    if (get_backlight_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(get_backlight_level());
-}
-
-void breathing_self_disable(void) {
-    if (get_backlight_level() == 0)
-        breathing_halt = BREATHING_HALT_OFF;
-    else
-        breathing_halt = BREATHING_HALT_ON;
-}
-
-/* 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] PROGMEM = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 17, 20, 24, 28, 32, 36, 41, 46, 51, 57, 63, 70, 76, 83, 91, 98, 106, 113, 121, 129, 138, 146, 154, 162, 170, 178, 185, 193, 200, 207, 213, 220, 225, 231, 235, 240, 244, 247, 250, 252, 253, 254, 255, 254, 253, 252, 250, 247, 244, 240, 235, 231, 225, 220, 213, 207, 200, 193, 185, 178, 170, 162, 154, 146, 138, 129, 121, 113, 106, 98, 91, 83, 76, 70, 63, 57, 51, 46, 41, 36, 32, 28, 24, 20, 17, 15, 12, 10, 8, 6, 5, 4, 3, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-
-// Use this before the cie_lightness function.
-static inline uint16_t scale_backlight(uint16_t v) {
-    return v / BACKLIGHT_LEVELS * get_backlight_level();
-}
-
-#    ifdef BACKLIGHT_PWM_TIMER
-void breathing_task(void)
-#    else
-/* Assuming a 16MHz CPU clock and a timer that resets at 64k (ICR1), the following interrupt handler will run
- * about 244 times per second.
- *
- * The following ISR runs at F_CPU/ISRx. With a 16MHz clock and default pwm resolution, that means 244Hz
- */
-ISR(TIMERx_OVF_vect)
-#    endif
-{
-
-    // Only run this ISR at ~120 Hz
-    if (breath_scale_counter++ == breathing_freq_scale_factor) {
-        breath_scale_counter = 1;
-    } else {
-        return;
-    }
-    uint16_t interval = (uint16_t)get_breathing_period() * breathing_ISR_frequency / BREATHING_STEPS;
-    // resetting after one period to prevent ugly reset at overflow.
-    breathing_counter = (breathing_counter + 1) % (get_breathing_period() * breathing_ISR_frequency);
-    uint8_t index     = breathing_counter / interval;
-    // limit index to max step value
-    if (index >= BREATHING_STEPS) {
-        index = BREATHING_STEPS - 1;
-    }
-
-    if (((breathing_halt == BREATHING_HALT_ON) && (index == BREATHING_STEPS / 2)) || ((breathing_halt == BREATHING_HALT_OFF) && (index == BREATHING_STEPS - 1))) {
-        breathing_interrupt_disable();
-    }
-
-    // Set PWM to a brightnessvalue scaled to the configured resolution
-    set_pwm(cie_lightness(rescale_limit_val(scale_backlight((uint32_t)pgm_read_byte(&breathing_table[index]) * ICRx / 255))));
-}
-
-#endif // BACKLIGHT_BREATHING
-
-void backlight_init_ports(void) {
-    // Setup backlight pin as output and output to on state.
-    backlight_pins_init();
-
-    // I could write a wall of text here to explain... but TL;DW
-    // Go read the ATmega32u4 datasheet.
-    // And this: http://blog.saikoled.com/post/43165849837/secret-konami-cheat-code-to-high-resolution-pwm-on
-
-#ifdef BACKLIGHT_PWM_TIMER
-    // TimerX setup, Fast PWM mode count to TOP set in ICRx
-    TCCRxA = _BV(WGM11); // = 0b00000010;
-    // clock select clk/1
-    TCCRxB = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001;
-#else                                             // hardware PWM
-    // Pin PB7 = OCR1C (Timer 1, Channel C)
-    // Compare Output Mode = Clear on compare match, Channel C = COM1C1=1 COM1C0=0
-    // (i.e. start high, go low when counter matches.)
-    // WGM Mode 14 (Fast PWM) = WGM13=1 WGM12=1 WGM11=1 WGM10=0
-    // Clock Select = clk/1 (no prescaling) = CS12=0 CS11=0 CS10=1
-
-    /*
-    14.8.3:
-    "In fast PWM mode, the compare units allow generation of PWM waveforms on the OCnx pins. Setting the COMnx1:0 bits to two will produce a non-inverted PWM [..]."
-    "In fast PWM mode the counter is incremented until the counter value matches either one of the fixed values 0x00FF, 0x01FF, or 0x03FF (WGMn3:0 = 5, 6, or 7), the value in ICRn (WGMn3:0 = 14), or the value in OCRnA (WGMn3:0 = 15)."
-    */
-    TCCRxA = _BV(COMxx1) | _BV(WGM11);            // = 0b00001010;
-    TCCRxB = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001;
-#endif
-
-#ifdef BACKLIGHT_CUSTOM_RESOLUTION
-#    if (BACKLIGHT_CUSTOM_RESOLUTION > 0xFFFF || BACKLIGHT_CUSTOM_RESOLUTION < 1)
-#        error "This out of range of the timer capabilities"
-#    elif (BACKLIGHT_CUSTOM_RESOLUTION < 0xFF)
-#        warning "Resolution lower than 0xFF isn't recommended"
-#    endif
-#    ifdef BACKLIGHT_BREATHING
-    breathing_freq_scale_factor = F_CPU / BACKLIGHT_CUSTOM_RESOLUTION / 120;
-#    endif
-    ICRx = BACKLIGHT_CUSTOM_RESOLUTION;
-#else
-    ICRx = TIMER_TOP;
-#endif
-
-    backlight_init();
-#ifdef BACKLIGHT_BREATHING
-    if (is_backlight_breathing()) {
-        breathing_enable();
-    }
-#endif
-}
diff --git a/quantum/backlight/backlight_chibios.c b/quantum/backlight/backlight_chibios.c
deleted file mode 100644
index 30e95bd5c80d..000000000000
--- a/quantum/backlight/backlight_chibios.c
+++ /dev/null
@@ -1,173 +0,0 @@
-#include "quantum.h"
-#include "backlight.h"
-#include <hal.h>
-#include "debug.h"
-
-// Maximum duty cycle limit
-#ifndef BACKLIGHT_LIMIT_VAL
-#    define BACKLIGHT_LIMIT_VAL 255
-#endif
-
-#ifndef BACKLIGHT_PAL_MODE
-#    if defined(USE_GPIOV1)
-#        define BACKLIGHT_PAL_MODE PAL_MODE_ALTERNATE_PUSHPULL
-#    else
-// GPIOV2 && GPIOV3
-#        define BACKLIGHT_PAL_MODE 5
-#    endif
-#endif
-
-// GENERIC
-#ifndef BACKLIGHT_PWM_DRIVER
-#    define BACKLIGHT_PWM_DRIVER PWMD4
-#endif
-#ifndef BACKLIGHT_PWM_CHANNEL
-#    define BACKLIGHT_PWM_CHANNEL 3
-#endif
-
-// Support for pins which are on TIM1_CH1N - requires STM32_PWM_USE_ADVANCED
-#ifdef BACKLIGHT_PWM_COMPLEMENTARY_OUTPUT
-#    if BACKLIGHT_ON_STATE == 1
-#        define PWM_OUTPUT_MODE PWM_COMPLEMENTARY_OUTPUT_ACTIVE_LOW;
-#    else
-#        define PWM_OUTPUT_MODE PWM_COMPLEMENTARY_OUTPUT_ACTIVE_HIGH;
-#    endif
-#else
-#    if BACKLIGHT_ON_STATE == 1
-#        define PWM_OUTPUT_MODE PWM_OUTPUT_ACTIVE_HIGH;
-#    else
-#        define PWM_OUTPUT_MODE PWM_OUTPUT_ACTIVE_LOW;
-#    endif
-#endif
-
-#ifndef BACKLIGHT_PWM_COUNTER_FREQUENCY
-#    define BACKLIGHT_PWM_COUNTER_FREQUENCY 0xFFFF
-#endif
-
-#ifndef BACKLIGHT_PWM_PERIOD
-#    define BACKLIGHT_PWM_PERIOD 256
-#endif
-
-static PWMConfig pwmCFG = {
-    .frequency = BACKLIGHT_PWM_COUNTER_FREQUENCY, /* PWM clock frequency  */
-    .period    = BACKLIGHT_PWM_PERIOD,            /* PWM period in counter ticks. e.g. clock frequency is 10KHz, period is 256 ticks then t_period is 25.6ms */
-};
-
-#ifdef BACKLIGHT_BREATHING
-static virtual_timer_t breathing_vt;
-#endif
-
-// 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;
-        }
-    }
-}
-
-static uint32_t rescale_limit_val(uint32_t val) {
-    // rescale the supplied backlight value to be in terms of the value limit
-    return (val * (BACKLIGHT_LIMIT_VAL + 1)) / 256;
-}
-
-void backlight_init_ports(void) {
-#ifdef USE_GPIOV1
-    palSetPadMode(PAL_PORT(BACKLIGHT_PIN), PAL_PAD(BACKLIGHT_PIN), BACKLIGHT_PAL_MODE);
-#else
-    palSetPadMode(PAL_PORT(BACKLIGHT_PIN), PAL_PAD(BACKLIGHT_PIN), PAL_MODE_ALTERNATE(BACKLIGHT_PAL_MODE));
-#endif
-
-    pwmCFG.channels[BACKLIGHT_PWM_CHANNEL - 1].mode = PWM_OUTPUT_MODE;
-    pwmStart(&BACKLIGHT_PWM_DRIVER, &pwmCFG);
-
-    backlight_set(get_backlight_level());
-
-#ifdef BACKLIGHT_BREATHING
-    chVTObjectInit(&breathing_vt);
-    if (is_backlight_breathing()) {
-        breathing_enable();
-    }
-#endif
-}
-
-void backlight_set(uint8_t level) {
-    if (level > BACKLIGHT_LEVELS) {
-        level = BACKLIGHT_LEVELS;
-    }
-
-    if (level == 0) {
-        // Turn backlight off
-        pwmDisableChannel(&BACKLIGHT_PWM_DRIVER, BACKLIGHT_PWM_CHANNEL - 1);
-    } else {
-        // Turn backlight on
-        uint32_t duty = (uint32_t)(cie_lightness(rescale_limit_val(0xFFFF * (uint32_t)level / BACKLIGHT_LEVELS)));
-        pwmEnableChannel(&BACKLIGHT_PWM_DRIVER, BACKLIGHT_PWM_CHANNEL - 1, PWM_FRACTION_TO_WIDTH(&BACKLIGHT_PWM_DRIVER, 0xFFFF, duty));
-    }
-}
-
-void backlight_task(void) {}
-
-#ifdef BACKLIGHT_BREATHING
-
-#    define BREATHING_STEPS 128
-
-/* 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};
-
-static void breathing_callback(virtual_timer_t *vtp, void *p);
-
-bool is_breathing(void) {
-    return chVTIsArmed(&breathing_vt);
-}
-
-void breathing_enable(void) {
-    /* Update frequency is 256Hz -> 3906us intervals */
-    chVTSetContinuous(&breathing_vt, TIME_US2I(3906), breathing_callback, NULL);
-}
-
-void breathing_disable(void) {
-    chVTReset(&breathing_vt);
-
-    // Restore backlight level
-    backlight_set(get_backlight_level());
-}
-
-// Use this before the cie_lightness function.
-static inline uint16_t scale_backlight(uint16_t v) {
-    return v / BACKLIGHT_LEVELS * get_backlight_level();
-}
-
-static void breathing_callback(virtual_timer_t *vtp, void *p) {
-    uint8_t  breathing_period = get_breathing_period();
-    uint16_t interval         = (uint16_t)breathing_period * 256 / BREATHING_STEPS;
-
-    // resetting after one period to prevent ugly reset at overflow.
-    static uint16_t breathing_counter = 0;
-    breathing_counter                 = (breathing_counter + 1) % (breathing_period * 256);
-    uint8_t  index                    = breathing_counter / interval % BREATHING_STEPS;
-    uint32_t duty                     = cie_lightness(rescale_limit_val(scale_backlight(breathing_table[index] * 256)));
-
-    chSysLockFromISR();
-    pwmEnableChannelI(&BACKLIGHT_PWM_DRIVER, BACKLIGHT_PWM_CHANNEL - 1, PWM_FRACTION_TO_WIDTH(&BACKLIGHT_PWM_DRIVER, 0xFFFF, duty));
-    chSysUnlockFromISR();
-}
-
-// TODO: integrate generic pulse solution
-void breathing_pulse(void) {
-    backlight_set(is_backlight_enabled() ? 0 : BACKLIGHT_LEVELS);
-    wait_ms(10);
-    backlight_set(is_backlight_enabled() ? get_backlight_level() : 0);
-}
-
-#endif
diff --git a/quantum/backlight/backlight_driver_common.c b/quantum/backlight/backlight_driver_common.c
index 1eb8969084e8..8c3fe461d7ca 100644
--- a/quantum/backlight/backlight_driver_common.c
+++ b/quantum/backlight/backlight_driver_common.c
@@ -1,6 +1,7 @@
-#include "quantum.h"
 #include "backlight.h"
 #include "backlight_driver_common.h"
+#include "gpio.h"
+#include "util.h"
 
 #if !defined(BACKLIGHT_PIN) && !defined(BACKLIGHT_PINS)
 #    error "Backlight pin/pins not defined. Please configure."
diff --git a/quantum/backlight/backlight_timer.c b/quantum/backlight/backlight_timer.c
deleted file mode 100644
index 82fb6a6a83e7..000000000000
--- a/quantum/backlight/backlight_timer.c
+++ /dev/null
@@ -1,179 +0,0 @@
-#include "quantum.h"
-#include "backlight.h"
-#include "backlight_driver_common.h"
-#include "debug.h"
-
-#ifndef BACKLIGHT_GPT_DRIVER
-#    define BACKLIGHT_GPT_DRIVER GPTD15
-#endif
-
-// Platform specific implementations
-static void     backlight_timer_configure(bool enable);
-static void     backlight_timer_set_duty(uint16_t duty);
-static uint16_t backlight_timer_get_duty(void);
-
-// See http://jared.geek.nz/2013/feb/linear-led-pwm
-static uint16_t cie_lightness(uint16_t v) {
-    if (v <= 5243)    // if below 8% of max
-        return v / 9; // same as dividing by 900%
-    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) {
-    backlight_pins_init();
-
-    backlight_set(get_backlight_level());
-
-#ifdef BACKLIGHT_BREATHING
-    if (is_backlight_breathing()) {
-        breathing_enable();
-    }
-#endif
-}
-
-void backlight_set(uint8_t level) {
-    if (level > BACKLIGHT_LEVELS) level = BACKLIGHT_LEVELS;
-
-    backlight_pins_off();
-
-    backlight_timer_set_duty(cie_lightness(0xFFFFU / BACKLIGHT_LEVELS * level));
-    backlight_timer_configure(level != 0);
-}
-
-static void backlight_timer_top(void) {
-#ifdef BACKLIGHT_BREATHING
-    if (is_breathing()) {
-        breathing_task();
-    }
-#endif
-
-    if (backlight_timer_get_duty() > 256) {
-        backlight_pins_on();
-    }
-}
-
-static void backlight_timer_cmp(void) {
-    backlight_pins_off();
-}
-
-void backlight_task(void) {}
-
-#ifdef BACKLIGHT_BREATHING
-#    define BREATHING_STEPS 128
-
-static bool     breathing         = false;
-static uint16_t breathing_counter = 0;
-
-/* 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 * get_backlight_level();
-}
-
-void breathing_task(void) {
-    uint8_t  breathing_period = get_breathing_period();
-    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;
-
-    // printf("index:%u\n", index);
-
-    backlight_timer_set_duty(cie_lightness(scale_backlight((uint16_t)breathing_table[index] * 256)));
-}
-
-bool is_breathing(void) {
-    return breathing;
-}
-
-void breathing_enable(void) {
-    breathing_counter = 0;
-    breathing         = true;
-}
-void breathing_disable(void) {
-    breathing = false;
-}
-
-void breathing_pulse(void) {
-    backlight_set(is_backlight_enabled() ? 0 : BACKLIGHT_LEVELS);
-    wait_ms(10);
-    backlight_set(is_backlight_enabled() ? get_backlight_level() : 0);
-}
-#endif
-
-#ifdef PROTOCOL_CHIBIOS
-// On Platforms where timers fire every tick and have no capture/top events
-//   - fake event in the normal timer callback
-uint16_t s_duty = 0;
-
-static void timerCallback(void) {
-    /* Software PWM
-     * timer:1111 1111 1111 1111
-     *       \______/| \_______/____  count(0-255)
-     *          \    \______________  unused(1)
-     *           \__________________  index of step table(0-127)
-     */
-
-    // this works for cca 65536 irqs/sec
-    static union {
-        uint16_t raw;
-        struct {
-            uint16_t count : 8;
-            uint8_t  dummy : 1;
-            uint8_t  index : 7;
-        } pwm;
-    } timer = {.raw = 0};
-
-    timer.raw++;
-
-    if (timer.pwm.count == 0) {
-        // LED on
-        backlight_timer_top();
-    } else if (timer.pwm.count == (s_duty / 256)) {
-        // LED off
-        backlight_timer_cmp();
-    }
-}
-
-static void backlight_timer_set_duty(uint16_t duty) {
-    s_duty = duty;
-}
-static uint16_t backlight_timer_get_duty(void) {
-    return s_duty;
-}
-
-// ChibiOS - Map GPT timer onto Software PWM
-static void gptTimerCallback(GPTDriver *gptp) {
-    (void)gptp;
-    timerCallback();
-}
-
-static void backlight_timer_configure(bool enable) {
-    static const GPTConfig gptcfg = {1000000, gptTimerCallback, 0, 0};
-
-    static bool s_init = false;
-    if (!s_init) {
-        gptStart(&BACKLIGHT_GPT_DRIVER, &gptcfg);
-        s_init = true;
-    }
-
-    if (enable) {
-        gptStartContinuous(&BACKLIGHT_GPT_DRIVER, gptcfg.frequency / 0xFFFF);
-    } else {
-        gptStopTimer(&BACKLIGHT_GPT_DRIVER);
-    }
-}
-#endif
diff --git a/quantum/bootmagic/bootmagic_lite.c b/quantum/bootmagic/bootmagic_lite.c
index f63c71fc6b16..efce6bfd121b 100644
--- a/quantum/bootmagic/bootmagic_lite.c
+++ b/quantum/bootmagic/bootmagic_lite.c
@@ -13,7 +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/>.
  */
-#include "quantum.h"
+#include "bootmagic.h"
+#include "matrix.h"
+#include "keyboard.h"
+#include "wait.h"
+#include "eeconfig.h"
+#include "bootloader.h"
 
 /** \brief Reset eeprom
  *
diff --git a/quantum/debounce.h b/quantum/debounce.h
index a8629654c20f..cea1f2b5260b 100644
--- a/quantum/debounce.h
+++ b/quantum/debounce.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <stdint.h>
+#include <stdbool.h>
+#include "matrix.h"
+
 /**
  * @brief Debounce raw matrix events according to the choosen debounce algorithm.
  *
diff --git a/quantum/debounce/asym_eager_defer_pk.c b/quantum/debounce/asym_eager_defer_pk.c
index 4745c6f4654f..954d43536c0e 100644
--- a/quantum/debounce/asym_eager_defer_pk.c
+++ b/quantum/debounce/asym_eager_defer_pk.c
@@ -22,9 +22,8 @@ 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.
 */
 
-#include "matrix.h"
+#include "debounce.h"
 #include "timer.h"
-#include "quantum.h"
 #include <stdlib.h>
 
 #ifdef PROTOCOL_CHIBIOS
@@ -144,6 +143,8 @@ static void update_debounce_counters_and_transfer_if_expired(matrix_row_t raw[],
 static void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows) {
     debounce_counter_t *debounce_pointer = debounce_counters;
 
+    matrix_need_update = false;
+
     for (uint8_t row = 0; row < num_rows; row++) {
         matrix_row_t delta = raw[row] ^ cooked[row];
         for (uint8_t col = 0; col < MATRIX_COLS; col++) {
diff --git a/quantum/debounce/none.c b/quantum/debounce/none.c
index 4cff5e05e260..1b8b1dc13a3a 100644
--- a/quantum/debounce/none.c
+++ b/quantum/debounce/none.c
@@ -14,9 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "matrix.h"
-#include "quantum.h"
-#include <stdlib.h>
+#include "debounce.h"
 #include <string.h>
 
 void debounce_init(uint8_t num_rows) {}
diff --git a/quantum/debounce/sym_defer_g.c b/quantum/debounce/sym_defer_g.c
index d04310a76151..25e18890affc 100644
--- a/quantum/debounce/sym_defer_g.c
+++ b/quantum/debounce/sym_defer_g.c
@@ -17,9 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Basic global debounce algorithm. Used in 99% of keyboards at time of implementation
 When no state changes have occured for DEBOUNCE milliseconds, we push the state.
 */
-#include "matrix.h"
+#include "debounce.h"
 #include "timer.h"
-#include "quantum.h"
 #include <string.h>
 #ifndef DEBOUNCE
 #    define DEBOUNCE 5
diff --git a/quantum/debounce/sym_defer_pk.c b/quantum/debounce/sym_defer_pk.c
index 7b59b5e10076..156535a37338 100644
--- a/quantum/debounce/sym_defer_pk.c
+++ b/quantum/debounce/sym_defer_pk.c
@@ -19,9 +19,8 @@ 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.
 */
 
-#include "matrix.h"
+#include "debounce.h"
 #include "timer.h"
-#include "quantum.h"
 #include <stdlib.h>
 
 #ifdef PROTOCOL_CHIBIOS
diff --git a/quantum/debounce/sym_defer_pr.c b/quantum/debounce/sym_defer_pr.c
index 452c4599d0a7..d6222af5b298 100644
--- a/quantum/debounce/sym_defer_pr.c
+++ b/quantum/debounce/sym_defer_pr.c
@@ -17,9 +17,8 @@ Symmetric per-row debounce algorithm. Changes only apply when
 DEBOUNCE milliseconds have elapsed since the last change.
 */
 
-#include "matrix.h"
+#include "debounce.h"
 #include "timer.h"
-#include "quantum.h"
 #include <stdlib.h>
 
 #ifndef DEBOUNCE
diff --git a/quantum/debounce/sym_eager_pk.c b/quantum/debounce/sym_eager_pk.c
index f736d1645cd4..b359e79287ec 100644
--- a/quantum/debounce/sym_eager_pk.c
+++ b/quantum/debounce/sym_eager_pk.c
@@ -19,9 +19,8 @@ After pressing a key, it immediately changes state, and sets a counter.
 No further inputs are accepted until DEBOUNCE milliseconds have occurred.
 */
 
-#include "matrix.h"
+#include "debounce.h"
 #include "timer.h"
-#include "quantum.h"
 #include <stdlib.h>
 
 #ifdef PROTOCOL_CHIBIOS
@@ -125,6 +124,7 @@ static void update_debounce_counters(uint8_t num_rows, uint8_t elapsed_time) {
 
 // upload from raw_matrix to final matrix;
 static void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows) {
+    matrix_need_update                   = false;
     debounce_counter_t *debounce_pointer = debounce_counters;
     for (uint8_t row = 0; row < num_rows; row++) {
         matrix_row_t delta        = raw[row] ^ cooked[row];
diff --git a/quantum/debounce/sym_eager_pr.c b/quantum/debounce/sym_eager_pr.c
index aad5ca351b89..ccc5d20fa2c0 100644
--- a/quantum/debounce/sym_eager_pr.c
+++ b/quantum/debounce/sym_eager_pr.c
@@ -19,9 +19,8 @@ After pressing a key, it immediately changes state, and sets a counter.
 No further inputs are accepted until DEBOUNCE milliseconds have occurred.
 */
 
-#include "matrix.h"
+#include "debounce.h"
 #include "timer.h"
-#include "quantum.h"
 #include <stdlib.h>
 
 #ifdef PROTOCOL_CHIBIOS
@@ -119,6 +118,7 @@ static void update_debounce_counters(uint8_t num_rows, uint8_t elapsed_time) {
 
 // upload from raw_matrix to final matrix;
 static void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows) {
+    matrix_need_update                   = false;
     debounce_counter_t *debounce_pointer = debounce_counters;
     for (uint8_t row = 0; row < num_rows; row++) {
         matrix_row_t existing_row = cooked[row];
diff --git a/quantum/debounce/tests/debounce_test_common.cpp b/quantum/debounce/tests/debounce_test_common.cpp
index bd98e329554a..b11378b286ac 100644
--- a/quantum/debounce/tests/debounce_test_common.cpp
+++ b/quantum/debounce/tests/debounce_test_common.cpp
@@ -23,9 +23,8 @@
 #include <sstream>
 
 extern "C" {
-#include "quantum.h"
-#include "timer.h"
 #include "debounce.h"
+#include "timer.h"
 
 void set_time(uint32_t t);
 void advance_time(uint32_t ms);
diff --git a/quantum/debounce/tests/debounce_test_common.h b/quantum/debounce/tests/debounce_test_common.h
index b7becb378260..7319abfbf3f3 100644
--- a/quantum/debounce/tests/debounce_test_common.h
+++ b/quantum/debounce/tests/debounce_test_common.h
@@ -21,7 +21,7 @@
 #include <string>
 
 extern "C" {
-#include "quantum.h"
+#include "matrix.h"
 #include "timer.h"
 }
 
diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index 90a0f2083828..3c22bbd4457f 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -14,16 +14,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "keymap_introspection.h" // to get keymaps[][][]
-#include "eeprom.h"
-#include "progmem.h" // to read default from flash
-#include "quantum.h" // for send_string()
 #include "dynamic_keymap.h"
+#include "keymap_introspection.h"
+#include "action.h"
+#include "eeprom.h"
+#include "progmem.h"
+#include "send_string.h"
+#include "keycodes.h"
 
 #ifdef VIA_ENABLE
-#    include "via.h" // for VIA_EEPROM_CONFIG_END
+#    include "via.h"
 #    define DYNAMIC_KEYMAP_EEPROM_START (VIA_EEPROM_CONFIG_END)
 #else
+#    include "eeconfig.h"
 #    define DYNAMIC_KEYMAP_EEPROM_START (EECONFIG_SIZE)
 #endif
 
@@ -152,22 +155,13 @@ void dynamic_keymap_reset(void) {
     for (int layer = 0; layer < DYNAMIC_KEYMAP_LAYER_COUNT; layer++) {
         for (int row = 0; row < MATRIX_ROWS; row++) {
             for (int column = 0; column < MATRIX_COLS; column++) {
-                if (layer < keymap_layer_count()) {
-                    dynamic_keymap_set_keycode(layer, row, column, keycode_at_keymap_location_raw(layer, row, column));
-                } else {
-                    dynamic_keymap_set_keycode(layer, row, column, KC_TRANSPARENT);
-                }
+                dynamic_keymap_set_keycode(layer, row, column, keycode_at_keymap_location_raw(layer, row, column));
             }
         }
 #ifdef ENCODER_MAP_ENABLE
         for (int encoder = 0; encoder < NUM_ENCODERS; encoder++) {
-            if (layer < encodermap_layer_count()) {
-                dynamic_keymap_set_encoder(layer, encoder, true, keycode_at_encodermap_location_raw(layer, encoder, true));
-                dynamic_keymap_set_encoder(layer, encoder, false, keycode_at_encodermap_location_raw(layer, encoder, false));
-            } else {
-                dynamic_keymap_set_encoder(layer, encoder, true, KC_TRANSPARENT);
-                dynamic_keymap_set_encoder(layer, encoder, false, KC_TRANSPARENT);
-            }
+            dynamic_keymap_set_encoder(layer, encoder, true, keycode_at_encodermap_location_raw(layer, encoder, true));
+            dynamic_keymap_set_encoder(layer, encoder, false, keycode_at_encodermap_location_raw(layer, encoder, false));
         }
 #endif // ENCODER_MAP_ENABLE
     }
diff --git a/quantum/encoder.c b/quantum/encoder.c
index 1046fe6cc3d2..7ab194ed5290 100644
--- a/quantum/encoder.c
+++ b/quantum/encoder.c
@@ -16,6 +16,11 @@
  */
 
 #include "encoder.h"
+#include "keyboard.h"
+#include "action.h"
+#include "keycodes.h"
+#include "wait.h"
+
 #ifdef SPLIT_KEYBOARD
 #    include "split_util.h"
 #endif
diff --git a/quantum/encoder.h b/quantum/encoder.h
index 7644853b30a3..1cbac98cb57a 100644
--- a/quantum/encoder.h
+++ b/quantum/encoder.h
@@ -17,7 +17,9 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "gpio.h"
 #include "util.h"
 
 void encoder_init(void);
diff --git a/quantum/encoder/tests/encoder_tests_split_role.cpp b/quantum/encoder/tests/encoder_tests_split_role.cpp
index 02264067f4c6..0ab7bfc2a783 100644
--- a/quantum/encoder/tests/encoder_tests_split_role.cpp
+++ b/quantum/encoder/tests/encoder_tests_split_role.cpp
@@ -22,6 +22,7 @@
 
 extern "C" {
 #include "encoder.h"
+#include "keyboard.h"
 #include "encoder/tests/mock_split.h"
 }
 
diff --git a/quantum/haptic.c b/quantum/haptic.c
index c151547fcafc..5a700dca388e 100644
--- a/quantum/haptic.c
+++ b/quantum/haptic.c
@@ -14,17 +14,20 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "haptic.h"
 #include "eeconfig.h"
 #include "debug.h"
 #include "usb_device_state.h"
 #include "gpio.h"
-#ifdef DRV2605L
-#    include "DRV2605L.h"
+
+#ifdef HAPTIC_DRV2605L
+#    include "drv2605l.h"
 #endif
-#ifdef SOLENOID_ENABLE
+#ifdef HAPTIC_SOLENOID
 #    include "solenoid.h"
 #endif
+
 #if defined(SPLIT_KEYBOARD) && defined(SPLIT_HAPTIC_ENABLE)
 extern uint8_t split_haptic_play;
 #endif
@@ -59,11 +62,11 @@ void haptic_init(void) {
         eeconfig_init();
     }
     haptic_config.raw = eeconfig_read_haptic();
-#ifdef SOLENOID_ENABLE
+#ifdef HAPTIC_SOLENOID
     solenoid_set_dwell(haptic_config.dwell);
 #endif
     if ((haptic_config.raw == 0)
-#ifdef SOLENOID_ENABLE
+#ifdef HAPTIC_SOLENOID
         || (haptic_config.dwell == 0)
 #endif
     ) {
@@ -77,12 +80,12 @@ void haptic_init(void) {
         // This is to execute any side effects of the configuration.
         set_haptic_config_enable(haptic_config.enable);
     }
-#ifdef SOLENOID_ENABLE
+#ifdef HAPTIC_SOLENOID
     solenoid_setup();
     dprintf("Solenoid driver initialized\n");
 #endif
-#ifdef DRV2605L
-    DRV_init();
+#ifdef HAPTIC_DRV2605L
+    drv2605l_init();
     dprintf("DRV2605 driver initialized\n");
 #endif
     eeconfig_debug_haptic();
@@ -95,7 +98,7 @@ void haptic_init(void) {
 }
 
 void haptic_task(void) {
-#ifdef SOLENOID_ENABLE
+#ifdef HAPTIC_SOLENOID
     solenoid_check();
 #endif
 }
@@ -108,13 +111,13 @@ void eeconfig_debug_haptic(void) {
 
 void haptic_enable(void) {
     set_haptic_config_enable(true);
-    xprintf("haptic_config.enable = %u\n", haptic_config.enable);
+    dprintf("haptic_config.enable = %u\n", haptic_config.enable);
     eeconfig_update_haptic(haptic_config.raw);
 }
 
 void haptic_disable(void) {
     set_haptic_config_enable(false);
-    xprintf("haptic_config.enable = %u\n", haptic_config.enable);
+    dprintf("haptic_config.enable = %u\n", haptic_config.enable);
     eeconfig_update_haptic(haptic_config.raw);
 }
 
@@ -130,7 +133,7 @@ void haptic_toggle(void) {
 void haptic_feedback_toggle(void) {
     haptic_config.feedback++;
     if (haptic_config.feedback >= HAPTIC_FEEDBACK_MAX) haptic_config.feedback = KEY_PRESS;
-    xprintf("haptic_config.feedback = %u\n", !haptic_config.feedback);
+    dprintf("haptic_config.feedback = %u\n", !haptic_config.feedback);
     eeconfig_update_haptic(haptic_config.raw);
 }
 
@@ -142,8 +145,8 @@ void haptic_buzz_toggle(void) {
 
 void haptic_mode_increase(void) {
     uint8_t mode = haptic_config.mode + 1;
-#ifdef DRV2605L
-    if (haptic_config.mode >= drv_effect_max) {
+#ifdef HAPTIC_DRV2605L
+    if (haptic_config.mode >= DRV2605L_EFFECT_COUNT) {
         mode = 1;
     }
 #endif
@@ -152,16 +155,16 @@ void haptic_mode_increase(void) {
 
 void haptic_mode_decrease(void) {
     uint8_t mode = haptic_config.mode - 1;
-#ifdef DRV2605L
+#ifdef HAPTIC_DRV2605L
     if (haptic_config.mode < 1) {
-        mode = (drv_effect_max - 1);
+        mode = (DRV2605L_EFFECT_COUNT - 1);
     }
 #endif
     haptic_set_mode(mode);
 }
 
 void haptic_dwell_increase(void) {
-#ifdef SOLENOID_ENABLE
+#ifdef HAPTIC_SOLENOID
     int16_t next_dwell = ((int16_t)haptic_config.dwell) + SOLENOID_DWELL_STEP_SIZE;
     if (haptic_config.dwell >= SOLENOID_MAX_DWELL) {
         // if it's already at max, we wrap back to min
@@ -178,7 +181,7 @@ void haptic_dwell_increase(void) {
 }
 
 void haptic_dwell_decrease(void) {
-#ifdef SOLENOID_ENABLE
+#ifdef HAPTIC_SOLENOID
     int16_t next_dwell = ((int16_t)haptic_config.dwell) - SOLENOID_DWELL_STEP_SIZE;
     if (haptic_config.dwell <= SOLENOID_MIN_DWELL) {
         // if it's already at min, we wrap to max
@@ -196,13 +199,13 @@ void haptic_dwell_decrease(void) {
 
 void haptic_reset(void) {
     set_haptic_config_enable(true);
-    uint8_t feedback       = HAPTIC_FEEDBACK_DEFAULT;
+    uint8_t feedback       = HAPTIC_DEFAULT_FEEDBACK;
     haptic_config.feedback = feedback;
-#ifdef DRV2605L
-    uint8_t mode       = HAPTIC_MODE_DEFAULT;
+#ifdef HAPTIC_DRV2605L
+    uint8_t mode       = HAPTIC_DEFAULT_MODE;
     haptic_config.mode = mode;
 #endif
-#ifdef SOLENOID_ENABLE
+#ifdef HAPTIC_SOLENOID
     uint8_t dwell       = SOLENOID_DEFAULT_DWELL;
     haptic_config.dwell = dwell;
     haptic_config.buzz  = SOLENOID_DEFAULT_BUZZ;
@@ -213,41 +216,41 @@ void haptic_reset(void) {
     haptic_config.buzz  = 0;
 #endif
     eeconfig_update_haptic(haptic_config.raw);
-    xprintf("haptic_config.feedback = %u\n", haptic_config.feedback);
-    xprintf("haptic_config.mode = %u\n", haptic_config.mode);
+    dprintf("haptic_config.feedback = %u\n", haptic_config.feedback);
+    dprintf("haptic_config.mode = %u\n", haptic_config.mode);
 }
 
 void haptic_set_feedback(uint8_t feedback) {
     haptic_config.feedback = feedback;
     eeconfig_update_haptic(haptic_config.raw);
-    xprintf("haptic_config.feedback = %u\n", haptic_config.feedback);
+    dprintf("haptic_config.feedback = %u\n", haptic_config.feedback);
 }
 
 void haptic_set_mode(uint8_t mode) {
     haptic_config.mode = mode;
     eeconfig_update_haptic(haptic_config.raw);
-    xprintf("haptic_config.mode = %u\n", haptic_config.mode);
+    dprintf("haptic_config.mode = %u\n", haptic_config.mode);
 }
 
 void haptic_set_amplitude(uint8_t amp) {
     haptic_config.amplitude = amp;
     eeconfig_update_haptic(haptic_config.raw);
-    xprintf("haptic_config.amplitude = %u\n", haptic_config.amplitude);
-#ifdef DRV2605L
-    DRV_amplitude(amp);
+    dprintf("haptic_config.amplitude = %u\n", haptic_config.amplitude);
+#ifdef HAPTIC_DRV2605L
+    drv2605l_amplitude(amp);
 #endif
 }
 
 void haptic_set_buzz(uint8_t buzz) {
     haptic_config.buzz = buzz;
     eeconfig_update_haptic(haptic_config.raw);
-    xprintf("haptic_config.buzz = %u\n", haptic_config.buzz);
+    dprintf("haptic_config.buzz = %u\n", haptic_config.buzz);
 }
 
 void haptic_set_dwell(uint8_t dwell) {
     haptic_config.dwell = dwell;
     eeconfig_update_haptic(haptic_config.raw);
-    xprintf("haptic_config.dwell = %u\n", haptic_config.dwell);
+    dprintf("haptic_config.dwell = %u\n", haptic_config.dwell);
 }
 
 uint8_t haptic_get_enable(void) {
@@ -277,19 +280,19 @@ uint8_t haptic_get_dwell(void) {
 
 void haptic_enable_continuous(void) {
     haptic_config.cont = 1;
-    xprintf("haptic_config.cont = %u\n", haptic_config.cont);
+    dprintf("haptic_config.cont = %u\n", haptic_config.cont);
     eeconfig_update_haptic(haptic_config.raw);
-#ifdef DRV2605L
-    DRV_rtp_init();
+#ifdef HAPTIC_DRV2605L
+    drv2605l_rtp_init();
 #endif
 }
 
 void haptic_disable_continuous(void) {
     haptic_config.cont = 0;
-    xprintf("haptic_config.cont = %u\n", haptic_config.cont);
+    dprintf("haptic_config.cont = %u\n", haptic_config.cont);
     eeconfig_update_haptic(haptic_config.raw);
-#ifdef DRV2605L
-    DRV_write(DRV_MODE, 0x00);
+#ifdef HAPTIC_DRV2605L
+    drv2605l_write(DRV2605L_REG_MODE, 0x00);
 #endif
 }
 
@@ -318,15 +321,15 @@ void haptic_cont_decrease(void) {
 }
 
 void haptic_play(void) {
-#ifdef DRV2605L
+#ifdef HAPTIC_DRV2605L
     uint8_t play_eff = 0;
     play_eff         = haptic_config.mode;
-    DRV_pulse(play_eff);
+    drv2605l_pulse(play_eff);
 #    if defined(SPLIT_KEYBOARD) && defined(SPLIT_HAPTIC_ENABLE)
     split_haptic_play = haptic_config.mode;
 #    endif
 #endif
-#ifdef SOLENOID_ENABLE
+#ifdef HAPTIC_SOLENOID
     solenoid_fire_handler();
 #    if defined(SPLIT_KEYBOARD) && defined(SPLIT_HAPTIC_ENABLE)
     split_haptic_play = 1;
@@ -335,7 +338,7 @@ void haptic_play(void) {
 }
 
 void haptic_shutdown(void) {
-#ifdef SOLENOID_ENABLE
+#ifdef HAPTIC_SOLENOID
     solenoid_shutdown();
 #endif
 }
diff --git a/quantum/haptic.h b/quantum/haptic.h
index 71d95cc61b3e..5bd1a71916db 100644
--- a/quantum/haptic.h
+++ b/quantum/haptic.h
@@ -16,14 +16,15 @@
  */
 
 #pragma once
+
 #include <stdint.h>
 #include <stdbool.h>
 
-#ifndef HAPTIC_FEEDBACK_DEFAULT
-#    define HAPTIC_FEEDBACK_DEFAULT 0
+#ifndef HAPTIC_DEFAULT_FEEDBACK
+#    define HAPTIC_DEFAULT_FEEDBACK 0
 #endif
-#ifndef HAPTIC_MODE_DEFAULT
-#    define HAPTIC_MODE_DEFAULT DRV_MODE_DEFAULT
+#ifndef HAPTIC_DEFAULT_MODE
+#    define HAPTIC_DEFAULT_MODE DRV2605L_DEFAULT_MODE
 #endif
 
 /* EEPROM config settings */
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 511570974878..c2ca15d52def 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -16,8 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <stdint.h>
-#include "quantum.h"
 #include "keyboard.h"
+#include "keycode_config.h"
 #include "matrix.h"
 #include "keymap_introspection.h"
 #include "magic.h"
@@ -33,6 +33,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "sendchar.h"
 #include "eeconfig.h"
 #include "action_layer.h"
+#ifdef AUDIO_ENABLE
+#    include "audio.h"
+#endif
+#if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))
+#    include "process_music.h"
+#endif
 #ifdef BACKLIGHT_ENABLE
 #    include "backlight.h"
 #endif
@@ -54,9 +60,27 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef ENCODER_ENABLE
 #    include "encoder.h"
 #endif
+#ifdef HAPTIC_ENABLE
+#    include "haptic.h"
+#endif
+#ifdef AUTO_SHIFT_ENABLE
+#    include "process_auto_shift.h"
+#endif
+#ifdef COMBO_ENABLE
+#    include "process_combo.h"
+#endif
+#ifdef TAP_DANCE_ENABLE
+#    include "process_tap_dance.h"
+#endif
 #ifdef STENO_ENABLE
 #    include "process_steno.h"
 #endif
+#ifdef KEY_OVERRIDE_ENABLE
+#    include "process_key_override.h"
+#endif
+#ifdef SECURE_ENABLE
+#    include "secure.h"
+#endif
 #ifdef POINTING_DEVICE_ENABLE
 #    include "pointing_device.h"
 #endif
@@ -64,7 +88,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "process_midi.h"
 #endif
 #ifdef JOYSTICK_ENABLE
-#    include "process_joystick.h"
+#    include "joystick.h"
 #endif
 #ifdef HD44780_ENABLE
 #    include "hd44780.h"
@@ -108,6 +132,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef LEADER_ENABLE
 #    include "leader.h"
 #endif
+#ifdef UNICODE_COMMON_ENABLE
+#    include "unicode.h"
+#endif
+#ifdef WPM_ENABLE
+#    include "wpm.h"
+#endif
 
 static uint32_t last_input_modification_time = 0;
 uint32_t        last_input_activity_time(void) {
diff --git a/quantum/keyboard.h b/quantum/keyboard.h
index bf1890d10ba6..5ea57815a719 100644
--- a/quantum/keyboard.h
+++ b/quantum/keyboard.h
@@ -20,6 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "timer.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/quantum/keycode_config.c b/quantum/keycode_config.c
index 9dd7097c861a..864488a65c97 100644
--- a/quantum/keycode_config.c
+++ b/quantum/keycode_config.c
@@ -122,40 +122,36 @@ __attribute__((weak)) uint16_t keycode_config(uint16_t keycode) {
  */
 
 __attribute__((weak)) uint8_t mod_config(uint8_t mod) {
+    /**
+     * Note: This function is for the 5-bit packed mods, NOT the full 8-bit mods.
+     * More info about the mods can be seen in modifiers.h.
+     */
     if (keymap_config.swap_lalt_lgui) {
-        if ((mod & MOD_RGUI) == MOD_LGUI) {
-            mod &= ~MOD_LGUI;
-            mod |= MOD_LALT;
-        } else if ((mod & MOD_RALT) == MOD_LALT) {
-            mod &= ~MOD_LALT;
-            mod |= MOD_LGUI;
+        /** If both modifiers pressed or neither pressed, do nothing
+         * Otherwise swap the values
+         * Note: The left mods are ANDed with the right-hand values to check
+         * if they were pressed with the right hand bit set
+         */
+        if (((mod & MOD_RALT) == MOD_LALT) ^ ((mod & MOD_RGUI) == MOD_LGUI)) {
+            mod ^= (MOD_LALT | MOD_LGUI);
         }
     }
     if (keymap_config.swap_ralt_rgui) {
-        if ((mod & MOD_RGUI) == MOD_RGUI) {
-            mod &= ~MOD_RGUI;
-            mod |= MOD_RALT;
-        } else if ((mod & MOD_RALT) == MOD_RALT) {
-            mod &= ~MOD_RALT;
-            mod |= MOD_RGUI;
+        if (((mod & MOD_RALT) == MOD_RALT) ^ ((mod & MOD_RGUI) == MOD_RGUI)) {
+            /* lefthand values to preserve the right hand bit */
+            mod ^= (MOD_LALT | MOD_LGUI);
         }
     }
     if (keymap_config.swap_lctl_lgui) {
-        if ((mod & MOD_RGUI) == MOD_LGUI) {
-            mod &= ~MOD_LGUI;
-            mod |= MOD_LCTL;
-        } else if ((mod & MOD_RCTL) == MOD_LCTL) {
-            mod &= ~MOD_LCTL;
-            mod |= MOD_LGUI;
+        /* left mods ANDed with right-hand values to check for right hand bit */
+        if (((mod & MOD_RCTL) == MOD_LCTL) ^ ((mod & MOD_RGUI) == MOD_LGUI)) {
+            mod ^= (MOD_LCTL | MOD_LGUI);
         }
     }
     if (keymap_config.swap_rctl_rgui) {
-        if ((mod & MOD_RGUI) == MOD_RGUI) {
-            mod &= ~MOD_RGUI;
-            mod |= MOD_RCTL;
-        } else if ((mod & MOD_RCTL) == MOD_RCTL) {
-            mod &= ~MOD_RCTL;
-            mod |= MOD_RGUI;
+        if (((mod & MOD_RCTL) == MOD_RCTL) ^ ((mod & MOD_RGUI) == MOD_RGUI)) {
+            /* lefthand values to preserve the right hand bit */
+            mod ^= (MOD_LCTL | MOD_LGUI);
         }
     }
     if (keymap_config.no_gui) {
diff --git a/quantum/keymap.h b/quantum/keymap.h
deleted file mode 100644
index a067e1aa368f..000000000000
--- a/quantum/keymap.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2012-2016 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
-
-#pragma message("'keymap.h' should no longer be included!")
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 0492e6fd1c3f..9a67fad278c2 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -22,7 +22,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "action_layer.h"
 #include "action.h"
 #include "debug.h"
-#include "quantum.h"
+#include "keycode_config.h"
+#include "quantum_keycodes.h"
+
+#ifdef ENCODER_MAP_ENABLE
+#    include "encoder.h"
+#endif
 
 #ifdef BACKLIGHT_ENABLE
 #    include "backlight.h"
diff --git a/quantum/keymap_extras/keymap_swiss_de.h b/quantum/keymap_extras/keymap_swiss_de.h
index 69bba7293e67..c22191dd4e7a 100644
--- a/quantum/keymap_extras/keymap_swiss_de.h
+++ b/quantum/keymap_extras/keymap_swiss_de.h
@@ -27,6 +27,8 @@
 #include "keycodes.h"
 // clang-format off
 
+#undef CH_H
+
 // Aliases
 #define CH_SECT KC_GRV  // §
 #define CH_1    KC_1    // 1
diff --git a/quantum/keymap_extras/keymap_swiss_fr.h b/quantum/keymap_extras/keymap_swiss_fr.h
index 1e2f833db16f..e0e8e52c9cef 100644
--- a/quantum/keymap_extras/keymap_swiss_fr.h
+++ b/quantum/keymap_extras/keymap_swiss_fr.h
@@ -27,6 +27,8 @@
 #include "keycodes.h"
 // clang-format off
 
+#undef CH_H
+
 // Aliases
 #define CH_SECT KC_GRV  // §
 #define CH_1    KC_1    // 1
diff --git a/quantum/keymap_extras/sendstring_belgian.h b/quantum/keymap_extras/sendstring_belgian.h
index 34ca9514c816..f33d6272e82f 100644
--- a/quantum/keymap_extras/sendstring_belgian.h
+++ b/quantum/keymap_extras/sendstring_belgian.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_belgian.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_bepo.h b/quantum/keymap_extras/sendstring_bepo.h
index 0f0d5a2111e4..1d24728ab662 100644
--- a/quantum/keymap_extras/sendstring_bepo.h
+++ b/quantum/keymap_extras/sendstring_bepo.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_bepo.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_brazilian_abnt2.h b/quantum/keymap_extras/sendstring_brazilian_abnt2.h
index b52ce4958ab7..ca908353ab4c 100644
--- a/quantum/keymap_extras/sendstring_brazilian_abnt2.h
+++ b/quantum/keymap_extras/sendstring_brazilian_abnt2.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_brazilian_abnt2.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_canadian_multilingual.h b/quantum/keymap_extras/sendstring_canadian_multilingual.h
index 92b588c82e40..63bca96de9e3 100644
--- a/quantum/keymap_extras/sendstring_canadian_multilingual.h
+++ b/quantum/keymap_extras/sendstring_canadian_multilingual.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_canadian_multilingual.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_colemak.h b/quantum/keymap_extras/sendstring_colemak.h
index 3aef96b24afe..1514620cb66a 100644
--- a/quantum/keymap_extras/sendstring_colemak.h
+++ b/quantum/keymap_extras/sendstring_colemak.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_colemak.h"
 
 // clang-format off
diff --git a/quantum/keymap_extras/sendstring_croatian.h b/quantum/keymap_extras/sendstring_croatian.h
index bf51c81a8842..e43b54713d4a 100644
--- a/quantum/keymap_extras/sendstring_croatian.h
+++ b/quantum/keymap_extras/sendstring_croatian.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_croatian.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_czech.h b/quantum/keymap_extras/sendstring_czech.h
index 54c331741863..083a723403b2 100644
--- a/quantum/keymap_extras/sendstring_czech.h
+++ b/quantum/keymap_extras/sendstring_czech.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_czech.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_danish.h b/quantum/keymap_extras/sendstring_danish.h
index 6923063ce2ce..573e4afae22d 100644
--- a/quantum/keymap_extras/sendstring_danish.h
+++ b/quantum/keymap_extras/sendstring_danish.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_danish.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_dvorak.h b/quantum/keymap_extras/sendstring_dvorak.h
index 25e1d31423a7..d31a33ba518c 100644
--- a/quantum/keymap_extras/sendstring_dvorak.h
+++ b/quantum/keymap_extras/sendstring_dvorak.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_dvorak.h"
 
 // clang-format off
diff --git a/quantum/keymap_extras/sendstring_dvorak_fr.h b/quantum/keymap_extras/sendstring_dvorak_fr.h
index 2f4f2817949a..f1c3fa04ccca 100644
--- a/quantum/keymap_extras/sendstring_dvorak_fr.h
+++ b/quantum/keymap_extras/sendstring_dvorak_fr.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_dvorak_fr.h"
 
 // clang-format off
diff --git a/quantum/keymap_extras/sendstring_dvorak_programmer.h b/quantum/keymap_extras/sendstring_dvorak_programmer.h
index f19bb6f4b215..372ee5726b32 100644
--- a/quantum/keymap_extras/sendstring_dvorak_programmer.h
+++ b/quantum/keymap_extras/sendstring_dvorak_programmer.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_dvorak_programmer.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_estonian.h b/quantum/keymap_extras/sendstring_estonian.h
index 9ea2ab3f8ffb..903ec3cab373 100644
--- a/quantum/keymap_extras/sendstring_estonian.h
+++ b/quantum/keymap_extras/sendstring_estonian.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_estonian.h"
-#include "quantum"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_finnish.h b/quantum/keymap_extras/sendstring_finnish.h
index 197836ba83da..f797f34e0adf 100644
--- a/quantum/keymap_extras/sendstring_finnish.h
+++ b/quantum/keymap_extras/sendstring_finnish.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_finnish.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_french.h b/quantum/keymap_extras/sendstring_french.h
index a37a5d314bdc..0e585ec0937e 100644
--- a/quantum/keymap_extras/sendstring_french.h
+++ b/quantum/keymap_extras/sendstring_french.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_french.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_french_afnor.h b/quantum/keymap_extras/sendstring_french_afnor.h
index 1408634a266b..55b90b32046e 100644
--- a/quantum/keymap_extras/sendstring_french_afnor.h
+++ b/quantum/keymap_extras/sendstring_french_afnor.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_french_afnor.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_french_mac_iso.h b/quantum/keymap_extras/sendstring_french_mac_iso.h
index 1033c3991fe4..9a1700789866 100644
--- a/quantum/keymap_extras/sendstring_french_mac_iso.h
+++ b/quantum/keymap_extras/sendstring_french_mac_iso.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_french_mac_iso.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_german.h b/quantum/keymap_extras/sendstring_german.h
index 69c7dd996ede..79357d71e491 100644
--- a/quantum/keymap_extras/sendstring_german.h
+++ b/quantum/keymap_extras/sendstring_german.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_german.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_german_mac_iso.h b/quantum/keymap_extras/sendstring_german_mac_iso.h
index 8345dbaaa145..711ba7d05bf0 100644
--- a/quantum/keymap_extras/sendstring_german_mac_iso.h
+++ b/quantum/keymap_extras/sendstring_german_mac_iso.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_german_mac_iso.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_hungarian.h b/quantum/keymap_extras/sendstring_hungarian.h
index 9169ba255757..d96a8fcd0494 100644
--- a/quantum/keymap_extras/sendstring_hungarian.h
+++ b/quantum/keymap_extras/sendstring_hungarian.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_hungarian.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_icelandic.h b/quantum/keymap_extras/sendstring_icelandic.h
index b25a4e76e7a9..8515c6cccf5d 100644
--- a/quantum/keymap_extras/sendstring_icelandic.h
+++ b/quantum/keymap_extras/sendstring_icelandic.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_icelandic.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_italian.h b/quantum/keymap_extras/sendstring_italian.h
index dad4902d34de..322da2ac1b81 100644
--- a/quantum/keymap_extras/sendstring_italian.h
+++ b/quantum/keymap_extras/sendstring_italian.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_italian.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_italian_mac_ansi.h b/quantum/keymap_extras/sendstring_italian_mac_ansi.h
index 97b5164e23b3..2961316de692 100644
--- a/quantum/keymap_extras/sendstring_italian_mac_ansi.h
+++ b/quantum/keymap_extras/sendstring_italian_mac_ansi.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_italian_mac_ansi.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_italian_mac_iso.h b/quantum/keymap_extras/sendstring_italian_mac_iso.h
index d82e8bbddf1f..25eb2549bda1 100644
--- a/quantum/keymap_extras/sendstring_italian_mac_iso.h
+++ b/quantum/keymap_extras/sendstring_italian_mac_iso.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_italian_mac_iso.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_japanese.h b/quantum/keymap_extras/sendstring_japanese.h
index 13628d702388..043446acbf6e 100644
--- a/quantum/keymap_extras/sendstring_japanese.h
+++ b/quantum/keymap_extras/sendstring_japanese.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_japanese.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_latvian.h b/quantum/keymap_extras/sendstring_latvian.h
index bd73a01e4843..9323c603cc2b 100644
--- a/quantum/keymap_extras/sendstring_latvian.h
+++ b/quantum/keymap_extras/sendstring_latvian.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_latvian.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_lithuanian_azerty.h b/quantum/keymap_extras/sendstring_lithuanian_azerty.h
index a886411143e5..92d25700229d 100644
--- a/quantum/keymap_extras/sendstring_lithuanian_azerty.h
+++ b/quantum/keymap_extras/sendstring_lithuanian_azerty.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_lithuanian_azerty.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_lithuanian_qwerty.h b/quantum/keymap_extras/sendstring_lithuanian_qwerty.h
index 69cb94de7135..676930e9d3cc 100644
--- a/quantum/keymap_extras/sendstring_lithuanian_qwerty.h
+++ b/quantum/keymap_extras/sendstring_lithuanian_qwerty.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_lithuanian_qwerty.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_norman.h b/quantum/keymap_extras/sendstring_norman.h
index 21dbbdd7054d..b9b175c82205 100644
--- a/quantum/keymap_extras/sendstring_norman.h
+++ b/quantum/keymap_extras/sendstring_norman.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_norman.h"
 
 // clang-format off
diff --git a/quantum/keymap_extras/sendstring_norwegian.h b/quantum/keymap_extras/sendstring_norwegian.h
index 28813da51f46..ce362b76db19 100644
--- a/quantum/keymap_extras/sendstring_norwegian.h
+++ b/quantum/keymap_extras/sendstring_norwegian.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_norwegian.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_portuguese.h b/quantum/keymap_extras/sendstring_portuguese.h
index 37db5f97aab9..951da2397cef 100644
--- a/quantum/keymap_extras/sendstring_portuguese.h
+++ b/quantum/keymap_extras/sendstring_portuguese.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_portuguese.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_portuguese_mac_iso.h b/quantum/keymap_extras/sendstring_portuguese_mac_iso.h
index 5d43c66279be..cda5541a50fa 100644
--- a/quantum/keymap_extras/sendstring_portuguese_mac_iso.h
+++ b/quantum/keymap_extras/sendstring_portuguese_mac_iso.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_portuguese_mac_iso.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_romanian.h b/quantum/keymap_extras/sendstring_romanian.h
index 9b5bee4a13e6..16d913710230 100644
--- a/quantum/keymap_extras/sendstring_romanian.h
+++ b/quantum/keymap_extras/sendstring_romanian.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_romanian.h"
-#include "quantum"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_serbian_latin.h b/quantum/keymap_extras/sendstring_serbian_latin.h
index 7e19a62595c2..5e3df75a951d 100644
--- a/quantum/keymap_extras/sendstring_serbian_latin.h
+++ b/quantum/keymap_extras/sendstring_serbian_latin.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_serbian_latin.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_slovak.h b/quantum/keymap_extras/sendstring_slovak.h
index c94cca1379fc..a908773969ba 100644
--- a/quantum/keymap_extras/sendstring_slovak.h
+++ b/quantum/keymap_extras/sendstring_slovak.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_slovak.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_slovenian.h b/quantum/keymap_extras/sendstring_slovenian.h
index 117af7e76d69..1b863aa6e9f6 100644
--- a/quantum/keymap_extras/sendstring_slovenian.h
+++ b/quantum/keymap_extras/sendstring_slovenian.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_slovenian.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_spanish.h b/quantum/keymap_extras/sendstring_spanish.h
index 680e99ef4efb..374ceaddfe09 100644
--- a/quantum/keymap_extras/sendstring_spanish.h
+++ b/quantum/keymap_extras/sendstring_spanish.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_spanish.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_spanish_dvorak.h b/quantum/keymap_extras/sendstring_spanish_dvorak.h
index ccf945824732..279b6f736ab4 100644
--- a/quantum/keymap_extras/sendstring_spanish_dvorak.h
+++ b/quantum/keymap_extras/sendstring_spanish_dvorak.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_spanish_dvorak.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_swedish.h b/quantum/keymap_extras/sendstring_swedish.h
index d4513429927b..6dd81ac95d6e 100644
--- a/quantum/keymap_extras/sendstring_swedish.h
+++ b/quantum/keymap_extras/sendstring_swedish.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_swedish.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_swiss_de.h b/quantum/keymap_extras/sendstring_swiss_de.h
index f6aa19210c63..b352ab0b379c 100644
--- a/quantum/keymap_extras/sendstring_swiss_de.h
+++ b/quantum/keymap_extras/sendstring_swiss_de.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_swiss_de.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_swiss_fr.h b/quantum/keymap_extras/sendstring_swiss_fr.h
index 7d04cc539a9c..1559b5efa43e 100644
--- a/quantum/keymap_extras/sendstring_swiss_fr.h
+++ b/quantum/keymap_extras/sendstring_swiss_fr.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_swiss_fr.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_turkish_f.h b/quantum/keymap_extras/sendstring_turkish_f.h
index cabd5c5dc5c0..6d3e70bf81a5 100644
--- a/quantum/keymap_extras/sendstring_turkish_f.h
+++ b/quantum/keymap_extras/sendstring_turkish_f.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_turkish_f.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_turkish_q.h b/quantum/keymap_extras/sendstring_turkish_q.h
index 986f02233339..077612737cd4 100644
--- a/quantum/keymap_extras/sendstring_turkish_q.h
+++ b/quantum/keymap_extras/sendstring_turkish_q.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_turkish_q.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_uk.h b/quantum/keymap_extras/sendstring_uk.h
index bbd30769b009..2a79507f20c0 100644
--- a/quantum/keymap_extras/sendstring_uk.h
+++ b/quantum/keymap_extras/sendstring_uk.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_uk.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_us_international.h b/quantum/keymap_extras/sendstring_us_international.h
index d1694ff0f0fb..9b13a2fcf7d7 100644
--- a/quantum/keymap_extras/sendstring_us_international.h
+++ b/quantum/keymap_extras/sendstring_us_international.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_us_international.h"
-#include "quantum.h"
 
 // clang-format off
 
diff --git a/quantum/keymap_extras/sendstring_workman.h b/quantum/keymap_extras/sendstring_workman.h
index 04f8e3908a45..d22104fc5a19 100644
--- a/quantum/keymap_extras/sendstring_workman.h
+++ b/quantum/keymap_extras/sendstring_workman.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_workman.h"
 
 // clang-format off
diff --git a/quantum/keymap_extras/sendstring_workman_zxcvm.h b/quantum/keymap_extras/sendstring_workman_zxcvm.h
index e7605d7cce13..791268fdebd9 100644
--- a/quantum/keymap_extras/sendstring_workman_zxcvm.h
+++ b/quantum/keymap_extras/sendstring_workman_zxcvm.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include "send_string.h"
 #include "keymap_workman_zxcvm.h"
 
 // clang-format off
diff --git a/quantum/led.c b/quantum/led.c
index 42144566fdd6..8d86374a6f22 100644
--- a/quantum/led.c
+++ b/quantum/led.c
@@ -153,14 +153,14 @@ __attribute__((weak)) void led_set(uint8_t usb_led) {
 /** \brief Trigger behaviour on transition to suspend
  */
 void led_suspend(void) {
-    uint8_t leds_off = 0;
+    led_t leds_off = {0};
 #ifdef BACKLIGHT_CAPS_LOCK
     if (is_backlight_enabled()) {
         // Don't try to turn off Caps Lock indicator as it is backlight and backlight is already off
-        leds_off |= (1 << USB_LED_CAPS_LOCK);
+        leds_off.caps_lock = true;
     }
 #endif
-    led_set(leds_off);
+    led_set(leds_off.raw);
 }
 
 /** \brief Trigger behaviour on transition from suspend
diff --git a/quantum/led.h b/quantum/led.h
index b9ad7ed9ae7c..b9fad670aeba 100644
--- a/quantum/led.h
+++ b/quantum/led.h
@@ -22,13 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* FIXME: Add doxygen comments here. */
 
-/* keyboard LEDs */
-#define USB_LED_NUM_LOCK 0
-#define USB_LED_CAPS_LOCK 1
-#define USB_LED_SCROLL_LOCK 2
-#define USB_LED_COMPOSE 3
-#define USB_LED_KANA 4
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c
index 828d61641a1b..2ec0ec4b19f1 100644
--- a/quantum/led_matrix/led_matrix.c
+++ b/quantum/led_matrix/led_matrix.c
@@ -20,8 +20,13 @@
 #include "led_matrix.h"
 #include "progmem.h"
 #include "eeprom.h"
+#include "eeconfig.h"
+#include "keyboard.h"
+#include "sync_timer.h"
+#include "debug.h"
 #include <string.h>
 #include <math.h>
+#include <stdlib.h>
 #include "led_tables.h"
 
 #include <lib/lib8tion/lib8tion.h>
@@ -366,7 +371,10 @@ void led_matrix_task(void) {
         case RENDERING:
             led_task_render(effect);
             if (effect) {
-                led_matrix_indicators();
+                // Only run the basic indicators in the last render iteration (default there are 5 iterations)
+                if (led_effect_params.iter == LED_MATRIX_LED_PROCESS_MAX_ITERATIONS) {
+                    led_matrix_indicators();
+                }
                 led_matrix_indicators_advanced(&led_effect_params);
             }
             break;
@@ -381,7 +389,6 @@ void led_matrix_task(void) {
 
 void led_matrix_indicators(void) {
     led_matrix_indicators_kb();
-    led_matrix_indicators_user();
 }
 
 __attribute__((weak)) bool led_matrix_indicators_kb(void) {
@@ -407,7 +414,6 @@ void led_matrix_indicators_advanced(effect_params_t *params) {
     uint8_t max = LED_MATRIX_LED_COUNT;
 #endif
     led_matrix_indicators_advanced_kb(min, max);
-    led_matrix_indicators_advanced_user(min, max);
 }
 
 __attribute__((weak)) bool led_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h
index c7d360f366dc..c2533ca49cbc 100644
--- a/quantum/led_matrix/led_matrix.h
+++ b/quantum/led_matrix/led_matrix.h
@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "led_matrix_types.h"
-#include "quantum.h"
+#include "keyboard.h"
 
 #ifdef IS31FL3731
 #    include "is31fl3731-simple.h"
@@ -42,8 +42,9 @@
 #endif
 
 #ifndef LED_MATRIX_LED_PROCESS_LIMIT
-#    define LED_MATRIX_LED_PROCESS_LIMIT (LED_MATRIX_LED_COUNT + 4) / 5
+#    define LED_MATRIX_LED_PROCESS_LIMIT ((LED_MATRIX_LED_COUNT + 4) / 5)
 #endif
+#define LED_MATRIX_LED_PROCESS_MAX_ITERATIONS ((LED_MATRIX_LED_COUNT + LED_MATRIX_LED_PROCESS_LIMIT - 1) / LED_MATRIX_LED_PROCESS_LIMIT)
 
 #if defined(LED_MATRIX_LED_PROCESS_LIMIT) && LED_MATRIX_LED_PROCESS_LIMIT > 0 && LED_MATRIX_LED_PROCESS_LIMIT < LED_MATRIX_LED_COUNT
 #    if defined(LED_MATRIX_SPLIT)
diff --git a/quantum/led_matrix/led_matrix_drivers.c b/quantum/led_matrix/led_matrix_drivers.c
index 2c09ba82b1f0..13c8935d112f 100644
--- a/quantum/led_matrix/led_matrix_drivers.c
+++ b/quantum/led_matrix/led_matrix_drivers.c
@@ -32,13 +32,13 @@ static void init(void) {
     i2c_init();
 
 #    if defined(IS31FL3731)
-    IS31FL3731_init(LED_DRIVER_ADDR_1);
+    is31fl3731_init(LED_DRIVER_ADDR_1);
 #        if defined(LED_DRIVER_ADDR_2)
-    IS31FL3731_init(LED_DRIVER_ADDR_2);
+    is31fl3731_init(LED_DRIVER_ADDR_2);
 #            if defined(LED_DRIVER_ADDR_3)
-    IS31FL3731_init(LED_DRIVER_ADDR_3);
+    is31fl3731_init(LED_DRIVER_ADDR_3);
 #                if defined(LED_DRIVER_ADDR_4)
-    IS31FL3731_init(LED_DRIVER_ADDR_4);
+    is31fl3731_init(LED_DRIVER_ADDR_4);
 #                endif
 #            endif
 #        endif
@@ -47,22 +47,22 @@ static void init(void) {
 #        if !defined(LED_DRIVER_SYNC_1)
 #            define LED_DRIVER_SYNC_1 0
 #        endif
-    IS31FL3733_init(LED_DRIVER_ADDR_1, LED_DRIVER_SYNC_1);
+    is31fl3733_init(LED_DRIVER_ADDR_1, LED_DRIVER_SYNC_1);
 #        if defined(LED_DRIVER_ADDR_2)
 #            if !defined(LED_DRIVER_SYNC_2)
 #                define LED_DRIVER_SYNC_2 0
 #            endif
-    IS31FL3733_init(LED_DRIVER_ADDR_2, LED_DRIVER_SYNC_2);
+    is31fl3733_init(LED_DRIVER_ADDR_2, LED_DRIVER_SYNC_2);
 #            if defined(LED_DRIVER_ADDR_3)
 #                if !defined(LED_DRIVER_SYNC_3)
 #                    define LED_DRIVER_SYNC_3 0
 #                endif
-    IS31FL3733_init(LED_DRIVER_ADDR_3, LED_DRIVER_SYNC_3);
+    is31fl3733_init(LED_DRIVER_ADDR_3, LED_DRIVER_SYNC_3);
 #                if defined(LED_DRIVER_ADDR_4)
 #                    if !defined(LED_DRIVER_SYNC_4)
 #                        define LED_DRIVER_SYNC_4 0
 #                    endif
-    IS31FL3733_init(LED_DRIVER_ADDR_4, LED_DRIVER_SYNC_4);
+    is31fl3733_init(LED_DRIVER_ADDR_4, LED_DRIVER_SYNC_4);
 #                endif
 #            endif
 #        endif
@@ -84,13 +84,13 @@ static void init(void) {
     writePinHigh(LED_DRIVER_SHUTDOWN_PIN);
 #        endif
 
-    CKLED2001_init(DRIVER_ADDR_1);
+    ckled2001_init(DRIVER_ADDR_1);
 #        if defined(DRIVER_ADDR_2)
-    CKLED2001_init(DRIVER_ADDR_2);
+    ckled2001_init(DRIVER_ADDR_2);
 #            if defined(DRIVER_ADDR_3)
-    CKLED2001_init(DRIVER_ADDR_3);
+    ckled2001_init(DRIVER_ADDR_3);
 #                if defined(DRIVER_ADDR_4)
-    CKLED2001_init(DRIVER_ADDR_4);
+    ckled2001_init(DRIVER_ADDR_4);
 #                endif
 #            endif
 #        endif
@@ -98,37 +98,37 @@ static void init(void) {
 
     for (int index = 0; index < LED_MATRIX_LED_COUNT; index++) {
 #    if defined(IS31FL3731)
-        IS31FL3731_set_led_control_register(index, true);
+        is31fl3731_set_led_control_register(index, true);
 #    elif defined(IS31FL3733)
-        IS31FL3733_set_led_control_register(index, true);
+        is31fl3733_set_led_control_register(index, true);
 #    elif defined(IS31FLCOMMON)
         IS31FL_simple_set_scaling_buffer(index, true);
 #    elif defined(CKLED2001)
-        CKLED2001_set_led_control_register(index, true);
+        ckled2001_set_led_control_register(index, true);
 #    endif
     }
 
 // This actually updates the LED drivers
 #    if defined(IS31FL3731)
-    IS31FL3731_update_led_control_registers(LED_DRIVER_ADDR_1, 0);
+    is31fl3731_update_led_control_registers(LED_DRIVER_ADDR_1, 0);
 #        if defined(LED_DRIVER_ADDR_2)
-    IS31FL3731_update_led_control_registers(LED_DRIVER_ADDR_2, 1);
+    is31fl3731_update_led_control_registers(LED_DRIVER_ADDR_2, 1);
 #            if defined(LED_DRIVER_ADDR_3)
-    IS31FL3731_update_led_control_registers(LED_DRIVER_ADDR_3, 2);
+    is31fl3731_update_led_control_registers(LED_DRIVER_ADDR_3, 2);
 #                if defined(LED_DRIVER_ADDR_4)
-    IS31FL3731_update_led_control_registers(LED_DRIVER_ADDR_4, 3);
+    is31fl3731_update_led_control_registers(LED_DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
 
 #    elif defined(IS31FL3733)
-    IS31FL3733_update_led_control_registers(LED_DRIVER_ADDR_1, 0);
+    is31fl3733_update_led_control_registers(LED_DRIVER_ADDR_1, 0);
 #        if defined(LED_DRIVER_ADDR_2)
-    IS31FL3733_update_led_control_registers(LED_DRIVER_ADDR_2, 1);
+    is31fl3733_update_led_control_registers(LED_DRIVER_ADDR_2, 1);
 #            if defined(LED_DRIVER_ADDR_3)
-    IS31FL3733_update_led_control_registers(LED_DRIVER_ADDR_3, 2);
+    is31fl3733_update_led_control_registers(LED_DRIVER_ADDR_3, 2);
 #                if defined(LED_DRIVER_ADDR_4)
-    IS31FL3733_update_led_control_registers(LED_DRIVER_ADDR_4, 3);
+    is31fl3733_update_led_control_registers(LED_DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
@@ -148,13 +148,13 @@ static void init(void) {
 #            endif
 #        endif
 #    elif defined(CKLED2001)
-    CKLED2001_update_led_control_registers(DRIVER_ADDR_1, 0);
+    ckled2001_update_led_control_registers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
-    CKLED2001_update_led_control_registers(DRIVER_ADDR_2, 1);
+    ckled2001_update_led_control_registers(DRIVER_ADDR_2, 1);
 #            if defined(DRIVER_ADDR_3)
-    CKLED2001_update_led_control_registers(DRIVER_ADDR_3, 2);
+    ckled2001_update_led_control_registers(DRIVER_ADDR_3, 2);
 #                if defined(DRIVER_ADDR_4)
-    CKLED2001_update_led_control_registers(DRIVER_ADDR_4, 3);
+    ckled2001_update_led_control_registers(DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
@@ -163,13 +163,13 @@ static void init(void) {
 
 #    if defined(IS31FL3731)
 static void flush(void) {
-    IS31FL3731_update_pwm_buffers(LED_DRIVER_ADDR_1, 0);
+    is31fl3731_update_pwm_buffers(LED_DRIVER_ADDR_1, 0);
 #        if defined(LED_DRIVER_ADDR_2)
-    IS31FL3731_update_pwm_buffers(LED_DRIVER_ADDR_2, 1);
+    is31fl3731_update_pwm_buffers(LED_DRIVER_ADDR_2, 1);
 #            if defined(LED_DRIVER_ADDR_3)
-    IS31FL3731_update_pwm_buffers(LED_DRIVER_ADDR_3, 2);
+    is31fl3731_update_pwm_buffers(LED_DRIVER_ADDR_3, 2);
 #                if defined(LED_DRIVER_ADDR_4)
-    IS31FL3731_update_pwm_buffers(LED_DRIVER_ADDR_4, 3);
+    is31fl3731_update_pwm_buffers(LED_DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
@@ -178,19 +178,19 @@ static void flush(void) {
 const led_matrix_driver_t led_matrix_driver = {
     .init          = init,
     .flush         = flush,
-    .set_value     = IS31FL3731_set_value,
-    .set_value_all = IS31FL3731_set_value_all,
+    .set_value     = is31fl3731_set_value,
+    .set_value_all = is31fl3731_set_value_all,
 };
 
 #    elif defined(IS31FL3733)
 static void flush(void) {
-    IS31FL3733_update_pwm_buffers(LED_DRIVER_ADDR_1, 0);
+    is31fl3733_update_pwm_buffers(LED_DRIVER_ADDR_1, 0);
 #        if defined(LED_DRIVER_ADDR_2)
-    IS31FL3733_update_pwm_buffers(LED_DRIVER_ADDR_2, 1);
+    is31fl3733_update_pwm_buffers(LED_DRIVER_ADDR_2, 1);
 #            if defined(LED_DRIVER_ADDR_3)
-    IS31FL3733_update_pwm_buffers(LED_DRIVER_ADDR_3, 2);
+    is31fl3733_update_pwm_buffers(LED_DRIVER_ADDR_3, 2);
 #                if defined(LED_DRIVER_ADDR_4)
-    IS31FL3733_update_pwm_buffers(LED_DRIVER_ADDR_4, 3);
+    is31fl3733_update_pwm_buffers(LED_DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
@@ -199,8 +199,8 @@ static void flush(void) {
 const led_matrix_driver_t led_matrix_driver = {
     .init = init,
     .flush = flush,
-    .set_value = IS31FL3733_set_value,
-    .set_value_all = IS31FL3733_set_value_all,
+    .set_value = is31fl3733_set_value,
+    .set_value_all = is31fl3733_set_value_all,
 };
 
 #    elif defined(IS31FLCOMMON)
@@ -225,13 +225,13 @@ const led_matrix_driver_t led_matrix_driver = {
 };
 #    elif defined(CKLED2001)
 static void flush(void) {
-    CKLED2001_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    ckled2001_update_pwm_buffers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
-    CKLED2001_update_pwm_buffers(DRIVER_ADDR_2, 1);
+    ckled2001_update_pwm_buffers(DRIVER_ADDR_2, 1);
 #            if defined(DRIVER_ADDR_3)
-    CKLED2001_update_pwm_buffers(DRIVER_ADDR_3, 2);
+    ckled2001_update_pwm_buffers(DRIVER_ADDR_3, 2);
 #                if defined(DRIVER_ADDR_4)
-    CKLED2001_update_pwm_buffers(DRIVER_ADDR_4, 3);
+    ckled2001_update_pwm_buffers(DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
@@ -240,8 +240,8 @@ static void flush(void) {
 const led_matrix_driver_t led_matrix_driver = {
     .init = init,
     .flush = flush,
-    .set_value = CKLED2001_set_value,
-    .set_value_all = CKLED2001_set_value_all,
+    .set_value = ckled2001_set_value,
+    .set_value_all = ckled2001_set_value_all,
 };
 #    endif
 #endif
diff --git a/quantum/led_matrix/post_config.h b/quantum/led_matrix/post_config.h
new file mode 100644
index 000000000000..b6770b9ee1c8
--- /dev/null
+++ b/quantum/led_matrix/post_config.h
@@ -0,0 +1,19 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// clang-format off
+
+// reactive
+#if defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE) || \
+    defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || \
+    defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE) || \
+    defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS) || \
+    defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS) || \
+    defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS) || \
+    defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS) || \
+    defined(ENABLE_LED_MATRIX_SOLID_SPLASH) || \
+    defined(ENABLE_LED_MATRIX_SOLID_MULTISPLASH)
+#    define LED_MATRIX_KEYPRESSES
+#endif
diff --git a/quantum/matrix.c b/quantum/matrix.c
index 97d41caedded..f087a215d46f 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -20,7 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
+#include "atomic_util.h"
+
 #ifdef SPLIT_KEYBOARD
 #    include "split_common/split_util.h"
 #    include "split_common/transactions.h"
diff --git a/quantum/matrix_common.c b/quantum/matrix_common.c
index 3173351888dd..d02c527caa8b 100644
--- a/quantum/matrix_common.c
+++ b/quantum/matrix_common.c
@@ -1,9 +1,9 @@
-#include "quantum.h"
 #include "matrix.h"
 #include "debounce.h"
 #include "wait.h"
 #include "print.h"
 #include "debug.h"
+
 #ifdef SPLIT_KEYBOARD
 #    include "split_common/split_util.h"
 #    include "split_common/transactions.h"
diff --git a/quantum/midi/qmk_midi.c b/quantum/midi/qmk_midi.c
index f6a5d9228124..6b8831fb589d 100644
--- a/quantum/midi/qmk_midi.c
+++ b/quantum/midi/qmk_midi.c
@@ -5,6 +5,11 @@
 #include "usb_descriptor.h"
 #include "process_midi.h"
 
+#ifdef AUDIO_ENABLE
+#    include "audio.h"
+#    include <math.h>
+#endif
+
 /*******************************************************************************
  * MIDI
  ******************************************************************************/
@@ -103,10 +108,10 @@ static void fallthrough_callback(MidiDevice* device, uint16_t cnt, uint8_t byte0
     if (cnt == 3) {
         switch (byte0 & 0xF0) {
             case MIDI_NOTEON:
-                play_note(((double)261.6) * pow(2.0, -4.0) * pow(2.0, (byte1 & 0x7F) / 12.0), (byte2 & 0x7F) / 8);
+                play_note(440.0f * powf(2.0f, ((byte1 & 0x7F) - 57) / 12.0f), (byte2 & 0x7F) / 8);
                 break;
             case MIDI_NOTEOFF:
-                stop_note(((double)261.6) * pow(2.0, -4.0) * pow(2.0, (byte1 & 0x7F) / 12.0));
+                stop_note(440.0f * powf(2.0f, ((byte1 & 0x7F) - 57) / 12.0f));
                 break;
         }
     }
diff --git a/quantum/mousekey.c b/quantum/mousekey.c
index df8aa613bea4..c982a2f40b42 100644
--- a/quantum/mousekey.c
+++ b/quantum/mousekey.c
@@ -25,11 +25,16 @@
 #include "mousekey.h"
 
 static inline int8_t times_inv_sqrt2(int8_t x) {
-    // 181/256 is pretty close to 1/sqrt(2)
-    // 0.70703125                 0.707106781
-    // 1 too small for x=99 and x=198
-    // This ends up being a mult and discard lower 8 bits
-    return (x * 181) >> 8;
+    // 181/256 (0.70703125) is used as an approximation for 1/sqrt(2)
+    // because it is close to the exact value which is 0.707106781
+    const int16_t  n = x * 181;
+    const uint16_t d = 256;
+
+    // To ensure that the integer result is rounded accurately after
+    // division, check the sign of the numerator:
+    // If negative, subtract half of the denominator before dividing
+    // Otherwise, add half of the denominator before dividing
+    return n < 0 ? (n - d / 2) / d : (n + d / 2) / d;
 }
 
 static report_mouse_t mouse_report = {0};
@@ -74,7 +79,7 @@ uint8_t mk_time_to_max = MOUSEKEY_TIME_TO_MAX;
 uint8_t mk_wheel_delay = MOUSEKEY_WHEEL_DELAY / 10;
 /* milliseconds between repeated motion events (0-255) */
 #    ifdef MK_KINETIC_SPEED
-float mk_wheel_interval = 1000.0f / MOUSEKEY_WHEEL_INITIAL_MOVEMENTS;
+uint16_t mk_wheel_interval = 1000U / MOUSEKEY_WHEEL_INITIAL_MOVEMENTS;
 #    else
 uint8_t mk_wheel_interval = MOUSEKEY_WHEEL_INTERVAL;
 #    endif
@@ -175,7 +180,7 @@ static uint8_t wheel_unit(void) {
 /*
  * Kinetic movement  acceleration algorithm
  *
- *  current speed = I + A * T/50 + A * 0.5 * T^2 | maximum B
+ *  current speed = I + A * T/50 + A * (T/50)^2 * 1/2 | maximum B
  *
  * T: time since the mouse movement started
  * E: mouse events per second (set through MOUSEKEY_INTERVAL, UHK sends 250, the
@@ -190,39 +195,48 @@ const uint16_t mk_decelerated_speed = MOUSEKEY_DECELERATED_SPEED;
 const uint16_t mk_initial_speed     = MOUSEKEY_INITIAL_SPEED;
 
 static uint8_t move_unit(void) {
-    float speed = mk_initial_speed;
+    uint16_t speed = mk_initial_speed;
 
-    if (mousekey_accel & ((1 << 0) | (1 << 2))) {
-        speed = mousekey_accel & (1 << 2) ? mk_accelerated_speed : mk_decelerated_speed;
+    if (mousekey_accel & (1 << 0)) {
+        speed = mk_decelerated_speed;
+    } else if (mousekey_accel & (1 << 2)) {
+        speed = mk_accelerated_speed;
     } else if (mousekey_repeat && mouse_timer) {
-        const float time_elapsed = timer_elapsed(mouse_timer) / 50;
-        speed                    = mk_initial_speed + MOUSEKEY_MOVE_DELTA * time_elapsed + MOUSEKEY_MOVE_DELTA * 0.5 * time_elapsed * time_elapsed;
-
-        speed = speed > mk_base_speed ? mk_base_speed : speed;
+        const uint16_t time_elapsed = timer_elapsed(mouse_timer) / 50;
+        speed                       = mk_initial_speed + MOUSEKEY_MOVE_DELTA * time_elapsed + (MOUSEKEY_MOVE_DELTA * time_elapsed * time_elapsed) / 2;
+        if (speed > mk_base_speed) {
+            speed = mk_base_speed;
+        }
     }
-
     /* convert speed to USB mouse speed 1 to 127 */
-    speed = (uint8_t)(speed / (1000.0f / mk_interval));
-    speed = speed < 1 ? 1 : speed;
+    speed = (uint8_t)(speed / (1000U / mk_interval));
 
-    return speed > MOUSEKEY_MOVE_MAX ? MOUSEKEY_MOVE_MAX : speed;
+    if (speed > MOUSEKEY_MOVE_MAX) {
+        speed = MOUSEKEY_MOVE_MAX;
+    } else if (speed < 1) {
+        speed = 1;
+    }
+    return speed;
 }
 
 static uint8_t wheel_unit(void) {
-    float speed = MOUSEKEY_WHEEL_INITIAL_MOVEMENTS;
+    uint16_t speed = MOUSEKEY_WHEEL_INITIAL_MOVEMENTS;
 
-    if (mousekey_accel & ((1 << 0) | (1 << 2))) {
-        speed = mousekey_accel & (1 << 2) ? MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS : MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS;
+    if (mousekey_accel & (1 << 0)) {
+        speed = MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS;
+    } else if (mousekey_accel & (1 << 2)) {
+        speed = MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS;
     } else if (mousekey_wheel_repeat && mouse_timer) {
         if (mk_wheel_interval != MOUSEKEY_WHEEL_BASE_MOVEMENTS) {
-            const float time_elapsed = timer_elapsed(mouse_timer) / 50;
-            speed                    = MOUSEKEY_WHEEL_INITIAL_MOVEMENTS + 1 * time_elapsed + 1 * 0.5 * time_elapsed * time_elapsed;
+            const uint16_t time_elapsed = timer_elapsed(mouse_timer) / 50;
+            speed                       = MOUSEKEY_WHEEL_INITIAL_MOVEMENTS + 1 * time_elapsed + (1 * time_elapsed * time_elapsed) / 2;
+        }
+        if (speed > MOUSEKEY_WHEEL_BASE_MOVEMENTS) {
+            speed = MOUSEKEY_WHEEL_BASE_MOVEMENTS;
         }
-        speed = speed > MOUSEKEY_WHEEL_BASE_MOVEMENTS ? MOUSEKEY_WHEEL_BASE_MOVEMENTS : speed;
     }
-    mk_wheel_interval = 1000.0f / speed;
-
-    return (uint8_t)speed > MOUSEKEY_WHEEL_INITIAL_MOVEMENTS ? 2 : 1;
+    mk_wheel_interval = 1000U / speed;
+    return 1;
 }
 
 #        endif /* #ifndef MK_KINETIC_SPEED */
diff --git a/quantum/mousekey.h b/quantum/mousekey.h
index e968e000c027..73380b743a7b 100644
--- a/quantum/mousekey.h
+++ b/quantum/mousekey.h
@@ -44,9 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #            define MOUSEKEY_MOVE_DELTA 8
 #        endif
 #    endif
-#    ifndef MOUSEKEY_WHEEL_DELTA
-#        define MOUSEKEY_WHEEL_DELTA 1
-#    endif
 #    ifndef MOUSEKEY_DELAY
 #        if defined(MK_KINETIC_SPEED)
 #            define MOUSEKEY_DELAY 5
@@ -85,6 +82,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    ifndef MOUSEKEY_WHEEL_INTERVAL
 #        define MOUSEKEY_WHEEL_INTERVAL 80
 #    endif
+#    ifndef MOUSEKEY_WHEEL_DELTA
+#        define MOUSEKEY_WHEEL_DELTA 1
+#    endif
 #    ifndef MOUSEKEY_WHEEL_MAX_SPEED
 #        define MOUSEKEY_WHEEL_MAX_SPEED 8
 #    endif
diff --git a/quantum/painter/lvgl/qp_lvgl.c b/quantum/painter/lvgl/qp_lvgl.c
index 6cc0061d73ba..280aeaf91f53 100644
--- a/quantum/painter/lvgl/qp_lvgl.c
+++ b/quantum/painter/lvgl/qp_lvgl.c
@@ -61,7 +61,7 @@ bool qp_lvgl_attach(painter_device_t device) {
     qp_lvgl_detach();
 
     painter_driver_t *driver = (painter_driver_t *)device;
-    if (!driver->validate_ok) {
+    if (!driver || !driver->validate_ok) {
         qp_dprintf("qp_lvgl_attach: fail (validation_ok == false)\n");
         qp_lvgl_detach();
         return false;
diff --git a/quantum/painter/qp.c b/quantum/painter/qp.c
index aea9381b602f..f27bb7892add 100644
--- a/quantum/painter/qp.c
+++ b/quantum/painter/qp.c
@@ -30,6 +30,11 @@ bool qp_init(painter_device_t device, painter_rotation_t rotation) {
     qp_dprintf("qp_init: entry\n");
     painter_driver_t *driver = (painter_driver_t *)device;
 
+    if (!driver) {
+        qp_dprintf("qp_init: fail (pointer to NULL)\n");
+        return false;
+    }
+
     driver->validate_ok = false;
     if (!validate_driver_integrity(driver)) {
         qp_dprintf("Failed to validate driver integrity in qp_init\n");
@@ -65,7 +70,7 @@ bool qp_init(painter_device_t device, painter_rotation_t rotation) {
 bool qp_power(painter_device_t device, bool power_on) {
     qp_dprintf("qp_power: entry\n");
     painter_driver_t *driver = (painter_driver_t *)device;
-    if (!driver->validate_ok) {
+    if (!driver || !driver->validate_ok) {
         qp_dprintf("qp_power: fail (validation_ok == false)\n");
         return false;
     }
@@ -87,7 +92,7 @@ bool qp_power(painter_device_t device, bool power_on) {
 bool qp_clear(painter_device_t device) {
     qp_dprintf("qp_clear: entry\n");
     painter_driver_t *driver = (painter_driver_t *)device;
-    if (!driver->validate_ok) {
+    if (!driver || !driver->validate_ok) {
         qp_dprintf("qp_clear: fail (validation_ok == false)\n");
         return false;
     }
@@ -109,7 +114,7 @@ bool qp_clear(painter_device_t device) {
 bool qp_flush(painter_device_t device) {
     qp_dprintf("qp_flush: entry\n");
     painter_driver_t *driver = (painter_driver_t *)device;
-    if (!driver->validate_ok) {
+    if (!driver || !driver->validate_ok) {
         qp_dprintf("qp_flush: fail (validation_ok == false)\n");
         return false;
     }
@@ -129,9 +134,14 @@ bool qp_flush(painter_device_t device) {
 // Quantum Painter External API: qp_get_geometry
 
 void qp_get_geometry(painter_device_t device, uint16_t *width, uint16_t *height, painter_rotation_t *rotation, uint16_t *offset_x, uint16_t *offset_y) {
-    qp_dprintf("qp_geometry: entry\n");
+    qp_dprintf("qp_get_geometry: entry\n");
     painter_driver_t *driver = (painter_driver_t *)device;
 
+    if (!driver) {
+        qp_dprintf("qp_get_geometry: fail (pointer to NULL)\n");
+        return;
+    }
+
     switch (driver->rotation) {
         default:
         case QP_ROTATION_0:
@@ -166,7 +176,7 @@ void qp_get_geometry(painter_device_t device, uint16_t *width, uint16_t *height,
         *offset_y = driver->offset_y;
     }
 
-    qp_dprintf("qp_geometry: ok\n");
+    qp_dprintf("qp_get_geometry: ok\n");
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -176,6 +186,11 @@ void qp_set_viewport_offsets(painter_device_t device, uint16_t offset_x, uint16_
     qp_dprintf("qp_set_viewport_offsets: entry\n");
     painter_driver_t *driver = (painter_driver_t *)device;
 
+    if (!driver) {
+        qp_dprintf("qp_set_viewport_offsets: fail (pointer to NULL)\n");
+        return;
+    }
+
     driver->offset_x = offset_x;
     driver->offset_y = offset_y;
 
@@ -188,7 +203,7 @@ void qp_set_viewport_offsets(painter_device_t device, uint16_t offset_x, uint16_
 bool qp_viewport(painter_device_t device, uint16_t left, uint16_t top, uint16_t right, uint16_t bottom) {
     qp_dprintf("qp_viewport: entry\n");
     painter_driver_t *driver = (painter_driver_t *)device;
-    if (!driver->validate_ok) {
+    if (!driver || !driver->validate_ok) {
         qp_dprintf("qp_viewport: fail (validation_ok == false)\n");
         return false;
     }
@@ -211,7 +226,7 @@ bool qp_viewport(painter_device_t device, uint16_t left, uint16_t top, uint16_t
 bool qp_pixdata(painter_device_t device, const void *pixel_data, uint32_t native_pixel_count) {
     qp_dprintf("qp_pixdata: entry\n");
     painter_driver_t *driver = (painter_driver_t *)device;
-    if (!driver->validate_ok) {
+    if (!driver || !driver->validate_ok) {
         qp_dprintf("qp_pixdata: fail (validation_ok == false)\n");
         return false;
     }
diff --git a/quantum/painter/qp_comms.c b/quantum/painter/qp_comms.c
index bcc6de8f2ec7..63667783e10d 100644
--- a/quantum/painter/qp_comms.c
+++ b/quantum/painter/qp_comms.c
@@ -8,7 +8,7 @@
 
 bool qp_comms_init(painter_device_t device) {
     painter_driver_t *driver = (painter_driver_t *)device;
-    if (!driver->validate_ok) {
+    if (!driver || !driver->validate_ok) {
         qp_dprintf("qp_comms_init: fail (validation_ok == false)\n");
         return false;
     }
@@ -18,7 +18,7 @@ bool qp_comms_init(painter_device_t device) {
 
 bool qp_comms_start(painter_device_t device) {
     painter_driver_t *driver = (painter_driver_t *)device;
-    if (!driver->validate_ok) {
+    if (!driver || !driver->validate_ok) {
         qp_dprintf("qp_comms_start: fail (validation_ok == false)\n");
         return false;
     }
@@ -28,7 +28,7 @@ bool qp_comms_start(painter_device_t device) {
 
 void qp_comms_stop(painter_device_t device) {
     painter_driver_t *driver = (painter_driver_t *)device;
-    if (!driver->validate_ok) {
+    if (!driver || !driver->validate_ok) {
         qp_dprintf("qp_comms_stop: fail (validation_ok == false)\n");
         return;
     }
@@ -38,7 +38,7 @@ void qp_comms_stop(painter_device_t device) {
 
 uint32_t qp_comms_send(painter_device_t device, const void *data, uint32_t byte_count) {
     painter_driver_t *driver = (painter_driver_t *)device;
-    if (!driver->validate_ok) {
+    if (!driver || !driver->validate_ok) {
         qp_dprintf("qp_comms_send: fail (validation_ok == false)\n");
         return false;
     }
diff --git a/quantum/painter/qp_draw_circle.c b/quantum/painter/qp_draw_circle.c
index 25517d91c599..7f5a7ddfcd71 100644
--- a/quantum/painter/qp_draw_circle.c
+++ b/quantum/painter/qp_draw_circle.c
@@ -128,7 +128,7 @@ static bool qp_circle_helper_impl(painter_device_t device, uint16_t centerx, uin
 bool qp_circle(painter_device_t device, uint16_t x, uint16_t y, uint16_t radius, uint8_t hue, uint8_t sat, uint8_t val, bool filled) {
     qp_dprintf("qp_circle: entry\n");
     painter_driver_t *driver = (painter_driver_t *)device;
-    if (!driver->validate_ok) {
+    if (!driver || !driver->validate_ok) {
         qp_dprintf("qp_circle: fail (validation_ok == false)\n");
         return false;
     }
diff --git a/quantum/painter/qp_draw_core.c b/quantum/painter/qp_draw_core.c
index 3988aaedf8e8..aa5fa4aa761f 100644
--- a/quantum/painter/qp_draw_core.c
+++ b/quantum/painter/qp_draw_core.c
@@ -145,7 +145,7 @@ bool qp_internal_load_qgf_palette(qp_stream_t *stream, uint8_t bpp) {
 
 bool qp_setpixel(painter_device_t device, uint16_t x, uint16_t y, uint8_t hue, uint8_t sat, uint8_t val) {
     painter_driver_t *driver = (painter_driver_t *)device;
-    if (!driver->validate_ok) {
+    if (!driver || !driver->validate_ok) {
         qp_dprintf("qp_setpixel: fail (validation_ok == false)\n");
         return false;
     }
@@ -175,7 +175,7 @@ bool qp_line(painter_device_t device, uint16_t x0, uint16_t y0, uint16_t x1, uin
 
     qp_dprintf("qp_line(%d, %d, %d, %d): entry\n", (int)x0, (int)y0, (int)x1, (int)y1);
     painter_driver_t *driver = (painter_driver_t *)device;
-    if (!driver->validate_ok) {
+    if (!driver || !driver->validate_ok) {
         qp_dprintf("qp_line: fail (validation_ok == false)\n");
         return false;
     }
@@ -253,7 +253,7 @@ bool qp_internal_fillrect_helper_impl(painter_device_t device, uint16_t left, ui
 bool qp_rect(painter_device_t device, uint16_t left, uint16_t top, uint16_t right, uint16_t bottom, uint8_t hue, uint8_t sat, uint8_t val, bool filled) {
     qp_dprintf("qp_rect(%d, %d, %d, %d): entry\n", (int)left, (int)top, (int)right, (int)bottom);
     painter_driver_t *driver = (painter_driver_t *)device;
-    if (!driver->validate_ok) {
+    if (!driver || !driver->validate_ok) {
         qp_dprintf("qp_rect: fail (validation_ok == false)\n");
         return false;
     }
diff --git a/quantum/painter/qp_draw_ellipse.c b/quantum/painter/qp_draw_ellipse.c
index 5c7abd7a7da3..e912a3e91fe8 100644
--- a/quantum/painter/qp_draw_ellipse.c
+++ b/quantum/painter/qp_draw_ellipse.c
@@ -62,7 +62,7 @@ static bool qp_ellipse_helper_impl(painter_device_t device, uint16_t centerx, ui
 bool qp_ellipse(painter_device_t device, uint16_t x, uint16_t y, uint16_t sizex, uint16_t sizey, uint8_t hue, uint8_t sat, uint8_t val, bool filled) {
     qp_dprintf("qp_ellipse: entry\n");
     painter_driver_t *driver = (painter_driver_t *)device;
-    if (!driver->validate_ok) {
+    if (!driver || !driver->validate_ok) {
         qp_dprintf("qp_ellipse: fail (validation_ok == false)\n");
         return false;
     }
diff --git a/quantum/painter/qp_draw_image.c b/quantum/painter/qp_draw_image.c
index 9f86b29f8b0d..fb17a05a1b61 100644
--- a/quantum/painter/qp_draw_image.c
+++ b/quantum/painter/qp_draw_image.c
@@ -90,7 +90,7 @@ painter_image_handle_t qp_load_image_mem(const void *buffer) {
 
 bool qp_close_image(painter_image_handle_t image) {
     qgf_image_handle_t *qgf_image = (qgf_image_handle_t *)image;
-    if (!qgf_image->validate_ok) {
+    if (!qgf_image || !qgf_image->validate_ok) {
         qp_dprintf("qp_close_image: fail (invalid image)\n");
         return false;
     }
@@ -210,13 +210,13 @@ static bool qp_drawimage_prepare_frame_for_stream_read(painter_device_t device,
 static bool qp_drawimage_recolor_impl(painter_device_t device, uint16_t x, uint16_t y, painter_image_handle_t image, int frame_number, qgf_frame_info_t *frame_info, qp_pixel_t fg_hsv888, qp_pixel_t bg_hsv888) {
     qp_dprintf("qp_drawimage_recolor: entry\n");
     painter_driver_t *driver = (painter_driver_t *)device;
-    if (!driver->validate_ok) {
+    if (!driver || !driver->validate_ok) {
         qp_dprintf("qp_drawimage_recolor: fail (validation_ok == false)\n");
         return false;
     }
 
     qgf_image_handle_t *qgf_image = (qgf_image_handle_t *)image;
-    if (!qgf_image->validate_ok) {
+    if (!qgf_image || !qgf_image->validate_ok) {
         qp_dprintf("qp_drawimage_recolor: fail (invalid image)\n");
         return false;
     }
diff --git a/quantum/painter/qp_draw_text.c b/quantum/painter/qp_draw_text.c
index a70caac6f4bc..ff6fc01d11ef 100644
--- a/quantum/painter/qp_draw_text.c
+++ b/quantum/painter/qp_draw_text.c
@@ -136,7 +136,7 @@ painter_font_handle_t qp_load_font_mem(const void *buffer) {
 
 bool qp_close_font(painter_font_handle_t font) {
     qff_font_handle_t *qff_font = (qff_font_handle_t *)font;
-    if (!qff_font->validate_ok) {
+    if (!qff_font || !qff_font->validate_ok) {
         qp_dprintf("qp_close_font: fail (invalid font)\n");
         return false;
     }
@@ -380,7 +380,7 @@ static inline bool qp_font_code_point_handler_drawglyph(qff_font_handle_t *qff_f
 
 int16_t qp_textwidth(painter_font_handle_t font, const char *str) {
     qff_font_handle_t *qff_font = (qff_font_handle_t *)font;
-    if (!qff_font->validate_ok) {
+    if (!qff_font || !qff_font->validate_ok) {
         qp_dprintf("qp_textwidth: fail (invalid font)\n");
         return false;
     }
@@ -406,13 +406,13 @@ int16_t qp_drawtext(painter_device_t device, uint16_t x, uint16_t y, painter_fon
 int16_t qp_drawtext_recolor(painter_device_t device, uint16_t x, uint16_t y, painter_font_handle_t font, const char *str, uint8_t hue_fg, uint8_t sat_fg, uint8_t val_fg, uint8_t hue_bg, uint8_t sat_bg, uint8_t val_bg) {
     qp_dprintf("qp_drawtext_recolor: entry\n");
     painter_driver_t *driver = (painter_driver_t *)device;
-    if (!driver->validate_ok) {
+    if (!driver || !driver->validate_ok) {
         qp_dprintf("qp_drawtext_recolor: fail (validation_ok == false)\n");
         return 0;
     }
 
     qff_font_handle_t *qff_font = (qff_font_handle_t *)font;
-    if (!qff_font->validate_ok) {
+    if (!qff_font || !qff_font->validate_ok) {
         qp_dprintf("qp_drawtext_recolor: fail (invalid font)\n");
         return false;
     }
diff --git a/quantum/pointing_device/pointing_device.c b/quantum/pointing_device/pointing_device.c
index abb3817b5f65..17dc701a4154 100644
--- a/quantum/pointing_device/pointing_device.c
+++ b/quantum/pointing_device/pointing_device.c
@@ -19,6 +19,8 @@
 #include "pointing_device.h"
 #include <string.h>
 #include "timer.h"
+#include "gpio.h"
+
 #ifdef MOUSEKEY_ENABLE
 #    include "mousekey.h"
 #endif
diff --git a/quantum/pointing_device/pointing_device_auto_mouse.c b/quantum/pointing_device/pointing_device_auto_mouse.c
index b008d18db54a..3135b9e531bf 100644
--- a/quantum/pointing_device/pointing_device_auto_mouse.c
+++ b/quantum/pointing_device/pointing_device_auto_mouse.c
@@ -17,7 +17,11 @@
 
 #ifdef POINTING_DEVICE_AUTO_MOUSE_ENABLE
 
+#    include <string.h>
 #    include "pointing_device_auto_mouse.h"
+#    include "debug.h"
+#    include "action_util.h"
+#    include "quantum_keycodes.h"
 
 /* local data structure for tracking auto mouse */
 static auto_mouse_context_t auto_mouse_context = {
diff --git a/quantum/pointing_device/pointing_device_auto_mouse.h b/quantum/pointing_device/pointing_device_auto_mouse.h
index 7db63bc6b8ab..1343855e0017 100644
--- a/quantum/pointing_device/pointing_device_auto_mouse.h
+++ b/quantum/pointing_device/pointing_device_auto_mouse.h
@@ -16,11 +16,14 @@
 
 #pragma once
 
-#include <string.h>
-
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
 #include "pointing_device.h"
-#include "print.h"
+#include "keycodes.h"
+#include "action.h"
+#include "report.h"
+#include "action_layer.h"
+#include "action_tapping.h"
 
 /* check settings and set defaults */
 #ifndef POINTING_DEVICE_AUTO_MOUSE_ENABLE
diff --git a/quantum/process_keycode/process_audio.c b/quantum/process_keycode/process_audio.c
index c189dd02b713..a8464e1b830c 100644
--- a/quantum/process_keycode/process_audio.c
+++ b/quantum/process_keycode/process_audio.c
@@ -1,5 +1,6 @@
 #include "audio.h"
 #include "process_audio.h"
+#include <math.h>
 
 #ifndef VOICE_CHANGE_SONG
 #    define VOICE_CHANGE_SONG SONG(VOICE_CHANGE_SOUND)
@@ -12,7 +13,7 @@ float voice_change_song[][2] = VOICE_CHANGE_SONG;
 
 float compute_freq_for_midi_note(uint8_t note) {
     // https://en.wikipedia.org/wiki/MIDI_tuning_standard
-    return pow(2.0, (note - 69) / 12.0) * PITCH_STANDARD_A;
+    return powf(2.0f, (note - 69) / 12.0f) * PITCH_STANDARD_A;
 }
 
 bool process_audio(uint16_t keycode, keyrecord_t *record) {
@@ -61,6 +62,3 @@ void process_audio_noteoff(uint8_t note) {
 void process_audio_all_notes_off(void) {
     stop_all_notes();
 }
-
-__attribute__((weak)) void audio_on_user(void) {}
-__attribute__((weak)) void audio_off_user(void) {}
diff --git a/quantum/process_keycode/process_audio.h b/quantum/process_keycode/process_audio.h
index 42cfab4af27d..69e201e447f0 100644
--- a/quantum/process_keycode/process_audio.h
+++ b/quantum/process_keycode/process_audio.h
@@ -1,11 +1,12 @@
 #pragma once
 
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
+
 float compute_freq_for_midi_note(uint8_t note);
 
 bool process_audio(uint16_t keycode, keyrecord_t *record);
 void process_audio_noteon(uint8_t note);
 void process_audio_noteoff(uint8_t note);
 void process_audio_all_notes_off(void);
-
-void audio_on_user(void);
-void audio_off_user(void);
diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c
index 62c347ae0cd7..9b78214e438a 100644
--- a/quantum/process_keycode/process_auto_shift.c
+++ b/quantum/process_keycode/process_auto_shift.c
@@ -14,27 +14,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifdef AUTO_SHIFT_ENABLE
-
-#    include <stdbool.h>
-#    include "process_auto_shift.h"
-
-#    ifndef AUTO_SHIFT_DISABLED_AT_STARTUP
-#        define AUTO_SHIFT_STARTUP_STATE true /* enabled */
-#    else
-#        define AUTO_SHIFT_STARTUP_STATE false /* disabled */
-#    endif
+#include "process_auto_shift.h"
+#include "quantum.h"
+#include "action_util.h"
+#include "timer.h"
+#include "keycodes.h"
+
+#ifndef AUTO_SHIFT_DISABLED_AT_STARTUP
+#    define AUTO_SHIFT_STARTUP_STATE true /* enabled */
+#else
+#    define AUTO_SHIFT_STARTUP_STATE false /* disabled */
+#endif
 
 // Stores the last Auto Shift key's up or down time, for evaluation or keyrepeat.
 static uint16_t autoshift_time = 0;
-#    if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
+#if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
 // Stores the last key's up or down time, to replace autoshift_time so that Tap Hold times are accurate.
 static uint16_t retroshift_time = 0;
 // Stores a possibly Retro Shift key's up or down time, as retroshift_time needs
 // to be set before the Retro Shift key is evaluated if it is interrupted by an
 // Auto Shifted key.
 static uint16_t last_retroshift_time;
-#    endif
+#endif
 static uint16_t    autoshift_timeout = AUTO_SHIFT_TIMEOUT;
 static uint16_t    autoshift_lastkey = KC_NO;
 static keyrecord_t autoshift_lastrecord;
@@ -68,15 +69,23 @@ __attribute__((weak)) bool get_custom_auto_shifted_key(uint16_t keycode, keyreco
 /** \brief Called on physical press, returns whether is Auto Shift key */
 __attribute__((weak)) bool get_auto_shifted_key(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-#    ifndef NO_AUTO_SHIFT_ALPHA
+#ifndef NO_AUTO_SHIFT_ALPHA
         case AUTO_SHIFT_ALPHA:
-#    endif
-#    ifndef NO_AUTO_SHIFT_NUMERIC
+#endif
+#ifndef NO_AUTO_SHIFT_NUMERIC
         case AUTO_SHIFT_NUMERIC:
+#endif
+#ifndef NO_AUTO_SHIFT_SPECIAL
+#    ifndef NO_AUTO_SHIFT_TAB
+        case KC_TAB:
 #    endif
-#    ifndef NO_AUTO_SHIFT_SPECIAL
-        case AUTO_SHIFT_SPECIAL:
+#    ifndef NO_AUTO_SHIFT_SYMBOLS
+        case AUTO_SHIFT_SYMBOLS:
 #    endif
+#endif
+#ifdef AUTO_SHIFT_ENTER
+        case KC_ENT:
+#endif
             return true;
     }
     return get_custom_auto_shifted_key(keycode, record);
@@ -122,9 +131,9 @@ bool get_autoshift_shift_state(uint16_t keycode) {
 /** \brief Restores the shift key if it was cancelled by Auto Shift */
 static void autoshift_flush_shift(void) {
     autoshift_flags.holding_shift = false;
-#    ifdef CAPS_WORD_ENABLE
+#ifdef CAPS_WORD_ENABLE
     if (!is_caps_word_on())
-#    endif // CAPS_WORD_ENABLE
+#endif // CAPS_WORD_ENABLE
     {
         del_weak_mods(MOD_BIT(KC_LSFT));
     }
@@ -146,26 +155,26 @@ static void autoshift_flush_shift(void) {
 static bool autoshift_press(uint16_t keycode, uint16_t now, keyrecord_t *record) {
     // clang-format off
     if ((get_mods()
-#    if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
+#if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
             | get_oneshot_mods()
-#    endif
+#endif
         ) & (~MOD_BIT(KC_LSFT))
     ) {
         // clang-format on
         // Prevents keyrepeating unshifted value of key after using it in a key combo.
         autoshift_lastkey = KC_NO;
-#    ifndef AUTO_SHIFT_MODIFIERS
+#ifndef AUTO_SHIFT_MODIFIERS
         // We can't return true here anymore because custom unshifted values are
         // possible and there's no good way to tell whether the press returned
         // true upon release.
         set_autoshift_shift_state(keycode, false);
         autoshift_press_user(keycode, false, record);
-#        if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
+#    if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
         set_oneshot_mods(get_oneshot_mods() & (~MOD_BIT(KC_LSFT)));
         clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-#        endif
-        return false;
 #    endif
+        return false;
+#endif
     }
 
     // Store record to be sent to user functions if there's no release record then.
@@ -173,19 +182,19 @@ static bool autoshift_press(uint16_t keycode, uint16_t now, keyrecord_t *record)
     autoshift_lastrecord.event.pressed = false;
     autoshift_lastrecord.event.time    = 0;
     // clang-format off
-#    if defined(AUTO_SHIFT_REPEAT) || defined(AUTO_SHIFT_REPEAT_PER_KEY)
+#if defined(AUTO_SHIFT_REPEAT) || defined(AUTO_SHIFT_REPEAT_PER_KEY)
     if (keycode == autoshift_lastkey &&
-#        ifdef AUTO_SHIFT_REPEAT_PER_KEY
+#    ifdef AUTO_SHIFT_REPEAT_PER_KEY
         get_auto_shift_repeat(autoshift_lastkey, record) &&
-#        endif
-#        if !defined(AUTO_SHIFT_NO_AUTO_REPEAT) || defined(AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY)
+#    endif
+#    if !defined(AUTO_SHIFT_NO_AUTO_REPEAT) || defined(AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY)
         (
             !autoshift_flags.lastshifted
-#            ifdef AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY
+#        ifdef AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY
             || get_auto_shift_no_auto_repeat(autoshift_lastkey, record)
-#            endif
-        ) &&
 #        endif
+        ) &&
+#    endif
         TIMER_DIFF_16(now, autoshift_time) < GET_TAPPING_TERM(autoshift_lastkey, record)
     ) {
         // clang-format on
@@ -202,23 +211,23 @@ static bool autoshift_press(uint16_t keycode, uint16_t now, keyrecord_t *record)
         autoshift_press_user(autoshift_lastkey, autoshift_flags.lastshifted, record);
         return false;
     }
-#    endif
+#endif
 
     // Use physical shift state of press event to be more like normal typing.
-#    if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
+#if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
     autoshift_flags.lastshifted = (get_mods() | get_oneshot_mods()) & MOD_BIT(KC_LSFT);
     set_oneshot_mods(get_oneshot_mods() & (~MOD_BIT(KC_LSFT)));
-#    else
+#else
     autoshift_flags.lastshifted = get_mods() & MOD_BIT(KC_LSFT);
-#    endif
+#endif
     // Record the keycode so we can simulate it later.
     autoshift_lastkey           = keycode;
     autoshift_time              = now;
     autoshift_flags.in_progress = true;
 
-#    if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
+#if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
     clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-#    endif
+#endif
     return false;
 }
 
@@ -239,11 +248,11 @@ static void autoshift_end(uint16_t keycode, uint16_t now, bool matrix_trigger, k
         autoshift_flags.lastshifted =
             autoshift_flags.lastshifted
             || TIMER_DIFF_16(now, autoshift_time) >=
-#    ifdef AUTO_SHIFT_TIMEOUT_PER_KEY
+#ifdef AUTO_SHIFT_TIMEOUT_PER_KEY
                 get_autoshift_timeout(autoshift_lastkey, record)
-#    else
+#else
                 autoshift_timeout
-#    endif
+#endif
         ;
         // clang-format on
         set_autoshift_shift_state(autoshift_lastkey, autoshift_flags.lastshifted);
@@ -258,23 +267,23 @@ static void autoshift_end(uint16_t keycode, uint16_t now, bool matrix_trigger, k
         autoshift_press_user(autoshift_lastkey, autoshift_flags.lastshifted, record);
 
         // clang-format off
-#    if (defined(AUTO_SHIFT_REPEAT) || defined(AUTO_SHIFT_REPEAT_PER_KEY)) && (!defined(AUTO_SHIFT_NO_AUTO_REPEAT) || defined(AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY))
+#if (defined(AUTO_SHIFT_REPEAT) || defined(AUTO_SHIFT_REPEAT_PER_KEY)) && (!defined(AUTO_SHIFT_NO_AUTO_REPEAT) || defined(AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY))
         if (matrix_trigger
-#        ifdef AUTO_SHIFT_REPEAT_PER_KEY
+#    ifdef AUTO_SHIFT_REPEAT_PER_KEY
             && get_auto_shift_repeat(autoshift_lastkey, record)
-#        endif
-#        ifdef AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY
+#    endif
+#    ifdef AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY
             && !get_auto_shift_no_auto_repeat(autoshift_lastkey, record)
-#        endif
+#    endif
         ) {
             // Prevents release.
             return;
         }
-#    endif
+#endif
         // clang-format on
-#    if TAP_CODE_DELAY > 0
+#if TAP_CODE_DELAY > 0
         wait_ms(TAP_CODE_DELAY);
-#    endif
+#endif
 
         autoshift_release_user(autoshift_lastkey, autoshift_flags.lastshifted, record);
         autoshift_flush_shift();
@@ -302,11 +311,11 @@ void autoshift_matrix_scan(void) {
     if (autoshift_flags.in_progress) {
         const uint16_t now = timer_read();
         if (TIMER_DIFF_16(now, autoshift_time) >=
-#    ifdef AUTO_SHIFT_TIMEOUT_PER_KEY
+#ifdef AUTO_SHIFT_TIMEOUT_PER_KEY
             get_autoshift_timeout(autoshift_lastkey, &autoshift_lastrecord)
-#    else
+#else
             autoshift_timeout
-#    endif
+#endif
         ) {
             autoshift_end(autoshift_lastkey, now, true, &autoshift_lastrecord);
         }
@@ -327,18 +336,18 @@ void autoshift_disable(void) {
     autoshift_flush_shift();
 }
 
-#    ifndef AUTO_SHIFT_NO_SETUP
+#ifndef AUTO_SHIFT_NO_SETUP
 void autoshift_timer_report(void) {
-#        ifdef SEND_STRING_ENABLE
+#    ifdef SEND_STRING_ENABLE
     const char *autoshift_timeout_str = get_u16_str(autoshift_timeout, ' ');
     // Skip padding spaces
     while (*autoshift_timeout_str == ' ') {
         autoshift_timeout_str++;
     }
     send_string(autoshift_timeout_str);
-#        endif
-}
 #    endif
+}
+#endif
 
 bool get_autoshift_state(void) {
     return autoshift_flags.enabled;
@@ -360,11 +369,11 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
     // https://github.com/qmk/qmk_firmware/pull/9826#issuecomment-733559550
     // clang-format off
     const uint16_t now =
-#    if !defined(RETRO_SHIFT) || defined(NO_ACTION_TAPPING)
+#if !defined(RETRO_SHIFT) || defined(NO_ACTION_TAPPING)
         timer_read()
-#    else
+#else
         (record->event.pressed) ? retroshift_time : timer_read()
-#    endif
+#endif
     ;
     // clang-format on
 
@@ -385,7 +394,7 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
                 autoshift_disable();
                 break;
 
-#    ifndef AUTO_SHIFT_NO_SETUP
+#ifndef AUTO_SHIFT_NO_SETUP
             case AS_UP:
                 autoshift_timeout += 5;
                 break;
@@ -395,27 +404,27 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
             case AS_RPT:
                 autoshift_timer_report();
                 break;
-#    endif
+#endif
         }
             // If Retro Shift is disabled, possible custom actions shouldn't happen.
             // clang-format off
-#   if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
-#       ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
+#if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
+#    ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
             const bool is_hold_on_interrupt = get_hold_on_other_key_press(keycode, record);
-#       else
+#    else
             const bool is_hold_on_interrupt = false;
-#       endif
-#   endif
+#    endif
+#endif
         if (IS_RETRO(keycode)
-#    if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
+#if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
             // Not tapped or #defines mean that rolls should use hold action.
             && (
                 record->tap.count == 0
-#        ifdef RETRO_TAPPING_PER_KEY
+#    ifdef RETRO_TAPPING_PER_KEY
                 || !get_retro_tapping(keycode, record)
-#        endif
-                || (record->tap.interrupted && is_hold_on_interrupt))
 #    endif
+                || (record->tap.interrupted && is_hold_on_interrupt))
+#endif
         ) {
             // clang-format on
             autoshift_lastkey = KC_NO;
@@ -431,21 +440,21 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
         // tap.count gets set to 0 in process_action
         // clang-format off
         else if (IS_RETRO(keycode)
-#    if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
+#if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
             && (
                 record->tap.count == 0
-#        ifdef RETRO_TAPPING_PER_KEY
+#    ifdef RETRO_TAPPING_PER_KEY
                 || !get_retro_tapping(keycode, record)
-#        endif
-            )
 #    endif
+            )
+#endif
         ) {
             // Fixes modifiers not being applied to rolls with AUTO_SHIFT_MODIFIERS set.
-#    ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
+#ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
             if (autoshift_flags.in_progress && get_hold_on_other_key_press(keycode, record)) {
                 autoshift_end(KC_NO, now, false, &autoshift_lastrecord);
             }
-#    endif
+#endif
             // clang-format on
             return true;
         }
@@ -471,7 +480,7 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-#    if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
+#if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
 // Called to record time before possible delays by action_tapping_process.
 void retroshift_poll_time(keyevent_t *event) {
     last_retroshift_time = retroshift_time;
@@ -485,6 +494,4 @@ void retroshift_swap_times(void) {
         last_retroshift_time = temp;
     }
 }
-#    endif
-
 #endif
diff --git a/quantum/process_keycode/process_auto_shift.h b/quantum/process_keycode/process_auto_shift.h
index 66a4b3138a39..885a47b5339d 100644
--- a/quantum/process_keycode/process_auto_shift.h
+++ b/quantum/process_keycode/process_auto_shift.h
@@ -16,7 +16,11 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
+#include "keyboard.h"
+#include "keycodes.h"
 
 #ifndef AUTO_SHIFT_TIMEOUT
 #    define AUTO_SHIFT_TIMEOUT 175
@@ -28,10 +32,14 @@
 // clang-format off
 #define AUTO_SHIFT_ALPHA KC_A ... KC_Z
 #define AUTO_SHIFT_NUMERIC KC_1 ... KC_0
+#define AUTO_SHIFT_SYMBOLS          \
+             KC_MINUS ... KC_SLASH: \
+        case KC_NONUS_BACKSLASH
+
+// Kept to avoid breaking existing keymaps.
 #define AUTO_SHIFT_SPECIAL          \
              KC_TAB:                \
-        case KC_MINUS ... KC_SLASH: \
-        case KC_NONUS_BACKSLASH
+        case AUTO_SHIFT_SYMBOLS
 // clang-format on
 
 bool process_auto_shift(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_autocorrect.c b/quantum/process_keycode/process_autocorrect.c
index 137678826646..edc47718f324 100644
--- a/quantum/process_keycode/process_autocorrect.c
+++ b/quantum/process_keycode/process_autocorrect.c
@@ -1,11 +1,16 @@
 // Copyright 2021 Google LLC
 // Copyright 2021 @filterpaper
+// Copyright 2023 Pablo Martinez (@elpekenin) <elpekenin@elpekenin.dev>
 // SPDX-License-Identifier: Apache-2.0
 // Original source: https://getreuer.info/posts/keyboards/autocorrection
 
 #include "process_autocorrect.h"
 #include <string.h>
+#include "keycodes.h"
+#include "quantum_keycodes.h"
 #include "keycode_config.h"
+#include "send_string.h"
+#include "action_util.h"
 
 #if __has_include("autocorrect_data.h")
 #    include "autocorrect_data.h"
@@ -57,7 +62,7 @@ void autocorrect_toggle(void) {
 }
 
 /**
- * @brief handler for determining if autocorrect should process keypress
+ * @brief handler for user to override whether autocorrect should process this keypress
  *
  * @param keycode Keycode registered by matrix press, per keymap
  * @param record keyrecord_t structure
@@ -67,6 +72,23 @@ void autocorrect_toggle(void) {
  * @return false Stop processing and escape from autocorrect.
  */
 __attribute__((weak)) bool process_autocorrect_user(uint16_t *keycode, keyrecord_t *record, uint8_t *typo_buffer_size, uint8_t *mods) {
+    return process_autocorrect_default_handler(keycode, record, typo_buffer_size, mods);
+}
+
+/**
+ * @brief fallback handler for determining if autocorrect should process this keypress
+ *        can be used by user callback to get the basic keycode being "wrapped"
+ *
+ * NOTE: These values may have been edited by user callback before getting here
+ *
+ * @param keycode Keycode registered by matrix press, per keymap
+ * @param record keyrecord_t structure
+ * @param typo_buffer_size passed along to allow resetting of autocorrect buffer
+ * @param mods allow processing of mod status
+ * @return true Allow autocorection
+ * @return false Stop processing and escape from autocorrect.
+ */
+bool process_autocorrect_default_handler(uint16_t *keycode, keyrecord_t *record, uint8_t *typo_buffer_size, uint8_t *mods) {
     // See quantum_keycodes.h for reference on these matched ranges.
     switch (*keycode) {
         // Exclude these keycodes from processing.
@@ -157,10 +179,12 @@ __attribute__((weak)) bool process_autocorrect_user(uint16_t *keycode, keyrecord
  *
  * @param backspaces number of characters to remove
  * @param str pointer to PROGMEM string to replace mistyped seletion with
+ * @param typo the wrong string that triggered a correction
+ * @param correct what it would become after the changes
  * @return true apply correction
  * @return false user handled replacement
  */
-__attribute__((weak)) bool apply_autocorrect(uint8_t backspaces, const char *str) {
+__attribute__((weak)) bool apply_autocorrect(uint8_t backspaces, const char *str, char *typo, char *correct) {
     return true;
 }
 
@@ -284,11 +308,57 @@ bool process_autocorrect(uint16_t keycode, keyrecord_t *record) {
 
         if (code & 128) { // A typo was found! Apply autocorrect.
             const uint8_t backspaces = (code & 63) + !record->event.pressed;
-            if (apply_autocorrect(backspaces, (char const *)(autocorrect_data + state + 1))) {
+            const char *  changes    = (const char *)(autocorrect_data + state + 1);
+
+            /* Gather info about the typo'd word
+             *
+             * Since buffer may contain several words, delimited by spaces, we
+             * iterate from the end to find the start and length of the typo
+             */
+            char typo[AUTOCORRECT_MAX_LENGTH + 1] = {0}; // extra char for null terminator
+
+            uint8_t typo_len   = 0;
+            uint8_t typo_start = 0;
+            bool    space_last = typo_buffer[typo_buffer_size - 1] == KC_SPC;
+            for (uint8_t i = typo_buffer_size; i > 0; --i) {
+                // stop counting after finding space (unless it is the last thing)
+                if (typo_buffer[i - 1] == KC_SPC && i != typo_buffer_size) {
+                    typo_start = i;
+                    break;
+                }
+
+                ++typo_len;
+            }
+
+            // when detecting 'typo:', reduce the length of the string by one
+            if (space_last) {
+                --typo_len;
+            }
+
+            // convert buffer of keycodes into a string
+            for (uint8_t i = 0; i < typo_len; ++i) {
+                typo[i] = typo_buffer[typo_start + i] - KC_A + 'a';
+            }
+
+            /* Gather the corrected word
+             *
+             * A) Correction of 'typo:' -- Code takes into account
+             * an extra backspace to delete the space (which we dont copy)
+             * for this reason the offset is correct to "skip" the null terminator
+             *
+             * B) When correcting 'typo' -- Need extra offset for terminator
+             */
+            char correct[AUTOCORRECT_MAX_LENGTH + 10] = {0}; // let's hope this is big enough
+
+            uint8_t offset = space_last ? backspaces : backspaces + 1;
+            strcpy(correct, typo);
+            strcpy_P(correct + typo_len - offset, changes);
+
+            if (apply_autocorrect(backspaces, changes, typo, correct)) {
                 for (uint8_t i = 0; i < backspaces; ++i) {
                     tap_code(KC_BSPC);
                 }
-                send_string_P((char const *)(autocorrect_data + state + 1));
+                send_string_P(changes);
             }
 
             if (keycode == KC_SPC) {
diff --git a/quantum/process_keycode/process_autocorrect.h b/quantum/process_keycode/process_autocorrect.h
index c7596107e505..ea77d6f56f8e 100644
--- a/quantum/process_keycode/process_autocorrect.h
+++ b/quantum/process_keycode/process_autocorrect.h
@@ -1,15 +1,19 @@
 // Copyright 2021 Google LLC
 // Copyright 2021 @filterpaper
+// Copyright 2023 Pablo Martinez (@elpekenin) <elpekenin@elpekenin.dev>
 // SPDX-License-Identifier: Apache-2.0
 // Original source: https://getreuer.info/posts/keyboards/autocorrection
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 bool process_autocorrect(uint16_t keycode, keyrecord_t *record);
 bool process_autocorrect_user(uint16_t *keycode, keyrecord_t *record, uint8_t *typo_buffer_size, uint8_t *mods);
-bool apply_autocorrect(uint8_t backspaces, const char *str);
+bool process_autocorrect_default_handler(uint16_t *keycode, keyrecord_t *record, uint8_t *typo_buffer_size, uint8_t *mods);
+bool apply_autocorrect(uint8_t backspaces, const char *str, char *typo, char *correct);
 
 bool autocorrect_is_enabled(void);
 void autocorrect_enable(void);
diff --git a/quantum/process_keycode/process_backlight.h b/quantum/process_keycode/process_backlight.h
index 7fe887ae6752..e926833e79cf 100644
--- a/quantum/process_keycode/process_backlight.h
+++ b/quantum/process_keycode/process_backlight.h
@@ -16,6 +16,8 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 bool process_backlight(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_caps_word.c b/quantum/process_keycode/process_caps_word.c
index d4382680bf47..1088c8f76c17 100644
--- a/quantum/process_keycode/process_caps_word.c
+++ b/quantum/process_keycode/process_caps_word.c
@@ -13,6 +13,14 @@
 // limitations under the License.
 
 #include "process_caps_word.h"
+#include "process_auto_shift.h"
+#include "caps_word.h"
+#include "keycodes.h"
+#include "quantum_keycodes.h"
+#include "modifiers.h"
+#include "timer.h"
+#include "action_tapping.h"
+#include "action_util.h"
 
 #ifdef CAPS_WORD_INVERT_ON_SHIFT
 static uint8_t held_mods = 0;
diff --git a/quantum/process_keycode/process_caps_word.h b/quantum/process_keycode/process_caps_word.h
index f215bbc3a3df..f5eb140d3219 100644
--- a/quantum/process_keycode/process_caps_word.h
+++ b/quantum/process_keycode/process_caps_word.h
@@ -14,8 +14,9 @@
 
 #pragma once
 
-#include "quantum.h"
-#include "caps_word.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 /**
  * @brief Process handler for Caps Word feature.
diff --git a/quantum/process_keycode/process_clicky.c b/quantum/process_keycode/process_clicky.c
index b662a3f2f4d1..0ee58282e603 100644
--- a/quantum/process_keycode/process_clicky.c
+++ b/quantum/process_keycode/process_clicky.c
@@ -1,5 +1,7 @@
-#include "audio.h"
 #include "process_clicky.h"
+#include "audio.h"
+#include "eeconfig.h"
+#include <stdlib.h>
 
 #ifdef AUDIO_CLICKY
 
diff --git a/quantum/process_keycode/process_clicky.h b/quantum/process_keycode/process_clicky.h
index 67b6463c5d4d..dfdba1413157 100644
--- a/quantum/process_keycode/process_clicky.h
+++ b/quantum/process_keycode/process_clicky.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
+
 void clicky_play(void);
 bool process_clicky(uint16_t keycode, keyrecord_t *record);
 
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index bbee560be9cc..b0034d136a8f 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -14,11 +14,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "keymap_common.h"
-#include "print.h"
 #include "process_combo.h"
+#include <stddef.h>
+#include "process_auto_shift.h"
+#include "caps_word.h"
+#include "timer.h"
+#include "wait.h"
+#include "keyboard.h"
+#include "keymap_common.h"
+#include "action_layer.h"
 #include "action_tapping.h"
-#include "action.h"
+#include "action_util.h"
 #include "keymap_introspection.h"
 
 __attribute__((weak)) void process_combo_event(uint16_t combo_index, bool pressed) {}
@@ -551,7 +557,7 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) {
     /* Only check keycodes from one layer. */
     keycode = keymap_key_to_keycode(COMBO_ONLY_FROM_LAYER, record->event.key);
 #else
-    uint8_t  highest_layer = get_highest_layer(layer_state);
+    uint8_t  highest_layer = get_highest_layer(layer_state | default_layer_state);
     uint8_t  ref_layer     = combo_ref_from_layer(highest_layer);
     if (ref_layer != highest_layer) {
         keycode = keymap_key_to_keycode(ref_layer, record->event.key);
diff --git a/quantum/process_keycode/process_combo.h b/quantum/process_keycode/process_combo.h
index bba5d5ee6301..f1d534236e24 100644
--- a/quantum/process_keycode/process_combo.h
+++ b/quantum/process_keycode/process_combo.h
@@ -16,9 +16,11 @@
 
 #pragma once
 
-#include "progmem.h"
-#include "quantum.h"
 #include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
+#include "keycodes.h"
+#include "quantum_keycodes.h"
 
 #ifdef EXTRA_SHORT_COMBOS
 #    define MAX_COMBO_LENGTH 6
diff --git a/quantum/process_keycode/process_dynamic_macro.c b/quantum/process_keycode/process_dynamic_macro.c
index bf6af566e2a8..30a51503dbb7 100644
--- a/quantum/process_keycode/process_dynamic_macro.c
+++ b/quantum/process_keycode/process_dynamic_macro.c
@@ -17,6 +17,15 @@
 
 /* Author: Wojciech Siewierski < wojciech dot siewierski at onet dot pl > */
 #include "process_dynamic_macro.h"
+#include <stddef.h>
+#include "action_layer.h"
+#include "keycodes.h"
+#include "debug.h"
+#include "wait.h"
+
+#ifdef BACKLIGHT_ENABLE
+#    include "backlight.h"
+#endif
 
 // default feedback method
 void dynamic_macro_led_blink(void) {
@@ -151,6 +160,67 @@ void dynamic_macro_record_end(keyrecord_t *macro_buffer, keyrecord_t *macro_poin
     *macro_end = macro_pointer;
 }
 
+/* Both macros use the same buffer but read/write on different
+ * ends of it.
+ *
+ * Macro1 is written left-to-right starting from the beginning of
+ * the buffer.
+ *
+ * Macro2 is written right-to-left starting from the end of the
+ * buffer.
+ *
+ * &macro_buffer   macro_end
+ *  v                   v
+ * +------------------------------------------------------------+
+ * |>>>>>> MACRO1 >>>>>>      <<<<<<<<<<<<< MACRO2 <<<<<<<<<<<<<|
+ * +------------------------------------------------------------+
+ *                           ^                                 ^
+ *                         r_macro_end                  r_macro_buffer
+ *
+ * During the recording when one macro encounters the end of the
+ * other macro, the recording is stopped. Apart from this, there
+ * are no arbitrary limits for the macros' length in relation to
+ * each other: for example one can either have two medium sized
+ * macros or one long macro and one short macro. Or even one empty
+ * and one using the whole buffer.
+ */
+static keyrecord_t macro_buffer[DYNAMIC_MACRO_SIZE];
+
+/* Pointer to the first buffer element after the first macro.
+ * Initially points to the very beginning of the buffer since the
+ * macro is empty. */
+static keyrecord_t *macro_end = macro_buffer;
+
+/* The other end of the macro buffer. Serves as the beginning of
+ * the second macro. */
+static keyrecord_t *const r_macro_buffer = macro_buffer + DYNAMIC_MACRO_SIZE - 1;
+
+/* Like macro_end but for the second macro. */
+static keyrecord_t *r_macro_end = macro_buffer + DYNAMIC_MACRO_SIZE - 1;
+
+/* A persistent pointer to the current macro position (iterator)
+ * used during the recording. */
+static keyrecord_t *macro_pointer = NULL;
+
+/* 0   - no macro is being recorded right now
+ * 1,2 - either macro 1 or 2 is being recorded */
+static uint8_t macro_id = 0;
+
+/**
+ * If a dynamic macro is currently being recorded, stop recording.
+ */
+void dynamic_macro_stop_recording(void) {
+    switch (macro_id) {
+        case 1:
+            dynamic_macro_record_end(macro_buffer, macro_pointer, +1, &macro_end);
+            break;
+        case 2:
+            dynamic_macro_record_end(r_macro_buffer, macro_pointer, -1, &r_macro_end);
+            break;
+    }
+    macro_id = 0;
+}
+
 /* Handle the key events related to the dynamic macros. Should be
  * called from process_record_user() like this:
  *
@@ -162,52 +232,6 @@ void dynamic_macro_record_end(keyrecord_t *macro_buffer, keyrecord_t *macro_poin
  *   }
  */
 bool process_dynamic_macro(uint16_t keycode, keyrecord_t *record) {
-    /* Both macros use the same buffer but read/write on different
-     * ends of it.
-     *
-     * Macro1 is written left-to-right starting from the beginning of
-     * the buffer.
-     *
-     * Macro2 is written right-to-left starting from the end of the
-     * buffer.
-     *
-     * &macro_buffer   macro_end
-     *  v                   v
-     * +------------------------------------------------------------+
-     * |>>>>>> MACRO1 >>>>>>      <<<<<<<<<<<<< MACRO2 <<<<<<<<<<<<<|
-     * +------------------------------------------------------------+
-     *                           ^                                 ^
-     *                         r_macro_end                  r_macro_buffer
-     *
-     * During the recording when one macro encounters the end of the
-     * other macro, the recording is stopped. Apart from this, there
-     * are no arbitrary limits for the macros' length in relation to
-     * each other: for example one can either have two medium sized
-     * macros or one long macro and one short macro. Or even one empty
-     * and one using the whole buffer.
-     */
-    static keyrecord_t macro_buffer[DYNAMIC_MACRO_SIZE];
-
-    /* Pointer to the first buffer element after the first macro.
-     * Initially points to the very beginning of the buffer since the
-     * macro is empty. */
-    static keyrecord_t *macro_end = macro_buffer;
-
-    /* The other end of the macro buffer. Serves as the beginning of
-     * the second macro. */
-    static keyrecord_t *const r_macro_buffer = macro_buffer + DYNAMIC_MACRO_SIZE - 1;
-
-    /* Like macro_end but for the second macro. */
-    static keyrecord_t *r_macro_end = r_macro_buffer;
-
-    /* A persistent pointer to the current macro position (iterator)
-     * used during the recording. */
-    static keyrecord_t *macro_pointer = NULL;
-
-    /* 0   - no macro is being recorded right now
-     * 1,2 - either macro 1 or 2 is being recorded */
-    static uint8_t macro_id = 0;
-
     if (macro_id == 0) {
         /* No macro recording in progress. */
         if (!record->event.pressed) {
@@ -238,15 +262,7 @@ bool process_dynamic_macro(uint16_t keycode, keyrecord_t *record) {
                 if (record->event.pressed ^ (keycode != QK_DYNAMIC_MACRO_RECORD_STOP)) { /* Ignore the initial release
                                                                                           * just after the recording
                                                                                           * starts for DM_RSTP. */
-                    switch (macro_id) {
-                        case 1:
-                            dynamic_macro_record_end(macro_buffer, macro_pointer, +1, &macro_end);
-                            break;
-                        case 2:
-                            dynamic_macro_record_end(r_macro_buffer, macro_pointer, -1, &r_macro_end);
-                            break;
-                    }
-                    macro_id = 0;
+                    dynamic_macro_stop_recording();
                 }
                 return false;
 #ifdef DYNAMIC_MACRO_NO_NESTING
diff --git a/quantum/process_keycode/process_dynamic_macro.h b/quantum/process_keycode/process_dynamic_macro.h
index ab70726897cb..2f10733cae31 100644
--- a/quantum/process_keycode/process_dynamic_macro.h
+++ b/quantum/process_keycode/process_dynamic_macro.h
@@ -18,7 +18,9 @@
 /* Author: Wojciech Siewierski < wojciech dot siewierski at onet dot pl > */
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 /* May be overridden with a custom value. Be aware that the effective
  * macro length is half of this value: each keypress is recorded twice
@@ -39,3 +41,4 @@ void dynamic_macro_record_start_user(int8_t direction);
 void dynamic_macro_play_user(int8_t direction);
 void dynamic_macro_record_key_user(int8_t direction, keyrecord_t *record);
 void dynamic_macro_record_end_user(int8_t direction);
+void dynamic_macro_stop_recording(void);
diff --git a/quantum/process_keycode/process_dynamic_tapping_term.c b/quantum/process_keycode/process_dynamic_tapping_term.c
index 146b9fccd726..cf52626e428c 100644
--- a/quantum/process_keycode/process_dynamic_tapping_term.c
+++ b/quantum/process_keycode/process_dynamic_tapping_term.c
@@ -14,8 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
 #include "process_dynamic_tapping_term.h"
+#include "quantum.h"
+#include "keycodes.h"
+#include "send_string.h"
 
 #ifndef DYNAMIC_TAPPING_TERM_INCREMENT
 #    define DYNAMIC_TAPPING_TERM_INCREMENT 5
diff --git a/quantum/process_keycode/process_dynamic_tapping_term.h b/quantum/process_keycode/process_dynamic_tapping_term.h
index 85e83ee73b0a..fee29e18dfdb 100644
--- a/quantum/process_keycode/process_dynamic_tapping_term.h
+++ b/quantum/process_keycode/process_dynamic_tapping_term.h
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <stdint.h>
 #include <stdbool.h>
 #include "action.h"
 
diff --git a/quantum/process_keycode/process_grave_esc.c b/quantum/process_keycode/process_grave_esc.c
index ddf027391d5a..d786f57a8034 100644
--- a/quantum/process_keycode/process_grave_esc.c
+++ b/quantum/process_keycode/process_grave_esc.c
@@ -14,6 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "process_grave_esc.h"
+#include "keycodes.h"
+#include "modifiers.h"
+#include "action_util.h"
 
 /* true if the last press of QK_GRAVE_ESCAPE was shifted (i.e. GUI or SHIFT were pressed), false otherwise.
  * Used to ensure that the correct keycode is released if the key is released.
diff --git a/quantum/process_keycode/process_grave_esc.h b/quantum/process_keycode/process_grave_esc.h
index bbf448376314..358ff3c4e78f 100644
--- a/quantum/process_keycode/process_grave_esc.h
+++ b/quantum/process_keycode/process_grave_esc.h
@@ -15,6 +15,8 @@
  */
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 bool process_grave_esc(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_haptic.h b/quantum/process_keycode/process_haptic.h
index 6dbb0f014d06..7e61f6c0d6a4 100644
--- a/quantum/process_keycode/process_haptic.h
+++ b/quantum/process_keycode/process_haptic.h
@@ -15,6 +15,7 @@
  */
 #pragma once
 
+#include <stdint.h>
 #include <stdbool.h>
 #include "action.h"
 
diff --git a/quantum/process_keycode/process_joystick.h b/quantum/process_keycode/process_joystick.h
index 1fb8757708d7..aa1a4432716f 100644
--- a/quantum/process_keycode/process_joystick.h
+++ b/quantum/process_keycode/process_joystick.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <stdint.h>
-#include "quantum.h"
+#include <stdbool.h>
+#include "action.h"
 
 bool process_joystick(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_key_lock.h b/quantum/process_keycode/process_key_lock.h
index 5159b0ba023c..858945a8e448 100644
--- a/quantum/process_keycode/process_key_lock.h
+++ b/quantum/process_keycode/process_key_lock.h
@@ -16,7 +16,9 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 void cancel_key_lock(void);
 bool process_key_lock(uint16_t *keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_key_override.c b/quantum/process_keycode/process_key_override.c
index 17e490e67ae3..264e2562b8cf 100644
--- a/quantum/process_keycode/process_key_override.c
+++ b/quantum/process_keycode/process_key_override.c
@@ -15,12 +15,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "process_key_override.h"
 #include "report.h"
 #include "timer.h"
-#include "process_key_override.h"
-
-#include <debug.h>
+#include "debug.h"
+#include "wait.h"
+#include "action_util.h"
+#include "quantum.h"
+#include "quantum_keycodes.h"
 
 #ifndef KEY_OVERRIDE_REPEAT_DELAY
 #    define KEY_OVERRIDE_REPEAT_DELAY 500
@@ -322,6 +324,15 @@ static bool try_activating_override(const uint16_t keycode, const uint8_t layer,
 
         clear_active_override(false);
 
+#ifdef DUMMY_MOD_NEUTRALIZER_KEYCODE
+        // Send a dummy keycode before unregistering the modifier(s)
+        // so that suppressing the modifier(s) doesn't falsely get interpreted
+        // by the host OS as a tap of a modifier key.
+        // For example, unintended activations of the start menu on Windows when
+        // using a GUI+<kc> key override with suppressed mods.
+        neutralize_flashing_modifiers(active_mods);
+#endif
+
         active_override                 = override;
         active_override_trigger_is_down = true;
 
diff --git a/quantum/process_keycode/process_key_override.h b/quantum/process_keycode/process_key_override.h
index fd76f297a807..3e37c7e63a60 100644
--- a/quantum/process_keycode/process_key_override.h
+++ b/quantum/process_keycode/process_key_override.h
@@ -18,9 +18,8 @@
 #pragma once
 
 #include <stdbool.h>
-#include <stddef.h>
 #include <stdint.h>
-
+#include "action.h"
 #include "action_layer.h"
 
 /**
diff --git a/quantum/process_keycode/process_leader.c b/quantum/process_keycode/process_leader.c
index a9823b628503..ca017a577deb 100644
--- a/quantum/process_keycode/process_leader.c
+++ b/quantum/process_keycode/process_leader.c
@@ -16,6 +16,7 @@
 
 #include "process_leader.h"
 #include "leader.h"
+#include "quantum_keycodes.h"
 
 bool process_leader(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
diff --git a/quantum/process_keycode/process_leader.h b/quantum/process_keycode/process_leader.h
index eb0f721f6008..b78fbb94dff6 100644
--- a/quantum/process_keycode/process_leader.h
+++ b/quantum/process_keycode/process_leader.h
@@ -16,6 +16,8 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 bool process_leader(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_magic.c b/quantum/process_keycode/process_magic.c
index 5fafe8550fc4..3b35884d68a7 100644
--- a/quantum/process_keycode/process_magic.c
+++ b/quantum/process_keycode/process_magic.c
@@ -14,8 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "process_magic.h"
+#include "keycode_config.h"
+#include "keycodes.h"
+#include "eeconfig.h"
 
 #ifdef AUDIO_ENABLE
+#    include "audio.h"
+
 #    ifndef AG_NORM_SONG
 #        define AG_NORM_SONG SONG(AG_NORM_SOUND)
 #    endif
diff --git a/quantum/process_keycode/process_magic.h b/quantum/process_keycode/process_magic.h
index 1eb39f14557c..aa65a43baede 100644
--- a/quantum/process_keycode/process_magic.h
+++ b/quantum/process_keycode/process_magic.h
@@ -15,6 +15,8 @@
  */
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 bool process_magic(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_midi.c b/quantum/process_keycode/process_midi.c
index ce62559849a6..377fcb69e25b 100644
--- a/quantum/process_keycode/process_midi.c
+++ b/quantum/process_keycode/process_midi.c
@@ -15,12 +15,13 @@
  */
 #include "process_midi.h"
 
-#ifdef MIDI_ENABLE
-#    include <LUFA/Drivers/USB/USB.h>
-#    include "midi.h"
-#    include "qmk_midi.h"
+#include <LUFA/Drivers/USB/USB.h>
+#include "midi.h"
+#include "qmk_midi.h"
+#include "timer.h"
+#include "debug.h"
 
-#    ifdef MIDI_BASIC
+#ifdef MIDI_BASIC
 
 void process_midi_basic_noteon(uint8_t note) {
     midi_send_noteon(&midi_device, 0, note, 127);
@@ -34,12 +35,9 @@ void process_midi_all_notes_off(void) {
     midi_send_cc(&midi_device, 0, 0x7B, 0);
 }
 
-#    endif // MIDI_BASIC
-
-#    ifdef MIDI_ADVANCED
-
-#        include "timer.h"
+#endif // MIDI_BASIC
 
+#ifdef MIDI_ADVANCED
 static uint8_t tone_status[2][MIDI_TONE_COUNT];
 
 static uint8_t  midi_modulation;
@@ -248,11 +246,11 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-#    endif // MIDI_ADVANCED
+#endif // MIDI_ADVANCED
 
 void midi_task(void) {
     midi_device_process(&midi_device);
-#    ifdef MIDI_ADVANCED
+#ifdef MIDI_ADVANCED
     if (timer_elapsed(midi_modulation_timer) < midi_config.modulation_interval) return;
     midi_modulation_timer = timer_read();
 
@@ -270,7 +268,5 @@ void midi_task(void) {
 
         if (midi_modulation > 127) midi_modulation = 127;
     }
-#    endif
+#endif
 }
-
-#endif // MIDI_ENABLE
diff --git a/quantum/process_keycode/process_midi.h b/quantum/process_keycode/process_midi.h
index e528c6ec0cab..64ccc610f90a 100644
--- a/quantum/process_keycode/process_midi.h
+++ b/quantum/process_keycode/process_midi.h
@@ -16,7 +16,10 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
+#include "quantum_keycodes.h"
 
 #ifdef MIDI_ENABLE
 
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c
index 7c572079a719..f047668504c3 100644
--- a/quantum/process_keycode/process_music.c
+++ b/quantum/process_keycode/process_music.c
@@ -14,8 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "process_music.h"
+#include "timer.h"
 
 #ifdef AUDIO_ENABLE
+#    include "audio.h"
 #    include "process_audio.h"
 #endif
 #if defined(MIDI_ENABLE) && defined(MIDI_BASIC)
diff --git a/quantum/process_keycode/process_music.h b/quantum/process_keycode/process_music.h
index 83726a05ba9f..ed39d3cda523 100644
--- a/quantum/process_keycode/process_music.h
+++ b/quantum/process_keycode/process_music.h
@@ -16,7 +16,9 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 #if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))
 
diff --git a/quantum/process_keycode/process_programmable_button.h b/quantum/process_keycode/process_programmable_button.h
index 47c6ce561440..ef818af4ca6c 100644
--- a/quantum/process_keycode/process_programmable_button.h
+++ b/quantum/process_keycode/process_programmable_button.h
@@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include <stdint.h>
-#include "quantum.h"
+#include <stdbool.h>
+#include "action.h"
 
 bool process_programmable_button(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_repeat_key.c b/quantum/process_keycode/process_repeat_key.c
index f819aa226e91..73f4ddedcf11 100644
--- a/quantum/process_keycode/process_repeat_key.c
+++ b/quantum/process_keycode/process_repeat_key.c
@@ -13,6 +13,10 @@
 // limitations under the License.
 
 #include "process_repeat_key.h"
+#include "repeat_key.h"
+#include "keycodes.h"
+#include "quantum_keycodes.h"
+#include "action_util.h"
 
 // Default implementation of remember_last_key_user().
 __attribute__((weak)) bool remember_last_key_user(uint16_t keycode, keyrecord_t* record, uint8_t* remembered_mods) {
diff --git a/quantum/process_keycode/process_repeat_key.h b/quantum/process_keycode/process_repeat_key.h
index eddc50f254c9..c3b200c63220 100644
--- a/quantum/process_keycode/process_repeat_key.h
+++ b/quantum/process_keycode/process_repeat_key.h
@@ -14,7 +14,9 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 /**
  * @brief Process handler for remembering the last key.
diff --git a/quantum/process_keycode/process_rgb.c b/quantum/process_keycode/process_rgb.c
index dae129786e22..4e63bf3ca84c 100644
--- a/quantum/process_keycode/process_rgb.c
+++ b/quantum/process_keycode/process_rgb.c
@@ -14,6 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "process_rgb.h"
+#include "action_util.h"
+
+#ifdef RGB_MATRIX_ENABLE
+#    include "rgb_matrix.h"
+#endif
+#ifdef RGBLIGHT_ENABLE
+#    include "rgblight.h"
+#endif
 
 typedef void (*rgb_func_pointer)(void);
 
diff --git a/quantum/process_keycode/process_rgb.h b/quantum/process_keycode/process_rgb.h
index 26aca46896bc..b1069d4bb6f7 100644
--- a/quantum/process_keycode/process_rgb.h
+++ b/quantum/process_keycode/process_rgb.h
@@ -15,6 +15,8 @@
  */
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 bool process_rgb(const uint16_t keycode, const keyrecord_t *record);
diff --git a/quantum/process_keycode/process_secure.h b/quantum/process_keycode/process_secure.h
index 2814264b92f5..78d793f0f66f 100644
--- a/quantum/process_keycode/process_secure.h
+++ b/quantum/process_keycode/process_secure.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <stdint.h>
 #include <stdbool.h>
 #include "action.h"
 
diff --git a/quantum/process_keycode/process_sequencer.h b/quantum/process_keycode/process_sequencer.h
index 2b85f24299ed..3a9bdc2b2409 100644
--- a/quantum/process_keycode/process_sequencer.h
+++ b/quantum/process_keycode/process_sequencer.h
@@ -16,6 +16,8 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 bool process_sequencer(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_space_cadet.c b/quantum/process_keycode/process_space_cadet.c
index 3109ea17114a..f948ad6238b9 100644
--- a/quantum/process_keycode/process_space_cadet.c
+++ b/quantum/process_keycode/process_space_cadet.c
@@ -13,8 +13,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "process_space_cadet.h"
+#include "keycodes.h"
+#include "timer.h"
+#include "action.h"
 #include "action_tapping.h"
+#include "action_util.h"
 
 // ********** OBSOLETE DEFINES, STOP USING! (pls?) **********
 // Shift / paren setup
diff --git a/quantum/process_keycode/process_space_cadet.h b/quantum/process_keycode/process_space_cadet.h
index fcb70f3b4369..6d10051532c3 100644
--- a/quantum/process_keycode/process_space_cadet.h
+++ b/quantum/process_keycode/process_space_cadet.h
@@ -15,7 +15,9 @@
  */
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 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);
diff --git a/quantum/process_keycode/process_steno.c b/quantum/process_keycode/process_steno.c
index d5ad61ba8581..af26d4ca86c3 100644
--- a/quantum/process_keycode/process_steno.c
+++ b/quantum/process_keycode/process_steno.c
@@ -15,6 +15,7 @@
  */
 #include "process_steno.h"
 #include "quantum_keycodes.h"
+#include "eeconfig.h"
 #include "keymap_steno.h"
 #include <string.h>
 #ifdef VIRTSER_ENABLE
diff --git a/quantum/process_keycode/process_steno.h b/quantum/process_keycode/process_steno.h
index 68d6097b9b78..0dd2103218e5 100644
--- a/quantum/process_keycode/process_steno.h
+++ b/quantum/process_keycode/process_steno.h
@@ -16,7 +16,9 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 #define BOLT_STROKE_SIZE 4
 #define GEMINI_STROKE_SIZE 6
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c
index 706f5cddbb1b..b8a8d32f350c 100644
--- a/quantum/process_keycode/process_tap_dance.c
+++ b/quantum/process_keycode/process_tap_dance.c
@@ -13,7 +13,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+#include "process_tap_dance.h"
 #include "quantum.h"
+#include "action_layer.h"
+#include "action_tapping.h"
+#include "action_util.h"
+#include "timer.h"
+#include "wait.h"
 
 static uint16_t active_td;
 static uint16_t last_tap_time;
@@ -88,6 +95,10 @@ static inline void process_tap_dance_action_on_each_tap(tap_dance_action_t *acti
     _process_tap_dance_action_fn(&action->state, action->user_data, action->fn.on_each_tap);
 }
 
+static inline void process_tap_dance_action_on_each_release(tap_dance_action_t *action) {
+    _process_tap_dance_action_fn(&action->state, action->user_data, action->fn.on_each_release);
+}
+
 static inline void process_tap_dance_action_on_reset(tap_dance_action_t *action) {
     _process_tap_dance_action_fn(&action->state, action->user_data, action->fn.on_reset);
     del_weak_mods(action->state.weak_mods);
@@ -151,8 +162,12 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {
                 process_tap_dance_action_on_each_tap(action);
                 active_td = action->state.finished ? 0 : keycode;
             } else {
+                process_tap_dance_action_on_each_release(action);
                 if (action->state.finished) {
                     process_tap_dance_action_on_reset(action);
+                    if (active_td == keycode) {
+                        active_td = 0;
+                    }
                 }
             }
 
diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h
index 5cb6d9202c6b..2b114dabd36d 100644
--- a/quantum/process_keycode/process_tap_dance.h
+++ b/quantum/process_keycode/process_tap_dance.h
@@ -16,18 +16,17 @@
 
 #pragma once
 
-#ifdef TAP_DANCE_ENABLE
-
-#    include <stdbool.h>
-#    include <inttypes.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 typedef struct {
     uint16_t interrupting_keycode;
     uint8_t  count;
     uint8_t  weak_mods;
-#    ifndef NO_ACTION_ONESHOT
+#ifndef NO_ACTION_ONESHOT
     uint8_t oneshot_mods;
-#    endif
+#endif
     bool pressed : 1;
     bool finished : 1;
     bool interrupted : 1;
@@ -41,6 +40,7 @@ typedef struct {
         tap_dance_user_fn_t on_each_tap;
         tap_dance_user_fn_t on_dance_finished;
         tap_dance_user_fn_t on_reset;
+        tap_dance_user_fn_t on_each_release;
     } fn;
     void *user_data;
 } tap_dance_action_t;
@@ -56,24 +56,27 @@ typedef struct {
     void (*layer_function)(uint8_t);
 } tap_dance_dual_role_t;
 
-#    define ACTION_TAP_DANCE_DOUBLE(kc1, kc2) \
-        { .fn = {tap_dance_pair_on_each_tap, tap_dance_pair_finished, tap_dance_pair_reset}, .user_data = (void *)&((tap_dance_pair_t){kc1, kc2}), }
+#define ACTION_TAP_DANCE_DOUBLE(kc1, kc2) \
+    { .fn = {tap_dance_pair_on_each_tap, tap_dance_pair_finished, tap_dance_pair_reset, NULL}, .user_data = (void *)&((tap_dance_pair_t){kc1, kc2}), }
 
-#    define ACTION_TAP_DANCE_LAYER_MOVE(kc, layer) \
-        { .fn = {tap_dance_dual_role_on_each_tap, tap_dance_dual_role_finished, tap_dance_dual_role_reset}, .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_move}), }
+#define ACTION_TAP_DANCE_LAYER_MOVE(kc, layer) \
+    { .fn = {tap_dance_dual_role_on_each_tap, tap_dance_dual_role_finished, tap_dance_dual_role_reset, NULL}, .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_move}), }
 
-#    define ACTION_TAP_DANCE_LAYER_TOGGLE(kc, layer) \
-        { .fn = {NULL, tap_dance_dual_role_finished, tap_dance_dual_role_reset}, .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_invert}), }
+#define ACTION_TAP_DANCE_LAYER_TOGGLE(kc, layer) \
+    { .fn = {NULL, tap_dance_dual_role_finished, tap_dance_dual_role_reset, NULL}, .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_invert}), }
 
-#    define ACTION_TAP_DANCE_FN(user_fn) \
-        { .fn = {NULL, user_fn, NULL}, .user_data = NULL, }
+#define ACTION_TAP_DANCE_FN(user_fn) \
+    { .fn = {NULL, user_fn, NULL, NULL}, .user_data = NULL, }
 
-#    define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, 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_data = NULL, }
+#define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, 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, NULL}, .user_data = NULL, }
 
-#    define TD(n) (QK_TAP_DANCE | TD_INDEX(n))
-#    define TD_INDEX(code) ((code)&0xFF)
-#    define TAP_DANCE_KEYCODE(state) TD(((tap_dance_action_t *)state) - tap_dance_actions)
+#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 TAP_DANCE_KEYCODE(state) TD(((tap_dance_action_t *)state) - tap_dance_actions)
 
 extern tap_dance_action_t tap_dance_actions[];
 
@@ -92,9 +95,3 @@ void tap_dance_pair_reset(tap_dance_state_t *state, void *user_data);
 void tap_dance_dual_role_on_each_tap(tap_dance_state_t *state, void *user_data);
 void tap_dance_dual_role_finished(tap_dance_state_t *state, void *user_data);
 void tap_dance_dual_role_reset(tap_dance_state_t *state, void *user_data);
-
-#else
-
-#    define TD(n) KC_NO
-
-#endif
diff --git a/quantum/process_keycode/process_tri_layer.h b/quantum/process_keycode/process_tri_layer.h
index 9c4e3df1c2f4..5e6e4ff94db2 100644
--- a/quantum/process_keycode/process_tri_layer.h
+++ b/quantum/process_keycode/process_tri_layer.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <stdint.h>
+#include <stdbool.h>
 #include "action.h"
 
 /**
diff --git a/quantum/process_keycode/process_ucis.c b/quantum/process_keycode/process_ucis.c
index 3aa09d5948f2..91a038bab1cd 100644
--- a/quantum/process_keycode/process_ucis.c
+++ b/quantum/process_keycode/process_ucis.c
@@ -15,110 +15,30 @@
  */
 
 #include "process_ucis.h"
-#include "unicode.h"
-#include "keycode.h"
-#include "wait.h"
+#include "ucis.h"
+#include "keycodes.h"
 
-ucis_state_t ucis_state;
-
-void ucis_start(void) {
-    ucis_state.count       = 0;
-    ucis_state.in_progress = true;
-
-    ucis_start_user();
-}
-
-__attribute__((weak)) void ucis_start_user(void) {
-    register_unicode(0x2328); // ⌨
-}
-
-__attribute__((weak)) void ucis_success(uint8_t symbol_index) {}
-
-static bool is_uni_seq(char *seq) {
-    uint8_t i;
-    for (i = 0; seq[i]; i++) {
-        uint16_t keycode;
-        if ('1' <= seq[i] && seq[i] <= '0') {
-            keycode = seq[i] - '1' + KC_1;
-        } else {
-            keycode = seq[i] - 'a' + KC_A;
-        }
-        if (i > ucis_state.count || ucis_state.codes[i] != keycode) {
+bool process_ucis(uint16_t keycode, keyrecord_t *record) {
+    if (ucis_active() && record->event.pressed) {
+        bool special = keycode == KC_SPACE || keycode == KC_ENTER || keycode == KC_ESCAPE || keycode == KC_BACKSPACE;
+        if (ucis_count() >= UCIS_MAX_INPUT_LENGTH && !special) {
             return false;
         }
-    }
-    return ucis_state.codes[i] == KC_ENTER || ucis_state.codes[i] == KC_SPACE;
-}
-
-__attribute__((weak)) void ucis_symbol_fallback(void) {
-    for (uint8_t i = 0; i < ucis_state.count - 1; i++) {
-        tap_code(ucis_state.codes[i]);
-    }
-}
-
-__attribute__((weak)) void ucis_cancel(void) {}
-
-void register_ucis(const uint32_t *code_points) {
-    for (int i = 0; i < UCIS_MAX_CODE_POINTS && code_points[i]; i++) {
-        register_unicode(code_points[i]);
-    }
-}
 
-bool process_ucis(uint16_t keycode, keyrecord_t *record) {
-    if (!ucis_state.in_progress || !record->event.pressed) {
-        return true;
-    }
-
-    bool special = keycode == KC_SPACE || keycode == KC_ENTER || keycode == KC_ESCAPE || keycode == KC_BACKSPACE;
-    if (ucis_state.count >= UCIS_MAX_SYMBOL_LENGTH && !special) {
-        return false;
-    }
-
-    ucis_state.codes[ucis_state.count] = keycode;
-    ucis_state.count++;
-
-    switch (keycode) {
-        case KC_BACKSPACE:
-            if (ucis_state.count >= 2) {
-                ucis_state.count -= 2;
-                return true;
-            } else {
-                ucis_state.count--;
-                return false;
-            }
-
-        case KC_SPACE:
-        case KC_ENTER:
-        case KC_ESCAPE:
-            for (uint8_t i = 0; i < ucis_state.count; i++) {
-                tap_code(KC_BACKSPACE);
-            }
-
-            if (keycode == KC_ESCAPE) {
-                ucis_state.in_progress = false;
-                ucis_cancel();
-                return false;
-            }
-
-            uint8_t i;
-            bool    symbol_found = false;
-            for (i = 0; ucis_symbol_table[i].symbol; i++) {
-                if (is_uni_seq(ucis_symbol_table[i].symbol)) {
-                    symbol_found = true;
-                    register_ucis(ucis_symbol_table[i].code_points);
-                    break;
-                }
+        if (!ucis_add(keycode)) {
+            switch (keycode) {
+                case KC_BACKSPACE:
+                    return ucis_remove_last();
+                case KC_ESCAPE:
+                    ucis_cancel();
+                    return false;
+                case KC_SPACE:
+                case KC_ENTER:
+                    ucis_finish();
+                    return false;
             }
-            if (symbol_found) {
-                ucis_success(i);
-            } else {
-                ucis_symbol_fallback();
-            }
-
-            ucis_state.in_progress = false;
-            return false;
-
-        default:
-            return true;
+        }
     }
+
+    return true;
 }
diff --git a/quantum/process_keycode/process_ucis.h b/quantum/process_keycode/process_ucis.h
index 54eb9413d41b..6282df78932d 100644
--- a/quantum/process_keycode/process_ucis.h
+++ b/quantum/process_keycode/process_ucis.h
@@ -18,48 +18,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-
 #include "action.h"
 
-#ifndef UCIS_MAX_SYMBOL_LENGTH
-#    define UCIS_MAX_SYMBOL_LENGTH 32
-#endif
-#ifndef UCIS_MAX_CODE_POINTS
-#    define UCIS_MAX_CODE_POINTS 3
-#endif
-
-typedef struct {
-    char *   symbol;
-    uint32_t code_points[UCIS_MAX_CODE_POINTS];
-} ucis_symbol_t;
-
-typedef struct {
-    uint8_t  count;
-    uint16_t codes[UCIS_MAX_SYMBOL_LENGTH];
-    bool     in_progress : 1;
-} ucis_state_t;
-
-extern ucis_state_t ucis_state;
-
-// clang-format off
-
-#define UCIS_TABLE(...) \
-    {                   \
-        __VA_ARGS__,    \
-        { NULL, {} }    \
-    }
-#define UCIS_SYM(name, ...) \
-    { name, {__VA_ARGS__} }
-
-// clang-format on
-
-extern const ucis_symbol_t ucis_symbol_table[];
-
-void ucis_start(void);
-void ucis_start_user(void);
-void ucis_symbol_fallback(void);
-void ucis_success(uint8_t symbol_index);
-
-void register_ucis(const uint32_t *code_points);
-
 bool process_ucis(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_unicode.c b/quantum/process_keycode/process_unicode.c
index 1ec76245a342..8ee6fcd7fca7 100644
--- a/quantum/process_keycode/process_unicode.c
+++ b/quantum/process_keycode/process_unicode.c
@@ -16,6 +16,7 @@
 
 #include "process_unicode.h"
 #include "unicode.h"
+#include "keycodes.h"
 #include "quantum_keycodes.h"
 
 bool process_unicode(uint16_t keycode, keyrecord_t *record) {
diff --git a/quantum/process_keycode/process_unicode.h b/quantum/process_keycode/process_unicode.h
index 341bc8d861dc..9a51ffaf7c9c 100644
--- a/quantum/process_keycode/process_unicode.h
+++ b/quantum/process_keycode/process_unicode.h
@@ -18,7 +18,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-
 #include "action.h"
 
 bool process_unicode(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_unicode_common.c b/quantum/process_keycode/process_unicode_common.c
index a0b901002763..f43770977aa2 100644
--- a/quantum/process_keycode/process_unicode_common.c
+++ b/quantum/process_keycode/process_unicode_common.c
@@ -17,7 +17,8 @@
 #include "process_unicode_common.h"
 #include "unicode.h"
 #include "action_util.h"
-#include "keycode.h"
+#include "keycodes.h"
+#include "modifiers.h"
 
 #if defined(UNICODE_ENABLE)
 #    include "process_unicode.h"
@@ -32,10 +33,18 @@ bool process_unicode_common(uint16_t keycode, keyrecord_t *record) {
         bool shifted = get_mods() & MOD_MASK_SHIFT;
         switch (keycode) {
             case QK_UNICODE_MODE_NEXT:
-                cycle_unicode_input_mode(shifted ? -1 : +1);
+                if (shifted) {
+                    unicode_input_mode_step_reverse();
+                } else {
+                    unicode_input_mode_step();
+                }
                 break;
             case QK_UNICODE_MODE_PREVIOUS:
-                cycle_unicode_input_mode(shifted ? +1 : -1);
+                if (shifted) {
+                    unicode_input_mode_step();
+                } else {
+                    unicode_input_mode_step_reverse();
+                }
                 break;
             case QK_UNICODE_MODE_MACOS:
                 set_unicode_input_mode(UNICODE_MODE_MACOS);
diff --git a/quantum/process_keycode/process_unicode_common.h b/quantum/process_keycode/process_unicode_common.h
index fd09a41818f9..046583007930 100644
--- a/quantum/process_keycode/process_unicode_common.h
+++ b/quantum/process_keycode/process_unicode_common.h
@@ -18,7 +18,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-
 #include "action.h"
 
 bool process_unicode_common(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_unicodemap.c b/quantum/process_keycode/process_unicodemap.c
index 195c093e6e5d..a85568521c5d 100644
--- a/quantum/process_keycode/process_unicodemap.c
+++ b/quantum/process_keycode/process_unicodemap.c
@@ -15,41 +15,12 @@
  */
 
 #include "process_unicodemap.h"
-#include "unicode.h"
-#include "quantum_keycodes.h"
-#include "keycode.h"
-#include "action_util.h"
-#include "host.h"
-
-__attribute__((weak)) uint16_t unicodemap_index(uint16_t keycode) {
-    if (keycode >= QK_UNICODEMAP_PAIR) {
-        // Keycode is a pair: extract index based on Shift / Caps Lock state
-        uint16_t index;
-
-        uint8_t mods = get_mods() | get_weak_mods();
-#ifndef NO_ACTION_ONESHOT
-        mods |= get_oneshot_mods();
-#endif
-
-        bool shift = mods & MOD_MASK_SHIFT;
-        bool caps  = host_keyboard_led_state().caps_lock;
-        if (shift ^ caps) {
-            index = QK_UNICODEMAP_PAIR_GET_SHIFTED_INDEX(keycode);
-        } else {
-            index = QK_UNICODEMAP_PAIR_GET_UNSHIFTED_INDEX(keycode);
-        }
-
-        return index;
-    } else {
-        // Keycode is a regular index
-        return QK_UNICODEMAP_GET_INDEX(keycode);
-    }
-}
+#include "unicodemap.h"
+#include "keycodes.h"
 
 bool process_unicodemap(uint16_t keycode, keyrecord_t *record) {
     if (keycode >= QK_UNICODEMAP && keycode <= QK_UNICODEMAP_PAIR_MAX && record->event.pressed) {
-        uint32_t code_point = pgm_read_dword(unicode_map + unicodemap_index(keycode));
-        register_unicode(code_point);
+        register_unicodemap(unicodemap_index(keycode));
     }
     return true;
 }
diff --git a/quantum/process_keycode/process_unicodemap.h b/quantum/process_keycode/process_unicodemap.h
index 5a3aeb000062..f07082e9efa9 100644
--- a/quantum/process_keycode/process_unicodemap.h
+++ b/quantum/process_keycode/process_unicodemap.h
@@ -18,11 +18,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-
 #include "action.h"
-#include "progmem.h"
-
-extern const uint32_t unicode_map[] PROGMEM;
 
-uint16_t unicodemap_index(uint16_t keycode);
-bool     process_unicodemap(uint16_t keycode, keyrecord_t *record);
+bool process_unicodemap(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 091cf298f73f..3323a5adb62e 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -16,24 +16,60 @@
 
 #include "quantum.h"
 
+#if defined(BACKLIGHT_ENABLE) || defined(LED_MATRIX_ENABLE)
+#    include "process_backlight.h"
+#endif
+
 #ifdef BLUETOOTH_ENABLE
 #    include "outputselect.h"
 #endif
 
-#ifdef BACKLIGHT_ENABLE
-#    include "backlight.h"
+#ifdef GRAVE_ESC_ENABLE
+#    include "process_grave_esc.h"
+#endif
+
+#ifdef HAPTIC_ENABLE
+#    include "process_haptic.h"
+#endif
+
+#ifdef JOYSTICK_ENABLE
+#    include "process_joystick.h"
+#endif
+
+#ifdef LEADER_ENABLE
+#    include "process_leader.h"
+#endif
+
+#ifdef MAGIC_KEYCODE_ENABLE
+#    include "process_magic.h"
 #endif
 
 #ifdef MIDI_ENABLE
 #    include "process_midi.h"
 #endif
 
-#ifdef VELOCIKEY_ENABLE
-#    include "velocikey.h"
+#ifdef PROGRAMMABLE_BUTTON_ENABLE
+#    include "process_programmable_button.h"
 #endif
 
-#ifdef HAPTIC_ENABLE
-#    include "haptic.h"
+#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
+#    include "process_rgb.h"
+#endif
+
+#ifdef SECURE_ENABLE
+#    include "process_secure.h"
+#endif
+
+#ifdef TRI_LAYER_ENABLE
+#    include "process_tri_layer.h"
+#endif
+
+#ifdef UNICODE_COMMON_ENABLE
+#    include "process_unicode_common.h"
+#endif
+
+#ifdef VELOCIKEY_ENABLE
+#    include "velocikey.h"
 #endif
 
 #ifdef AUDIO_ENABLE
@@ -310,15 +346,15 @@ bool process_record_quantum(keyrecord_t *record) {
 #if (defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))) && !defined(NO_MUSIC_MODE)
             process_music(keycode, record) &&
 #endif
+#ifdef CAPS_WORD_ENABLE
+            process_caps_word(keycode, record) &&
+#endif
 #ifdef KEY_OVERRIDE_ENABLE
             process_key_override(keycode, record) &&
 #endif
 #ifdef TAP_DANCE_ENABLE
             process_tap_dance(keycode, record) &&
 #endif
-#ifdef CAPS_WORD_ENABLE
-            process_caps_word(keycode, record) &&
-#endif
 #if defined(UNICODE_COMMON_ENABLE)
             process_unicode_common(keycode, record) &&
 #endif
@@ -468,7 +504,7 @@ void suspend_power_down_quantum(void) {
 #ifndef NO_SUSPEND_POWER_DOWN
 // Turn off backlight
 #    ifdef BACKLIGHT_ENABLE
-    backlight_set(0);
+    backlight_level_noeeprom(0);
 #    endif
 
 #    ifdef LED_MATRIX_ENABLE
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 31a1a63a7acb..4d183e755f28 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -93,30 +93,20 @@ extern layer_state_t layer_state;
 #    include "process_music.h"
 #endif
 
-#if defined(BACKLIGHT_ENABLE) || defined(LED_MATRIX_ENABLE)
-#    include "process_backlight.h"
-#endif
-
 #ifdef LEADER_ENABLE
 #    include "leader.h"
-#    include "process_leader.h"
 #endif
 
-#ifdef UNICODE_ENABLE
-#    include "process_unicode.h"
+#ifdef UNICODE_COMMON_ENABLE
+#    include "unicode.h"
 #endif
 
 #ifdef UCIS_ENABLE
-#    include "process_ucis.h"
+#    include "ucis.h"
 #endif
 
 #ifdef UNICODEMAP_ENABLE
-#    include "process_unicodemap.h"
-#endif
-
-#ifdef UNICODE_COMMON_ENABLE
-#    include "unicode.h"
-#    include "process_unicode_common.h"
+#    include "unicodemap.h"
 #endif
 
 #ifdef KEY_OVERRIDE_ENABLE
@@ -147,24 +137,8 @@ extern layer_state_t layer_state;
 #    include "process_space_cadet.h"
 #endif
 
-#ifdef MAGIC_KEYCODE_ENABLE
-#    include "process_magic.h"
-#endif
-
-#ifdef JOYSTICK_ENABLE
-#    include "process_joystick.h"
-#endif
-
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
-#    include "process_programmable_button.h"
-#endif
-
-#ifdef GRAVE_ESC_ENABLE
-#    include "process_grave_esc.h"
-#endif
-
-#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-#    include "process_rgb.h"
+#    include "programmable_button.h"
 #endif
 
 #ifdef HD44780_ENABLE
@@ -177,7 +151,6 @@ extern layer_state_t layer_state;
 
 #ifdef HAPTIC_ENABLE
 #    include "haptic.h"
-#    include "process_haptic.h"
 #endif
 
 #ifdef OLED_ENABLE
@@ -202,7 +175,6 @@ extern layer_state_t layer_state;
 
 #ifdef SECURE_ENABLE
 #    include "secure.h"
-#    include "process_secure.h"
 #endif
 
 #ifdef DYNAMIC_KEYMAP_ENABLE
@@ -248,7 +220,6 @@ extern layer_state_t layer_state;
 
 #ifdef TRI_LAYER_ENABLE
 #    include "tri_layer.h"
-#    include "process_tri_layer.h"
 #endif
 
 #ifdef REPEAT_KEY_ENABLE
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index f931b7e4c70a..d3249bd45559 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -179,10 +179,10 @@
 #define QK_UNICODE_GET_CODE_POINT(kc) ((kc)&0x7FFF)
 
 // UNICODEMAP_ENABLE - Allows Unicode input up to 0x10FFFF, requires unicode_map
-#define X(i) (QK_UNICODEMAP | ((i)&0x3FFF))
+#define UM(i) (QK_UNICODEMAP | ((i)&0x3FFF))
 #define QK_UNICODEMAP_GET_INDEX(kc) ((kc)&0x3FFF)
 
-#define XP(i, j) (QK_UNICODEMAP_PAIR | ((i)&0x7F) | (((j)&0x7F) << 7)) // 127 max i and j
+#define UP(i, j) (QK_UNICODEMAP_PAIR | ((i)&0x7F) | (((j)&0x7F) << 7)) // 127 max i and j
 #define QK_UNICODEMAP_PAIR_GET_UNSHIFTED_INDEX(kc) ((kc)&0x7F)
 #define QK_UNICODEMAP_PAIR_GET_SHIFTED_INDEX(kc) (((kc) >> 7) & 0x7F)
 
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 120c98bc6283..260ac1c8a443 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -53,3 +53,6 @@
 #define GUI_ON  QK_MAGIC_GUI_ON
 #define GUI_OFF QK_MAGIC_GUI_OFF
 #define GUI_TOG QK_MAGIC_TOGGLE_GUI
+
+#define X(i) UM(i)
+#define XP(i, j) UP(i, j)
diff --git a/quantum/raw_hid.h b/quantum/raw_hid.h
index 6d60ab2bffc1..16830833ccf4 100644
--- a/quantum/raw_hid.h
+++ b/quantum/raw_hid.h
@@ -1,5 +1,31 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
+#include <stdint.h>
+
+/**
+ * \file
+ *
+ * \defgroup raw_hid Raw HID API
+ * \{
+ */
+
+/**
+ * \brief Callback, invoked when a raw HID report has been received from the host.
+ *
+ * \param data A pointer to the received data. Always 32 bytes in length.
+ * \param length The length of the buffer. Always 32.
+ */
 void raw_hid_receive(uint8_t *data, uint8_t length);
 
+/**
+ * \brief Send an HID report.
+ *
+ * \param data A pointer to the data to send. Must always be 32 bytes in length.
+ * \param length The length of the buffer. Must always be 32.
+ */
 void raw_hid_send(uint8_t *data, uint8_t length);
+
+/** \} */
diff --git a/quantum/repeat_key.c b/quantum/repeat_key.c
index 0689c6d45476..4567428723ac 100644
--- a/quantum/repeat_key.c
+++ b/quantum/repeat_key.c
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "repeat_key.h"
+#include "quantum_keycodes.h"
 
 // Variables saving the state of the last key press.
 static keyrecord_t last_record = {0};
diff --git a/quantum/repeat_key.h b/quantum/repeat_key.h
index 06e83645295c..8084be24ad4c 100644
--- a/quantum/repeat_key.h
+++ b/quantum/repeat_key.h
@@ -14,7 +14,10 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
+#include "keyboard.h"
 
 uint16_t get_last_keycode(void);             /**< Keycode of the last key. */
 uint8_t  get_last_mods(void);                /**< Mods active with the last key. */
diff --git a/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h b/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h
index 6bde60053bf5..5d3df1059e5c 100644
--- a/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h
+++ b/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h
@@ -10,17 +10,16 @@ static void jellybean_raindrops_set_color(int i, effect_params_t* params) {
 }
 
 bool JELLYBEAN_RAINDROPS(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
     if (!params->init) {
         // Change one LED every tick, make sure speed is not 0
         if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 5 == 0) {
             jellybean_raindrops_set_color(random8_max(RGB_MATRIX_LED_COUNT), params);
         }
-        return false;
-    }
-
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-    for (int i = led_min; i < led_max; i++) {
-        jellybean_raindrops_set_color(i, params);
+    } else {
+        for (int i = led_min; i < led_max; i++) {
+            jellybean_raindrops_set_color(i, params);
+        }
     }
     return rgb_matrix_check_finished_leds(led_max);
 }
diff --git a/quantum/rgb_matrix/animations/pixel_fractal_anim.h b/quantum/rgb_matrix/animations/pixel_fractal_anim.h
index 875b4ceb3dc0..4cd1d9b86149 100644
--- a/quantum/rgb_matrix/animations/pixel_fractal_anim.h
+++ b/quantum/rgb_matrix/animations/pixel_fractal_anim.h
@@ -7,7 +7,11 @@ RGB_MATRIX_EFFECT(PIXEL_FRACTAL)
 #    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
 static bool PIXEL_FRACTAL(effect_params_t* params) {
-#        define MID_COL MATRIX_COLS / 2
+#        if MATRIX_COLS < 2
+#            define MID_COL 1
+#        else
+#            define MID_COL MATRIX_COLS / 2
+#        endif
     static bool     led[MATRIX_ROWS][MID_COL];
     static uint32_t wait_timer = 0;
 
diff --git a/quantum/rgb_matrix/animations/pixel_rain_anim.h b/quantum/rgb_matrix/animations/pixel_rain_anim.h
index 9d63f451e278..26cd73b57804 100644
--- a/quantum/rgb_matrix/animations/pixel_rain_anim.h
+++ b/quantum/rgb_matrix/animations/pixel_rain_anim.h
@@ -16,13 +16,9 @@ static bool PIXEL_RAIN(effect_params_t* params) {
         if (!HAS_ANY_FLAGS(g_led_config.flags[led_index], params->flags)) {
             return;
         }
-        if (random8() & 2) {
-            rgb_matrix_set_color(led_index, 0, 0, 0);
-        } else {
-            HSV hsv = {random8(), random8_min_max(127, 255), rgb_matrix_config.hsv.v};
-            RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
-            rgb_matrix_set_color(led_index, rgb.r, rgb.g, rgb.b);
-        }
+        HSV hsv = (random8() & 2) ? (HSV){0, 0, 0} : (HSV){random8(), random8_min_max(127, 255), rgb_matrix_config.hsv.v};
+        RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
+        rgb_matrix_set_color(led_index, rgb.r, rgb.g, rgb.b);
         wait_timer = g_rgb_timer + interval();
     }
 
diff --git a/quantum/rgb_matrix/post_config.h b/quantum/rgb_matrix/post_config.h
new file mode 100644
index 000000000000..7162c8679ba3
--- /dev/null
+++ b/quantum/rgb_matrix/post_config.h
@@ -0,0 +1,29 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// clang-format off
+
+// framebuffer
+#if defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP) || \
+    defined(ENABLE_RGB_MATRIX_DIGITAL_RAIN)
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#endif
+
+// reactive
+#if defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE) || \
+    defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE) || \
+    defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE) || \
+    defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE) || \
+    defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS) || \
+    defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS) || \
+    defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS) || \
+    defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS) || \
+    defined(ENABLE_RGB_MATRIX_SPLASH) || \
+    defined(ENABLE_RGB_MATRIX_MULTISPLASH) || \
+    defined(ENABLE_RGB_MATRIX_SOLID_SPLASH) || \
+    defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS) || \
+    defined(ENABLE_RGB_MATRIX_SOLID_MULTISPLASH)
+#    define RGB_MATRIX_KEYPRESSES
+#endif
diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
index 1f3912cf7e0c..96be6151628f 100644
--- a/quantum/rgb_matrix/rgb_matrix.c
+++ b/quantum/rgb_matrix/rgb_matrix.c
@@ -19,8 +19,13 @@
 #include "rgb_matrix.h"
 #include "progmem.h"
 #include "eeprom.h"
+#include "eeconfig.h"
+#include "keyboard.h"
+#include "sync_timer.h"
+#include "debug.h"
 #include <string.h>
 #include <math.h>
+#include <stdlib.h>
 
 #include <lib/lib8tion/lib8tion.h>
 
@@ -428,7 +433,10 @@ void rgb_matrix_task(void) {
         case RENDERING:
             rgb_task_render(effect);
             if (effect) {
-                rgb_matrix_indicators();
+                // Only run the basic indicators in the last render iteration (default there are 5 iterations)
+                if (rgb_effect_params.iter == RGB_MATRIX_LED_PROCESS_MAX_ITERATIONS) {
+                    rgb_matrix_indicators();
+                }
                 rgb_matrix_indicators_advanced(&rgb_effect_params);
             }
             break;
diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h
index 9ea248b66d2c..38040fb0ccc4 100644
--- a/quantum/rgb_matrix/rgb_matrix.h
+++ b/quantum/rgb_matrix/rgb_matrix.h
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include "rgb_matrix_types.h"
 #include "color.h"
-#include "quantum.h"
+#include "keyboard.h"
 
 #ifdef IS31FL3731
 #    include "is31fl3731.h"
@@ -49,8 +49,9 @@
 #endif
 
 #ifndef RGB_MATRIX_LED_PROCESS_LIMIT
-#    define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5
+#    define RGB_MATRIX_LED_PROCESS_LIMIT ((RGB_MATRIX_LED_COUNT + 4) / 5)
 #endif
+#define RGB_MATRIX_LED_PROCESS_MAX_ITERATIONS ((RGB_MATRIX_LED_COUNT + RGB_MATRIX_LED_PROCESS_LIMIT - 1) / RGB_MATRIX_LED_PROCESS_LIMIT)
 
 #if defined(RGB_MATRIX_LED_PROCESS_LIMIT) && RGB_MATRIX_LED_PROCESS_LIMIT > 0 && RGB_MATRIX_LED_PROCESS_LIMIT < RGB_MATRIX_LED_COUNT
 #    if defined(RGB_MATRIX_SPLIT)
diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c
index d66fc801ddea..695ecc78a47a 100644
--- a/quantum/rgb_matrix/rgb_matrix_drivers.c
+++ b/quantum/rgb_matrix/rgb_matrix_drivers.c
@@ -15,6 +15,7 @@
  */
 
 #include "rgb_matrix.h"
+#include "util.h"
 
 /* Each driver needs to define the struct
  *    const rgb_matrix_driver_t rgb_matrix_driver;
@@ -37,13 +38,13 @@ static void init(void) {
     i2c_init();
 
 #    if defined(IS31FL3731)
-    IS31FL3731_init(DRIVER_ADDR_1);
+    is31fl3731_init(DRIVER_ADDR_1);
 #        if defined(DRIVER_ADDR_2)
-    IS31FL3731_init(DRIVER_ADDR_2);
+    is31fl3731_init(DRIVER_ADDR_2);
 #            if defined(DRIVER_ADDR_3)
-    IS31FL3731_init(DRIVER_ADDR_3);
+    is31fl3731_init(DRIVER_ADDR_3);
 #                if defined(DRIVER_ADDR_4)
-    IS31FL3731_init(DRIVER_ADDR_4);
+    is31fl3731_init(DRIVER_ADDR_4);
 #                endif
 #            endif
 #        endif
@@ -52,58 +53,58 @@ static void init(void) {
 #        if !defined(DRIVER_SYNC_1)
 #            define DRIVER_SYNC_1 0
 #        endif
-    IS31FL3733_init(DRIVER_ADDR_1, DRIVER_SYNC_1);
+    is31fl3733_init(DRIVER_ADDR_1, DRIVER_SYNC_1);
 #        if defined(DRIVER_ADDR_2)
 #            if !defined(DRIVER_SYNC_2)
 #                define DRIVER_SYNC_2 0
 #            endif
-    IS31FL3733_init(DRIVER_ADDR_2, DRIVER_SYNC_2);
+    is31fl3733_init(DRIVER_ADDR_2, DRIVER_SYNC_2);
 #            if defined(DRIVER_ADDR_3)
 #                if !defined(DRIVER_SYNC_3)
 #                    define DRIVER_SYNC_3 0
 #                endif
-    IS31FL3733_init(DRIVER_ADDR_3, DRIVER_SYNC_3);
+    is31fl3733_init(DRIVER_ADDR_3, DRIVER_SYNC_3);
 #                if defined(DRIVER_ADDR_4)
 #                    if !defined(DRIVER_SYNC_4)
 #                        define DRIVER_SYNC_4 0
 #                    endif
-    IS31FL3733_init(DRIVER_ADDR_4, DRIVER_SYNC_4);
+    is31fl3733_init(DRIVER_ADDR_4, DRIVER_SYNC_4);
 #                endif
 #            endif
 #        endif
 
 #    elif defined(IS31FL3736)
-    IS31FL3736_init(DRIVER_ADDR_1);
+    is31fl3736_init(DRIVER_ADDR_1);
 #        if defined(DRIVER_ADDR_2)
-    IS31FL3736_init(DRIVER_ADDR_2);
+    is31fl3736_init(DRIVER_ADDR_2);
 #            if defined(DRIVER_ADDR_3)
-    IS31FL3736_init(DRIVER_ADDR_3);
+    is31fl3736_init(DRIVER_ADDR_3);
 #                if defined(DRIVER_ADDR_4)
-    IS31FL3736_init(DRIVER_ADDR_4);
+    is31fl3736_init(DRIVER_ADDR_4);
 #                endif
 #            endif
 #        endif
 
 #    elif defined(IS31FL3737)
-    IS31FL3737_init(DRIVER_ADDR_1);
+    is31fl3737_init(DRIVER_ADDR_1);
 #        if defined(DRIVER_ADDR_2)
-    IS31FL3737_init(DRIVER_ADDR_2);
+    is31fl3737_init(DRIVER_ADDR_2);
 #            if defined(DRIVER_ADDR_3)
-    IS31FL3737_init(DRIVER_ADDR_3);
+    is31fl3737_init(DRIVER_ADDR_3);
 #                if defined(DRIVER_ADDR_4)
-    IS31FL3737_init(DRIVER_ADDR_4);
+    is31fl3737_init(DRIVER_ADDR_4);
 #                endif
 #            endif
 #        endif
 
 #    elif defined(IS31FL3741)
-    IS31FL3741_init(DRIVER_ADDR_1);
+    is31fl3741_init(DRIVER_ADDR_1);
 #        if defined(DRIVER_ADDR_2)
-    IS31FL3741_init(DRIVER_ADDR_2);
+    is31fl3741_init(DRIVER_ADDR_2);
 #            if defined(DRIVER_ADDR_3)
-    IS31FL3741_init(DRIVER_ADDR_3);
+    is31fl3741_init(DRIVER_ADDR_3);
 #                if defined(DRIVER_ADDR_4)
-    IS31FL3741_init(DRIVER_ADDR_4);
+    is31fl3741_init(DRIVER_ADDR_4);
 #                endif
 #            endif
 #        endif
@@ -121,13 +122,13 @@ static void init(void) {
 #        endif
 
 #    elif defined(CKLED2001)
-    CKLED2001_init(DRIVER_ADDR_1);
+    ckled2001_init(DRIVER_ADDR_1);
 #        if defined(DRIVER_ADDR_2)
-    CKLED2001_init(DRIVER_ADDR_2);
+    ckled2001_init(DRIVER_ADDR_2);
 #            if defined(DRIVER_ADDR_3)
-    CKLED2001_init(DRIVER_ADDR_3);
+    ckled2001_init(DRIVER_ADDR_3);
 #                if defined(DRIVER_ADDR_4)
-    CKLED2001_init(DRIVER_ADDR_4);
+    ckled2001_init(DRIVER_ADDR_4);
 #                endif
 #            endif
 #        endif
@@ -138,79 +139,79 @@ static void init(void) {
 
         // This only caches it for later
 #    if defined(IS31FL3731)
-        IS31FL3731_set_led_control_register(index, enabled, enabled, enabled);
+        is31fl3731_set_led_control_register(index, enabled, enabled, enabled);
 #    elif defined(IS31FL3733)
-        IS31FL3733_set_led_control_register(index, enabled, enabled, enabled);
+        is31fl3733_set_led_control_register(index, enabled, enabled, enabled);
 #    elif defined(IS31FL3736)
-        IS31FL3736_set_led_control_register(index, enabled, enabled, enabled);
+        is31fl3736_set_led_control_register(index, enabled, enabled, enabled);
 #    elif defined(IS31FL3737)
-        IS31FL3737_set_led_control_register(index, enabled, enabled, enabled);
+        is31fl3737_set_led_control_register(index, enabled, enabled, enabled);
 #    elif defined(IS31FL3741)
-        IS31FL3741_set_led_control_register(index, enabled, enabled, enabled);
+        is31fl3741_set_led_control_register(index, enabled, enabled, enabled);
 #    elif defined(IS31FLCOMMON)
         IS31FL_RGB_set_scaling_buffer(index, enabled, enabled, enabled);
 #    elif defined(CKLED2001)
-        CKLED2001_set_led_control_register(index, enabled, enabled, enabled);
+        ckled2001_set_led_control_register(index, enabled, enabled, enabled);
 #    endif
     }
 
     // This actually updates the LED drivers
 #    if defined(IS31FL3731)
-    IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3731_update_led_control_registers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
-    IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1);
+    is31fl3731_update_led_control_registers(DRIVER_ADDR_2, 1);
 #            if defined(DRIVER_ADDR_3)
-    IS31FL3731_update_led_control_registers(DRIVER_ADDR_3, 2);
+    is31fl3731_update_led_control_registers(DRIVER_ADDR_3, 2);
 #                if defined(DRIVER_ADDR_4)
-    IS31FL3731_update_led_control_registers(DRIVER_ADDR_4, 3);
+    is31fl3731_update_led_control_registers(DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
 
 #    elif defined(IS31FL3733)
-    IS31FL3733_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3733_update_led_control_registers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
-    IS31FL3733_update_led_control_registers(DRIVER_ADDR_2, 1);
+    is31fl3733_update_led_control_registers(DRIVER_ADDR_2, 1);
 #            if defined(DRIVER_ADDR_3)
-    IS31FL3733_update_led_control_registers(DRIVER_ADDR_3, 2);
+    is31fl3733_update_led_control_registers(DRIVER_ADDR_3, 2);
 #                if defined(DRIVER_ADDR_4)
-    IS31FL3733_update_led_control_registers(DRIVER_ADDR_4, 3);
+    is31fl3733_update_led_control_registers(DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
 
 #    elif defined(IS31FL3736)
-    IS31FL3736_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3736_update_led_control_registers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
-    IS31FL3736_update_led_control_registers(DRIVER_ADDR_2, 1);
+    is31fl3736_update_led_control_registers(DRIVER_ADDR_2, 1);
 #            if defined(DRIVER_ADDR_3)
-    IS31FL3736_update_led_control_registers(DRIVER_ADDR_3, 2);
+    is31fl3736_update_led_control_registers(DRIVER_ADDR_3, 2);
 #                if defined(DRIVER_ADDR_4)
-    IS31FL3736_update_led_control_registers(DRIVER_ADDR_4, 3);
+    is31fl3736_update_led_control_registers(DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
 
 #    elif defined(IS31FL3737)
-    IS31FL3737_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3737_update_led_control_registers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
-    IS31FL3737_update_led_control_registers(DRIVER_ADDR_2, 1);
+    is31fl3737_update_led_control_registers(DRIVER_ADDR_2, 1);
 #            if defined(DRIVER_ADDR_3)
-    IS31FL3737_update_led_control_registers(DRIVER_ADDR_3, 2);
+    is31fl3737_update_led_control_registers(DRIVER_ADDR_3, 2);
 #                if defined(DRIVER_ADDR_4)
-    IS31FL3737_update_led_control_registers(DRIVER_ADDR_4, 3);
+    is31fl3737_update_led_control_registers(DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
 
 #    elif defined(IS31FL3741)
-    IS31FL3741_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3741_update_led_control_registers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
-    IS31FL3741_update_led_control_registers(DRIVER_ADDR_2, 1);
+    is31fl3741_update_led_control_registers(DRIVER_ADDR_2, 1);
 #            if defined(DRIVER_ADDR_3)
-    IS31FL3741_update_led_control_registers(DRIVER_ADDR_3, 2);
+    is31fl3741_update_led_control_registers(DRIVER_ADDR_3, 2);
 #                if defined(DRIVER_ADDR_4)
-    IS31FL3741_update_led_control_registers(DRIVER_ADDR_4, 3);
+    is31fl3741_update_led_control_registers(DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
@@ -231,13 +232,13 @@ static void init(void) {
 #        endif
 
 #    elif defined(CKLED2001)
-    CKLED2001_update_led_control_registers(DRIVER_ADDR_1, 0);
+    ckled2001_update_led_control_registers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
-    CKLED2001_update_led_control_registers(DRIVER_ADDR_2, 1);
+    ckled2001_update_led_control_registers(DRIVER_ADDR_2, 1);
 #            if defined(DRIVER_ADDR_3)
-    CKLED2001_update_led_control_registers(DRIVER_ADDR_3, 2);
+    ckled2001_update_led_control_registers(DRIVER_ADDR_3, 2);
 #                if defined(DRIVER_ADDR_4)
-    CKLED2001_update_led_control_registers(DRIVER_ADDR_4, 3);
+    ckled2001_update_led_control_registers(DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
@@ -246,13 +247,13 @@ static void init(void) {
 
 #    if defined(IS31FL3731)
 static void flush(void) {
-    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
-    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
+    is31fl3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
 #            if defined(DRIVER_ADDR_3)
-    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_3, 2);
+    is31fl3731_update_pwm_buffers(DRIVER_ADDR_3, 2);
 #                if defined(DRIVER_ADDR_4)
-    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_4, 3);
+    is31fl3731_update_pwm_buffers(DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
@@ -261,19 +262,19 @@ static void flush(void) {
 const rgb_matrix_driver_t rgb_matrix_driver = {
     .init          = init,
     .flush         = flush,
-    .set_color     = IS31FL3731_set_color,
-    .set_color_all = IS31FL3731_set_color_all,
+    .set_color     = is31fl3731_set_color,
+    .set_color_all = is31fl3731_set_color_all,
 };
 
 #    elif defined(IS31FL3733)
 static void flush(void) {
-    IS31FL3733_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3733_update_pwm_buffers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
-    IS31FL3733_update_pwm_buffers(DRIVER_ADDR_2, 1);
+    is31fl3733_update_pwm_buffers(DRIVER_ADDR_2, 1);
 #            if defined(DRIVER_ADDR_3)
-    IS31FL3733_update_pwm_buffers(DRIVER_ADDR_3, 2);
+    is31fl3733_update_pwm_buffers(DRIVER_ADDR_3, 2);
 #                if defined(DRIVER_ADDR_4)
-    IS31FL3733_update_pwm_buffers(DRIVER_ADDR_4, 3);
+    is31fl3733_update_pwm_buffers(DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
@@ -282,19 +283,19 @@ static void flush(void) {
 const rgb_matrix_driver_t rgb_matrix_driver = {
     .init = init,
     .flush = flush,
-    .set_color = IS31FL3733_set_color,
-    .set_color_all = IS31FL3733_set_color_all,
+    .set_color = is31fl3733_set_color,
+    .set_color_all = is31fl3733_set_color_all,
 };
 
 #    elif defined(IS31FL3736)
 static void flush(void) {
-    IS31FL3736_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3736_update_pwm_buffers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
-    IS31FL3736_update_pwm_buffers(DRIVER_ADDR_2, 1);
+    is31fl3736_update_pwm_buffers(DRIVER_ADDR_2, 1);
 #            if defined(DRIVER_ADDR_3)
-    IS31FL3736_update_pwm_buffers(DRIVER_ADDR_3, 2);
+    is31fl3736_update_pwm_buffers(DRIVER_ADDR_3, 2);
 #                if defined(DRIVER_ADDR_4)
-    IS31FL3736_update_pwm_buffers(DRIVER_ADDR_4, 3);
+    is31fl3736_update_pwm_buffers(DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
@@ -303,19 +304,19 @@ static void flush(void) {
 const rgb_matrix_driver_t rgb_matrix_driver = {
     .init = init,
     .flush = flush,
-    .set_color = IS31FL3736_set_color,
-    .set_color_all = IS31FL3736_set_color_all,
+    .set_color = is31fl3736_set_color,
+    .set_color_all = is31fl3736_set_color_all,
 };
 
 #    elif defined(IS31FL3737)
 static void flush(void) {
-    IS31FL3737_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3737_update_pwm_buffers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
-    IS31FL3737_update_pwm_buffers(DRIVER_ADDR_2, 1);
+    is31fl3737_update_pwm_buffers(DRIVER_ADDR_2, 1);
 #            if defined(DRIVER_ADDR_3)
-    IS31FL3737_update_pwm_buffers(DRIVER_ADDR_3, 2);
+    is31fl3737_update_pwm_buffers(DRIVER_ADDR_3, 2);
 #                if defined(DRIVER_ADDR_4)
-    IS31FL3737_update_pwm_buffers(DRIVER_ADDR_4, 3);
+    is31fl3737_update_pwm_buffers(DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
@@ -324,19 +325,19 @@ static void flush(void) {
 const rgb_matrix_driver_t rgb_matrix_driver = {
     .init = init,
     .flush = flush,
-    .set_color = IS31FL3737_set_color,
-    .set_color_all = IS31FL3737_set_color_all,
+    .set_color = is31fl3737_set_color,
+    .set_color_all = is31fl3737_set_color_all,
 };
 
 #    elif defined(IS31FL3741)
 static void flush(void) {
-    IS31FL3741_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3741_update_pwm_buffers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
-    IS31FL3741_update_pwm_buffers(DRIVER_ADDR_2, 1);
+    is31fl3741_update_pwm_buffers(DRIVER_ADDR_2, 1);
 #            if defined(DRIVER_ADDR_3)
-    IS31FL3741_update_pwm_buffers(DRIVER_ADDR_3, 2);
+    is31fl3741_update_pwm_buffers(DRIVER_ADDR_3, 2);
 #                if defined(DRIVER_ADDR_4)
-    IS31FL3741_update_pwm_buffers(DRIVER_ADDR_4, 3);
+    is31fl3741_update_pwm_buffers(DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
@@ -345,8 +346,8 @@ static void flush(void) {
 const rgb_matrix_driver_t rgb_matrix_driver = {
     .init = init,
     .flush = flush,
-    .set_color = IS31FL3741_set_color,
-    .set_color_all = IS31FL3741_set_color_all,
+    .set_color = is31fl3741_set_color,
+    .set_color_all = is31fl3741_set_color_all,
 };
 
 #    elif defined(IS31FLCOMMON)
@@ -372,13 +373,13 @@ const rgb_matrix_driver_t rgb_matrix_driver = {
 
 #    elif defined(CKLED2001)
 static void flush(void) {
-    CKLED2001_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    ckled2001_update_pwm_buffers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
-    CKLED2001_update_pwm_buffers(DRIVER_ADDR_2, 1);
+    ckled2001_update_pwm_buffers(DRIVER_ADDR_2, 1);
 #            if defined(DRIVER_ADDR_3)
-    CKLED2001_update_pwm_buffers(DRIVER_ADDR_3, 2);
+    ckled2001_update_pwm_buffers(DRIVER_ADDR_3, 2);
 #                if defined(DRIVER_ADDR_4)
-    CKLED2001_update_pwm_buffers(DRIVER_ADDR_4, 3);
+    ckled2001_update_pwm_buffers(DRIVER_ADDR_4, 3);
 #                endif
 #            endif
 #        endif
@@ -387,8 +388,8 @@ static void flush(void) {
 const rgb_matrix_driver_t rgb_matrix_driver = {
     .init = init,
     .flush = flush,
-    .set_color = CKLED2001_set_color,
-    .set_color_all = CKLED2001_set_color_all,
+    .set_color = ckled2001_set_color,
+    .set_color_all = ckled2001_set_color_all,
 };
 #    endif
 
@@ -398,24 +399,24 @@ const rgb_matrix_driver_t rgb_matrix_driver = {
 static void init(void) {
     spi_init();
 
-    AW20216_init(DRIVER_1_CS, DRIVER_1_EN);
+    aw20216_init(DRIVER_1_CS, DRIVER_1_EN);
 #    if defined(DRIVER_2_CS)
-    AW20216_init(DRIVER_2_CS, DRIVER_2_EN);
+    aw20216_init(DRIVER_2_CS, DRIVER_2_EN);
 #    endif
 }
 
 static void flush(void) {
-    AW20216_update_pwm_buffers(DRIVER_1_CS, 0);
+    aw20216_update_pwm_buffers(DRIVER_1_CS, 0);
 #    if defined(DRIVER_2_CS)
-    AW20216_update_pwm_buffers(DRIVER_2_CS, 1);
+    aw20216_update_pwm_buffers(DRIVER_2_CS, 1);
 #    endif
 }
 
 const rgb_matrix_driver_t rgb_matrix_driver = {
     .init          = init,
     .flush         = flush,
-    .set_color     = AW20216_set_color,
-    .set_color_all = AW20216_set_color_all,
+    .set_color     = aw20216_set_color,
+    .set_color_all = aw20216_set_color_all,
 };
 
 #elif defined(WS2812)
@@ -426,11 +427,17 @@ const rgb_matrix_driver_t rgb_matrix_driver = {
 
 // LED color buffer
 LED_TYPE rgb_matrix_ws2812_array[RGB_MATRIX_LED_COUNT];
+bool     ws2812_dirty = false;
 
-static void init(void) {}
+static void init(void) {
+    ws2812_dirty = false;
+}
 
 static void flush(void) {
-    ws2812_setleds(rgb_matrix_ws2812_array, RGB_MATRIX_LED_COUNT);
+    if (ws2812_dirty) {
+        ws2812_setleds(rgb_matrix_ws2812_array, RGB_MATRIX_LED_COUNT);
+        ws2812_dirty = false;
+    }
 }
 
 // Set an led in the buffer to a color
@@ -448,6 +455,11 @@ static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) {
     }
 #    endif
 
+    if (rgb_matrix_ws2812_array[i].r == r && rgb_matrix_ws2812_array[i].g == g && rgb_matrix_ws2812_array[i].b == b) {
+        return;
+    }
+
+    ws2812_dirty                 = true;
     rgb_matrix_ws2812_array[i].r = r;
     rgb_matrix_ws2812_array[i].g = g;
     rgb_matrix_ws2812_array[i].b = b;
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index a43138345402..5d044c4ea0bd 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -18,9 +18,10 @@
 #include "keyboard.h"
 #include "timer.h"
 #include "transport.h"
-#include "quantum.h"
 #include "wait.h"
+#include "debug.h"
 #include "usb_util.h"
+#include "bootloader.h"
 
 #ifdef EE_HANDS
 #    include "eeconfig.h"
@@ -205,9 +206,6 @@ void split_pre_init(void) {
 #endif
 
     if (is_keyboard_master()) {
-#if defined(USE_I2C) && defined(SSD1306OLED)
-        matrix_master_OLED_init();
-#endif
         transport_master_init();
     }
 }
diff --git a/quantum/split_common/split_util.h b/quantum/split_common/split_util.h
index 5c9a260a14ab..f83b05b6a636 100644
--- a/quantum/split_common/split_util.h
+++ b/quantum/split_common/split_util.h
@@ -2,13 +2,11 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdlib.h>
 
 #include "matrix.h"
 
 extern volatile bool isLeftHand;
 
-void matrix_master_OLED_init(void);
 void split_pre_init(void);
 void split_post_init(void);
 
diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c
index b3c80f119458..2b9423cd6369 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -20,13 +20,50 @@
 #include "crc.h"
 #include "debug.h"
 #include "matrix.h"
-#include "quantum.h"
+#include "host.h"
+#include "action_util.h"
+#include "sync_timer.h"
+#include "wait.h"
 #include "transactions.h"
 #include "transport.h"
 #include "transaction_id_define.h"
 #include "split_util.h"
 #include "synchronization_util.h"
 
+#ifdef BACKLIGHT_ENABLE
+#    include "backlight.h"
+#endif
+#ifdef RGBLIGHT_ENABLE
+#    include "rgblight.h"
+#endif
+#ifdef LED_MATRIX_ENABLE
+#    include "led_matrix.h"
+#endif
+#ifdef RGB_MATRIX_ENABLE
+#    include "rgb_matrix.h"
+#endif
+#ifdef OLED_ENABLE
+#    include "oled_driver.h"
+#endif
+#ifdef ST7565_ENABLE
+#    include "st7565.h"
+#endif
+#ifdef ENCODER_ENABLE
+#    include "encoder.h"
+#endif
+#ifdef HAPTIC_ENABLE
+#    include "haptic.h"
+#endif
+#ifdef POINTING_DEVICE_ENABLE
+#    include "pointing_device.h"
+#endif
+#ifdef OS_DETECTION_ENABLE
+#    include "os_detection.h"
+#endif
+#ifdef WPM_ENABLE
+#    include "wpm.h"
+#endif
+
 #define SYNC_TIMER_OFFSET 2
 
 #ifndef FORCED_SYNC_THROTTLE_MS
@@ -412,7 +449,7 @@ static void backlight_handlers_slave(matrix_row_t master_matrix[], matrix_row_t
     uint8_t backlight_level = split_shmem->backlight_level;
     split_shared_memory_unlock();
 
-    backlight_set(backlight_level);
+    backlight_level_noeeprom(backlight_level);
 }
 
 #    define TRANSACTIONS_BACKLIGHT_MASTER() TRANSACTION_HANDLER_MASTER(backlight)
diff --git a/quantum/split_common/transactions.h b/quantum/split_common/transactions.h
index e38ec79ce910..af3e68a15fbb 100644
--- a/quantum/split_common/transactions.h
+++ b/quantum/split_common/transactions.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "stdint.h"
-#include "stdbool.h"
+#include <stdint.h>
+#include <stdbool.h>
 
 #include "matrix.h"
 #include "transaction_id_define.h"
diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h
index a3d6f1dfe956..2e2b918d4518 100644
--- a/quantum/split_common/transport.h
+++ b/quantum/split_common/transport.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "stdint.h"
-#include "stdbool.h"
+#include <stdint.h>
+#include <stdbool.h>
 
 #include "progmem.h"
 #include "action_layer.h"
diff --git a/quantum/unicode/ucis.c b/quantum/unicode/ucis.c
new file mode 100644
index 000000000000..32be78520654
--- /dev/null
+++ b/quantum/unicode/ucis.c
@@ -0,0 +1,96 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "ucis.h"
+#include "unicode.h"
+#include "action.h"
+
+uint8_t count                        = 0;
+bool    active                       = false;
+char    input[UCIS_MAX_INPUT_LENGTH] = {0};
+
+void ucis_start(void) {
+    count  = 0;
+    active = true;
+
+    register_unicode(0x2328); // ⌨
+}
+
+bool ucis_active(void) {
+    return active;
+}
+
+uint8_t ucis_count(void) {
+    return count;
+}
+
+static char keycode_to_char(uint16_t keycode) {
+    if (keycode >= KC_A && keycode <= KC_Z) {
+        return 'a' + (keycode - KC_A);
+    } else if (keycode >= KC_1 && keycode <= KC_9) {
+        return '1' + (keycode - KC_1);
+    } else if (keycode == KC_0) {
+        return '0';
+    }
+    return 0;
+}
+
+bool ucis_add(uint16_t keycode) {
+    char c = keycode_to_char(keycode);
+    if (c) {
+        input[count++] = c;
+        return true;
+    }
+    return false;
+}
+
+bool ucis_remove_last(void) {
+    if (count) {
+        count--;
+        return true;
+    }
+
+    return false;
+}
+
+static bool match_mnemonic(char *mnemonic) {
+    for (uint8_t i = 0; input[i]; i++) {
+        if (i > count || input[i] != mnemonic[i]) {
+            return false;
+        }
+    }
+    return true;
+}
+
+void ucis_finish(void) {
+    uint8_t i     = 0;
+    bool    found = false;
+    for (; ucis_symbol_table[i].mnemonic; i++) {
+        if (match_mnemonic(ucis_symbol_table[i].mnemonic)) {
+            found = true;
+            break;
+        }
+    }
+
+    if (found) {
+        for (uint8_t j = 0; j <= count; j++) {
+            tap_code(KC_BACKSPACE);
+        }
+        register_ucis(i);
+    }
+
+    active = false;
+}
+
+void ucis_cancel(void) {
+    count  = 0;
+    active = false;
+}
+
+void register_ucis(uint8_t index) {
+    const uint32_t *code_points = ucis_symbol_table[index].code_points;
+
+    for (int i = 0; i < UCIS_MAX_CODE_POINTS && code_points[i]; i++) {
+        register_unicode(code_points[i]);
+    }
+}
diff --git a/quantum/unicode/ucis.h b/quantum/unicode/ucis.h
new file mode 100644
index 000000000000..5a4fa267841c
--- /dev/null
+++ b/quantum/unicode/ucis.h
@@ -0,0 +1,97 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
+
+/**
+ * \file
+ *
+ * \defgroup ucis UCIS
+ * \{
+ */
+
+#ifndef UCIS_MAX_INPUT_LENGTH
+#    define UCIS_MAX_INPUT_LENGTH 32
+#endif
+
+#ifndef UCIS_MAX_CODE_POINTS
+#    define UCIS_MAX_CODE_POINTS 3
+#endif
+
+typedef struct {
+    char*    mnemonic;
+    uint32_t code_points[UCIS_MAX_CODE_POINTS];
+} ucis_symbol_t;
+
+// clang-format off
+
+#define UCIS_TABLE(...) { \
+    __VA_ARGS__,          \
+    { NULL, {} }          \
+}
+
+#define UCIS_SYM(name, ...) {    \
+    .mnemonic    = name,         \
+    .code_points = {__VA_ARGS__} \
+}
+
+// clang-format on
+
+extern const ucis_symbol_t ucis_symbol_table[];
+
+/**
+ * \brief Begin the input sequence.
+ */
+void ucis_start(void);
+
+/**
+ * \brief Whether UCIS is currently active.
+ *
+ * \return `true` if UCIS is active.
+ */
+bool ucis_active(void);
+
+/**
+ * \brief Get the number of characters in the input sequence buffer.
+ *
+ * \return The current input sequence buffer length.
+ */
+uint8_t ucis_count(void);
+
+/**
+ * \brief Add the given keycode to the input sequence buffer.
+ *
+ * \param keycode The keycode to add. Must be between `KC_A` and `KC_Z`, or `KC_1` and `KC_0`.
+ *
+ * \return `true` if the keycode was added.
+ */
+bool ucis_add(uint16_t keycode);
+
+/**
+ * \brief Remove the last character from the input sequence.
+ *
+ * \return `true` if the sequence was not empty.
+ */
+bool ucis_remove_last(void);
+
+/**
+ * Mark the input sequence as complete, and attempt to match.
+ */
+void ucis_finish(void);
+
+/**
+ * \brief Cancel the input sequence.
+ */
+void ucis_cancel(void);
+
+/**
+ * Send the code point(s) for the given UCIS index.
+ *
+ * \param index The index into the UCIS symbol table.
+ */
+void register_ucis(uint8_t index);
+
+/** \} */
diff --git a/quantum/unicode/unicode.c b/quantum/unicode/unicode.c
index 35cb62e70045..78a4cad58594 100644
--- a/quantum/unicode/unicode.c
+++ b/quantum/unicode/unicode.c
@@ -25,6 +25,8 @@
 #include "wait.h"
 #include "send_string.h"
 #include "utf8.h"
+#include "debug.h"
+#include "quantum.h"
 
 #if defined(AUDIO_ENABLE)
 #    include "audio.h"
@@ -71,16 +73,8 @@ static int8_t  selected_count = ARRAY_SIZE(selected);
 static int8_t  selected_index;
 #endif
 
-/** \brief unicode input mode set at user level
- *
- * Run user code on unicode input mode change
- */
 __attribute__((weak)) void unicode_input_mode_set_user(uint8_t input_mode) {}
 
-/** \brief unicode input mode set at keyboard level
- *
- *  Run keyboard code on unicode input mode change
- */
 __attribute__((weak)) void unicode_input_mode_set_kb(uint8_t input_mode) {
     unicode_input_mode_set_user(input_mode);
 }
@@ -170,6 +164,10 @@ uint8_t get_unicode_input_mode(void) {
     return unicode_config.input_mode;
 }
 
+static void persist_unicode_input_mode(void) {
+    eeprom_update_byte(EECONFIG_UNICODEMODE, unicode_config.input_mode);
+}
+
 void set_unicode_input_mode(uint8_t mode) {
     unicode_config.input_mode = mode;
     persist_unicode_input_mode();
@@ -180,26 +178,34 @@ void set_unicode_input_mode(uint8_t mode) {
     dprintf("Unicode input mode set to: %u\n", unicode_config.input_mode);
 }
 
-void cycle_unicode_input_mode(int8_t offset) {
+static void cycle_unicode_input_mode(int8_t offset) {
 #if UNICODE_SELECTED_MODES != -1
     selected_index = (selected_index + offset) % selected_count;
     if (selected_index < 0) {
         selected_index += selected_count;
     }
+
     unicode_config.input_mode = selected[selected_index];
+
 #    if UNICODE_CYCLE_PERSIST
     persist_unicode_input_mode();
 #    endif
+
 #    ifdef AUDIO_ENABLE
     unicode_play_song(unicode_config.input_mode);
 #    endif
+
     unicode_input_mode_set_kb(unicode_config.input_mode);
     dprintf("Unicode input mode cycle to: %u\n", unicode_config.input_mode);
 #endif
 }
 
-void persist_unicode_input_mode(void) {
-    eeprom_update_byte(EECONFIG_UNICODEMODE, unicode_config.input_mode);
+void unicode_input_mode_step(void) {
+    cycle_unicode_input_mode(1);
+}
+
+void unicode_input_mode_step_reverse(void) {
+    cycle_unicode_input_mode(-1);
 }
 
 __attribute__((weak)) void unicode_input_start(void) {
diff --git a/quantum/unicode/unicode.h b/quantum/unicode/unicode.h
index 06505d87c0c9..90a54c8b18b5 100644
--- a/quantum/unicode/unicode.h
+++ b/quantum/unicode/unicode.h
@@ -17,8 +17,14 @@
 #pragma once
 
 #include <stdint.h>
+#include "unicode_keycodes.h"
 
-#include "quantum.h"
+/**
+ * \file
+ *
+ * \defgroup unicode Unicode
+ * \{
+ */
 
 typedef union {
     uint8_t raw;
@@ -42,127 +48,87 @@ enum unicode_input_modes {
     UNICODE_MODE_COUNT // Number of available input modes (always leave at the end)
 };
 
-void    unicode_input_mode_init(void);
+void unicode_input_mode_init(void);
+
+/**
+ * \brief Get the current Unicode input mode.
+ *
+ * \return The currently active Unicode input mode.
+ */
 uint8_t get_unicode_input_mode(void);
-void    set_unicode_input_mode(uint8_t mode);
-void    cycle_unicode_input_mode(int8_t offset);
-void    persist_unicode_input_mode(void);
 
+/**
+ * \brief Set the Unicode input mode.
+ *
+ * \param mode The input mode to set.
+ */
+void set_unicode_input_mode(uint8_t mode);
+
+/**
+ * \brief Change to the next Unicode input mode.
+ */
+void unicode_input_mode_step(void);
+
+/**
+ * \brief Change to the previous Unicode input mode.
+ */
+void unicode_input_mode_step_reverse(void);
+
+/**
+ * \brief User-level callback, invoked when the input mode is changed.
+ *
+ * \param input_mode The new input mode.
+ */
 void unicode_input_mode_set_user(uint8_t input_mode);
+
+/**
+ * \brief Keyboard-level callback, invoked when the input mode is changed.
+ *
+ * \param input_mode The new input mode.
+ */
 void unicode_input_mode_set_kb(uint8_t input_mode);
 
+/**
+ * \brief Begin the Unicode input sequence. The exact behavior depends on the currently selected input mode.
+ */
 void unicode_input_start(void);
+
+/**
+ * \brief Complete the Unicode input sequence. The exact behavior depends on the currently selected input mode.
+ */
 void unicode_input_finish(void);
+
+/**
+ * \brief Cancel the Unicode input sequence. The exact behavior depends on the currently selected input mode.
+ */
 void unicode_input_cancel(void);
 
+/**
+ * \brief Send a 16-bit hex number.
+ *
+ * \param hex The number to send.
+ */
 void register_hex(uint16_t hex);
+
+/**
+ * \brief Send a 32-bit hex number.
+ *
+ * \param hex The number to send.
+ */
 void register_hex32(uint32_t hex);
+
+/**
+ * \brief Input a single Unicode character. A surrogate pair will be sent if required by the input mode.
+ *
+ * \param code_point The code point of the character to send.
+ */
 void register_unicode(uint32_t code_point);
 
+/**
+ * \brief Send a string containing Unicode characters.
+ *
+ * \param str The string to send.
+ */
 void send_unicode_string(const char *str);
 
-// clang-format off
-
-#define UC_BSPC UC(0x0008) // (backspace)
-
-#define UC_SPC  UC(0x0020) // (space)
-#define UC_EXLM UC(0x0021) // !
-#define UC_DQUT UC(0x0022) // "
-#define UC_HASH UC(0x0023) // #
-#define UC_DLR  UC(0x0024) // $
-#define UC_PERC UC(0x0025) // %
-#define UC_AMPR UC(0x0026) // &
-#define UC_QUOT UC(0x0027) // '
-#define UC_LPRN UC(0x0028) // (
-#define UC_RPRN UC(0x0029) // )
-#define UC_ASTR UC(0x002A) // *
-#define UC_PLUS UC(0x002B) // +
-#define UC_COMM UC(0x002C) // ,
-#define UC_DASH UC(0x002D) // -
-#define UC_DOT  UC(0x002E) // .
-#define UC_SLSH UC(0x002F) // /
-
-#define UC_0    UC(0x0030) // 0
-#define UC_1    UC(0x0031) // 1
-#define UC_2    UC(0x0032) // 2
-#define UC_3    UC(0x0033) // 3
-#define UC_4    UC(0x0034) // 4
-#define UC_5    UC(0x0035) // 5
-#define UC_6    UC(0x0036) // 6
-#define UC_7    UC(0x0037) // 7
-#define UC_8    UC(0x0038) // 8
-#define UC_9    UC(0x0039) // 9
-#define UC_COLN UC(0x003A) // :
-#define UC_SCLN UC(0x003B) // ;
-#define UC_LT   UC(0x003C) // <
-#define UC_EQL  UC(0x003D) // =
-#define UC_GT   UC(0x003E) // >
-#define UC_QUES UC(0x003F) // ?
-
-#define UC_AT   UC(0x0040) // @
-#define UC_A    UC(0x0041) // A
-#define UC_B    UC(0x0042) // B
-#define UC_C    UC(0x0043) // C
-#define UC_D    UC(0x0044) // D
-#define UC_E    UC(0x0045) // E
-#define UC_F    UC(0x0046) // F
-#define UC_G    UC(0x0047) // G
-#define UC_H    UC(0x0048) // H
-#define UC_I    UC(0x0049) // I
-#define UC_J    UC(0x004A) // J
-#define UC_K    UC(0x004B) // K
-#define UC_L    UC(0x004C) // L
-#define UC_M    UC(0x004D) // M
-#define UC_N    UC(0x004E) // N
-#define UC_O    UC(0x004F) // O
-
-#define UC_P    UC(0x0050) // P
-#define UC_Q    UC(0x0051) // Q
-#define UC_R    UC(0x0052) // R
-#define UC_S    UC(0x0053) // S
-#define UC_T    UC(0x0054) // T
-#define UC_U    UC(0x0055) // U
-#define UC_V    UC(0x0056) // V
-#define UC_W    UC(0x0057) // W
-#define UC_X    UC(0x0058) // X
-#define UC_Y    UC(0x0059) // Y
-#define UC_Z    UC(0x005A) // Z
-#define UC_LBRC UC(0x005B) // [
-#define UC_BSLS UC(0x005C) // (backslash)
-#define UC_RBRC UC(0x005D) // ]
-#define UC_CIRM UC(0x005E) // ^
-#define UC_UNDR UC(0x005F) // _
-
-#define UC_GRV  UC(0x0060) // `
-#define UC_a    UC(0x0061) // a
-#define UC_b    UC(0x0062) // b
-#define UC_c    UC(0x0063) // c
-#define UC_d    UC(0x0064) // d
-#define UC_e    UC(0x0065) // e
-#define UC_f    UC(0x0066) // f
-#define UC_g    UC(0x0067) // g
-#define UC_h    UC(0x0068) // h
-#define UC_i    UC(0x0069) // i
-#define UC_j    UC(0x006A) // j
-#define UC_k    UC(0x006B) // k
-#define UC_l    UC(0x006C) // l
-#define UC_m    UC(0x006D) // m
-#define UC_n    UC(0x006E) // n
-#define UC_o    UC(0x006F) // o
-
-#define UC_p    UC(0x0070) // p
-#define UC_q    UC(0x0071) // q
-#define UC_r    UC(0x0072) // r
-#define UC_s    UC(0x0073) // s
-#define UC_t    UC(0x0074) // t
-#define UC_u    UC(0x0075) // u
-#define UC_v    UC(0x0076) // v
-#define UC_w    UC(0x0077) // w
-#define UC_x    UC(0x0078) // x
-#define UC_y    UC(0x0079) // y
-#define UC_z    UC(0x007A) // z
-#define UC_LCBR UC(0x007B) // {
-#define UC_PIPE UC(0x007C) // |
-#define UC_RCBR UC(0x007D) // }
-#define UC_TILD UC(0x007E) // ~
-#define UC_DEL  UC(0x007F) // (delete)
+/** \} */
diff --git a/quantum/unicode/unicode_keycodes.h b/quantum/unicode/unicode_keycodes.h
new file mode 100644
index 000000000000..acc176cb6f2e
--- /dev/null
+++ b/quantum/unicode/unicode_keycodes.h
@@ -0,0 +1,125 @@
+/* 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 "quantum_keycodes.h"
+
+// clang-format off
+
+#define UC_BSPC UC(0x0008) // (backspace)
+
+#define UC_SPC  UC(0x0020) // (space)
+#define UC_EXLM UC(0x0021) // !
+#define UC_DQUT UC(0x0022) // "
+#define UC_HASH UC(0x0023) // #
+#define UC_DLR  UC(0x0024) // $
+#define UC_PERC UC(0x0025) // %
+#define UC_AMPR UC(0x0026) // &
+#define UC_QUOT UC(0x0027) // '
+#define UC_LPRN UC(0x0028) // (
+#define UC_RPRN UC(0x0029) // )
+#define UC_ASTR UC(0x002A) // *
+#define UC_PLUS UC(0x002B) // +
+#define UC_COMM UC(0x002C) // ,
+#define UC_DASH UC(0x002D) // -
+#define UC_DOT  UC(0x002E) // .
+#define UC_SLSH UC(0x002F) // /
+
+#define UC_0    UC(0x0030) // 0
+#define UC_1    UC(0x0031) // 1
+#define UC_2    UC(0x0032) // 2
+#define UC_3    UC(0x0033) // 3
+#define UC_4    UC(0x0034) // 4
+#define UC_5    UC(0x0035) // 5
+#define UC_6    UC(0x0036) // 6
+#define UC_7    UC(0x0037) // 7
+#define UC_8    UC(0x0038) // 8
+#define UC_9    UC(0x0039) // 9
+#define UC_COLN UC(0x003A) // :
+#define UC_SCLN UC(0x003B) // ;
+#define UC_LT   UC(0x003C) // <
+#define UC_EQL  UC(0x003D) // =
+#define UC_GT   UC(0x003E) // >
+#define UC_QUES UC(0x003F) // ?
+
+#define UC_AT   UC(0x0040) // @
+#define UC_A    UC(0x0041) // A
+#define UC_B    UC(0x0042) // B
+#define UC_C    UC(0x0043) // C
+#define UC_D    UC(0x0044) // D
+#define UC_E    UC(0x0045) // E
+#define UC_F    UC(0x0046) // F
+#define UC_G    UC(0x0047) // G
+#define UC_H    UC(0x0048) // H
+#define UC_I    UC(0x0049) // I
+#define UC_J    UC(0x004A) // J
+#define UC_K    UC(0x004B) // K
+#define UC_L    UC(0x004C) // L
+#define UC_M    UC(0x004D) // M
+#define UC_N    UC(0x004E) // N
+#define UC_O    UC(0x004F) // O
+
+#define UC_P    UC(0x0050) // P
+#define UC_Q    UC(0x0051) // Q
+#define UC_R    UC(0x0052) // R
+#define UC_S    UC(0x0053) // S
+#define UC_T    UC(0x0054) // T
+#define UC_U    UC(0x0055) // U
+#define UC_V    UC(0x0056) // V
+#define UC_W    UC(0x0057) // W
+#define UC_X    UC(0x0058) // X
+#define UC_Y    UC(0x0059) // Y
+#define UC_Z    UC(0x005A) // Z
+#define UC_LBRC UC(0x005B) // [
+#define UC_BSLS UC(0x005C) // (backslash)
+#define UC_RBRC UC(0x005D) // ]
+#define UC_CIRM UC(0x005E) // ^
+#define UC_UNDR UC(0x005F) // _
+
+#define UC_GRV  UC(0x0060) // `
+#define UC_a    UC(0x0061) // a
+#define UC_b    UC(0x0062) // b
+#define UC_c    UC(0x0063) // c
+#define UC_d    UC(0x0064) // d
+#define UC_e    UC(0x0065) // e
+#define UC_f    UC(0x0066) // f
+#define UC_g    UC(0x0067) // g
+#define UC_h    UC(0x0068) // h
+#define UC_i    UC(0x0069) // i
+#define UC_j    UC(0x006A) // j
+#define UC_k    UC(0x006B) // k
+#define UC_l    UC(0x006C) // l
+#define UC_m    UC(0x006D) // m
+#define UC_n    UC(0x006E) // n
+#define UC_o    UC(0x006F) // o
+
+#define UC_p    UC(0x0070) // p
+#define UC_q    UC(0x0071) // q
+#define UC_r    UC(0x0072) // r
+#define UC_s    UC(0x0073) // s
+#define UC_t    UC(0x0074) // t
+#define UC_u    UC(0x0075) // u
+#define UC_v    UC(0x0076) // v
+#define UC_w    UC(0x0077) // w
+#define UC_x    UC(0x0078) // x
+#define UC_y    UC(0x0079) // y
+#define UC_z    UC(0x007A) // z
+#define UC_LCBR UC(0x007B) // {
+#define UC_PIPE UC(0x007C) // |
+#define UC_RCBR UC(0x007D) // }
+#define UC_TILD UC(0x007E) // ~
+#define UC_DEL  UC(0x007F) // (delete)
diff --git a/quantum/unicode/unicodemap.c b/quantum/unicode/unicodemap.c
new file mode 100644
index 000000000000..2f618056a2e7
--- /dev/null
+++ b/quantum/unicode/unicodemap.c
@@ -0,0 +1,43 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "unicodemap.h"
+#include "unicode.h"
+#include "keycodes.h"
+#include "quantum_keycodes.h"
+#include "modifiers.h"
+#include "host.h"
+#include "action_util.h"
+
+uint8_t unicodemap_index(uint16_t keycode) {
+    if (keycode >= QK_UNICODEMAP_PAIR) {
+        // Keycode is a pair: extract index based on Shift / Caps Lock state
+        uint16_t index;
+
+        uint8_t mods = get_mods() | get_weak_mods();
+#ifndef NO_ACTION_ONESHOT
+        mods |= get_oneshot_mods();
+#endif
+
+        bool shift = mods & MOD_MASK_SHIFT;
+        bool caps  = host_keyboard_led_state().caps_lock;
+        if (shift ^ caps) {
+            index = QK_UNICODEMAP_PAIR_GET_SHIFTED_INDEX(keycode);
+        } else {
+            index = QK_UNICODEMAP_PAIR_GET_UNSHIFTED_INDEX(keycode);
+        }
+
+        return index;
+    } else {
+        // Keycode is a regular index
+        return QK_UNICODEMAP_GET_INDEX(keycode);
+    }
+}
+
+uint32_t unicodemap_get_code_point(uint8_t index) {
+    return pgm_read_dword(unicode_map + index);
+}
+
+void register_unicodemap(uint8_t index) {
+    register_unicode(unicodemap_get_code_point(index));
+}
diff --git a/quantum/unicode/unicodemap.h b/quantum/unicode/unicodemap.h
new file mode 100644
index 000000000000..00d2aec8fad7
--- /dev/null
+++ b/quantum/unicode/unicodemap.h
@@ -0,0 +1,43 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+#include "progmem.h"
+
+/**
+ * \file
+ *
+ * \defgroup unicodemap Unicode Map
+ * \{
+ */
+
+extern const uint32_t unicode_map[] PROGMEM;
+
+/**
+ * \brief Get the index into the `unicode_map` array for the given keycode, respecting shift state for pair keycodes.
+ *
+ * \param keycode The Unicode Map keycode to get the index of.
+ *
+ * \return An index into the `unicode_map` array.
+ */
+uint8_t unicodemap_index(uint16_t keycode);
+
+/**
+ * \brief Get the code point for the given index in the `unicode_map` array.
+ *
+ * \param index The index into the `unicode_map` array.
+ *
+ * \return A Unicode code point value.
+ */
+uint32_t unicodemap_get_code_point(uint8_t index);
+
+/**
+ * \brief Send the code point for the given index in the `unicode_map` array.
+ *
+ * \param index The index into the `unicode_map` array.
+ */
+void register_unicodemap(uint8_t index);
+
+/** \} */
diff --git a/quantum/via.c b/quantum/via.c
index c54e37a17516..2acd7aa90c31 100644
--- a/quantum/via.c
+++ b/quantum/via.c
@@ -22,19 +22,41 @@
 #    error "DYNAMIC_KEYMAP_ENABLE is not enabled"
 #endif
 
-#include "quantum.h"
-
 #include "via.h"
 
 #include "raw_hid.h"
 #include "dynamic_keymap.h"
 #include "eeprom.h"
+#include "eeconfig.h"
+#include "matrix.h"
+#include "timer.h"
+#include "wait.h"
 #include "version.h" // for QMK_BUILDDATE used in EEPROM magic
 
-#if defined(RGB_MATRIX_ENABLE)
+#if defined(AUDIO_ENABLE)
+#    include "audio.h"
+#endif
+
+#if defined(BACKLIGHT_ENABLE)
+#    include "backlight.h"
+#endif
+
+#if defined(RGBLIGHT_ENABLE)
+#    include "rgblight.h"
+#endif
+
+#if (defined(RGB_MATRIX_ENABLE) || defined(LED_MATRIX_ENABLE))
 #    include <lib/lib8tion/lib8tion.h>
 #endif
 
+#if defined(RGB_MATRIX_ENABLE)
+#    include "rgb_matrix.h"
+#endif
+
+#if defined(LED_MATRIX_ENABLE)
+#    include "led_matrix.h"
+#endif
+
 // Can be called in an overriding via_init_kb() to test if keyboard level code usage of
 // EEPROM is invalid and use/save defaults.
 bool via_eeprom_is_valid(void) {
@@ -141,6 +163,9 @@ __attribute__((weak)) void via_set_device_indication(uint8_t value) {
 #if defined(RGB_MATRIX_ENABLE)
     rgb_matrix_toggle_noeeprom();
 #endif // RGB_MATRIX_ENABLE
+#if defined(LED_MATRIX_ENABLE)
+    led_matrix_toggle_noeeprom();
+#endif // LED_MATRIX_ENABLE
 #if defined(AUDIO_ENABLE)
     if (value == 0) {
         wait_ms(10);
@@ -194,6 +219,7 @@ __attribute__((weak)) void via_custom_value_command_kb(uint8_t *data, uint8_t le
 //      id_qmk_backlight_channel    ->  via_qmk_backlight_command()
 //      id_qmk_rgblight_channel     ->  via_qmk_rgblight_command()
 //      id_qmk_rgb_matrix_channel   ->  via_qmk_rgb_matrix_command()
+//      id_qmk_led_matrix_channel   ->  via_qmk_led_matrix_command()
 //      id_qmk_audio_channel        ->  via_qmk_audio_command()
 //
 __attribute__((weak)) void via_custom_value_command(uint8_t *data, uint8_t length) {
@@ -219,7 +245,14 @@ __attribute__((weak)) void via_custom_value_command(uint8_t *data, uint8_t lengt
         via_qmk_rgb_matrix_command(data, length);
         return;
     }
-#endif // RGBLIGHT_ENABLE
+#endif // RGB_MATRIX_ENABLE
+
+#if defined(LED_MATRIX_ENABLE)
+    if (*channel_id == id_qmk_led_matrix_channel) {
+        via_qmk_led_matrix_command(data, length);
+        return;
+    }
+#endif // LED_MATRIX_ENABLE
 
 #if defined(AUDIO_ENABLE)
     if (*channel_id == id_qmk_audio_channel) {
@@ -692,6 +725,90 @@ void via_qmk_rgb_matrix_save(void) {
 
 #endif // RGB_MATRIX_ENABLE
 
+#if defined(LED_MATRIX_ENABLE)
+
+#    if !defined(LED_MATRIX_MAXIMUM_BRIGHTNESS) || LED_MATRIX_MAXIMUM_BRIGHTNESS > UINT8_MAX
+#        undef LED_MATRIX_MAXIMUM_BRIGHTNESS
+#        define LED_MATRIX_MAXIMUM_BRIGHTNESS UINT8_MAX
+#    endif
+
+void via_qmk_led_matrix_command(uint8_t *data, uint8_t length) {
+    // data = [ command_id, channel_id, value_id, value_data ]
+    uint8_t *command_id        = &(data[0]);
+    uint8_t *value_id_and_data = &(data[2]);
+
+    switch (*command_id) {
+        case id_custom_set_value: {
+            via_qmk_led_matrix_set_value(value_id_and_data);
+            break;
+        }
+        case id_custom_get_value: {
+            via_qmk_led_matrix_get_value(value_id_and_data);
+            break;
+        }
+        case id_custom_save: {
+            via_qmk_led_matrix_save();
+            break;
+        }
+        default: {
+            *command_id = id_unhandled;
+            break;
+        }
+    }
+}
+
+void via_qmk_led_matrix_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_qmk_led_matrix_brightness: {
+            value_data[0] = ((uint16_t)led_matrix_get_val() * UINT8_MAX) / LED_MATRIX_MAXIMUM_BRIGHTNESS;
+            break;
+        }
+        case id_qmk_led_matrix_effect: {
+            value_data[0] = led_matrix_is_enabled() ? led_matrix_get_mode() : 0;
+            break;
+        }
+        case id_qmk_led_matrix_effect_speed: {
+            value_data[0] = led_matrix_get_speed();
+            break;
+        }
+    }
+}
+
+void via_qmk_led_matrix_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_qmk_led_matrix_brightness: {
+            led_matrix_set_val_noeeprom(scale8(value_data[0], LED_MATRIX_MAXIMUM_BRIGHTNESS));
+            break;
+        }
+        case id_qmk_led_matrix_effect: {
+            if (value_data[0] == 0) {
+                led_matrix_disable_noeeprom();
+            } else {
+                led_matrix_enable_noeeprom();
+                led_matrix_mode_noeeprom(value_data[0]);
+            }
+            break;
+        }
+        case id_qmk_led_matrix_effect_speed: {
+            led_matrix_set_speed_noeeprom(value_data[0]);
+            break;
+        }
+    }
+}
+
+void via_qmk_led_matrix_save(void) {
+    eeconfig_update_led_matrix();
+}
+
+#endif // LED_MATRIX_ENABLE
+
 #if defined(AUDIO_ENABLE)
 
 extern audio_config_t audio_config;
diff --git a/quantum/via.h b/quantum/via.h
index ab4eb0502818..01d4c48b374f 100644
--- a/quantum/via.h
+++ b/quantum/via.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include "eeconfig.h" // for EECONFIG_SIZE
+#include "action.h"
 
 // Keyboard level code can change where VIA stores the magic.
 // The magic is the build date YYMMDD encoded as BCD in 3 bytes,
@@ -109,6 +110,7 @@ enum via_channel_id {
     id_qmk_rgblight_channel   = 2,
     id_qmk_rgb_matrix_channel = 3,
     id_qmk_audio_channel      = 4,
+    id_qmk_led_matrix_channel = 5,
 };
 
 enum via_qmk_backlight_value {
@@ -130,6 +132,12 @@ enum via_qmk_rgb_matrix_value {
     id_qmk_rgb_matrix_color        = 4,
 };
 
+enum via_qmk_led_matrix_value {
+    id_qmk_led_matrix_brightness   = 1,
+    id_qmk_led_matrix_effect       = 2,
+    id_qmk_led_matrix_effect_speed = 3,
+};
+
 enum via_qmk_audio_value {
     id_qmk_audio_enable        = 1,
     id_qmk_audio_clicky_enable = 2,
@@ -182,6 +190,13 @@ void via_qmk_rgb_matrix_get_value(uint8_t *data);
 void via_qmk_rgb_matrix_save(void);
 #endif
 
+#if defined(LED_MATRIX_ENABLE)
+void via_qmk_led_matrix_command(uint8_t *data, uint8_t length);
+void via_qmk_led_matrix_set_value(uint8_t *data);
+void via_qmk_led_matrix_get_value(uint8_t *data);
+void via_qmk_led_matrix_save(void);
+#endif
+
 #if defined(AUDIO_ENABLE)
 void via_qmk_audio_command(uint8_t *data, uint8_t length);
 void via_qmk_audio_set_value(uint8_t *data);
diff --git a/readme.md b/readme.md
index 5649ddfa097a..f0e49a08e956 100644
--- a/readme.md
+++ b/readme.md
@@ -6,7 +6,7 @@
 [![GitHub contributors](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly)
 [![GitHub forks](https://img.shields.io/github/forks/qmk/qmk_firmware.svg?style=social&label=Fork)](https://github.com/qmk/qmk_firmware/)
 
-This is a keyboard firmware based on the [tmk\_keyboard firmware](https://github.com/tmk/tmk_keyboard) with some useful features for Atmel AVR and ARM controllers, and more specifically, the [OLKB product line](https://olkb.com), the [ErgoDox EZ](https://ergodox-ez.com) keyboard, and the [Clueboard product line](https://clueboard.co).
+This is a keyboard firmware based on the [tmk\_keyboard firmware](https://github.com/tmk/tmk_keyboard) with some useful features for Atmel AVR and ARM controllers, and more specifically, the [OLKB product line](https://olkb.com), the [ErgoDox EZ](https://ergodox-ez.com) keyboard, and the Clueboard product line.
 
 ## Documentation
 
diff --git a/tests/audio/config.h b/tests/audio/config.h
new file mode 100644
index 000000000000..d0c4ddadbd3b
--- /dev/null
+++ b/tests/audio/config.h
@@ -0,0 +1,18 @@
+// Copyright 2023 Google LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should 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 "test_common.h"
diff --git a/tests/audio/test.mk b/tests/audio/test.mk
new file mode 100644
index 000000000000..a2c71d958781
--- /dev/null
+++ b/tests/audio/test.mk
@@ -0,0 +1,16 @@
+# Copyright 2023 Google LLC
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+AUDIO_ENABLE = yes
diff --git a/tests/audio/test_audio.cpp b/tests/audio/test_audio.cpp
new file mode 100644
index 000000000000..ef34748b0606
--- /dev/null
+++ b/tests/audio/test_audio.cpp
@@ -0,0 +1,118 @@
+// Copyright 2023 Google LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include <cmath>
+#include <random>
+
+#include "gtest/gtest.h"
+#include "keyboard_report_util.hpp"
+#include "test_common.hpp"
+
+namespace {
+
+class AudioTest : public TestFixture {
+   public:
+    uint16_t infer_tempo() {
+        return audio_ms_to_duration(1875) / 2;
+    }
+};
+
+TEST_F(AudioTest, OnOffToggle) {
+    audio_on();
+    EXPECT_TRUE(audio_is_on());
+
+    audio_off();
+    EXPECT_FALSE(audio_is_on());
+
+    audio_toggle();
+    EXPECT_TRUE(audio_is_on());
+
+    audio_toggle();
+    EXPECT_FALSE(audio_is_on());
+}
+
+TEST_F(AudioTest, ChangeTempo) {
+    for (int tempo = 50; tempo <= 250; tempo += 50) {
+        audio_set_tempo(tempo);
+        EXPECT_EQ(infer_tempo(), tempo);
+    }
+
+    audio_set_tempo(10);
+    audio_increase_tempo(25);
+    EXPECT_EQ(infer_tempo(), 35);
+
+    audio_decrease_tempo(4);
+    EXPECT_EQ(infer_tempo(), 31);
+
+    audio_increase_tempo(250);
+    EXPECT_EQ(infer_tempo(), 255);
+
+    audio_set_tempo(9);
+    EXPECT_EQ(infer_tempo(), 10);
+
+    audio_decrease_tempo(100);
+    EXPECT_EQ(infer_tempo(), 10);
+}
+
+TEST_F(AudioTest, BpmConversion) {
+    const int tol = 1;
+
+    audio_set_tempo(120);
+    // At 120 bpm, there are 2 beats per second, and a whole note is 500 ms.
+    EXPECT_NEAR(audio_duration_to_ms(64 /* whole note */), 500, tol);
+    EXPECT_NEAR(audio_ms_to_duration(500), 64, tol);
+    EXPECT_EQ(audio_duration_to_ms(0), 0);
+    EXPECT_EQ(audio_ms_to_duration(0), 0);
+
+    audio_set_tempo(10);
+    // At 10 bpm, UINT16_MAX ms corresponds to 699/64 beats and is the longest
+    // duration that can be converted without overflow.
+    EXPECT_NEAR(audio_ms_to_duration(UINT16_MAX), 699, tol);
+    EXPECT_NEAR(audio_duration_to_ms(699), 65531, tol);
+
+    audio_set_tempo(255);
+    // At 255 bpm, UINT16_MAX ms corresponds to 17825/64 beats and is the longest
+    // duration that can be converted without overflow.
+    EXPECT_NEAR(audio_ms_to_duration(UINT16_MAX), 17825, tol);
+    EXPECT_NEAR(audio_duration_to_ms(17825), 65533, tol);
+
+    std::mt19937                       rng(0 /*seed*/);
+    std::uniform_int_distribution<int> dist_tempo(10, 255);
+    std::uniform_int_distribution<int> dist_ms(0, UINT16_MAX);
+
+    // Test bpm <-> ms conversions for random tempos and durations.
+    for (int trial = 0; trial < 50; ++trial) {
+        const int tempo       = dist_tempo(rng);
+        const int duration_ms = dist_ms(rng);
+        SCOPED_TRACE("tempo " + testing::PrintToString(tempo) + ", duration " + testing::PrintToString(duration_ms) + " ms");
+
+        audio_set_tempo(tempo);
+        int duration_bpm = std::round((64.0f / (60.0f * 1000.0f)) * duration_ms * tempo);
+        ASSERT_NEAR(audio_ms_to_duration(duration_ms), duration_bpm, tol);
+
+        int roundtrip_ms = std::round((60.0f * 1000.0f / 64.0f) * duration_bpm / tempo);
+        // Because of round-off error, duration_ms and roundtrip_ms may differ by
+        // about (60 * 1000 / 64) / tempo.
+        int roundtrip_tol = tol * (60.0f * 1000.0f / 64.0f) / tempo;
+        ASSERT_NEAR(roundtrip_ms, duration_ms, roundtrip_tol);
+
+        // Only test converting back to ms if the result would be in uint16_t range.
+        if (roundtrip_ms <= UINT16_MAX) {
+            ASSERT_NEAR(audio_duration_to_ms(duration_bpm), roundtrip_ms, tol);
+        }
+    }
+}
+
+} // namespace
diff --git a/tests/caps_word/caps_word_unicodemap/test_caps_word_unicodemap.cpp b/tests/caps_word/caps_word_unicodemap/test_caps_word_unicodemap.cpp
index 01cdfd6408d2..21e5493526e0 100644
--- a/tests/caps_word/caps_word_unicodemap/test_caps_word_unicodemap.cpp
+++ b/tests/caps_word/caps_word_unicodemap/test_caps_word_unicodemap.cpp
@@ -39,8 +39,8 @@ const uint32_t unicode_map[] PROGMEM = {
     [DELTA_UPPERCASE] = 0x0394,
 };
 
-#define U_DASH XP(ENDASH, EMDASH)
-#define U_DELTA XP(DELTA_LOWERCASE, DELTA_UPPERCASE)
+#define U_DASH UP(ENDASH, EMDASH)
+#define U_DELTA UP(DELTA_LOWERCASE, DELTA_UPPERCASE)
 
 bool caps_word_press_user(uint16_t keycode) {
     switch (keycode) {
diff --git a/tests/tap_dance/examples.c b/tests/tap_dance/examples.c
index af7438820954..13086bbb4bba 100644
--- a/tests/tap_dance/examples.c
+++ b/tests/tap_dance/examples.c
@@ -187,13 +187,35 @@ void x_reset(tap_dance_state_t *state, void *user_data) {
     xtap_state.state = TD_NONE;
 }
 
+static void release_press(tap_dance_state_t *state, void *user_data) {
+    tap_code16(KC_P);
+}
+
+static void release_unpress(tap_dance_state_t *state, void *user_data) {
+    tap_code16(KC_U);
+}
+
+static void release_unpress_mark_finished(tap_dance_state_t *state, void *user_data) {
+    tap_code16(KC_U);
+    state->finished = true;
+}
+
+static void release_finished(tap_dance_state_t *state, void *user_data) {
+    tap_code16(KC_F);
+}
+
+static void release_reset(tap_dance_state_t *state, void *user_data) {
+    tap_code16(KC_R);
+}
 
 tap_dance_action_t tap_dance_actions[] = {
     [TD_ESC_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS),
     [CT_EGG]      = ACTION_TAP_DANCE_FN(dance_egg),
     [CT_FLSH]     = ACTION_TAP_DANCE_FN_ADVANCED(dance_flsh_each, dance_flsh_finished, dance_flsh_reset),
     [CT_CLN]      = ACTION_TAP_DANCE_TAP_HOLD(KC_COLN, KC_SCLN),
-    [X_CTL]       = ACTION_TAP_DANCE_FN_ADVANCED(NULL, x_finished, x_reset)
+    [X_CTL]       = ACTION_TAP_DANCE_FN_ADVANCED(NULL, x_finished, x_reset),
+    [TD_RELEASE]  = ACTION_TAP_DANCE_FN_ADVANCED_WITH_RELEASE(release_press, release_unpress, release_finished, release_reset),
+    [TD_RELEASE_AND_FINISH]  = ACTION_TAP_DANCE_FN_ADVANCED_WITH_RELEASE(release_press, release_unpress_mark_finished, release_finished, release_reset),
 };
 
 // clang-format on
diff --git a/tests/tap_dance/examples.h b/tests/tap_dance/examples.h
index 2622af6b2f4a..6118188dd185 100644
--- a/tests/tap_dance/examples.h
+++ b/tests/tap_dance/examples.h
@@ -26,6 +26,8 @@ enum {
     CT_FLSH,
     CT_CLN,
     X_CTL,
+    TD_RELEASE,
+    TD_RELEASE_AND_FINISH,
 };
 
 #ifdef __cplusplus
diff --git a/tests/tap_dance/test_examples.cpp b/tests/tap_dance/test_examples.cpp
index 6dabc45513af..7858dab92b9d 100644
--- a/tests/tap_dance/test_examples.cpp
+++ b/tests/tap_dance/test_examples.cpp
@@ -316,3 +316,119 @@ TEST_F(TapDance, QuadFunction) {
     EXPECT_EMPTY_REPORT(driver);
     run_one_scan_loop();
 }
+
+TEST_F(TapDance, DanceFnAdvancedWithRelease) {
+    TestDriver driver;
+    InSequence s;
+    auto       key_rls = KeymapKey(0, 1, 0, TD(TD_RELEASE));
+
+    set_keymap({key_rls});
+
+    /* Single press and unpress */
+    key_rls.press();
+    EXPECT_REPORT(driver, (KC_P));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    key_rls.release();
+    EXPECT_REPORT(driver, (KC_U));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    EXPECT_REPORT(driver, (KC_F));
+    EXPECT_EMPTY_REPORT(driver);
+    EXPECT_REPORT(driver, (KC_R));
+    EXPECT_EMPTY_REPORT(driver);
+    idle_for(TAPPING_TERM);
+    run_one_scan_loop();
+
+    /* Double press and unpress */
+    key_rls.press();
+    EXPECT_REPORT(driver, (KC_P));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    key_rls.release();
+    EXPECT_REPORT(driver, (KC_U));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    key_rls.press();
+    EXPECT_REPORT(driver, (KC_P));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    key_rls.release();
+    EXPECT_REPORT(driver, (KC_U));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    EXPECT_REPORT(driver, (KC_F));
+    EXPECT_EMPTY_REPORT(driver);
+    EXPECT_REPORT(driver, (KC_R));
+    EXPECT_EMPTY_REPORT(driver);
+    idle_for(TAPPING_TERM);
+    run_one_scan_loop();
+
+    /* Unpress after tapping term has elapsed (key is registered as held) */
+    key_rls.press();
+    EXPECT_REPORT(driver, (KC_P));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    EXPECT_REPORT(driver, (KC_F));
+    EXPECT_EMPTY_REPORT(driver);
+    idle_for(TAPPING_TERM);
+    run_one_scan_loop();
+
+    key_rls.release();
+    EXPECT_REPORT(driver, (KC_U));
+    EXPECT_EMPTY_REPORT(driver);
+    EXPECT_REPORT(driver, (KC_R));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+}
+
+TEST_F(TapDance, DanceFnAdvancedWithReleaseAndFinish) {
+    TestDriver driver;
+    InSequence s;
+    auto       key_rls = KeymapKey(0, 1, 0, TD(TD_RELEASE_AND_FINISH));
+
+    set_keymap({key_rls});
+
+    /* Single press and unpress */
+    key_rls.press();
+    EXPECT_REPORT(driver, (KC_P));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    key_rls.release();
+    EXPECT_REPORT(driver, (KC_U));
+    EXPECT_EMPTY_REPORT(driver);
+    EXPECT_REPORT(driver, (KC_R));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    // Verify the finished and/or reset functions aren't called
+    // after the tapping term elapses
+    idle_for(TAPPING_TERM);
+    run_one_scan_loop();
+
+    /* Unpress after tapping term has elapsed (key is registered as held) */
+    key_rls.press();
+    EXPECT_REPORT(driver, (KC_P));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+
+    EXPECT_REPORT(driver, (KC_F));
+    EXPECT_EMPTY_REPORT(driver);
+    idle_for(TAPPING_TERM);
+    run_one_scan_loop();
+
+    key_rls.release();
+    EXPECT_REPORT(driver, (KC_U));
+    EXPECT_EMPTY_REPORT(driver);
+    EXPECT_REPORT(driver, (KC_R));
+    EXPECT_EMPTY_REPORT(driver);
+    run_one_scan_loop();
+}
diff --git a/tests/tap_hold_configurations/retro_tapping/config.h b/tests/tap_hold_configurations/retro_tapping/config.h
index 4b38f2644b83..cc9f1624770e 100644
--- a/tests/tap_hold_configurations/retro_tapping/config.h
+++ b/tests/tap_hold_configurations/retro_tapping/config.h
@@ -18,4 +18,7 @@
 
 #include "test_common.h"
 
-#define RETRO_TAPPING
\ No newline at end of file
+#define RETRO_TAPPING
+#define DUMMY_MOD_NEUTRALIZER_KEYCODE KC_RIGHT_CTRL
+#define MODS_TO_NEUTRALIZE \
+    { MOD_BIT(KC_LEFT_GUI) }
diff --git a/tests/tap_hold_configurations/retro_tapping/test_neutralization.cpp b/tests/tap_hold_configurations/retro_tapping/test_neutralization.cpp
new file mode 100644
index 000000000000..10d675a3b188
--- /dev/null
+++ b/tests/tap_hold_configurations/retro_tapping/test_neutralization.cpp
@@ -0,0 +1,201 @@
+/* Copyright 2023 Vladislav Kucheriavykh
+ *
+ * This program is free software: you can 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 "keyboard_report_util.hpp"
+#include "keycode.h"
+#include "test_common.hpp"
+#include "action_tapping.h"
+#include "test_keymap_key.hpp"
+
+using testing::_;
+using testing::InSequence;
+
+class RetroTapNeutralization : public TestFixture {};
+
+TEST_F(RetroTapNeutralization, neutralize_retro_tapped_left_gui_mod_tap) {
+    TestDriver driver;
+    InSequence s;
+    auto       mod_tap_hold_key = KeymapKey(0, 7, 0, LGUI_T(KC_P));
+
+    set_keymap({mod_tap_hold_key});
+
+    EXPECT_NO_REPORT(driver);
+    mod_tap_hold_key.press();
+    idle_for(TAPPING_TERM);
+    VERIFY_AND_CLEAR(driver);
+
+    EXPECT_REPORT(driver, (KC_LGUI));
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    EXPECT_REPORT(driver, (DUMMY_MOD_NEUTRALIZER_KEYCODE, KC_LGUI));
+    EXPECT_REPORT(driver, (KC_LGUI));
+    EXPECT_EMPTY_REPORT(driver);
+    EXPECT_REPORT(driver, (KC_P));
+    EXPECT_EMPTY_REPORT(driver);
+    mod_tap_hold_key.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(RetroTapNeutralization, do_not_neutralize_retro_tapped_left_shift_mod_tap) {
+    TestDriver driver;
+    InSequence s;
+    auto       mod_tap_hold_key = KeymapKey(0, 7, 0, LSFT_T(KC_P));
+
+    set_keymap({mod_tap_hold_key});
+
+    EXPECT_NO_REPORT(driver);
+    mod_tap_hold_key.press();
+    idle_for(TAPPING_TERM);
+    VERIFY_AND_CLEAR(driver);
+
+    EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    EXPECT_EMPTY_REPORT(driver);
+    EXPECT_REPORT(driver, (KC_P));
+    EXPECT_EMPTY_REPORT(driver);
+    mod_tap_hold_key.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(RetroTapNeutralization, do_not_neutralize_retro_tapped_right_gui_mod_tap) {
+    TestDriver driver;
+    InSequence s;
+    auto       mod_tap_hold_key = KeymapKey(0, 7, 0, RGUI_T(KC_P));
+
+    set_keymap({mod_tap_hold_key});
+
+    EXPECT_NO_REPORT(driver);
+    mod_tap_hold_key.press();
+    idle_for(TAPPING_TERM);
+    VERIFY_AND_CLEAR(driver);
+
+    EXPECT_REPORT(driver, (KC_RGUI));
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    EXPECT_EMPTY_REPORT(driver);
+    EXPECT_REPORT(driver, (KC_P));
+    EXPECT_EMPTY_REPORT(driver);
+    mod_tap_hold_key.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(RetroTapNeutralization, do_not_neutralize_retro_tapped_left_gui_shift_mod_tap) {
+    TestDriver driver;
+    InSequence s;
+    auto       mod_tap_hold_key = KeymapKey(0, 7, 0, MT(MOD_LGUI | MOD_LSFT, KC_P));
+
+    set_keymap({mod_tap_hold_key});
+
+    EXPECT_NO_REPORT(driver);
+    mod_tap_hold_key.press();
+    idle_for(TAPPING_TERM);
+    VERIFY_AND_CLEAR(driver);
+
+    EXPECT_REPORT(driver, (KC_LSFT, KC_LGUI));
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    EXPECT_EMPTY_REPORT(driver);
+    EXPECT_REPORT(driver, (KC_P));
+    EXPECT_EMPTY_REPORT(driver);
+    mod_tap_hold_key.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(RetroTapNeutralization, do_not_neutralize_roll_of_regular_and_mod_tap_keys) {
+    TestDriver driver;
+    InSequence s;
+    auto       mod_tap_hold_key = KeymapKey(0, 1, 0, LGUI_T(KC_P));
+    auto       regular_key      = KeymapKey(0, 2, 0, KC_A);
+
+    set_keymap({mod_tap_hold_key, regular_key});
+
+    /* Press mod-tap-hold key. */
+    EXPECT_NO_REPORT(driver);
+    mod_tap_hold_key.press();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Press regular key. */
+    EXPECT_NO_REPORT(driver);
+    regular_key.press();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Release regular key. */
+    EXPECT_NO_REPORT(driver);
+    regular_key.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Release mod-tap-hold key. */
+    EXPECT_REPORT(driver, (KC_P));
+    EXPECT_REPORT(driver, (KC_P, KC_A));
+    EXPECT_REPORT(driver, (KC_P));
+    EXPECT_EMPTY_REPORT(driver);
+    mod_tap_hold_key.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Idle for tapping term of mod tap hold key. */
+    idle_for(TAPPING_TERM - 3);
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(RetroTapNeutralization, do_not_neutralize_tap_regular_key_while_mod_tap_is_held) {
+    TestDriver driver;
+    InSequence s;
+    auto       mod_tap_hold_key = KeymapKey(0, 1, 0, LGUI_T(KC_P));
+    auto       regular_key      = KeymapKey(0, 2, 0, KC_A);
+
+    set_keymap({mod_tap_hold_key, regular_key});
+
+    /* Press and hold mod-tap key. */
+    EXPECT_REPORT(driver, (KC_LEFT_GUI));
+    mod_tap_hold_key.press();
+    idle_for(TAPPING_TERM + 1);
+    VERIFY_AND_CLEAR(driver);
+
+    /* Press regular key. */
+    EXPECT_REPORT(driver, (KC_A, KC_LEFT_GUI));
+    regular_key.press();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Release regular key. */
+    EXPECT_REPORT(driver, (KC_LEFT_GUI));
+    regular_key.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Release mod-tap-hold key. */
+    EXPECT_EMPTY_REPORT(driver);
+    mod_tap_hold_key.release();
+    run_one_scan_loop();
+    VERIFY_AND_CLEAR(driver);
+
+    /* Idle for tapping term of mod tap hold key. */
+    idle_for(TAPPING_TERM - 3);
+    VERIFY_AND_CLEAR(driver);
+}
diff --git a/tests/test_common/test_driver.cpp b/tests/test_common/test_driver.cpp
index f1c52cb7b62b..0495da8205ac 100644
--- a/tests/test_common/test_driver.cpp
+++ b/tests/test_common/test_driver.cpp
@@ -60,7 +60,10 @@ void TestDriver::send_extra(report_extra_t* report) {
 namespace internal {
 void expect_unicode_code_point(TestDriver& driver, uint32_t code_point) {
     testing::InSequence seq;
-    EXPECT_REPORT(driver, (KC_LCTL, KC_LSFT, KC_U));
+    EXPECT_REPORT(driver, (KC_LEFT_CTRL, KC_LEFT_SHIFT));
+    EXPECT_REPORT(driver, (KC_LEFT_CTRL, KC_LEFT_SHIFT, KC_U));
+    EXPECT_REPORT(driver, (KC_LEFT_CTRL, KC_LEFT_SHIFT));
+    EXPECT_EMPTY_REPORT(driver);
 
     bool print_zero = false;
     for (int i = 7; i >= 0; --i) {
@@ -71,10 +74,12 @@ void expect_unicode_code_point(TestDriver& driver, uint32_t code_point) {
         const uint8_t digit = (code_point >> (i * 4)) & 0xf;
         if (digit || print_zero) {
             EXPECT_REPORT(driver, (hex_digit_to_keycode(digit)));
+            EXPECT_EMPTY_REPORT(driver);
             print_zero = true;
         }
     }
 
-    EXPECT_REPORT(driver, (KC_SPC));
+    EXPECT_REPORT(driver, (KC_SPACE));
+    EXPECT_EMPTY_REPORT(driver);
 }
 } // namespace internal
diff --git a/tests/unicode/config.h b/tests/unicode/config.h
new file mode 100644
index 000000000000..16f95f7f8db7
--- /dev/null
+++ b/tests/unicode/config.h
@@ -0,0 +1,8 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "test_common.h"
+
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS
diff --git a/tests/unicode/test.mk b/tests/unicode/test.mk
new file mode 100644
index 000000000000..1afc79be559c
--- /dev/null
+++ b/tests/unicode/test.mk
@@ -0,0 +1,5 @@
+# --------------------------------------------------------------------------------
+# Keep this file, even if it is empty, as a marker that this folder contains tests
+# --------------------------------------------------------------------------------
+
+UNICODE_COMMON = yes
diff --git a/tests/unicode/test_unicode.cpp b/tests/unicode/test_unicode.cpp
new file mode 100644
index 000000000000..a8500e3ba1dc
--- /dev/null
+++ b/tests/unicode/test_unicode.cpp
@@ -0,0 +1,86 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "keyboard_report_util.hpp"
+#include "keycode.h"
+#include "test_common.hpp"
+#include "test_keymap_key.hpp"
+
+using testing::_;
+
+class Unicode : public TestFixture {};
+
+TEST_F(Unicode, sends_bmp_unicode_sequence) {
+    TestDriver driver;
+
+    set_unicode_input_mode(UNICODE_MODE_LINUX);
+
+    EXPECT_UNICODE(driver, 0x03A8); // Ψ
+    register_unicode(0x03A8);
+
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(Unicode, sends_smp_unicode_sequence) {
+    TestDriver driver;
+
+    set_unicode_input_mode(UNICODE_MODE_LINUX);
+
+    EXPECT_UNICODE(driver, 0x1F9D9); // 🧙
+    register_unicode(0x1F9D9);
+
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(Unicode, sends_surrogate_pair_for_macos) {
+    TestDriver driver;
+
+    set_unicode_input_mode(UNICODE_MODE_MACOS);
+
+    // EXPECT_UNICODE() assumes Linux input mode
+    {
+        testing::InSequence s;
+
+        // Alt+D83EDDD9 🧙
+        EXPECT_REPORT(driver, (KC_LEFT_ALT));
+        EXPECT_REPORT(driver, (KC_D, KC_LEFT_ALT));
+        EXPECT_REPORT(driver, (KC_LEFT_ALT));
+        EXPECT_REPORT(driver, (KC_8, KC_LEFT_ALT));
+        EXPECT_REPORT(driver, (KC_LEFT_ALT));
+        EXPECT_REPORT(driver, (KC_3, KC_LEFT_ALT));
+        EXPECT_REPORT(driver, (KC_LEFT_ALT));
+        EXPECT_REPORT(driver, (KC_E, KC_LEFT_ALT));
+        EXPECT_REPORT(driver, (KC_LEFT_ALT));
+        EXPECT_REPORT(driver, (KC_D, KC_LEFT_ALT));
+        EXPECT_REPORT(driver, (KC_LEFT_ALT));
+        EXPECT_REPORT(driver, (KC_D, KC_LEFT_ALT));
+        EXPECT_REPORT(driver, (KC_LEFT_ALT));
+        EXPECT_REPORT(driver, (KC_D, KC_LEFT_ALT));
+        EXPECT_REPORT(driver, (KC_LEFT_ALT));
+        EXPECT_REPORT(driver, (KC_9, KC_LEFT_ALT));
+        EXPECT_REPORT(driver, (KC_LEFT_ALT));
+        EXPECT_EMPTY_REPORT(driver);
+    }
+
+    register_unicode(0x1F9D9);
+
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(Unicode, sends_unicode_string) {
+    TestDriver driver;
+
+    set_unicode_input_mode(UNICODE_MODE_LINUX);
+
+    {
+        testing::InSequence s;
+
+        EXPECT_UNICODE(driver, 0xFF31);
+        EXPECT_UNICODE(driver, 0xFF2D);
+        EXPECT_UNICODE(driver, 0xFF2B);
+        EXPECT_UNICODE(driver, 0xFF01);
+    }
+    send_unicode_string("ＱＭＫ！");
+
+    VERIFY_AND_CLEAR(driver);
+}
diff --git a/tests/unicode/unicode_basic/config.h b/tests/unicode/unicode_basic/config.h
new file mode 100644
index 000000000000..16f95f7f8db7
--- /dev/null
+++ b/tests/unicode/unicode_basic/config.h
@@ -0,0 +1,8 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "test_common.h"
+
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS
diff --git a/tests/unicode/unicode_basic/test.mk b/tests/unicode/unicode_basic/test.mk
new file mode 100644
index 000000000000..f53051dce679
--- /dev/null
+++ b/tests/unicode/unicode_basic/test.mk
@@ -0,0 +1,5 @@
+# --------------------------------------------------------------------------------
+# Keep this file, even if it is empty, as a marker that this folder contains tests
+# --------------------------------------------------------------------------------
+
+UNICODE_ENABLE = yes
diff --git a/tests/unicode/unicode_basic/test_unicode_basic.cpp b/tests/unicode/unicode_basic/test_unicode_basic.cpp
new file mode 100644
index 000000000000..598b57277f3d
--- /dev/null
+++ b/tests/unicode/unicode_basic/test_unicode_basic.cpp
@@ -0,0 +1,26 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "keyboard_report_util.hpp"
+#include "keycode.h"
+#include "test_common.hpp"
+#include "test_keymap_key.hpp"
+
+using testing::_;
+
+class UnicodeBasic : public TestFixture {};
+
+TEST_F(UnicodeBasic, sends_unicode_sequence) {
+    TestDriver driver;
+
+    set_unicode_input_mode(UNICODE_MODE_LINUX);
+
+    auto key_uc = KeymapKey(0, 0, 0, UC(0x03A8)); // Ψ
+
+    set_keymap({key_uc});
+
+    EXPECT_UNICODE(driver, 0x03A8);
+    tap_key(key_uc);
+
+    VERIFY_AND_CLEAR(driver);
+}
diff --git a/tests/unicode/unicode_map/config.h b/tests/unicode/unicode_map/config.h
new file mode 100644
index 000000000000..0d86922f0da7
--- /dev/null
+++ b/tests/unicode/unicode_map/config.h
@@ -0,0 +1,8 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "test_common.h"
+
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
diff --git a/tests/unicode/unicode_map/test.mk b/tests/unicode/unicode_map/test.mk
new file mode 100644
index 000000000000..e6d003479988
--- /dev/null
+++ b/tests/unicode/unicode_map/test.mk
@@ -0,0 +1,5 @@
+# --------------------------------------------------------------------------------
+# Keep this file, even if it is empty, as a marker that this folder contains tests
+# --------------------------------------------------------------------------------
+
+UNICODEMAP_ENABLE = yes
diff --git a/tests/unicode/unicode_map/test_unicode_map.cpp b/tests/unicode/unicode_map/test_unicode_map.cpp
new file mode 100644
index 000000000000..cacd8f3c757c
--- /dev/null
+++ b/tests/unicode/unicode_map/test_unicode_map.cpp
@@ -0,0 +1,54 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "keyboard_report_util.hpp"
+#include "keycode.h"
+#include "test_common.hpp"
+#include "test_keymap_key.hpp"
+
+using testing::_;
+
+const uint32_t PROGMEM unicode_map[] = {
+    0x03A8, // Ψ
+    0x2318  // ⌘
+};
+
+class UnicodeMap : public TestFixture {};
+
+TEST_F(UnicodeMap, sends_unicodemap_code_point_from_keycode) {
+    TestDriver driver;
+
+    auto key_um = KeymapKey(0, 0, 0, UM(0));
+
+    set_keymap({key_um});
+
+    EXPECT_UNICODE(driver, 0x03A8);
+    tap_key(key_um);
+
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(UnicodeMap, sends_unicodemap_pair_from_keycode) {
+    TestDriver driver;
+
+    auto key_shift = KeymapKey(0, 0, 0, KC_LEFT_SHIFT);
+    auto key_up    = KeymapKey(0, 1, 0, UP(0, 1));
+
+    set_keymap({key_shift, key_up});
+
+    EXPECT_UNICODE(driver, 0x03A8);
+    tap_key(key_up);
+
+    EXPECT_REPORT(driver, (KC_LEFT_SHIFT));
+    key_shift.press();
+    run_one_scan_loop();
+
+    EXPECT_UNICODE(driver, 0x2318);
+    tap_key(key_up);
+
+    EXPECT_NO_REPORT(driver);
+    key_shift.release();
+    run_one_scan_loop();
+
+    VERIFY_AND_CLEAR(driver);
+}
diff --git a/tests/unicode/unicode_ucis/config.h b/tests/unicode/unicode_ucis/config.h
new file mode 100644
index 000000000000..0d86922f0da7
--- /dev/null
+++ b/tests/unicode/unicode_ucis/config.h
@@ -0,0 +1,8 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "test_common.h"
+
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
diff --git a/tests/unicode/unicode_ucis/test.mk b/tests/unicode/unicode_ucis/test.mk
new file mode 100644
index 000000000000..d7ac6517583a
--- /dev/null
+++ b/tests/unicode/unicode_ucis/test.mk
@@ -0,0 +1,5 @@
+# --------------------------------------------------------------------------------
+# Keep this file, even if it is empty, as a marker that this folder contains tests
+# --------------------------------------------------------------------------------
+
+UCIS_ENABLE = yes
diff --git a/tests/unicode/unicode_ucis/test_unicode_ucis.cpp b/tests/unicode/unicode_ucis/test_unicode_ucis.cpp
new file mode 100644
index 000000000000..acc6329f857b
--- /dev/null
+++ b/tests/unicode/unicode_ucis/test_unicode_ucis.cpp
@@ -0,0 +1,221 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "keyboard_report_util.hpp"
+#include "keycode.h"
+#include "test_common.hpp"
+#include "test_keymap_key.hpp"
+
+using testing::_;
+
+// clang-format off
+const ucis_symbol_t ucis_symbol_table[] = UCIS_TABLE(
+    UCIS_SYM("qmk", 0x03A8) // Ψ
+);
+// clang-format on
+
+class UnicodeUCIS : public TestFixture {};
+
+TEST_F(UnicodeUCIS, matches_sequence) {
+    TestDriver driver;
+
+    auto key_q     = KeymapKey(0, 0, 0, KC_Q);
+    auto key_m     = KeymapKey(0, 1, 0, KC_M);
+    auto key_k     = KeymapKey(0, 2, 0, KC_K);
+    auto key_enter = KeymapKey(0, 3, 0, KC_ENTER);
+
+    set_keymap({key_q, key_m, key_k, key_enter});
+
+    EXPECT_UNICODE(driver, 0x2328); // ⌨
+    ucis_start();
+
+    EXPECT_EQ(ucis_active(), true);
+    EXPECT_EQ(ucis_count(), 0);
+
+    EXPECT_REPORT(driver, (KC_Q));
+    EXPECT_EMPTY_REPORT(driver);
+    tap_key(key_q);
+    EXPECT_EQ(ucis_count(), 1);
+
+    EXPECT_REPORT(driver, (KC_M));
+    EXPECT_EMPTY_REPORT(driver);
+    tap_key(key_m);
+    EXPECT_EQ(ucis_count(), 2);
+
+    EXPECT_REPORT(driver, (KC_K));
+    EXPECT_EMPTY_REPORT(driver);
+    tap_key(key_k);
+    EXPECT_EQ(ucis_count(), 3);
+
+    EXPECT_REPORT(driver, (KC_BACKSPACE)).Times(4);
+    EXPECT_EMPTY_REPORT(driver).Times(4);
+    EXPECT_UNICODE(driver, 0x03A8);
+    tap_key(key_enter);
+
+    EXPECT_EQ(ucis_active(), false);
+
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(UnicodeUCIS, cancels_sequence) {
+    TestDriver driver;
+
+    auto key_q      = KeymapKey(0, 0, 0, KC_Q);
+    auto key_m      = KeymapKey(0, 1, 0, KC_M);
+    auto key_k      = KeymapKey(0, 2, 0, KC_K);
+    auto key_escape = KeymapKey(0, 3, 0, KC_ESCAPE);
+
+    set_keymap({key_q, key_m, key_k, key_escape});
+
+    EXPECT_UNICODE(driver, 0x2328); // ⌨
+    ucis_start();
+
+    EXPECT_EQ(ucis_active(), true);
+    EXPECT_EQ(ucis_count(), 0);
+
+    EXPECT_REPORT(driver, (KC_Q));
+    EXPECT_EMPTY_REPORT(driver);
+    tap_key(key_q);
+    EXPECT_EQ(ucis_count(), 1);
+
+    EXPECT_REPORT(driver, (KC_M));
+    EXPECT_EMPTY_REPORT(driver);
+    tap_key(key_m);
+    EXPECT_EQ(ucis_count(), 2);
+
+    EXPECT_REPORT(driver, (KC_K));
+    EXPECT_EMPTY_REPORT(driver);
+    tap_key(key_k);
+    EXPECT_EQ(ucis_count(), 3);
+
+    EXPECT_NO_REPORT(driver);
+    tap_key(key_escape);
+
+    EXPECT_EQ(ucis_active(), false);
+
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(UnicodeUCIS, matches_sequence_with_corrected_typo) {
+    TestDriver driver;
+
+    auto key_q         = KeymapKey(0, 0, 0, KC_Q);
+    auto key_m         = KeymapKey(0, 1, 0, KC_M);
+    auto key_j         = KeymapKey(0, 2, 0, KC_J);
+    auto key_k         = KeymapKey(0, 3, 0, KC_K);
+    auto key_backspace = KeymapKey(0, 4, 0, KC_BACKSPACE);
+    auto key_enter     = KeymapKey(0, 5, 0, KC_ENTER);
+
+    set_keymap({key_q, key_m, key_j, key_k, key_backspace, key_enter});
+
+    EXPECT_UNICODE(driver, 0x2328); // ⌨
+    ucis_start();
+
+    EXPECT_EQ(ucis_active(), true);
+    EXPECT_EQ(ucis_count(), 0);
+
+    EXPECT_REPORT(driver, (KC_Q));
+    EXPECT_EMPTY_REPORT(driver);
+    tap_key(key_q);
+    EXPECT_EQ(ucis_count(), 1);
+
+    EXPECT_REPORT(driver, (KC_M));
+    EXPECT_EMPTY_REPORT(driver);
+    tap_key(key_m);
+    EXPECT_EQ(ucis_count(), 2);
+
+    EXPECT_REPORT(driver, (KC_J));
+    EXPECT_EMPTY_REPORT(driver);
+    tap_key(key_j);
+    EXPECT_EQ(ucis_count(), 3);
+
+    EXPECT_REPORT(driver, (KC_BACKSPACE));
+    EXPECT_EMPTY_REPORT(driver);
+    tap_key(key_backspace);
+    EXPECT_EQ(ucis_count(), 2);
+
+    EXPECT_REPORT(driver, (KC_K));
+    EXPECT_EMPTY_REPORT(driver);
+    tap_key(key_k);
+    EXPECT_EQ(ucis_count(), 3);
+
+    EXPECT_REPORT(driver, (KC_BACKSPACE)).Times(4);
+    EXPECT_EMPTY_REPORT(driver).Times(4);
+    EXPECT_UNICODE(driver, 0x03A8);
+    tap_key(key_enter);
+
+    EXPECT_EQ(ucis_active(), false);
+
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(UnicodeUCIS, does_not_match_longer_sequence) {
+    TestDriver driver;
+
+    auto key_q     = KeymapKey(0, 0, 0, KC_Q);
+    auto key_m     = KeymapKey(0, 1, 0, KC_M);
+    auto key_k     = KeymapKey(0, 2, 0, KC_K);
+    auto key_enter = KeymapKey(0, 3, 0, KC_ENTER);
+
+    set_keymap({key_q, key_m, key_k, key_enter});
+
+    EXPECT_UNICODE(driver, 0x2328); // ⌨
+    ucis_start();
+
+    EXPECT_EQ(ucis_active(), true);
+    EXPECT_EQ(ucis_count(), 0);
+
+    EXPECT_REPORT(driver, (KC_Q));
+    EXPECT_EMPTY_REPORT(driver);
+    tap_key(key_q);
+    EXPECT_EQ(ucis_count(), 1);
+
+    EXPECT_REPORT(driver, (KC_M));
+    EXPECT_EMPTY_REPORT(driver);
+    tap_key(key_m);
+    EXPECT_EQ(ucis_count(), 2);
+
+    EXPECT_REPORT(driver, (KC_K));
+    EXPECT_EMPTY_REPORT(driver);
+    tap_key(key_k);
+    EXPECT_EQ(ucis_count(), 3);
+
+    EXPECT_REPORT(driver, (KC_K));
+    EXPECT_EMPTY_REPORT(driver);
+    tap_key(key_k);
+    EXPECT_EQ(ucis_count(), 4);
+
+    EXPECT_NO_REPORT(driver);
+    tap_key(key_enter);
+
+    EXPECT_EQ(ucis_active(), false);
+
+    VERIFY_AND_CLEAR(driver);
+}
+
+TEST_F(UnicodeUCIS, does_not_match_shorter_sequence) {
+    TestDriver driver;
+
+    auto key_q     = KeymapKey(0, 0, 0, KC_Q);
+    auto key_enter = KeymapKey(0, 1, 0, KC_ENTER);
+
+    set_keymap({key_q, key_enter});
+
+    EXPECT_UNICODE(driver, 0x2328); // ⌨
+    ucis_start();
+
+    EXPECT_EQ(ucis_active(), true);
+    EXPECT_EQ(ucis_count(), 0);
+
+    EXPECT_REPORT(driver, (KC_Q));
+    EXPECT_EMPTY_REPORT(driver);
+    tap_key(key_q);
+    EXPECT_EQ(ucis_count(), 1);
+
+    EXPECT_NO_REPORT(driver);
+    tap_key(key_enter);
+
+    EXPECT_EQ(ucis_active(), false);
+
+    VERIFY_AND_CLEAR(driver);
+}
diff --git a/tmk_core/protocol.mk b/tmk_core/protocol.mk
index d3f15c458876..d159dacc55bf 100644
--- a/tmk_core/protocol.mk
+++ b/tmk_core/protocol.mk
@@ -1,4 +1,4 @@
-TMK_COMMON_SRC +=	\
+SRC +=	\
 	$(PROTOCOL_DIR)/host.c \
 	$(PROTOCOL_DIR)/report.c \
 	$(PROTOCOL_DIR)/usb_device_state.c \
@@ -7,7 +7,7 @@ TMK_COMMON_SRC +=	\
 SHARED_EP_ENABLE = no
 MOUSE_SHARED_EP ?= yes
 ifeq ($(strip $(KEYBOARD_SHARED_EP)), yes)
-    TMK_COMMON_DEFS += -DKEYBOARD_SHARED_EP
+    OPT_DEFS += -DKEYBOARD_SHARED_EP
     SHARED_EP_ENABLE = yes
     # With the current usb_descriptor.c code,
     # you can't share kbd without sharing mouse;
@@ -18,31 +18,31 @@ endif
 ifeq ($(strip $(MOUSE_ENABLE)), yes)
     OPT_DEFS += -DMOUSE_ENABLE
     ifeq ($(strip $(MOUSE_SHARED_EP)), yes)
-        TMK_COMMON_DEFS += -DMOUSE_SHARED_EP
+        OPT_DEFS += -DMOUSE_SHARED_EP
         SHARED_EP_ENABLE = yes
     endif
 endif
 
 ifeq ($(strip $(EXTRAKEY_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DEXTRAKEY_ENABLE
+    OPT_DEFS += -DEXTRAKEY_ENABLE
     SHARED_EP_ENABLE = yes
 endif
 
 ifeq ($(strip $(PROGRAMMABLE_BUTTON_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DPROGRAMMABLE_BUTTON_ENABLE
+    OPT_DEFS += -DPROGRAMMABLE_BUTTON_ENABLE
     SHARED_EP_ENABLE = yes
 endif
 
 ifeq ($(strip $(RAW_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DRAW_ENABLE
+    OPT_DEFS += -DRAW_ENABLE
 endif
 
 ifeq ($(strip $(CONSOLE_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DCONSOLE_ENABLE
+    OPT_DEFS += -DCONSOLE_ENABLE
 else
     # TODO: decouple this so other print backends can exist
-    TMK_COMMON_DEFS += -DNO_PRINT
-    TMK_COMMON_DEFS += -DNO_DEBUG
+    OPT_DEFS += -DNO_PRINT
+    OPT_DEFS += -DNO_DEBUG
 endif
 
 ifeq ($(strip $(NKRO_ENABLE)), yes)
@@ -51,55 +51,55 @@ ifeq ($(strip $(NKRO_ENABLE)), yes)
     else ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
         $(info NKRO is not currently supported with Bluetooth, and has been disabled.)
     else
-        TMK_COMMON_DEFS += -DNKRO_ENABLE
+        OPT_DEFS += -DNKRO_ENABLE
         SHARED_EP_ENABLE = yes
     endif
 endif
 
 ifeq ($(strip $(RING_BUFFERED_6KRO_REPORT_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DRING_BUFFERED_6KRO_REPORT_ENABLE
+    OPT_DEFS += -DRING_BUFFERED_6KRO_REPORT_ENABLE
 endif
 
 ifeq ($(strip $(NO_SUSPEND_POWER_DOWN)), yes)
-    TMK_COMMON_DEFS += -DNO_SUSPEND_POWER_DOWN
+    OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 endif
 
 ifeq ($(strip $(NO_USB_STARTUP_CHECK)), yes)
-    TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
+    OPT_DEFS += -DNO_USB_STARTUP_CHECK
 endif
 
 ifeq ($(strip $(JOYSTICK_SHARED_EP)), yes)
-    TMK_COMMON_DEFS += -DJOYSTICK_SHARED_EP
+    OPT_DEFS += -DJOYSTICK_SHARED_EP
     SHARED_EP_ENABLE = yes
 endif
 
 ifeq ($(strip $(JOYSTICK_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DJOYSTICK_ENABLE
+    OPT_DEFS += -DJOYSTICK_ENABLE
     ifeq ($(strip $(SHARED_EP_ENABLE)), yes)
-        TMK_COMMON_DEFS += -DJOYSTICK_SHARED_EP
+        OPT_DEFS += -DJOYSTICK_SHARED_EP
         SHARED_EP_ENABLE = yes
     endif
 endif
 
 ifeq ($(strip $(DIGITIZER_SHARED_EP)), yes)
-    TMK_COMMON_DEFS += -DDIGITIZER_SHARED_EP
+    OPT_DEFS += -DDIGITIZER_SHARED_EP
     SHARED_EP_ENABLE = yes
 endif
 
 ifeq ($(strip $(DIGITIZER_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DDIGITIZER_ENABLE
+    OPT_DEFS += -DDIGITIZER_ENABLE
     ifeq ($(strip $(SHARED_EP_ENABLE)), yes)
-        TMK_COMMON_DEFS += -DDIGITIZER_SHARED_EP
+        OPT_DEFS += -DDIGITIZER_SHARED_EP
         SHARED_EP_ENABLE = yes
     endif
 endif
 
 ifeq ($(strip $(SHARED_EP_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DSHARED_EP_ENABLE
+    OPT_DEFS += -DSHARED_EP_ENABLE
 endif
 
 ifeq ($(strip $(USB_HID_ENABLE)), yes)
-    include $(TMK_DIR)/protocol/usb_hid.mk
+    include $(TMK_DIR)/protocol/usb_hid/usb_hid.mk
 endif
 
 # Search Path
diff --git a/tmk_core/protocol/arm_atsam.mk b/tmk_core/protocol/arm_atsam/arm_atsam.mk
similarity index 100%
rename from tmk_core/protocol/arm_atsam.mk
rename to tmk_core/protocol/arm_atsam/arm_atsam.mk
diff --git a/tmk_core/protocol/arm_atsam/main_arm_atsam.c b/tmk_core/protocol/arm_atsam/main_arm_atsam.c
index 1ccfbfb54a92..30817c17b643 100644
--- a/tmk_core/protocol/arm_atsam/main_arm_atsam.c
+++ b/tmk_core/protocol/arm_atsam/main_arm_atsam.c
@@ -21,9 +21,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "report.h"
 #include "host.h"
 #include "host_driver.h"
+#include "suspend.h"
 #include "keycode_config.h"
 #include <string.h>
-#include "quantum.h"
 
 // From protocol directory
 #include "arm_atsam_protocol.h"
diff --git a/tmk_core/protocol/arm_atsam/md_rgb_matrix.c b/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
index 52fe86d297b4..0f316b256cfc 100644
--- a/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
+++ b/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
@@ -23,6 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "arm_atsam_protocol.h"
 #    include "led.h"
 #    include "rgb_matrix.h"
+#    include "eeprom.h"
+#    include "host.h"
 #    include <string.h>
 #    include <math.h>
 
@@ -347,24 +349,24 @@ static void flush(void) {
 }
 
 void md_rgb_matrix_indicators_advanced(uint8_t led_min, uint8_t led_max) {
-    uint8_t kbled = keyboard_leds();
-    if (kbled && rgb_matrix_config.enable) {
+    led_t led_state = host_keyboard_led_state();
+    if (led_state.raw && rgb_matrix_config.enable) {
         for (uint8_t i = led_min; i < led_max; i++) {
             if (
 #    if USB_LED_NUM_LOCK_SCANCODE != 255
-                (led_map[i].scan == USB_LED_NUM_LOCK_SCANCODE && (kbled & (1 << USB_LED_NUM_LOCK))) ||
+                (led_map[i].scan == USB_LED_NUM_LOCK_SCANCODE && led_state.num_lock) ||
 #    endif // NUM LOCK
 #    if USB_LED_CAPS_LOCK_SCANCODE != 255
-                (led_map[i].scan == USB_LED_CAPS_LOCK_SCANCODE && (kbled & (1 << USB_LED_CAPS_LOCK))) ||
+                (led_map[i].scan == USB_LED_CAPS_LOCK_SCANCODE && led_state.caps_lock) ||
 #    endif // CAPS LOCK
 #    if USB_LED_SCROLL_LOCK_SCANCODE != 255
-                (led_map[i].scan == USB_LED_SCROLL_LOCK_SCANCODE && (kbled & (1 << USB_LED_SCROLL_LOCK))) ||
+                (led_map[i].scan == USB_LED_SCROLL_LOCK_SCANCODE && led_state.scroll_lock) ||
 #    endif // SCROLL LOCK
 #    if USB_LED_COMPOSE_SCANCODE != 255
-                (led_map[i].scan == USB_LED_COMPOSE_SCANCODE && (kbled & (1 << USB_LED_COMPOSE))) ||
+                (led_map[i].scan == USB_LED_COMPOSE_SCANCODE && led_state.compose) ||
 #    endif // COMPOSE
 #    if USB_LED_KANA_SCANCODE != 255
-                (led_map[i].scan == USB_LED_KANA_SCANCODE && (kbled & (1 << USB_LED_KANA))) ||
+                (led_map[i].scan == USB_LED_KANA_SCANCODE && led_state.kana) ||
 #    endif // KANA
                 (0)) {
                 if (rgb_matrix_get_flags() & LED_FLAG_INDICATOR) {
diff --git a/tmk_core/protocol/arm_atsam/md_rgb_matrix.h b/tmk_core/protocol/arm_atsam/md_rgb_matrix.h
index f27da028a0c3..bb3312e8e749 100644
--- a/tmk_core/protocol/arm_atsam/md_rgb_matrix.h
+++ b/tmk_core/protocol/arm_atsam/md_rgb_matrix.h
@@ -15,11 +15,9 @@ 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 _LED_MATRIX_H_
-#define _LED_MATRIX_H_
+#pragma once
 
-#include "quantum.h"
-#include "eeprom.h"
+#include <stdint.h>
 
 // From keyboard
 #include "config_led.h"
@@ -200,5 +198,3 @@ void md_led_changed(void);
 #else
 extern uint8_t gcr_desired;
 #endif // USE_MASSDROP_CONFIGURATOR
-
-#endif //_LED_MATRIX_H_
diff --git a/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c b/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c
index 58fc4efd9c6a..476b60529716 100644
--- a/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c
+++ b/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c
@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    ifdef USE_MASSDROP_CONFIGURATOR
 
 #        include "md_rgb_matrix.h"
+#        include "util.h"
 
 // Teal <-> Salmon
 led_setup_t leds_teal_salmon[] = {
diff --git a/tmk_core/protocol/arm_atsam/spi_master.h b/tmk_core/protocol/arm_atsam/spi_master.h
index 26c55128be12..80678a57077e 100644
--- a/tmk_core/protocol/arm_atsam/spi_master.h
+++ b/tmk_core/protocol/arm_atsam/spi_master.h
@@ -16,7 +16,9 @@
 
 #pragma once
 
+#include <stdint.h>
 #include <stdbool.h>
+#include "gpio.h"
 
 typedef int16_t spi_status_t;
 
diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c
index 10a976608ad0..4d97f1cd82e6 100644
--- a/tmk_core/protocol/chibios/chibios.c
+++ b/tmk_core/protocol/chibios/chibios.c
@@ -49,6 +49,8 @@
 #include "suspend.h"
 #include "wait.h"
 
+#define USB_GETSTATUS_REMOTE_WAKEUP_ENABLED (2U)
+
 /* -------------------------
  *   TMK host driver defs
  * -------------------------
@@ -182,12 +184,12 @@ void protocol_pre_task(void) {
 
 #if !defined(NO_USB_STARTUP_CHECK)
     if (USB_DRIVER.state == USB_SUSPENDED) {
-        print("[s]");
+        dprintln("suspending keyboard");
         while (USB_DRIVER.state == USB_SUSPENDED) {
             /* Do this in the suspended state */
             suspend_power_down(); // on AVR this deep sleeps for 15ms
             /* Remote wakeup */
-            if (suspend_wakeup_condition()) {
+            if ((USB_DRIVER.status & USB_GETSTATUS_REMOTE_WAKEUP_ENABLED) && suspend_wakeup_condition()) {
                 usbWakeupHost(&USB_DRIVER);
                 restart_usb_driver(&USB_DRIVER);
             }
diff --git a/tmk_core/protocol/chibios.mk b/tmk_core/protocol/chibios/chibios.mk
similarity index 100%
rename from tmk_core/protocol/chibios.mk
rename to tmk_core/protocol/chibios/chibios.mk
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 20bfc8fb3c75..f04ca79a0ca2 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -48,10 +48,10 @@
 #    include "sleep_led.h"
 #endif
 #include "suspend.h"
+#include "wait.h"
 
 #include "usb_descriptor.h"
 #include "lufa.h"
-#include "quantum.h"
 #include "usb_device_state.h"
 #include <util/atomic.h>
 
@@ -858,7 +858,7 @@ void protocol_post_init(void) {
 void protocol_pre_task(void) {
 #if !defined(NO_USB_STARTUP_CHECK)
     if (USB_DeviceState == DEVICE_STATE_Suspended) {
-        print("[s]");
+        dprintln("suspending keyboard");
         while (USB_DeviceState == DEVICE_STATE_Suspended) {
             suspend_power_down();
             if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) {
diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa/lufa.mk
similarity index 100%
rename from tmk_core/protocol/lufa.mk
rename to tmk_core/protocol/lufa/lufa.mk
diff --git a/tmk_core/protocol/report.c b/tmk_core/protocol/report.c
index 5755098c60f1..1ba3be4604e0 100644
--- a/tmk_core/protocol/report.c
+++ b/tmk_core/protocol/report.c
@@ -281,13 +281,21 @@ void clear_keys_from_report(report_keyboard_t* keyboard_report) {
 
 #ifdef MOUSE_ENABLE
 /**
- * @brief Compares 2 mouse reports for difference and returns result
+ * @brief Compares 2 mouse reports for difference and returns result. Empty
+ * reports always evaluate as unchanged.
  *
  * @param[in] new_report report_mouse_t
  * @param[in] old_report report_mouse_t
  * @return bool result
  */
 __attribute__((weak)) bool has_mouse_report_changed(report_mouse_t* new_report, report_mouse_t* old_report) {
-    return memcmp(new_report, old_report, sizeof(report_mouse_t));
+    // memcmp doesn't work here because of the `report_id` field when using
+    // shared mouse endpoint
+    bool changed = ((new_report->buttons != old_report->buttons) ||
+#    ifdef MOUSE_EXTENDED_REPORT
+                    (new_report->boot_x != 0 && new_report->boot_x != old_report->boot_x) || (new_report->boot_y != 0 && new_report->boot_y != old_report->boot_y) ||
+#    endif
+                    (new_report->x != 0 && new_report->x != old_report->x) || (new_report->y != 0 && new_report->y != old_report->y) || (new_report->h != 0 && new_report->h != old_report->h) || (new_report->v != 0 && new_report->v != old_report->v));
+    return changed;
 }
 #endif
diff --git a/tmk_core/protocol/usb_descriptor.c b/tmk_core/protocol/usb_descriptor.c
index 5ab9e3ff4f56..e215c9090043 100644
--- a/tmk_core/protocol/usb_descriptor.c
+++ b/tmk_core/protocol/usb_descriptor.c
@@ -93,6 +93,8 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM KeyboardReport[] = {
         HID_RI_USAGE_PAGE(8, 0x08),    // LED
         HID_RI_USAGE_MINIMUM(8, 0x01), // Num Lock
         HID_RI_USAGE_MAXIMUM(8, 0x05), // Kana
+        HID_RI_LOGICAL_MINIMUM(8, 0x00),
+        HID_RI_LOGICAL_MAXIMUM(8, 0x01),
         HID_RI_REPORT_COUNT(8, 0x05),
         HID_RI_REPORT_SIZE(8, 0x01),
         HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
diff --git a/tmk_core/protocol/usb_hid.mk b/tmk_core/protocol/usb_hid/usb_hid.mk
similarity index 100%
rename from tmk_core/protocol/usb_hid.mk
rename to tmk_core/protocol/usb_hid/usb_hid.mk
diff --git a/tmk_core/protocol/usb_util.c b/tmk_core/protocol/usb_util.c
index 49aadedc2af9..3b3be4a76757 100644
--- a/tmk_core/protocol/usb_util.c
+++ b/tmk_core/protocol/usb_util.c
@@ -13,13 +13,17 @@
  * You 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 "usb_util.h"
+#include "gpio.h"
+#include "wait.h"
 
 __attribute__((weak)) void usb_disconnect(void) {}
+
 __attribute__((weak)) bool usb_connected_state(void) {
     return true;
 }
+
 __attribute__((weak)) bool usb_vbus_state(void) {
 #ifdef USB_VBUS_PIN
     setPinInput(USB_VBUS_PIN);
diff --git a/tmk_core/protocol/usb_util.h b/tmk_core/protocol/usb_util.h
index 13db9fbfbdfb..6f0e406378fd 100644
--- a/tmk_core/protocol/usb_util.h
+++ b/tmk_core/protocol/usb_util.h
@@ -13,10 +13,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #pragma once
 
 #include <stdbool.h>
 
 void usb_disconnect(void);
+
 bool usb_connected_state(void);
+
 bool usb_vbus_state(void);
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index b3eeff9e0169..d74f375f66af 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -435,6 +435,8 @@ const PROGMEM uchar keyboard_hid_report[] = {
     0x05, 0x08, //   Usage Page (LED)
     0x19, 0x01, //   Usage Minimum (Num Lock)
     0x29, 0x05, //   Usage Maximum (Kana)
+    0x15, 0x00, //   Logical Minimum (0)
+    0x25, 0x01, //   Logical Maximum (1)
     0x95, 0x05, //   Report Count (5)
     0x75, 0x01, //   Report Size (1)
     0x91, 0x02, //   Output (Data, Variable, Absolute)
diff --git a/tmk_core/protocol/vusb.mk b/tmk_core/protocol/vusb/vusb.mk
similarity index 100%
rename from tmk_core/protocol/vusb.mk
rename to tmk_core/protocol/vusb/vusb.mk
diff --git a/users/badger/badger.c b/users/badger/badger.c
index 455184061046..8537e3e4a8e9 100644
--- a/users/badger/badger.c
+++ b/users/badger/badger.c
@@ -14,15 +14,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "badger.h"
 
-bool      _capsLockState;
-
 __attribute__ ((weak))
 void keyboard_post_init_user(void) {
-  _capsLockState = false;
 }
 
 __attribute__ ((weak))
 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: %2u, row: %2u, pressed: %u, time: %5u, int: %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 CS_RIGHT:
       if (record->event.pressed) {
@@ -36,12 +38,73 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         return false;
       }
       break;
-    case KC_CAPS:
+    case SHEBANG:
       if (record->event.pressed) {
-        _capsLockState = !_capsLockState;
-        return true;
+        SEND_STRING("#! /bin/bash");
+        SEND_STRING(SS_TAP(X_ENTER));
+        return false;
       }
-      break;
+    case FN:
+      if (record->event.pressed) {
+        SEND_STRING("function ");
+        return false;
+      }
+    case CONST:
+      if (record->event.pressed) {
+        SEND_STRING("const ");
+        return false;
+      }
+    case SHRUG:
+      if (record->event.pressed) {
+        SEND_STRING("¯\\_()_/¯");
+        SEND_STRING(SS_LALT("D30C4"));
+        return false;
+      }
+    case SELECT:
+      if (record->event.pressed) {
+        SEND_STRING("SELECT * FROM ;");
+        SEND_STRING(SS_TAP(X_LEFT));
+        return false;
+      }
+    case FOR_LOOP:
+      if (record->event.pressed) {
+        SEND_STRING("for file in $(ls); do echo $file; done");
+        return false;
+      }
+    case SED:
+      if (record->event.pressed) {
+        SEND_STRING("sed 's/replaceme//g'");
+        return false;
+      }
+    case BASH_IF:
+      if (record->event.pressed) {
+        SEND_STRING("if [[ 0 -eq 0 ]]; then echo 'true'; fi");
+        return false;
+      }
+    case P_PAREN:
+      if (record->event.pressed) {
+        SEND_STRING("()");
+        SEND_STRING(SS_TAP(X_LEFT));
+        return false;
+      }
+    case P_BRACE:
+      if (record->event.pressed) {
+        SEND_STRING("{}");
+        SEND_STRING(SS_TAP(X_LEFT));
+        return false;
+      }
+    case P_BRACK:
+      if (record->event.pressed) {
+        SEND_STRING("[]");
+        SEND_STRING(SS_TAP(X_LEFT));
+        return false;
+      }
+    case TS_IMPT:
+    if (record->event.pressed) {
+      SEND_STRING("import {  } from \"\";");
+      SEND_STRING(SS_TAP(X_LEFT)SS_TAP(X_LEFT)SS_TAP(X_LEFT)SS_TAP(X_LEFT)SS_TAP(X_LEFT)SS_TAP(X_LEFT)SS_TAP(X_LEFT)SS_TAP(X_LEFT)SS_TAP(X_LEFT)SS_TAP(X_LEFT)SS_TAP(X_LEFT));
+      return false;
+    }
     default:
       return true;
   }
diff --git a/users/badger/badger.h b/users/badger/badger.h
index bb2dcd0bd3a8..94501280a9d0 100644
--- a/users/badger/badger.h
+++ b/users/badger/badger.h
@@ -17,37 +17,65 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 enum layers {
-  _QWERTY_MAC,
-  _MOVE_MAC,
+  _QWERTY,
+  _MOVE,
   _QWERTY_LINUX,
   _MOVE_LINUX,
-  _ADJUST,
+  _FUNCTION,
+  _MACRO,
   _CONFIG
 };
 
 enum CustomKeys {
   CS_RIGHT = SAFE_RANGE,
-  CS_DOWN
+  CS_DOWN,
+  SHEBANG,
+  SHRUG,
+  FN,
+  CONST,
+  SELECT,
+  FOR_LOOP,
+  SED,
+  BASH_IF,
+  P_PAREN,
+  P_BRACE,
+  P_BRACK,
+  TS_IMPT,
 };
 
 #define OS_POP     LCTL(KC_F10)
-#define MAC_POP    LCTL(KC_UP)
+#define MAC_POP    LT(_CONFIG, LCTL(KC_UP))
 #define MAC_FRC    LGUI(LALT(KC_ESC))
 #define OS_COPY    LSFT(LCTL(KC_C))
 #define OS_PAST    LSFT(LCTL(KC_V))
+#define MAC_UND    LGUI(KC_Z)
+#define MAC_CUT    LGUI(KC_X)
 #define MAC_PST    LGUI(KC_V)
+#define MAC_SPS    LGUI(LSFT(LALT(KC_V)))
 #define MAC_CPY    LGUI(KC_C)
-#define KC_BACK    LCTL(LSFT(KC_LBRC))
-#define KC_NEXT    LCTL(LSFT(KC_RBRC))
+#define MAC_DUP    LGUI(KC_D)
+#define MAC_ALL    LGUI(KC_A)
+#define MAC_SAV    LGUI(KC_S)
+#define MAC_B      LGUI(KC_B)
+#define MAC_FND    LGUI(KC_F)
+#define MAC_WND    LGUI(KC_GRV)
+#define KC_BACK    LGUI(KC_LBRC)
+#define KC_NEXT    LGUI(KC_RBRC)
 
 #define MOVE       LT(_MOVE_LINUX, KC_ESC)
-#define MOVE_MAC   LT(_MOVE_MAC, KC_ESC)
-#define ADJUST     MO(_ADJUST)
-#define CFG_MAC    LT(_CONFIG, MAC_POP)
-#define CFG_LNX    LT(_CONFIG, OS_POP)
+#define MOVE_MAC   LT(_MOVE, KC_ESC)
+#define LT_END     LT(_MACRO, KC_END)
+#define LT_SPACE   LT(_MACRO, KC_SPC)
+#define FN_SPACE   LT(_FUNCTION, KC_SPC)
+#define LT_FUNC    LT(_FUNCTION, KC_LEFT)
+#define CONFIG     MO(_CONFIG)
+#define J_MACRO    MO(_MACRO)
+#define J_FUNCT    MO(_FUNCTION)
+#define CFG_LNX    MO(_CONFIG)
 
 #define WD_BACK    LALT(KC_LEFT)
 #define WD_FRWD    LALT(KC_RIGHT)
+#define WD_DELE    LALT(KC_BSPC)
 
 #define VD_1       LCTL(KC_F1)
 #define VD_2       LCTL(KC_F2)
@@ -69,6 +97,7 @@ enum CustomKeys {
 
 /* IntelliJ / JetBrains shortcuts with Mac keymap */
 #define IJ_BACK    LGUI(LALT(KC_LEFT))
+#define LT_SLSH    RSFT_T(KC_SLSH)
 #define IJ_FWD     LGUI(LALT(KC_RIGHT))
 #define IJ_UP      LGUI(LALT(KC_UP))
 #define IJ_DOWN    LGUI(LALT(KC_DOWN))
@@ -76,16 +105,42 @@ enum CustomKeys {
 #define IJ_DECL    LGUI(KC_B)
 #define IJ_REN     LSFT(KC_F6)
 #define IJ_USAG    LALT(KC_F7)
-#define IJ_RUN     KC_F9
+#define IJ_RUN     LCTL(LALT(KC_D))
+#define IJ_NEXT    KC_F9
 #define IJ_STEP    KC_F8
 #define IJ_INTO    LSFT(KC_F7)
-#define IJ_OUT     LSFT(KC_F8) 
-#define IJ_STOP    LGUI(KC_F2) 
+#define IJ_OUT     LSFT(KC_F8)
+#define IJ_STOP    LGUI(KC_F2)
 #define IJ_IMPS    LCTL(LALT(LSFT(KC_EQUAL)))
 #define IJ_IMPH    LCTL(LALT(LSFT(KC_MINUS)))
 #define IJ_TOP     LGUI(KC_HOME)
 #define IJ_BOTT    LGUI(KC_END)
 #define IJ_FIND    LGUI(LSFT(KC_F))
+#define IJ_LINE    LGUI(KC_L)
+#define IJ_RELD    LGUI(LSFT(KC_F9))
+#define IJ_TERM    LALT(KC_F12)
+#define IJ_DEBG    LGUI(KC_5)
+#define IJ_RFMT    LALT(LSFT(LGUI(KC_L)))
+#define IJ_FILE    LSFT(LGUI(KC_O))
+#define IJ_PROJ    LSFT(LGUI(KC_O))
+
+/* VS Code shortcuts */
+#define VS_CMD     LGUI(LSFT(KC_A))
+#define VS_EXP     LGUI(LSFT(KC_E))
+#define VS_DBG     LGUI(LSFT(KC_F8))
+#define VS_SCC     LCTL(LSFT(KC_G))
+#define VS_RUN     KC_F5
+#define VS_STEP    KC_F8
+#define VS_INTO    KC_F7
+#define VS_BPT     LGUI(KC_F8)
+#define VS_OUT     LSFT(KC_F8)
+#define VS_STOP    LSFT(KC_F5)
+#define VS_TERM    LSFT(KC_ESC)
+#define VS_FILE    LSFT(LGUI(KC_O))
+#define VS_LINE    LGUI(KC_L)
+#define VS_MVUP    LSFT(LALT(KC_UP))
+#define VS_MVDN    LSFT(LALT(KC_DOWN))
+#define VS_JSFT    RSFT_T(LGUI(LSFT((KC_P))))
 
 /* MacOS virtual desktop shortcuts */
 #define M_VD1      LCTL(KC_1)
@@ -97,7 +152,7 @@ enum CustomKeys {
 #define MM_URCN    LCTL(LGUI(KC_RIGHT))
 #define MM_LLCN    LCTL(LSFT(LGUI(KC_LEFT)))
 #define MM_LRCN    LCTL(LSFT(LGUI(KC_RIGHT)))
-#define MM_MAX     LALT(LGUI(KC_F))
+#define MM_MAX     LCTL(LALT(KC_ENTER))
 #define MM_LH      HYPR(KC_LBRC)
 #define MM_RH      HYPR(KC_RBRC)
 #define MM_UH      LALT(LGUI(KC_UP))
@@ -105,5 +160,7 @@ enum CustomKeys {
 #define MM_LEFT    LCTL(LALT(LGUI(KC_LEFT)))
 #define MM_RGHT    LCTL(LALT(LGUI(KC_RIGHT)))
 
-#define DF_1       DF(_QWERTY_MAC)
-#define DF_2       DF(_QWERTY_LINUX)
+#define DF_1       DF(_QWERTY)
+#define DF_2       DF(_MOVE)
+#define DF_3       DF(_FUNCTION)
+#define DF_4       DF(_MACRO)
diff --git a/users/badger/ortho.c b/users/badger/ortho.c
index ff84e1706f06..e295d693b75a 100644
--- a/users/badger/ortho.c
+++ b/users/badger/ortho.c
@@ -28,7 +28,7 @@ float raiseLayerSong[][2]              = SONG(RAISE_LAYER_SONG);
 float lowerLayerSong[][2]              = SONG(LOWER_LAYER_SONG);
 float agSwapSong[][2]                  = SONG(LONG_AG_SWAP);
 float agNormSong[][2]                  = SONG(LONG_AG_NORM);
-#endif 
+#endif
 
 __attribute__ ((weak))
 void keyboard_post_init_user(void) {
@@ -109,7 +109,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         // don't lock the ADJUST layer
         // since this key is accessible via the ADJUST
         // layer, as it will require tricky state management
-        if (++_currentLayer == _ADJUST_ORTHO) {
+        if (++_currentLayer == _FUNCTION_ORTHO) {
           _currentLayer = _QWERTY_MAC_ORTHO;
         } else {
           layer_on(_currentLayer);
@@ -126,16 +126,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 void playSongForLayer(int currentLayer) {
   #ifdef AUDIO_ENABLE
   switch (currentLayer) {
-    case   _QWERTY_LINUX:
+    case   _QWERTY_LINUX_ORTHO:
       PLAY_SONG(defaultLayerSong);
       break;
-    case  _MOVE_LINUX:
+    case  _MOVE_LINUX_ORTHO:
       PLAY_SONG(moveLayerSong);
       break;
-    case  _QWERTY_MAC:
+    case  _QWERTY_MAC_ORTHO:
       PLAY_SONG(macLayerSong);
       break;
-    case  _MOVE_MAC:
+    case  _MOVE_MAC_ORTHO:
       PLAY_SONG(moveLayerSong);
       break;
     case  _RAISE:
@@ -148,4 +148,5 @@ void playSongForLayer(int currentLayer) {
       break;
   }
   #endif
-}
\ No newline at end of file
+}
+
diff --git a/users/badger/ortho.h b/users/badger/ortho.h
index 207f2e2822ec..3bb6bfefd0bb 100644
--- a/users/badger/ortho.h
+++ b/users/badger/ortho.h
@@ -23,6 +23,7 @@ enum OrthoLayers {
   _MOVE_LINUX_ORTHO,
   _RAISE,
   _LOWER,
+  _FUNCTION_ORTHO,
   _ADJUST_ORTHO
 };
 
@@ -33,16 +34,17 @@ enum OrthoKeys {
   KC_FIRST
 };
 
-#define P_ADJ LT(_ADJUST_ORTHO, KC_BSPC)
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
+#define RAISE LT(_RAISE, KC_SPACE)
+#define LOWER LT(_LOWER, KC_SPACE)
+#define J_FUN MO(_FUNCTION_ORTHO)
+#define J_ADJ MO(_ADJUST_ORTHO)
 #define MOMAC LT(_MOVE_MAC_ORTHO, KC_ESC)
 #define MOLNX LT(_MOVE_LINUX_ORTHO, KC_ESC)
 
 void playSongForLayer(int currentLayer);
 
 #ifdef AUDIO_ENABLE
-#define QWERTY_LAYER_SONG H__NOTE(_G6),  H__NOTE(_D6),  Q__NOTE(_A5),   Q__NOTE(_E5), 
+#define QWERTY_LAYER_SONG H__NOTE(_G6),  H__NOTE(_D6),  Q__NOTE(_A5),   Q__NOTE(_E5),
 #define MAC_LAYER_SONG    H__NOTE(_E5),  H__NOTE(_A5),  Q__NOTE(_D6),   Q__NOTE(_G6), \
         ED_NOTE(_E7),     E__NOTE(_CS7), E__NOTE(_E6),  E__NOTE(_A6),   M__NOTE(_CS7, 20),
 #define LONG_AG_SWAP      Q__NOTE(_G5),  Q__NOTE(_D6),  Q__NOTE(_A6),   Q__NOTE(_E7), \
diff --git a/users/bcat/bcat.h b/users/bcat/bcat.h
index 6fc84937c449..fb500b3b3bab 100644
--- a/users/bcat/bcat.h
+++ b/users/bcat/bcat.h
@@ -18,7 +18,7 @@
 
 #include <stdbool.h>
 
-#include "keycodes.h"
+#include "quantum_keycodes.h"
 
 /* Layer numbers shared across keymaps. */
 enum user_layer {
diff --git a/users/curry/oled.c b/users/curry/oled.c
index 89112af121e7..2defcbd80e24 100644
--- a/users/curry/oled.c
+++ b/users/curry/oled.c
@@ -86,12 +86,12 @@ void render_layer_state(void) {
     oled_write_P(PSTR(" Mods"), layer_state_is(_MODS));
 }
 
-void render_keylock_status(uint8_t led_usb_state) {
+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_usb_state & (1 << USB_LED_NUM_LOCK));
-    oled_write_P(PSTR("C"), led_usb_state & (1 << USB_LED_CAPS_LOCK));
-    oled_write_ln_P(PSTR("S"), led_usb_state & (1 << USB_LED_SCROLL_LOCK));
+    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) {
@@ -129,7 +129,7 @@ void render_user_status(void) {
 void render_status_main(void) {
     /* Show Keyboard Layout  */
     render_default_layer_state();
-    render_keylock_status(host_keyboard_leds());
+    render_keylock_status(host_keyboard_led_state());
     render_bootmagic_status();
     render_user_status();
 
diff --git a/users/curry/rgb_lighting_user.c b/users/curry/rgb_lighting_user.c
index b8d519feca17..34156744fe86 100644
--- a/users/curry/rgb_lighting_user.c
+++ b/users/curry/rgb_lighting_user.c
@@ -11,9 +11,9 @@ void rgblight_sethsv_default_helper(uint8_t index) { rgblight_sethsv_at(rgblight
  * This is especially useful for One Shot Mods, since it's not always obvious if they're still lit up.
  */
 #if defined(INDICATOR_LIGHTS)
-void set_rgb_indicators(uint8_t this_mod, uint8_t this_led, uint8_t this_osm) {
+void set_rgb_indicators(uint8_t this_mod, led_t this_led, uint8_t this_osm) {
     if (userspace_config.rgb_layer_change && get_highest_layer(layer_state) == 0) {
-        if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led & (1 << USB_LED_CAPS_LOCK)) {
+        if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led.caps_lock) {
 #    ifdef SHFT_LED1
             rgblight_sethsv_at(120, 255, 255, SHFT_LED1);
 #    endif  // SHFT_LED1
@@ -79,7 +79,7 @@ void set_rgb_indicators(uint8_t this_mod, uint8_t this_led, uint8_t this_osm) {
 /* Function for the indicators */
 void matrix_scan_indicator(void) {
     if (has_initialized) {
-        set_rgb_indicators(get_mods(), host_keyboard_leds(), get_oneshot_mods());
+        set_rgb_indicators(get_mods(), host_keyboard_led_state(), get_oneshot_mods());
     }
 }
 #endif  // INDICATOR_LIGHTS
diff --git a/users/doogle999/doogle999.c b/users/doogle999/doogle999.c
index 5d71599687a0..a5bd637ecea7 100644
--- a/users/doogle999/doogle999.c
+++ b/users/doogle999/doogle999.c
@@ -389,7 +389,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record)
 			/* KC_KP_1, KC_KP_2, ..., KC_KP_0, KC_KP_DOT */
 			(keycode >= KC_KP_1 && keycode <= KC_KP_DOT);
 
-		if(numpadKeyPressed && !(host_keyboard_leds() & (1 << USB_LED_NUM_LOCK)))
+		if(numpadKeyPressed && !host_keyboard_led_state().num_lock)
 		{
 			add_key(KC_NUM_LOCK);
 			send_keyboard_report();
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c
index cad6db8f3d91..b8ccbb028cdc 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -141,7 +141,7 @@ float autocorrect_song[][2] = SONG(PLOVER_GOODBYE_SOUND);
 #        endif
 #    endif
 
-bool apply_autocorrect(uint8_t backspaces, const char *str) {
+bool apply_autocorrect(uint8_t backspaces, const char* str, char *typo, char *correct) {
     if (layer_state_is(_GAMEPAD)) {
         return false;
     }
diff --git a/users/ericgebhart/oled/oled_stuff.c b/users/ericgebhart/oled/oled_stuff.c
index f2c4f0f394ba..211fe4ab3ef4 100755
--- a/users/ericgebhart/oled/oled_stuff.c
+++ b/users/ericgebhart/oled/oled_stuff.c
@@ -32,11 +32,11 @@ void oled_render_locale(void) {
     }
 }
 
-void oled_render_keylock_status(uint8_t led_usb_state) {
+void oled_render_keylock_status(led_t led_state) {
   oled_write_P(PSTR(" Lock:"), false);
-  oled_write_P(PSTR("N"), led_usb_state & (1 << USB_LED_NUM_LOCK));
-  oled_write_P(PSTR("C"), led_usb_state & (1 << USB_LED_CAPS_LOCK));
-  oled_write_P(PSTR("S"), led_usb_state & (1 << USB_LED_SCROLL_LOCK));
+  oled_write_P(PSTR("N"), led_state.num_lock);
+  oled_write_P(PSTR("C"), led_state.caps_lock);
+  oled_write_P(PSTR("S"), led_state.scroll_lock);
 }
 
 void oled_render_mod_status(uint8_t modifiers) {
@@ -49,7 +49,7 @@ void oled_render_mod_status(uint8_t modifiers) {
 
 void oled_render_mod_lock_status(void){
   oled_render_mod_status(get_mods() | get_oneshot_mods());
-  oled_render_keylock_status(host_keyboard_leds());
+  oled_render_keylock_status(host_keyboard_led_state());
 }
 
 
@@ -187,6 +187,3 @@ bool oled_task_user(void) {
 
 }
 #endif
-
-/* oled_render_keylock_status(host_keyboard_leds()); */
-/* oled_render_mod_status(get_mods() | get_oneshot_mods()); */
diff --git a/users/ishtob/ishtob.h b/users/ishtob/ishtob.h
index fd9e19c80932..fcc2e2b84750 100644
--- a/users/ishtob/ishtob.h
+++ b/users/ishtob/ishtob.h
@@ -36,7 +36,7 @@ enum userspace_keycodes {
 #define _FNLAYER 6
 #define _NUMLAY 7
 #define _MOUSECURSOR 8
-#define _ADJUST 16
+#define _ADJUST 9
 
 
 
diff --git a/users/konstantin/unicode.h b/users/konstantin/unicode.h
index 82caea7c9ace..472f48a9428a 100644
--- a/users/konstantin/unicode.h
+++ b/users/konstantin/unicode.h
@@ -31,7 +31,7 @@
 
 #define UCM_NAME(name, code)    UCM_ ## name,
 #define UCM_ENTRY(name, code)   [UCM_ ## name] = code,
-#define UCM_KEYCODE(name, code) name = X(UCM_ ## name),
+#define UCM_KEYCODE(name, code) name = UM(UCM_ ## name),
 
 #if defined(UNICODE_ENABLE)
 enum unicode_keycodes {
diff --git a/users/kuchosauronad0/unicode.h b/users/kuchosauronad0/unicode.h
index 9ff523baadf7..340b4cf94bcf 100644
--- a/users/kuchosauronad0/unicode.h
+++ b/users/kuchosauronad0/unicode.h
@@ -2,7 +2,6 @@
 
 #include "quantum.h"
 
-/* use X(n) to call the  */
 #ifdef UNICODEMAP_ENABLE
 enum unicode_name {
 OKOK,     // 
diff --git a/users/kuchosauronad0/wrappers.h b/users/kuchosauronad0/wrappers.h
index 543586e00906..a17e4178ffe4 100644
--- a/users/kuchosauronad0/wrappers.h
+++ b/users/kuchosauronad0/wrappers.h
@@ -152,13 +152,13 @@ NOTE: These are all the same length.  If you do a search/replace
 #endif
 
 #ifdef UNICODEMAP_ENABLE
-#  define _______________UNICODE_L1__________________     X(SMRK),  X(THINK),  X(CLOWN), X(HUNDR),  X(BANG)
-#  define _______________UNICODE_L2__________________     X(GRIN),  X(MONKEY), X(OKOK),  X(EGGPL),  X(LIT)
-#  define _______________UNICODE_L3__________________     X(WEARY), X(UNAMU),  X(EFFU),  X(MONOCL), X(IRONY)
+#  define _______________UNICODE_L1__________________     UM(SMRK),  UM(THINK),  UM(CLOWN), UM(HUNDR),  UM(BANG)
+#  define _______________UNICODE_L2__________________     UM(GRIN),  UM(MONKEY), UM(OKOK),  UM(EGGPL),  UM(LIT)
+#  define _______________UNICODE_L3__________________     UM(WEARY), UM(UNAMU),  UM(EFFU),  UM(MONOCL), UM(IRONY)
 
-#  define _______________UNICODE_R1__________________     X(DRUG0),   X(THUP),  X(INUP),  X(DIZZY), X(COOL)
-#  define _______________UNICODE_R2__________________     X(FIST0),   X(FIST2), X(FIST3), X(FIST1), X(OKOK)
-#  define _______________UNICODE_R3__________________     X(MNDBLWN), X(THDN),  X(SPOCK), X(HOLE),  X(DASH)
+#  define _______________UNICODE_R1__________________     UM(DRUG0),   UM(THUP),  UM(INUP),  UM(DIZZY), UM(COOL)
+#  define _______________UNICODE_R2__________________     UM(FIST0),   UM(FIST2), UM(FIST3), UM(FIST1), UM(OKOK)
+#  define _______________UNICODE_R3__________________     UM(MNDBLWN), UM(THDN),  UM(SPOCK), UM(HOLE),  UM(DASH)
 #endif
 
 #define ________________NUMBER_LEFT________________       KC_1,    KC_2,    KC_3,    KC_4,    KC_5
diff --git a/users/peterfalken/config.h b/users/peterfalken/config.h
index 5295923ec66f..1342705550c5 100644
--- a/users/peterfalken/config.h
+++ b/users/peterfalken/config.h
@@ -14,6 +14,7 @@
 #endif
 
 // Space optimizations
+#define LAYER_STATE_8BIT
 #undef LOCKING_SUPPORT_ENABLE
 #undef LOCKING_RESYNC_ENABLE
 
diff --git a/users/peterfalken/peterfalken.c b/users/peterfalken/peterfalken.c
index 5041f29da6d4..dcec1d650b2f 100644
--- a/users/peterfalken/peterfalken.c
+++ b/users/peterfalken/peterfalken.c
@@ -3,6 +3,15 @@
 
 #include "peterfalken.h"
 
+// Magic keycodes - overwrite placeholder functions
+uint16_t keycode_config(uint16_t keycode) {
+    return keycode;
+}
+
+uint8_t mod_config(uint8_t mod) {
+    return mod;
+}
+
 // Switch layer
 #ifndef CUSTOM_LAYER_STATE
 layer_state_t layer_state_set_user(layer_state_t state) {
diff --git a/users/ridingqwerty/unicode.h b/users/ridingqwerty/unicode.h
index de8d1593b4a1..08b6f4fb8d50 100644
--- a/users/ridingqwerty/unicode.h
+++ b/users/ridingqwerty/unicode.h
@@ -216,7 +216,7 @@
 
 #define UCM_NAME(name, code)    UCM_ ## name,           // UCM_LALP,
 #define UCM_ENTRY(name, code)   [UCM_ ## name] = code,  // [UCM_LALP] = 0x03B1,
-#define UCM_KEYCODE(name, code) name = X(UCM_ ## name), // LALP = X(UCM_LALP)
+#define UCM_KEYCODE(name, code) name = UM(UCM_ ## name), // LALP = UM(UCM_LALP)
 
 #if defined(UNICODE_ENABLE)
 enum unicode_keycodes {
@@ -235,61 +235,61 @@ enum unicode_keycodes {
 #endif
 
 
-#define ALPHA XP(LALP, UALP)
-#define BETA  XP(LBET, UBET)
-#define GAMMA XP(LGAM, UGAM)
-#define DELTA XP(LDEL, UDEL)
-#define EPSLN XP(LEPS, UEPS)
-#define ZETA  XP(LZET, UZET)
-#define ETA   XP(LETA, UETA)
-#define THETA XP(LTHE, UTHE)
-#define IOTA  XP(LIOT, UIOT)
-#define KAPPA XP(LKAP, UKAP)
-#define LAMBD XP(LLAM, ULAM)
-#define GMU   XP(LMU,  UMU)
-#define NU    XP(LNU,  UNU)
-#define XI    XP(LXI,  UXI)
-#define OMCRN XP(LOMI, UOMI)
-#define PI    XP(LPI,  UPI)
-#define RHO   XP(LRHO, URHO)
-#define SIGMA XP(LSIG, USIG)
-#define TAU   XP(LTAU, UTAU)
-#define UPSLN XP(LUPS, UUPS)
-#define PHI   XP(LPHI, UPHI)
-#define CHI   XP(LCHI, UCHI)
-#define PSI   XP(LPSI, UPSI)
-#define OMEGA XP(LOME, UOME)
+#define ALPHA UP(LALP, UALP)
+#define BETA  UP(LBET, UBET)
+#define GAMMA UP(LGAM, UGAM)
+#define DELTA UP(LDEL, UDEL)
+#define EPSLN UP(LEPS, UEPS)
+#define ZETA  UP(LZET, UZET)
+#define ETA   UP(LETA, UETA)
+#define THETA UP(LTHE, UTHE)
+#define IOTA  UP(LIOT, UIOT)
+#define KAPPA UP(LKAP, UKAP)
+#define LAMBD UP(LLAM, ULAM)
+#define GMU   UP(LMU,  UMU)
+#define NU    UP(LNU,  UNU)
+#define XI    UP(LXI,  UXI)
+#define OMCRN UP(LOMI, UOMI)
+#define PI    UP(LPI,  UPI)
+#define RHO   UP(LRHO, URHO)
+#define SIGMA UP(LSIG, USIG)
+#define TAU   UP(LTAU, UTAU)
+#define UPSLN UP(LUPS, UUPS)
+#define PHI   UP(LPHI, UPHI)
+#define CHI   UP(LCHI, UCHI)
+#define PSI   UP(LPSI, UPSI)
+#define OMEGA UP(LOME, UOME)
 
-#define AH   XP(LAH,   UAH)
-#define BE   XP(LBE,   UBE)
-#define VE   XP(LVE,   UVE)
-#define GHE  XP(LGHE,  UGHE)
-#define DE   XP(LDE,   UDE)
-#define IE   XP(LIE,   UIE)
-#define IO   XP(LIO,   UIO)
-#define ZHE  XP(LZHE,  UZHE)
-#define ZE   XP(LZE,   UZE)
-#define IH   XP(LIH,   UIH)
-#define SIH  XP(LSIH,  USIH)
-#define KA   XP(LKA,   UKA)
-#define EL   XP(LEL,   UEL)
-#define EM   XP(LEM,   UEM)
-#define EN   XP(LEN,   UEN)
-#define OH   XP(LOH,   UOH)
-#define PE   XP(LPE,   UPE)
-#define ER   XP(LER,   UER)
-#define ES   XP(LES,   UES)
-#define TE   XP(LTE,   UTE)
-#define UU   XP(LUU,   UUU)
-#define EF   XP(LEF,   UEF)
-#define HA   XP(LHA,   UHA)
-#define TSE  XP(LTSE,  UTSE)
-#define CHE  XP(LCHE,  UCHE)
-#define SHA  XP(LSHA,  USHA)
-#define SCHA XP(LSCHA, USCHA)
-#define HARD XP(LHARD, UHARD)
-#define YERU XP(LYERU, UYERU)
-#define SOFT XP(LSOFT, USOFT)
-#define EH   XP(LEH,   UEH)
-#define YU   XP(LYU,   UYU)
-#define YA   XP(LYA,   UYA)
+#define AH   UP(LAH,   UAH)
+#define BE   UP(LBE,   UBE)
+#define VE   UP(LVE,   UVE)
+#define GHE  UP(LGHE,  UGHE)
+#define DE   UP(LDE,   UDE)
+#define IE   UP(LIE,   UIE)
+#define IO   UP(LIO,   UIO)
+#define ZHE  UP(LZHE,  UZHE)
+#define ZE   UP(LZE,   UZE)
+#define IH   UP(LIH,   UIH)
+#define SIH  UP(LSIH,  USIH)
+#define KA   UP(LKA,   UKA)
+#define EL   UP(LEL,   UEL)
+#define EM   UP(LEM,   UEM)
+#define EN   UP(LEN,   UEN)
+#define OH   UP(LOH,   UOH)
+#define PE   UP(LPE,   UPE)
+#define ER   UP(LER,   UER)
+#define ES   UP(LES,   UES)
+#define TE   UP(LTE,   UTE)
+#define UU   UP(LUU,   UUU)
+#define EF   UP(LEF,   UEF)
+#define HA   UP(LHA,   UHA)
+#define TSE  UP(LTSE,  UTSE)
+#define CHE  UP(LCHE,  UCHE)
+#define SHA  UP(LSHA,  USHA)
+#define SCHA UP(LSCHA, USCHA)
+#define HARD UP(LHARD, UHARD)
+#define YERU UP(LYERU, UYERU)
+#define SOFT UP(LSOFT, USOFT)
+#define EH   UP(LEH,   UEH)
+#define YU   UP(LYU,   UYU)
+#define YA   UP(LYA,   UYA)
diff --git a/users/rmeli/keyrecords/unicode.h b/users/rmeli/keyrecords/unicode.h
index c3ba96d5b654..63c355415e32 100644
--- a/users/rmeli/keyrecords/unicode.h
+++ b/users/rmeli/keyrecords/unicode.h
@@ -74,13 +74,13 @@ const uint32_t unicode_map[] PROGMEM = {
 };
 
 // Accents
-#define A_GRV XP(aGRV, AGRV)
-#define A_UML XP(aUML, AUML)
-#define E_GRV XP(eGRV, EGRV)
-#define E_ACT XP(eACT, EACT)
-#define I_GRV XP(iGRV, IGRV)
-#define I_CIR XP(iCIR, ICIR)
-#define O_GRV XP(oGRV, OGRV)
-#define O_UML XP(oUML, OUML)
-#define U_GRV XP(uGRV, UGRV)
-#define U_UML XP(uUML, UUML)
+#define A_GRV UP(aGRV, AGRV)
+#define A_UML UP(aUML, AUML)
+#define E_GRV UP(eGRV, EGRV)
+#define E_ACT UP(eACT, EACT)
+#define I_GRV UP(iGRV, IGRV)
+#define I_CIR UP(iCIR, ICIR)
+#define O_GRV UP(oGRV, OGRV)
+#define O_UML UP(oUML, OUML)
+#define U_GRV UP(uGRV, UGRV)
+#define U_UML UP(uUML, UUML)
diff --git a/users/romus/romus.c b/users/romus/romus.c
index 7d59f28eec78..e16dd3b8a0e5 100644
--- a/users/romus/romus.c
+++ b/users/romus/romus.c
@@ -291,13 +291,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case TUR_A:
             if (record->event.pressed) {
                 if ( is_capital ) {
-                    unicode_input_start();
-                    register_hex(0x00c2);
-                    unicode_input_finish();
+                    register_unicode(0x00c2);
                 } else {
-                    unicode_input_start();
-                    register_hex(0x00e2);
-                    unicode_input_finish();
+                    register_unicode(0x00e2);
                 }
             }
             return false;
@@ -305,13 +301,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case TUR_O:
             if (record->event.pressed) {
                 if ( is_capital ) {
-                    unicode_input_start();
-                    register_hex(0x00d6);
-                    unicode_input_finish();
+                    register_unicode(0x00d6);
                 } else {
-                    unicode_input_start();
-                    register_hex(0x00f6);
-                    unicode_input_finish();
+                    register_unicode(0x00f6);
                 }
             }
             return false;
@@ -319,13 +311,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case TUR_U:
             if (record->event.pressed) {
                 if ( is_capital ) {
-                    unicode_input_start();
-                    register_hex(0x00dc);
-                    unicode_input_finish();
+                    register_unicode(0x00dc);
                 } else {
-                    unicode_input_start();
-                    register_hex(0x00fc);
-                    unicode_input_finish();
+                    register_unicode(0x00fc);
                 }
             }
             return false;
@@ -333,13 +321,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case TUR_I:
             if (record->event.pressed) {
                 if ( is_capital ) {
-                    unicode_input_start();
-                    register_hex(0x0130);
-                    unicode_input_finish();
+                    register_unicode(0x0130);
                 } else {
-                    unicode_input_start();
-                    register_hex(0x0131);
-                    unicode_input_finish();
+                    register_unicode(0x0131);
                 }
             }
             return false;
@@ -347,13 +331,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case TUR_G:
             if (record->event.pressed) {
                 if ( is_capital ) {
-                    unicode_input_start();
-                    register_hex(0x011e);
-                    unicode_input_finish();
+                    register_unicode(0x011e);
                 } else {
-                    unicode_input_start();
-                    register_hex(0x011f);
-                    unicode_input_finish();
+                    register_unicode(0x011f);
                 }
             }
             return false;
@@ -361,13 +341,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case TUR_C:
             if (record->event.pressed) {
                 if ( is_capital ) {
-                    unicode_input_start();
-                    register_hex(0x00c7);
-                    unicode_input_finish();
+                    register_unicode(0x00c7);
                 } else {
-                    unicode_input_start();
-                    register_hex(0x00e7);
-                    unicode_input_finish();
+                    register_unicode(0x00e7);
                 }
             }
             return false;
@@ -375,13 +351,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case TUR_S:
             if (record->event.pressed) {
                 if ( is_capital ) {
-                    unicode_input_start();
-                    register_hex(0x015e);
-                    unicode_input_finish();
+                    register_unicode(0x015e);
                 } else {
-                    unicode_input_start();
-                    register_hex(0x015f);
-                    unicode_input_finish();
+                    register_unicode(0x015f);
                 }
             }
             return false;
diff --git a/users/rupa/unicode.c b/users/rupa/unicode.c
index f99e6d08325e..56b4509813e0 100644
--- a/users/rupa/unicode.c
+++ b/users/rupa/unicode.c
@@ -125,12 +125,14 @@ bool u_xp(bool is_shifted, const char *shifted, const char *plain) {
 };
 
 void zalgo(void) {
+    unicode_input_start();
     int number = (rand() % (8 + 1 - 2)) + 2;
     unsigned int index;
     for (index=0; index<number; index++) {
         uint16_t hex = (rand() % (0x036F + 1 - 0x0300)) + 0x0300;
         register_hex(hex);
     }
+    unicode_input_finish();
 }
 
 bool combined_text(uint16_t keycode) {
@@ -138,16 +140,16 @@ bool combined_text(uint16_t keycode) {
         return false;
     }
     tap_code(keycode);
-    unicode_input_start();
+
     switch (combined_mode) {
         case CM_CIRCLE:
-          register_hex(0x20DD);
+          register_unicode(0x20DD);
           break;
         case CM_NO:
-          register_hex(0x20E0);
+          register_unicode(0x20E0);
           break;
         case CM_KEYCAP:
-          register_hex(0x20E3);
+          register_unicode(0x20E3);
           break;
         case CM_ZALGO:
           zalgo();
@@ -155,7 +157,6 @@ bool combined_text(uint16_t keycode) {
         default:
           break;
     }
-    unicode_input_finish();
     return true;
 }
 
diff --git a/users/rupa/wrappers.h b/users/rupa/wrappers.h
index dfc00b512004..df32ef39abf8 100644
--- a/users/rupa/wrappers.h
+++ b/users/rupa/wrappers.h
@@ -28,14 +28,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define G_LWR   LT(_LOWER, KC_G)
 
 #if defined(UNICODEMAP_ENABLE)
-#    define CSHAPES XP(CCIR,CKEY)
-#    define CUIDADO XP(CUI,HAS)
-#    define NOPENAH XP(NOPE,STOP)
-#    define MUSIC_A XP(M4,M8)
-#    define MUSIC_B XP(M8B,M16)
-#    define SMILE   XP(SMB,SMW)
-#    define STARS   XP(STB,STW)
-#    define YEPYEP  XP(CHEK,HUN)
+#    define CSHAPES UP(CCIR,CKEY)
+#    define CUIDADO UP(CUI,HAS)
+#    define NOPENAH UP(NOPE,STOP)
+#    define MUSIC_A UP(M4,M8)
+#    define MUSIC_B UP(M8B,M16)
+#    define SMILE   UP(SMB,SMW)
+#    define STARS   UP(STB,STW)
+#    define YEPYEP  UP(CHEK,HUN)
 #endif
 
 /* _QWERTY
@@ -70,10 +70,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * │RCtl│RAlt│RGui│          FLIP          │   │   │   │M← │M↓ │M→ │
  * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
  */
-#define ____65_RAISE_______________ROW1    KC_GRV,  X(IBNG), X(IRNY), _______, X(CENT), _______, _______, _______, STARS,   _______, SMILE,   X(NEG),  CSHAPES, KC_DEL,  KC_HOME
-#define ____65_RAISE_______________ROW2    _______, _______, WAT,     X(LEXI), RUPA,    TADA,    YUNO,    _______, X(LELM), X(OM),   _______, MUSIC_A, MUSIC_B, _______, KC_INS
-#define ____65_RAISE_______________ROW3    _______, X(LALL), X(EFF),  DICE,    FART,    _______, HUGS,    JOY,     KISS,    LOD,     _______, NOPENAH,          YEPYEP,  KC_END
-#define ____65_RAISE_______________ROW4    OS_RSFT,          CUIDADO, X(ECKS), CATS,    DOMO,    BUGS,    X(NUM),  MUSIC,   DANCE,   X(LPRO), SHRUG,   KC_BTN1, KC_MS_U, KC_BTN2
+#define ____65_RAISE_______________ROW1    KC_GRV,  UM(IBNG), UM(IRNY), _______, UM(CENT), _______, _______, _______, STARS,   _______, SMILE,   UM(NEG),  CSHAPES, KC_DEL,  KC_HOME
+#define ____65_RAISE_______________ROW2    _______, _______, WAT,     UM(LEXI), RUPA,    TADA,    YUNO,    _______, UM(LELM), UM(OM),   _______, MUSIC_A, MUSIC_B, _______, KC_INS
+#define ____65_RAISE_______________ROW3    _______, UM(LALL), UM(EFF),  DICE,    FART,    _______, HUGS,    JOY,     KISS,    LOD,     _______, NOPENAH,          YEPYEP,  KC_END
+#define ____65_RAISE_______________ROW4    OS_RSFT,          CUIDADO, UM(ECKS), CATS,    DOMO,    BUGS,    UM(NUM),  MUSIC,   DANCE,   UM(LPRO), SHRUG,   KC_BTN1, KC_MS_U, KC_BTN2
 #define ____65_RAISE_______________ROW5    OS_RCTL, OS_RALT, OS_RGUI,                            FLIP,                      _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
 
 /* _LOWER
diff --git a/users/snowe/readme_ocean_dream.md b/users/snowe/readme_ocean_dream.md
index 688afc899824..fd6de1bca7d4 100644
--- a/users/snowe/readme_ocean_dream.md
+++ b/users/snowe/readme_ocean_dream.md
@@ -60,7 +60,6 @@ endif
 You're done! Now you can enable **Ocean Dream** by simply turning on the OLED feature
 ```makefile
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 ```
 
 And if you want to disable it without turning off the OLED Driver you can simply set 
diff --git a/users/spidey3/layer_rgb.c b/users/spidey3/layer_rgb.c
index cff20898cd9f..be76788d2196 100644
--- a/users/spidey3/layer_rgb.c
+++ b/users/spidey3/layer_rgb.c
@@ -73,9 +73,9 @@ const rgblight_segment_t *const PROGMEM _rgb_layers[] = {
     [LAYER_OFFSET + _NUMPAD] = _layer1_layer,
     [LAYER_OFFSET + _FN]     = _layer2_layer,
 
-    [LOCK_OFFSET + USB_LED_NUM_LOCK]    = _numlock_layer,
-    [LOCK_OFFSET + USB_LED_CAPS_LOCK]   = _capslock_layer,
-    [LOCK_OFFSET + USB_LED_SCROLL_LOCK] = _scrolllock_layer,
+    [LOCK_OFFSET + 0]    = _numlock_layer,
+    [LOCK_OFFSET + 1]   = _capslock_layer,
+    [LOCK_OFFSET + 2] = _scrolllock_layer,
 
     [MISC_OFFSET + 0] = _gflock_layer,
     [MISC_OFFSET + 1] = _glyphreplace_layer,
@@ -374,9 +374,9 @@ layer_state_t layer_state_set_user_rgb(layer_state_t state) {
 }
 
 bool led_update_user_rgb(led_t led_state) {
-    rgblight_set_layer_state(LOCK_OFFSET + USB_LED_NUM_LOCK, led_state.num_lock);
-    rgblight_set_layer_state(LOCK_OFFSET + USB_LED_CAPS_LOCK, led_state.caps_lock);
-    rgblight_set_layer_state(LOCK_OFFSET + USB_LED_SCROLL_LOCK, led_state.scroll_lock);
+    rgblight_set_layer_state(LOCK_OFFSET + 0, led_state.num_lock);
+    rgblight_set_layer_state(LOCK_OFFSET + 1, led_state.caps_lock);
+    rgblight_set_layer_state(LOCK_OFFSET + 2, led_state.scroll_lock);
 
     return true;
 }
diff --git a/users/spidey3/spidey3.c b/users/spidey3/spidey3.c
index 0f3c08fca6a9..b177f9f6526f 100644
--- a/users/spidey3/spidey3.c
+++ b/users/spidey3/spidey3.c
@@ -73,19 +73,13 @@ static uint32_t math_glyph_exceptions(const uint16_t keycode, const bool shifted
 }
 
 bool process_record_glyph_replacement(uint16_t keycode, keyrecord_t *record, uint32_t baseAlphaLower, uint32_t baseAlphaUpper, uint32_t zeroGlyph, uint32_t baseNumberOne, uint32_t spaceGlyph, uint32_t (*exceptions)(const uint16_t keycode, const bool shifted), uint8_t temp_mod, uint8_t temp_osm) {
-    void _register(uint32_t codepoint) {
-        unicode_input_start();
-        register_hex32(codepoint);
-        unicode_input_finish();
-    }
-
     if ((((temp_mod | temp_osm) & (MOD_MASK_CTRL | MOD_MASK_ALT | MOD_MASK_GUI))) == 0) {
         bool shifted = ((temp_mod | temp_osm) & MOD_MASK_SHIFT);
         if (exceptions) {
             uint32_t res = exceptions(keycode, shifted);
             if (res) {
                 if (record->event.pressed) {
-                    _register(res);
+                    register_unicode(res);
                 }
                 return false;
             }
@@ -100,7 +94,7 @@ bool process_record_glyph_replacement(uint16_t keycode, keyrecord_t *record, uin
 
                     bool     caps = host_keyboard_led_state().caps_lock;
                     uint32_t base = ((shifted == caps) ? baseAlphaLower : baseAlphaUpper);
-                    _register(base + (keycode - KC_A));
+                    register_unicode(base + (keycode - KC_A));
                     set_mods(temp_mod);
                 }
                 return false;
@@ -109,7 +103,7 @@ bool process_record_glyph_replacement(uint16_t keycode, keyrecord_t *record, uin
                     return true;
                 }
                 if (record->event.pressed) {
-                    _register(zeroGlyph);
+                    register_unicode(zeroGlyph);
                 }
                 return false;
             case KC_1 ... KC_9:
@@ -117,12 +111,12 @@ bool process_record_glyph_replacement(uint16_t keycode, keyrecord_t *record, uin
                     return true;
                 }
                 if (record->event.pressed) {
-                    _register(baseNumberOne + (keycode - KC_1));
+                    register_unicode(baseNumberOne + (keycode - KC_1));
                 }
                 return false;
             case KC_SPACE:
                 if (record->event.pressed) {
-                    _register(spaceGlyph); // em space
+                    register_unicode(spaceGlyph); // em space
                 }
                 return false;
         }
diff --git a/users/spidey3/spidey3_unicode.h b/users/spidey3/spidey3_unicode.h
index ee8e00056ce6..4a3657fdfd83 100644
--- a/users/spidey3/spidey3_unicode.h
+++ b/users/spidey3/spidey3_unicode.h
@@ -25,7 +25,7 @@ enum unicode_names {
     SURPRISE,
 };
 
-#    define X_BUL (XP(BUL1, BUL2))
-#    define X_DASH (XP(EMDASH, ENDASH))
+#    define X_BUL (UP(BUL1, BUL2))
+#    define X_DASH (UP(EMDASH, ENDASH))
 
 #endif
diff --git a/users/tominabox1/rules.mk b/users/tominabox1/rules.mk
index 1df563464045..f1ee5c04850f 100644
--- a/users/tominabox1/rules.mk
+++ b/users/tominabox1/rules.mk
@@ -12,7 +12,6 @@ RGB_MATRIX_ENABLE = yes
 EXTRAFLAGS += -flto
 BOOTLOADER = qmk-dfu
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
 endif
 
 ifeq ($(strip $(KEYBOARD)), lazydesigners/dimple)
diff --git a/users/turbomech/backupturbomech.c b/users/turbomech/backupturbomech.c
index 3671d27ab495..70d3d065c4f1 100644
--- a/users/turbomech/backupturbomech.c
+++ b/users/turbomech/backupturbomech.c
@@ -135,14 +135,15 @@ void matrix_init_user(void) {
 }
 
 static bool is_capslocked = false;
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
     is_capslocked = true;
    //     DDRB |= (1 << 2); PORTB &= ~(1 << 2);
   } else {
     is_capslocked = false;
   //  DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
   }
+  return false;
 }
   //rgblight_set();
 
diff --git a/users/turbomech/turbomech.c b/users/turbomech/turbomech.c
index 892db1b92724..75796fb8fb36 100644
--- a/users/turbomech/turbomech.c
+++ b/users/turbomech/turbomech.c
@@ -101,8 +101,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if (record->event.pressed) {
        register_code(KC_LPRN);
        unregister_code(KC_LPRN);
-       register_code(X(0x00B0));
-       unregister_code(X(0x00B0));
+       register_unicode(0x00B0);
 
         UC(0x256F);
         PROCESS_UNICODE(UC(0x00B0));
diff --git a/users/wanleg/rules.mk b/users/wanleg/rules.mk
index de4decf78a3f..cb447a179283 100644
--- a/users/wanleg/rules.mk
+++ b/users/wanleg/rules.mk
@@ -22,7 +22,7 @@ ifeq ($(strip $(BT)), yes)
   OPT_DEFS += -DBLUEFRUIT
   #Adafruit Bluefruit controller settings
   BLUETOOTH_ENABLE = yes
-  BLUETOOTH_DRIVER = BluefruitLE
+  BLUETOOTH_DRIVER = bluefruit_le
   F_CPU = 8000000
   CONSOLE_ENABLE = no 		# Console for debug(+400)
   COMMAND_ENABLE = no 		# Commands for debug and configuration
diff --git a/users/xulkal/custom_oled.c b/users/xulkal/custom_oled.c
index fd03033ad67c..c6341fa3d7dd 100644
--- a/users/xulkal/custom_oled.c
+++ b/users/xulkal/custom_oled.c
@@ -71,15 +71,15 @@ static void render_layer(void)
 static void render_keyboard_leds(void)
 {
     // Host Keyboard LED Status
-    uint8_t led_state = host_keyboard_leds();
+    led_t led_state = host_keyboard_led_state();
 #ifdef OLED_90ROTATION
-    oled_write_P(IS_LED_ON(led_state, USB_LED_NUM_LOCK) ? PSTR("NUMLK") : PSTR("     "), false);
-    oled_write_P(IS_LED_ON(led_state, USB_LED_CAPS_LOCK) ? PSTR("CAPLK") : PSTR("     "), false);
-    oled_write_P(IS_LED_ON(led_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLK") : 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);
 #else
-    oled_write_P(IS_LED_ON(led_state, USB_LED_NUM_LOCK) ? PSTR("NUM  ") : PSTR("     "), false);
-    oled_write_P(IS_LED_ON(led_state, USB_LED_CAPS_LOCK) ? PSTR("CAPS ") : PSTR("     "), false);
-    oled_write_P(IS_LED_ON(led_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRL") : PSTR("    "), false);
+    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);
 #endif
 }
 
diff --git a/users/yet-another-developer/unicode.h b/users/yet-another-developer/unicode.h
index 9ff523baadf7..340b4cf94bcf 100644
--- a/users/yet-another-developer/unicode.h
+++ b/users/yet-another-developer/unicode.h
@@ -2,7 +2,6 @@
 
 #include "quantum.h"
 
-/* use X(n) to call the  */
 #ifdef UNICODEMAP_ENABLE
 enum unicode_name {
 OKOK,     // 
diff --git a/users/yet-another-developer/wrappers.h b/users/yet-another-developer/wrappers.h
index cd21032a4ecc..776da0c77ef3 100644
--- a/users/yet-another-developer/wrappers.h
+++ b/users/yet-another-developer/wrappers.h
@@ -118,13 +118,13 @@ NOTE: These are all the same length.  If you do a search/replace
 #endif
 
 #ifdef UNICODEMAP_ENABLE
-#define _______________UNICODE_L1__________________        X(SMRK),  X(THINK),  X(CLOWN), X(HUNDR), X(BANG)
-#define _______________UNICODE_L2__________________        X(GRIN),  X(MONKEY), X(OKOK), X(EGGPL), X(LIT)
-#define _______________UNICODE_L3__________________        X(WEARY), X(UNAMU),  X(EFFU), X(MONOCL), X(IRONY)
+#define _______________UNICODE_L1__________________        UM(SMRK),  UM(THINK),  UM(CLOWN), UM(HUNDR), UM(BANG)
+#define _______________UNICODE_L2__________________        UM(GRIN),  UM(MONKEY), UM(OKOK), UM(EGGPL), UM(LIT)
+#define _______________UNICODE_L3__________________        UM(WEARY), UM(UNAMU),  UM(EFFU), UM(MONOCL), UM(IRONY)
 
-#define _______________UNICODE_R1__________________        X(DRUG0), X(THUP), X(INUP), X(DIZZY), X(COOL)
-#define _______________UNICODE_R2__________________        X(FIST0), X(FIST2),X(FIST3),X(FIST1), X(OKOK)
-#define _______________UNICODE_R3__________________        X(MNDBLWN), X(THDN), X(SPOCK),X(HOLE),  X(DASH)
+#define _______________UNICODE_R1__________________        UM(DRUG0), UM(THUP), UM(INUP), UM(DIZZY), UM(COOL)
+#define _______________UNICODE_R2__________________        UM(FIST0), UM(FIST2),UM(FIST3),UM(FIST1), UM(OKOK)
+#define _______________UNICODE_R3__________________        UM(MNDBLWN), UM(THDN), UM(SPOCK),UM(HOLE),  UM(DASH)
 #endif
 
 #define ________________NUMBER_LEFT________________       KC_1,    KC_2,    KC_3,    KC_4,    KC_5
diff --git a/users/zer09/zer09.c b/users/zer09/zer09.c
index 78433b4c20d2..5e192f037a25 100644
--- a/users/zer09/zer09.c
+++ b/users/zer09/zer09.c
@@ -69,8 +69,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   return process_record_keymap(keycode, record);
 }
 
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+  if (led_state.caps_lock) {
     rbw_led_keys[RBW_LCAP].status = ENABLED;
     rbw_led_keys[RBW_RCAP].status = ENABLED;
   } else {
@@ -78,11 +78,12 @@ void led_set_user(uint8_t usb_led) {
     rbw_led_keys[RBW_RCAP].status = DISABLED;
   }
 
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
+  if (led_state.scroll_lock) {
     rbw_led_keys[RBW_SCRL].status = ENABLED;
   } else {
     rbw_led_keys[RBW_SCRL].status = DISABLED;
   }
 
-  led_set_keymap(usb_led);
+  led_set_keymap(led_state.raw);
+  return false;
 }
diff --git a/util/install/macos.sh b/util/install/macos.sh
index 870b4bec9451..8890c5a3f08c 100755
--- a/util/install/macos.sh
+++ b/util/install/macos.sh
@@ -19,8 +19,13 @@ _qmk_install() {
     # https://github.com/qmk/homebrew-qmk
     brew install qmk/qmk/qmk
 
+    # Conflicts with new toolchain formulae
+    brew uninstall --ignore-dependencies arm-gcc-bin@8 >/dev/null 2>&1
+
+    # Keg-only, so need to be manually linked
     brew link --force avr-gcc@8
-    brew link --force arm-gcc-bin@8
+    brew link --force arm-none-eabi-binutils
+    brew link --force arm-none-eabi-gcc@8
 
     python3 -m pip install -r $QMK_FIRMWARE_DIR/requirements.txt
 }
diff --git a/util/uf2conv.py b/util/uf2conv.py
index 578b2b49772d..84271cee4f6f 100755
--- a/util/uf2conv.py
+++ b/util/uf2conv.py
@@ -74,7 +74,7 @@ def convert_from_uf2(buf):
             assert False, "Non-word padding size at " + ptr
         while padding > 0:
             padding -= 4
-            outp += b"\x00\x00\x00\x00"
+            outp.append(b"\x00\x00\x00\x00")
         if familyid == 0x0 or ((hd[2] & 0x2000) and familyid == hd[7]):
             outp.append(block[32 : 32 + datalen])
         curraddr = newaddr + datalen
@@ -218,18 +218,17 @@ def get_drives():
             if len(words) >= 3 and words[1] == "2" and words[2] == "FAT":
                 drives.append(words[0])
     else:
-        rootpath = "/media"
+        searchpaths = ["/media"]
         if sys.platform == "darwin":
-            rootpath = "/Volumes"
+            searchpaths = ["/Volumes"]
         elif sys.platform == "linux":
-            tmp = rootpath + "/" + os.environ["USER"]
-            if os.path.isdir(tmp):
-                rootpath = tmp
-            tmp = "/run" + rootpath + "/" + os.environ["USER"]
-            if os.path.isdir(tmp):
-                rootpath = tmp
-        for d in os.listdir(rootpath):
-            drives.append(os.path.join(rootpath, d))
+            searchpaths += ["/media/" + os.environ["USER"], '/run/media/' + os.environ["USER"]]
+
+        for rootpath in searchpaths:
+            if os.path.isdir(rootpath):
+                for d in os.listdir(rootpath):
+                    if os.path.isdir(rootpath):
+                        drives.append(os.path.join(rootpath, d))
 
 
     def has_info(d):
diff --git a/util/uf2families.json b/util/uf2families.json
index c2140fe351a2..778af4421fc6 100644
--- a/util/uf2families.json
+++ b/util/uf2families.json
@@ -203,5 +203,15 @@
         "id": "0x11de784a",
         "short_name": "M0SENSE",
         "description": "M0SENSE BL702"
+    },
+    {
+        "id": "0x4b684d71",
+        "short_name": "MaixPlay-U4",
+        "description": "Sipeed MaixPlay-U4(BL618)"
+    },
+    {
+        "id": "0x9517422f",
+        "short_name": "RZA1LU",
+        "description": "Renesas RZ/A1LU (R7S7210xx)"
     }
-]
\ No newline at end of file
+]